From 18188947fa36358fac213245d41206edf2c3c7e7 Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Mon, 14 Nov 2016 14:56:24 +0100
Subject: [PATCH 001/877] service-wrapper: init at 16.04.0

---
 .../linux/service-wrapper/default.nix         |  25 ++
 .../linux/service-wrapper/service-wrapper.sh  | 247 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 274 insertions(+)
 create mode 100644 pkgs/os-specific/linux/service-wrapper/default.nix
 create mode 100755 pkgs/os-specific/linux/service-wrapper/service-wrapper.sh

diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix
new file mode 100644
index 00000000000..07a9b06ae76
--- /dev/null
+++ b/pkgs/os-specific/linux/service-wrapper/default.nix
@@ -0,0 +1,25 @@
+{ lib, runCommand, substituteAll, fetchurl, systemd, coreutils }:
+
+let
+  name = "service-wrapper-${version}";
+  version = "16.04.0"; # Ajar to Ubuntu Release
+in
+runCommand "${name}" {
+  script = substituteAll {
+    src = ./service-wrapper.sh;
+    inherit coreutils;
+  };
+
+  meta = with lib; {
+    description = "A convenient wrapper for the systemctl commands, borrow from Ubuntu";
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ DerTim1 ];
+  };
+}
+''
+  mkdir -p $out/bin
+  ln -s $out/bin $out/sbin
+  cp $script $out/bin/service
+  chmod a+x $out/bin/service
+''
diff --git a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
new file mode 100755
index 00000000000..373d86443f0
--- /dev/null
+++ b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
@@ -0,0 +1,247 @@
+#!/bin/sh
+
+###########################################################################
+# /usr/bin/service
+#
+# A convenient wrapper for the /etc/init.d init scripts.
+#
+# This script is a modified version of the /sbin/service utility found on
+# Red Hat/Fedora systems (licensed GPLv2+).
+#
+# Copyright (C) 2006 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2008 Canonical Ltd.
+#   * August 2008 - Dustin Kirkland <kirkland@canonical.com>
+# Copyright (C) 2013 Michael Stapelberg <stapelberg@debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# On Debian GNU/Linux systems, the complete text of the GNU General
+# Public License can be found in `/usr/share/common-licenses/GPL-2'.
+###########################################################################
+
+
+is_ignored_file() {
+	case "$1" in
+		skeleton | README | *.dpkg-dist | *.dpkg-old | rc | rcS | single | reboot | bootclean.sh)
+			return 0
+		;;
+	esac
+	return 1
+}
+
+VERSION=$(@coreutils@/bin/basename $0)" ver. 0.91-ubuntu1"
+USAGE="Usage: "$(@coreutils@/bin/basename $0)" < option > | --status-all | \
+[ service_name [ command | --full-restart ] ]"
+SERVICE=
+ACTION=
+SERVICEDIR="/etc/init.d"
+OPTIONS=
+is_systemd=
+
+
+if [ $# -eq 0 ]; then
+   echo "${USAGE}" >&2
+   exit 1
+fi
+
+if [ -d /run/systemd/system ]; then
+   is_systemd=1
+fi
+
+cd /
+while [ $# -gt 0 ]; do
+  case "${1}" in
+    --help | -h | --h* )
+       echo "${USAGE}" >&2
+       exit 0
+       ;;
+    --version | -V )
+       echo "${VERSION}" >&2
+       exit 0
+       ;;
+    *)
+       if [ -z "${SERVICE}" -a $# -eq 1 -a "${1}" = "--status-all" ]; then
+          if [ -d "${SERVICEDIR}" ]; then
+             cd ${SERVICEDIR}
+	     for SERVICE in * ; do
+	       case "${SERVICE}" in
+	         functions | halt | killall | single| linuxconf| kudzu)
+	             ;;
+	         *)
+	           if ! is_ignored_file "${SERVICE}" \
+	   	    && [ -x "${SERVICEDIR}/${SERVICE}" ]; then
+	                   out=$(env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status 2>&1)
+	                   retval=$?
+	                   if echo "$out" | egrep -iq "usage:"; then
+	                     #printf " %s %-60s %s\n" "[?]" "$SERVICE:" "unknown" 1>&2
+	                     echo " [ ? ]  $SERVICE" 1>&2
+	                     continue
+	                   else
+	                     if [ "$retval" = "0" -a -n "$out" ]; then
+	                       #printf " %s %-60s %s\n" "[+]" "$SERVICE:" "running"
+	                       echo " [ + ]  $SERVICE"
+	                       continue
+	                     else
+	                       #printf " %s %-60s %s\n" "[-]" "$SERVICE:" "NOT running"
+	                       echo " [ - ]  $SERVICE"
+	                       continue
+	                     fi
+	                   fi
+	             #env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status
+	           fi
+	           ;;
+	       esac
+	     done
+          else
+             systemctl $sctl_args list-units
+          fi
+          exit 0
+       elif [ $# -eq 2 -a "${2}" = "--full-restart" ]; then
+          SERVICE="${1}"
+          # On systems using systemd, we just perform a normal restart:
+          # A restart with systemd is already a full restart.
+          if [ -n "$is_systemd" ]; then
+             ACTION="restart"
+          else
+             if [ -x "${SERVICEDIR}/${SERVICE}" ]; then
+               env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" stop
+               env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" start
+               exit $?
+             fi
+          fi
+       elif [ -z "${SERVICE}" ]; then
+         SERVICE="${1}"
+       elif [ -z "${ACTION}" ]; then
+         ACTION="${1}"
+       else
+         OPTIONS="${OPTIONS} ${1}"
+       fi
+       shift
+       ;;
+   esac
+done
+
+# Operate against system upstart, not session
+unset UPSTART_SESSION
+if [ -r "/etc/init/${SERVICE}.conf" ] && which initctl >/dev/null \
+   && initctl version 2>/dev/null | grep -q upstart \
+   && initctl status ${SERVICE} 2>/dev/null 1>/dev/null
+then
+   # Upstart configuration exists for this job and we're running on upstart
+   case "${ACTION}" in
+      start|stop|status|reload)
+         # Action is a valid upstart action
+         exec ${ACTION} ${SERVICE} ${OPTIONS}
+      ;;
+      restart|force-reload)
+        # Map restart to the usual sysvinit behavior.
+        # Map force-reload to restart as per Debian policy 9.3.2,
+        # since there is no way to know if "reload" is supported
+         stop ${SERVICE} ${OPTIONS} || :
+         exec start ${SERVICE} ${OPTIONS}
+      ;;
+   esac
+fi
+
+
+run_via_sysvinit() {
+   # Otherwise, use the traditional sysvinit
+   if [ -x "${SERVICEDIR}/${SERVICE}" ]; then
+      exec env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" ${ACTION} ${OPTIONS}
+   else
+      echo "${SERVICE}: unrecognized service" >&2
+      exit 1
+   fi
+}
+
+update_openrc_started_symlinks() {
+   # maintain the symlinks of /run/openrc/started so that
+   # rc-status works with the service command as well
+   if [ -d /run/openrc/started ] ; then
+      case "${ACTION}" in
+      start)
+         if [ ! -h /run/openrc/started/$SERVICE ] ; then
+            ln -s $SERVICEDIR/$SERVICE /run/openrc/started/$SERVICE || true
+         fi
+      ;;
+      stop)
+         rm /run/openrc/started/$SERVICE || true
+      ;;
+      esac
+   fi
+}
+
+# When this machine is running systemd, standard service calls are turned into
+# systemctl calls.
+if [ -n "$is_systemd" ]
+then
+   UNIT="${SERVICE%.sh}.service"
+   # avoid deadlocks during bootup and shutdown from units/hooks
+   # which call "invoke-rc.d service reload" and similar, since
+   # the synchronous wait plus systemd's normal behaviour of
+   # transactionally processing all dependencies first easily
+   # causes dependency loops
+   if ! systemctl --quiet is-active multi-user.target; then
+       sctl_args="--job-mode=ignore-dependencies"
+   fi
+
+   case "${ACTION}" in
+      restart|status)
+         exec systemctl $sctl_args ${ACTION} ${UNIT}
+      ;;
+      start|stop)
+         # Follow the principle of least surprise for SysV people:
+         # When running "service foo stop" and foo happens to be a service that
+         # has one or more .socket files, we also stop the .socket units.
+         # Users who need more control will use systemctl directly.
+         for unit in $(systemctl list-unit-files --full --type=socket 2>/dev/null | sed -ne 's/\.socket\s*[a-z]*\s*$/.socket/p'); do
+             if [ "$(systemctl -p Triggers show $unit)" = "Triggers=${UNIT}" ]; then
+                systemctl $sctl_args ${ACTION} $unit
+             fi
+         done
+         exec systemctl $sctl_args ${ACTION} ${UNIT}
+      ;;
+      reload)
+         _canreload="$(SYSTEMCTL -p CanReload show ${UNIT} 2>/dev/null)"
+         if [ "$_canreload" = "CanReload=no" ]; then
+            # The reload action falls back to the sysv init script just in case
+            # the systemd service file does not (yet) support reload for a
+            # specific service.
+            run_via_sysvinit
+         else
+            exec systemctl $sctl_args reload "${UNIT}"
+         fi
+         ;;
+      force-stop)
+         exec systemctl --signal=KILL kill "${UNIT}"
+         ;;
+      force-reload)
+         _canreload="$(systemctl -p CanReload show ${UNIT} 2>/dev/null)"
+         if [ "$_canreload" = "CanReload=no" ]; then
+            exec systemctl $sctl_args restart "${UNIT}"
+         else
+            exec systemctl $sctl_args reload "${UNIT}"
+         fi
+         ;;
+      *)
+         # We try to run non-standard actions by running
+         # the init script directly.
+         run_via_sysvinit
+         ;;
+   esac
+fi
+
+update_openrc_started_symlinks
+run_via_sysvinit
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3a881fc9ad..1f9a9509254 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15786,6 +15786,8 @@ in
 
   sdlmame = callPackage ../games/sdlmame { };
 
+  service-wrapper = callPackage ../os-specific/linux/service-wrapper { };
+
   sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { };
 
   sienna = callPackage ../games/sienna { love = love_0_10; };
-- 
GitLab


From a4a63800c858767971b696a856f1565807862f8a Mon Sep 17 00:00:00 2001
From: Anton Schirg <anton.schirg@posteo.de>
Date: Sat, 6 May 2017 14:54:29 +0200
Subject: [PATCH 002/877] portaudio: add enable-cxx option

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

diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 3882e1fb08a..4185e29a442 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig ]
     ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
-  configureFlags = [ "--disable-mac-universal" ];
+  configureFlags = [ "--disable-mac-universal --enable-cxx" ];
 
   propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
 
-- 
GitLab


From 7a9efec8edd064dec5fbd08bb3fa358a4844d746 Mon Sep 17 00:00:00 2001
From: Anton Schirg <anton.schirg@posteo.de>
Date: Sat, 6 May 2017 14:55:13 +0200
Subject: [PATCH 003/877] lightworks: init at 14.0.0

---
 lib/maintainers.nix                           |  1 +
 .../applications/video/lightworks/default.nix | 87 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 90 insertions(+)
 create mode 100644 pkgs/applications/video/lightworks/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ee0697ed6e4..72090dbdc4a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -43,6 +43,7 @@
   andsild = "Anders Sildnes <andsild@gmail.com>";
   aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
   antono = "Antono Vasiljev <self@antono.info>";
+  antonxy = "Anton Schirg <anton.schirg@posteo.de>";
   apeschar = "Albert Peschar <albert@peschar.net>";
   apeyroux = "Alexandre Peyroux <alex@px.io>";
   ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
new file mode 100644
index 00000000000..9c6a49c5513
--- /dev/null
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv
+, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, mesa_glu
+, nvidia_cg_toolkit, zlib, openssl, portaudio
+}:
+let
+  fullPath = stdenv.lib.makeLibraryPath [
+    stdenv.cc.cc
+    gnome3.gtk
+    gdk_pixbuf
+    cairo
+    libjpeg_original
+    glib
+    gnome2.pango
+    mesa_glu
+    nvidia_cg_toolkit
+    zlib
+    openssl
+    portaudio
+  ];
+
+  lightworks = stdenv.mkDerivation rec {
+    version = "14.0.0";
+    name = "lightworks-${version}";
+    
+    src =
+      if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb";
+          sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033";
+        }
+      else throw "${name} is not supported on ${stdenv.system}";
+
+    buildInputs = [ dpkg makeWrapper ];
+
+    phases = [ "unpackPhase" "installPhase" ];
+    unpackPhase = "dpkg-deb -x ${src} ./";
+
+    installPhase = ''
+      mkdir -p $out/bin
+      substitute usr/bin/lightworks $out/bin/lightworks \
+        --replace "/usr/lib/lightworks" "$out/lib/lightworks"
+      chmod +x $out/bin/lightworks
+
+      cp -r usr/lib $out
+
+      # /usr/share/fonts is not normally searched
+      # This adds it to lightworks' search path while keeping the default
+      # using the FONTCONFIG_FILE env variable
+      echo "<?xml version='1.0'?>
+      <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+      <fontconfig>
+          <dir>/usr/share/fonts/truetype</dir>
+          <include>/etc/fonts/fonts.conf</include>
+      </fontconfig>" > $out/lib/lightworks/fonts.conf
+
+      patchelf \
+        --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        $out/lib/lightworks/ntcardvt
+
+      wrapProgram $out/lib/lightworks/ntcardvt \
+        --prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib/lightworks \
+        --set FONTCONFIG_FILE $out/lib/lightworks/fonts.conf
+       
+      cp -r usr/share $out/share
+    '';
+
+    dontPatchELF = true;
+
+    meta = {
+      description = "Professional Non-Linear Video Editor";
+      homepage = "https://www.lwks.com/";
+      license = stdenv.lib.licenses.unfree;
+      maintainers = [ stdenv.lib.maintainers.antonxy ];
+      platforms = [ "x86_64-linux" ];
+    };
+  };
+
+# Lightworks expects some files in /usr/share/lightworks
+in buildFHSUserEnv rec {
+  name = "lightworks";
+
+  targetPkgs = pkgs: [
+      lightworks
+  ];
+
+  runScript = "lightworks";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 944db15e148..508eb96b15a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14611,6 +14611,8 @@ with pkgs;
     inherit (gnome3) libpeas gsettings_desktop_schemas dconf;
   };
 
+  lightworks = callPackage ../applications/video/lightworks { };
+
   lingot = callPackage ../applications/audio/lingot {
     inherit (gnome2) libglade;
   };
-- 
GitLab


From 33dc8ced657188aeb3f1a28ac5cdff107f99b81d Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Wed, 30 Aug 2017 22:55:53 -0400
Subject: [PATCH 004/877] vscode-extension-ms-vscode-cpptools: Init at 0.12.3

---
 .../vscode-extensions/cpptools/default.nix    | 128 ++++++++++++++++++
 .../vscode-cpptools-0-12-3-package-json.patch |  82 +++++++++++
 pkgs/misc/vscode-extensions/default.nix       |   4 +-
 3 files changed, 213 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/misc/vscode-extensions/cpptools/default.nix
 create mode 100644 pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch

diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
new file mode 100644
index 00000000000..87c782222fc
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -0,0 +1,128 @@
+{ stdenv, lib, fetchurl, vscode-utils, unzip, dos2unix, mono46, clang-tools, writeScript
+, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. 
+}:
+
+assert gdbUseFixed -> null != gdb;
+
+/*
+  Note that this version of the extension still has some nix specific issues
+  which could not be fixed merely by patching (inside a C# dll).
+
+  In particular, the debugger requires either gnome-terminal or xterm. However
+  instead of looking for the terminal executable in `PATH`, for any linux platform
+  the dll uses an hardcoded path to one of these.
+
+  So, in order for debugging to work properly, you merely need to create symlinks
+  to one of these terminals at the appropriate location.
+
+  The good news is the the utility library is open source and with some effort
+  we could build a patched version ourselves. See:
+
+  <https://github.com/Microsoft/MIEngine/blob/2885386dc7f35e0f1e44827269341e786361f28e/src/MICore/TerminalLauncher.cs#L156>
+
+  Also, the extension should eventually no longer require an external terminal. See:
+
+  <https://github.com/Microsoft/vscode-cpptools/issues/35>
+
+  Once the symbolic link temporary solution taken, everything shoud run smootly.
+*/
+
+let
+  gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb";
+
+  langComponentBinaries = stdenv.mkDerivation {
+    name = "cpptools-language-component-binaries";
+
+    src = fetchurl {
+      url = https://download.visualstudio.microsoft.com/download/pr/11151953/d3cc8b654bffb8a2f3896d101f3c3155/Bin_Linux.zip;
+      sha256 = "12qbxsrdc73cqjb84xdck1xafzhfkcyn6bqbpcy1bxxr3b7hxbii";
+    };
+
+    buildInputs = [ unzip ];
+
+    patchPhase = ''
+      elfInterpreter="${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2"
+      patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.Extension.linux
+      patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.IntelliSense.Msvc.linux
+      chmod a+x ./Microsoft.VSCode.CPP.Extension.linux ./Microsoft.VSCode.CPP.IntelliSense.Msvc.linux
+    '';
+
+    installPhase = ''
+      mkdir -p "$out/bin"
+      find . -mindepth 1 -maxdepth 1 | xargs cp -a -t "$out/bin"
+    '';
+  };
+
+  cpptoolsJsonFile = fetchurl {
+    url = https://download.visualstudio.microsoft.com/download/pr/11070848/7b97d6724d52cae8377c61bb4601c989/cpptools.json;
+    sha256 = "124f091aic92rzbg2vg831y22zr5wi056c1kh775djqs3qv31ja6";
+  };
+
+
+
+  openDebugAD7Script = writeScript "OpenDebugAD7" ''
+    #!${stdenv.shell}
+    BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+    ${if gdbUseFixed
+        then ''
+          export PATH=''${PATH}''${PATH:+:}${gdb}/bin
+        ''
+        else ""}
+    ${mono46}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $*
+  '';
+in
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "cpptools";
+    publisher = "ms-vscode";
+    version = "0.12.3";
+    sha256 = "1dcqy54n1w29xhbvxscd41hdrbdwar6g12zx02f6kh2f1kw34z5z";
+  };
+
+  buildInputs = [
+    dos2unix
+  ];
+
+  prePatch = ''
+    dos2unix package.json      
+  '';
+
+  patches = [
+    ./vscode-cpptools-0-12-3-package-json.patch
+  ];
+
+  postPatch = ''
+    # Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`.
+    substituteInPlace "./package.json" \
+      --replace "\"default\": \"/usr/bin/gdb\"" "\"default\": \"${gdbDefaultsTo}\""
+
+    # Prevent download/install of extensions
+    touch "./install.lock"
+
+    # Move unused files out of the way.
+    mv ./debugAdapters/bin/OpenDebugAD7.exe.config ./debugAdapters/bin/OpenDebugAD7.exe.config.unused
+
+    # Bring the `cpptools.json` file at the root of the package, same as the extension would do.
+    cp -p "${cpptoolsJsonFile}" "./cpptools.json"
+
+    # Combining the language component binaries as part of our package.
+    find "${langComponentBinaries}/bin" -mindepth 1 -maxdepth 1 | xargs cp -p -t "./bin"
+
+    # Mono runtimes from nix package (used by generated `OpenDebugAD7`).
+    rm "./debugAdapters/OpenDebugAD7"
+    cp -p "${openDebugAD7Script}" "./debugAdapters/OpenDebugAD7"
+
+    # Clang-format from nix package.
+    mkdir -p "./LLVM"
+    find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM"
+  '';
+
+    meta = with stdenv.lib; {
+      license = licenses.unfree;
+      maintainer = [ maintainers.jraygauthier ];
+      # A 32 bit linux would also be possible with some effort (specific download of binaries + 
+      # patching of the elf files with 32 bit interpreter).
+      platforms = [ "x86_64-linux" ];
+    };
+}
\ No newline at end of file
diff --git a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch b/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch
new file mode 100644
index 00000000000..1873963f460
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch
@@ -0,0 +1,82 @@
+diff --git a/package.json b/package.json
+index 518e839..1c17c35 100644
+--- a/package.json
++++ b/package.json
+@@ -37,7 +37,26 @@
+     "Linters"
+   ],
+   "activationEvents": [
+-    "*"
++    "onLanguage:cpp",
++    "onLanguage:c",
++    "onCommand:extension.pickNativeProcess",
++    "onCommand:extension.pickRemoteNativeProcess",
++    "onCommand:extension.provideInitialConfigurations_cppvsdbg",
++    "onCommand:extension.provideInitialConfigurations_cppdbg",
++    "onCommand:C_Cpp.ConfigurationEdit",
++    "onCommand:C_Cpp.ConfigurationSelect",
++    "onCommand:C_Cpp.SwitchHeaderSource",
++    "onCommand:C_Cpp.UnloadLanguageServer",
++    "onCommand:C_Cpp.Navigate",
++    "onCommand:C_Cpp.GoToDeclaration",
++    "onCommand:C_Cpp.PeekDeclaration",
++    "onCommand:C_Cpp.ToggleErrorSquiggles",
++    "onCommand:C_Cpp.ToggleIncludeFallback",
++    "onCommand:C_Cpp.ShowReleaseNotes",
++    "onCommand:C_Cpp.ResetDatabase",
++    "workspaceContains:.vscode/c_cpp_properties.json",
++    "onDebug:cppdbg",
++    "onDebug:cppvsdbg"
+   ],
+   "main": "./out/src/main",
+   "contributes": {
+@@ -281,8 +300,7 @@
+             "cpp"
+           ]
+         },
+-        "runtime": "node",
+-        "program": "./out/src/Debugger/Proxy/debugProxy.js",
++        "program": "./debugAdapters/OpenDebugAD7",
+         "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
+         "variables": {
+           "pickProcess": "extension.pickNativeProcess",
+@@ -722,7 +740,29 @@
+               }
+             }
+           }
+-        }
++        },
++        "configurationSnippets": [
++          {
++            "label": "C/C++: (gdb) Launch",
++            "description": "Launch with gdb.",
++            "bodyText": "{\n\t\"name\": \"(gdb) Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t    {\n\t        \"description\": \"Enable pretty-printing for gdb\",\n\t        \"text\": \"-enable-pretty-printing\",\n\t        \"ignoreFailures\": true\n\t    }\n\t]\n}"
++          },
++          {
++            "label": "C/C++: (gdb) Attach",
++            "description": "Attach with gdb.",
++            "bodyText": "{ \n\t\"name\": \"(gdb) Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickProcess}\",\n\t\"MIMode\": \"gdb\"\n}"
++          },
++          {
++            "label": "C/C++: (gdb) Pipe Launch",
++            "description": "Pipe Launch with gdb.",
++            "bodyText": "{\n\t\"name\": \"(gdb) Pipe Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t    {\n\t        \"description\": \"Enable pretty-printing for gdb\",\n\t        \"text\": \"-enable-pretty-printing\",\n\t        \"ignoreFailures\": true\n\t    }\n\t]\n}"
++          },
++          {
++            "label": "C/C++: (gdb) Pipe Attach",
++            "description": "Pipe Attach with gdb.",
++            "bodyText": "{\n\t\"name\": \"(gdb) Pipe Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickRemoteProcess}\",\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\"\n}"
++          }
++        ]
+       },
+       {
+         "type": "cppvsdbg",
+@@ -741,7 +781,7 @@
+         "variables": {
+           "pickProcess": "extension.pickNativeProcess"
+         },
+-        "initialConfigurations": "extension.provideInitialConfigurations_cppvsdbg",
++        "initialConfigurations": "",
+         "configurationAttributes": {
+           "launch": {
+             "required": [
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index d357c43abd8..8047e29ad55 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, vscode-utils }:
+{ stdenv, lib, fetchurl, callPackage, vscode-utils }:
 
 let
   inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension;
@@ -22,4 +22,6 @@ rec {
       license = licenses.mit;
     };
   };
+
+  ms-vscode.cpptools = callPackage ./cpptools {};
 }
\ No newline at end of file
-- 
GitLab


From 362c84227332dddf536238e75acb7fd1c646714a Mon Sep 17 00:00:00 2001
From: timor <timor.dd@googlemail.com>
Date: Sun, 10 Sep 2017 13:43:32 +0200
Subject: [PATCH 005/877] mpich2: 1.4 -> 3.2

---
 pkgs/development/libraries/mpich2/default.nix | 26 ++++---------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix
index b80d549931c..d400712a6f9 100644
--- a/pkgs/development/libraries/mpich2/default.nix
+++ b/pkgs/development/libraries/mpich2/default.nix
@@ -1,33 +1,17 @@
 { stdenv, fetchurl, python, perl, gfortran }:
 
-let version = "1.4"; in
-stdenv.mkDerivation {
-  name = "mpich2-${version}";
+stdenv.mkDerivation  rec {
+  name = "mpich-${version}";
+  version = "3.2";
 
   src = fetchurl {
-    url = "http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${version}/mpich2-${version}.tar.gz";
+    url = "http://www.mpich.org/static/downloads/3.2/mpich-3.2.tar.gz";
     sha256 = "0bvvk4n9g4rmrncrgs9jnkcfh142i65wli5qp1akn9kwab1q80z6";
   };
 
   configureFlags = "--enable-shared --enable-sharedlib";
 
-  buildInputs = [ python perl gfortran ];
-  propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) stdenv.glibc;
-
-  patchPhase =
-    '' for i in $(find -type f -not -name Makefile.\*)
-       do
-         if grep -q /usr/bin/env "$i"
-         then
-             interpreter="$(cat $i | grep /usr/bin/env | sed -'es|^.*/usr/bin/env \([^ ]\+\).*$|\1|g')"
-             echo "file \`$i' -> interpreter \`$interpreter'"
-             path="$(type -P $interpreter)"
-             echo "\`/usr/bin/env $interpreter' -> \`$path' in \`$i'..."
-             sed -i "$i" -e "s|/usr/bin/env $interpreter|$path|g"
-         fi
-       done
-       true
-    '';
+  buildInputs = [ perl gfortran ];
 
   meta = {
     description = "Implementation of the Message Passing Interface (MPI) standard";
-- 
GitLab


From 306a0d32dfb668f697e962206284f8df75964d0d Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Fri, 22 Sep 2017 23:12:49 +1000
Subject: [PATCH 006/877] CONTRIBUTING.md: mention that the meta.license and
 meta.maintainers attributes must be set

---
 .github/CONTRIBUTING.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index f7fac647f41..99c5e0e429b 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -32,11 +32,13 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
     The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
 
 * `meta.description` should:
-  * Be capitalized
-  * Not start with the package name
-  * Not have a dot at the end
+  * Be capitalized.
+  * Not start with the package name.
+  * Not have a period at the end.
+* `meta.license` must be set and fit the upstream license.
+* `meta.maintainers` must be set.
 
-See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
+See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
 
 ## Writing good commit messages
 
-- 
GitLab


From dc8500165ca456df4ea9c4e828ea6dfb85797feb Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Thu, 5 Oct 2017 00:42:50 +0000
Subject: [PATCH 007/877] declarative containers: improve example config

Container config example code mentions `postgresql` service, but the correct use of that service involves setting `system.stateVersion` option (as discovered in https://github.com/NixOS/nixpkgs/issues/30056).

The actual system state version is set randomly to 17.03 because I have no preferences here
---
 nixos/modules/virtualisation/containers.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 82dfc1c9f1c..2e91a62c74b 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -596,6 +596,8 @@ in
                   { config, pkgs, ... }:
                   { services.postgresql.enable = true;
                     services.postgresql.package = pkgs.postgresql96;
+                    
+                    system.stateVersion = "17.03";
                   };
               };
           }
-- 
GitLab


From 86a6784fcaad8a17e242b2d566ae70277b9ca3c7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 5 Oct 2017 19:48:28 +0200
Subject: [PATCH 008/877] kdeApplication: kill unused file kde-locale-5.nix

---
 pkgs/applications/kde/kde-locale-5.nix | 24 ------------------------
 pkgs/applications/kde/l10n.nix         |  1 -
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/applications/kde/kde-locale-5.nix

diff --git a/pkgs/applications/kde/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix
deleted file mode 100644
index 76d601cbdc0..00000000000
--- a/pkgs/applications/kde/kde-locale-5.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-name: args:
-
-{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }:
-
-mkDerivation (args // {
-  sname = "kde-l10n-${name}";
-  name = "kde-l10n-${name}-qt5";
-
-  outputs = [ "out" ];
-
-  nativeBuildInputs =
-    [ cmake extra-cmake-modules gettext kdoctools ]
-    ++ (args.nativeBuildInputs or []);
-
-  preConfigure = ''
-    sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
-    ${args.preConfigure or ""}
-  '';
-
-  preFixup = ''
-    propagatedBuildInputs=
-    propagatedNativeBuildInputs=
-  '';
-})
diff --git a/pkgs/applications/kde/l10n.nix b/pkgs/applications/kde/l10n.nix
index 403db98c0f3..10a8472d5a9 100644
--- a/pkgs/applications/kde/l10n.nix
+++ b/pkgs/applications/kde/l10n.nix
@@ -3,7 +3,6 @@
 let
 
   kdeLocale4 = import ./kde-locale-4.nix;
-  kdeLocale5 = import ./kde-locale-5.nix;
 
 in
 
-- 
GitLab


From 78785a06f99d20ae86479c4f6896463f812e2760 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 4 Oct 2017 17:35:45 -0500
Subject: [PATCH 009/877] lsb-release: wrap to ensure needed utilities are
 available

---
 pkgs/os-specific/linux/lsb-release/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lsb-release/default.nix b/pkgs/os-specific/linux/lsb-release/default.nix
index 9715f77f9e4..34dae105a8d 100644
--- a/pkgs/os-specific/linux/lsb-release/default.nix
+++ b/pkgs/os-specific/linux/lsb-release/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, getopt }:
+{ stdenv, fetchurl, perl, coreutils, getopt, makeWrapper }:
 
 stdenv.mkDerivation rec {
   version = "1.4";
@@ -16,7 +16,14 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "prefix=$(out)" ];
 
-  buildInputs = [ perl getopt ];
+  nativeBuildInputs  = [ makeWrapper perl ];
+
+  buildInputs = [ coreutils getopt ];
+
+  # Ensure utilities used are available
+  preFixup = ''
+    wrapProgram $out/bin/lsb_release --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils getopt ]}
+  '';
 
   meta = {
     description = "Prints certain LSB (Linux Standard Base) and Distribution information";
-- 
GitLab


From 4b25ecc7b8142155728422cbab4a68592e63f35d Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Mon, 9 Oct 2017 20:37:02 +1100
Subject: [PATCH 010/877] CONTRIBUTING.md: license should default to unfree if
 there is no upstream license

---
 .github/CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 99c5e0e429b..41e85bd5ac4 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -36,6 +36,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
   * Not start with the package name.
   * Not have a period at the end.
 * `meta.license` must be set and fit the upstream license.
+  * If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`.
 * `meta.maintainers` must be set.
 
 See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
-- 
GitLab


From df5691d6770e2a8b2955ed0da2d48a01b00e4eaa Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Sun, 1 Oct 2017 00:36:10 +1000
Subject: [PATCH 011/877] buildLuaPackage: set makeFlags directly instead of
 through preBuild

So that lua packages can override it without having to resort to setting
makeFlagsArray in preBuild.
---
 pkgs/development/lua-modules/generic/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix
index 2a44cdfca0b..7152d0b9e36 100644
--- a/pkgs/development/lua-modules/generic/default.nix
+++ b/pkgs/development/lua-modules/generic/default.nix
@@ -5,14 +5,13 @@ lua:
 if disabled then
   throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
 else
-  lua.stdenv.mkDerivation ({
-
-      preBuild = ''
-        makeFlagsArray=(
-          PREFIX=$out
-          LUA_LIBDIR="$out/lib/lua/${lua.luaversion}"
-          LUA_INC="-I${lua}/include");
-      '';
+  lua.stdenv.mkDerivation (
+    {
+      makeFlags = [
+        "PREFIX=$(out)"
+        "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"
+        "LUA_INC=-I${lua}/include"
+      ];
     }
     //
     attrs
-- 
GitLab


From b83c89b6b488653d935e038a4d1763e0f814caa5 Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Mon, 9 Oct 2017 23:21:48 +1100
Subject: [PATCH 012/877] luajitPackages.mpack: disable with new isLuaJIT
 function insead of marking it as broken

---
 pkgs/top-level/lua-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index ff1108471bd..bea78a4c7df 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -14,6 +14,7 @@
 let
   isLua51 = lua.luaversion == "5.1";
   isLua52 = lua.luaversion == "5.2";
+  isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit";
 
   platformString =
     if stdenv.isDarwin then "macosx"
@@ -534,13 +535,13 @@ let
       "LUA_VERSION_MAJ_MIN="
       "LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}"
     ];
+    # gcc -llua fails with luajit.
+    disabled = isLuaJIT;
     meta = {
       description = "Simple implementation of msgpack in C Lua 5.1";
       homepage = "https://github.com/tarruda/libmpack";
       platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
       license = stdenv.lib.licenses.mit;
-      # gcc -llua fails with luajit
-      broken = (builtins.parseDrvName lua.name).name != "lua";
     };
   };
 
-- 
GitLab


From 152d294479a5fa7ddfb6c59d58719777ea2cb11c Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Mon, 9 Oct 2017 23:27:42 +1100
Subject: [PATCH 013/877] luajitPackages: disable luaexpat, luazip and cjson as
 their builds fail

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index bea78a4c7df..164b8258162 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -151,6 +151,8 @@ let
         EXPAT_INC="-I${expat.dev}/include");
     '';
 
+    disabled = isLuaJIT;
+
     meta = {
       homepage = "http://matthewwild.co.uk/projects/luaexpat";
       platforms = stdenv.lib.platforms.unix;
@@ -333,7 +335,7 @@ let
     buildInputs = [ unzip zziplib ];
     patches = [ ../development/lua-modules/zip.patch ];
     # does not currently work under lua 5.2
-    disabled = isLua52;
+    disabled = isLua52 || isLuaJIT;
     meta = {
       homepage = "https://github.com/luaforge/luazip";
       platforms = stdenv.lib.platforms.linux;
@@ -484,6 +486,7 @@ let
       rm -rf $out/share/lua/${lua.luaversion}/cjson/tests
     '';
     installTargets = "install install-extra";
+    disabled = isLuaJIT;
     meta = {
       description = "Lua C extension module for JSON support";
       license = stdenv.lib.licenses.mit;
-- 
GitLab


From b584c46623eba3985686ae41b9318694a6cb59ac Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Mon, 9 Oct 2017 23:29:56 +1100
Subject: [PATCH 014/877] luaPackages.luacheck: skip buildPhase

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 164b8258162..9bbb5a7c0c0 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -86,6 +86,9 @@ let
 
     propagatedBuildInputs = [ lua ];
 
+    # No Makefile.
+    dontBuild = true;
+
     installPhase = ''
       ${lua}/bin/lua install.lua $out
       '';
-- 
GitLab


From 2227d3586e1f0ed38b14bbd946738551a9d88329 Mon Sep 17 00:00:00 2001
From: Tom Saeger <tom.saeger@gmail.com>
Date: Mon, 9 Oct 2017 21:22:16 -0500
Subject: [PATCH 015/877] pythonPackages.ofxclient: 1.3.8 -> 2.0.3

---
 .../python-modules/ofxclient/default.nix      | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +----------
 2 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/ofxclient/default.nix

diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix
new file mode 100644
index 00000000000..c7877675530
--- /dev/null
+++ b/pkgs/development/python-modules/ofxclient/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi,
+ ofxhome, ofxparse, beautifulsoup, lxml, keyring
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  version = "2.0.3";
+  pname = "ofxclient";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0jdhqsbl34yn3n0x6mwsnl58c25v5lp6vr910c2hk7l74l5y7538";
+  };
+
+  patchPhase = ''
+    substituteInPlace setup.py --replace '"argparse",' ""
+  '';
+
+  # ImportError: No module named tests
+  doCheck = false;
+
+  propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup lxml keyring ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/captin411/ofxclient;
+    description = "OFX client for dowloading transactions from banks";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a34b22482e..75a2c8d077d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24776,22 +24776,7 @@ EOF
     };
   };
 
-  ofxclient = buildPythonPackage rec {
-    name = "ofxclient-1.3.8";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/ofxclient/${name}.tar.gz";
-      sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233";
-    };
-
-    patchPhase = ''
-      substituteInPlace setup.py --replace '"argparse",' ""
-    '';
-
-    # ImportError: No module named tests
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ ofxhome ofxparse beautifulsoup keyring ];
-  };
+  ofxclient = callPackage ../development/python-modules/ofxclient {};
 
   ofxhome = buildPythonPackage rec {
     name = "ofxhome-0.3.1";
-- 
GitLab


From 0946e304705414dd9f01e01f792293338fd37caf Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Fri, 13 Oct 2017 14:46:51 +1100
Subject: [PATCH 016/877] luaPackages: use consistent multiline strings for
 luafilsystem and luazlib

---
 pkgs/top-level/lua-packages.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 9bbb5a7c0c0..e4f18258aff 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -169,7 +169,10 @@ let
       url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
       sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1";
     };
-    preConfigure = "substituteInPlace config --replace 'CC= gcc' '';"
+
+    preConfigure = ''
+      substituteInPlace config --replace "CC= gcc" "";
+    ''
     + stdenv.lib.optionalString stdenv.isDarwin ''
       substituteInPlace config \
       --replace 'LIB_OPTION= -shared' '###' \
@@ -357,7 +360,9 @@ let
 
     buildInputs = [ zlib ];
 
-    preConfigure = "substituteInPlace Makefile --replace gcc cc --replace '-llua' ''";
+    preConfigure = ''
+      substituteInPlace Makefile --replace gcc cc --replace "-llua" ""
+    '';
 
     preBuild = ''
       makeFlagsArray=(
-- 
GitLab


From acc076d51fb367ec900c026ab64513f62d997258 Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Fri, 13 Oct 2017 14:48:17 +1100
Subject: [PATCH 017/877] luaPackages: various cosmetic fixes

These involve:

- Formatting and spacing.
- Switching to using fetchFromGitHub where possible.
- Adding missing meta attributes.
  - Correcting license values or adding missing license values.
  - Adding vyp as maintainer for unmaintained packages.

None of these changes should affect the build result.

A different revision is used for luasqlite3, however, the source code
between these revisions is actually the same. (And the advantage is that
the new revision is a tagged release.)
---
 pkgs/top-level/lua-packages.nix | 297 +++++++++++++++++++++-----------
 1 file changed, 194 insertions(+), 103 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index e4f18258aff..c94a401db0f 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -43,6 +43,7 @@ let
   luabitop = buildLuaPackage rec {
     version = "1.0.2";
     name = "bitop-${version}";
+
     src = fetchurl {
       url = "http://bitop.luajit.org/download/LuaBitOp-${version}.tar.gz";
       sha256 = "16fffbrgfcw40kskh2bn9q7m3gajffwd2f35rafynlnd7llwj1qj";
@@ -66,8 +67,10 @@ let
       install -p bit.so $out/lib/lua/${lua.luaversion}
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
+      description = "C extension module for Lua which adds bitwise operations on numbers";
       homepage = "http://bitop.luajit.org";
+      license = licenses.mit;
       maintainers = with maintainers; [ flosse ];
     };
   };
@@ -75,7 +78,7 @@ let
   luacheck = buildLuaPackage rec {
     pname = "luacheck";
     version = "0.20.0";
-    name = "${pname}${version}";
+    name = "${pname}-${version}";
 
     src = fetchFromGitHub {
       owner = "mpeterv";
@@ -91,12 +94,13 @@ let
 
     installPhase = ''
       ${lua}/bin/lua install.lua $out
-      '';
+    '';
 
     meta = with stdenv.lib; {
       description = "A tool for linting and static analysis of Lua code";
       homepage = https://github.com/mpeterv/luacheck;
       license = licenses.mit;
+      maintainers = with maintainers; [ vyp ];
       platforms = platforms.unix;
     };
   };
@@ -106,8 +110,10 @@ let
     name = "luaevent-${version}";
     disabled = isLua52;
 
-    src = fetchzip {
-      url = "https://github.com/harningt/luaevent/archive/v${version}.tar.gz";
+    src = fetchFromGitHub {
+      owner = "harningt";
+      repo = "luaevent";
+      rev = "v${version}";
       sha256 = "1c1n2zqx5rwfwkqaq1jj8gvx1vswvbihj2sy445w28icz1xfhpik";
     };
 
@@ -127,7 +133,7 @@ let
       homepage = http://luaforge.net/projects/luaevent/;
       description = "Binding of libevent to Lua";
       license = licenses.mit;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -135,6 +141,7 @@ let
     version = "1.3.0";
     name = "expat-${version}";
     isLibrary = true;
+
     src = fetchurl {
       url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz";
       sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h";
@@ -156,17 +163,22 @@ let
 
     disabled = isLuaJIT;
 
-    meta = {
+    meta = with stdenv.lib; {
+      description = "SAX XML parser based on the Expat library";
       homepage = "http://matthewwild.co.uk/projects/luaexpat";
-      platforms = stdenv.lib.platforms.unix;
-      maintainers = [ stdenv.lib.maintainers.flosse ];
+      license = licenses.mit;
+      maintainers = with maintainers; [ flosse ];
+      platforms = platforms.unix;
     };
   };
 
   luafilesystem = buildLuaPackage rec {
     name = "filesystem-1.6.2";
-    src = fetchzip {
-      url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
+
+    src = fetchFromGitHub {
+      owner = "keplerproject";
+      repo = "luafilesystem";
+      rev = "v1_6_2";
       sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1";
     };
 
@@ -179,40 +191,47 @@ let
       --replace '#LIB_OPTION= -bundle' 'LIB_OPTION= -bundle'
       substituteInPlace Makefile --replace '10.3' '10.5'
     '';
-    meta = {
+
+    meta = with stdenv.lib; {
+      description = "Lua library complementing filesystem-related functions";
       homepage = "https://github.com/keplerproject/luafilesystem";
-      platforms = stdenv.lib.platforms.unix;
+      license = licenses.mit;
       maintainers = with maintainers; [ flosse ];
+      platforms = platforms.unix;
     };
   };
 
   luaposix = buildLuaPackage rec {
     name = "posix-${version}";
     version = "33.4.0";
-    src = fetchurl {
-      url = "https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz";
-      sha256 = "e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21";
+
+    src = fetchFromGitHub {
+      owner = "luaposix";
+      repo = "luaposix";
+      rev = "release-v${version}";
+      sha256 = "0y531p54lx2yf243bcsyp6sv8fvbqidp20yry0xvb85p8zw9dlrq";
     };
+
     buildInputs = [ perl ];
-    meta = {
+
+    meta = with stdenv.lib; {
       description = "Lua bindings for POSIX API";
       homepage = "https://github.com/luaposix/luaposix";
-      platforms = stdenv.lib.platforms.unix;
+      license = licenses.mit;
+      maintainers = with maintainers; [ vyp ];
+      platforms = platforms.unix;
     };
   };
 
   lpty = buildLuaPackage rec {
     name = "lpty-${version}";
     version = "1.1.1";
+
     src = fetchurl {
       url = "http://www.tset.de/downloads/lpty-1.1-1.tar.gz";
       sha256 = "0d4ffda654dcf37dd8c99bcd100d0ee0dde7782cbd0ba9200ef8711c5cab02f1";
     };
-    meta = {
-      homepage = "http://www.tset.de/lpty";
-      platforms = stdenv.lib.platforms.linux;
-      license = stdenv.lib.licenses.mit;
-    };
+
     preBuild = ''
       makeFlagsArray=(
         INST_LIBDIR="$out/lib/lua/${lua.luaversion}"
@@ -222,15 +241,24 @@ let
         LUA_LIBDIR="-L${lua}/lib"
         );
     '';
+
+    meta = with stdenv.lib; {
+      description = "PTY control for Lua";
+      homepage = "http://www.tset.de/lpty";
+      license = licenses.mit;
+      maintainers = with maintainers; [ vyp ];
+      platforms = platforms.linux;
+    };
   };
 
   lua-iconv = buildLuaPackage rec {
     name = "lua-iconv-${version}";
     version = "7";
+
     src = fetchFromGitHub {
       owner = "ittner";
       repo = "lua-iconv";
-      rev = "e8d34024a6b185a759733915f116cc5588550261";
+      rev = name;
       sha256 = "0rd76966qlxfp8ypkyrbif76nxnm1acclqwfs45wz3972jsk654i";
     };
 
@@ -240,17 +268,18 @@ let
       );
     '';
 
-    meta = {
-      platforms = stdenv.lib.platforms.unix;
-      license = stdenv.lib.licenses.mit;
+    meta = with stdenv.lib; {
       description = "Lua bindings for POSIX iconv";
-      maintainers = [ maintainers.richardipsum ];
       homepage = "https://ittner.github.io/lua-iconv/";
+      license = licenses.mit;
+      maintainers = with maintainers; [ richardipsum ];
+      platforms = platforms.unix;
     };
   };
 
   luasec = buildLuaPackage rec {
     name = "sec-0.6";
+
     src = fetchFromGitHub {
       owner = "brunoos";
       repo = "luasec";
@@ -269,19 +298,24 @@ let
         LIB_PATH="-L$out/lib");
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
+      description = "Lua binding for OpenSSL library to provide TLS/SSL communication";
       homepage = "https://github.com/brunoos/luasec";
-      platforms = stdenv.lib.platforms.unix;
-      maintainers = [ stdenv.lib.maintainers.flosse ];
+      license = licenses.mit;
+      maintainers = with maintainers; [ flosse ];
+      platforms = platforms.unix;
     };
   };
 
   luasocket = buildLuaPackage rec {
     name = "socket-${version}";
     version = "3.0-rc1";
-    src = fetchurl {
-      url = "https://github.com/diegonehab/luasocket/archive/v${version}.tar.gz";
-      sha256 = "0j8jx8bjicvp9khs26xjya8c495wrpb7parxfnabdqa5nnsxjrwb";
+
+    src = fetchFromGitHub {
+      owner = "diegonehab";
+      repo = "luasocket";
+      rev = "v${version}";
+      sha256 = "1chs7z7a3i3lck4x7rz60ziwbf793gw169hpjdfca8y4yf1hzsxk";
     };
 
     patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
@@ -298,29 +332,29 @@ let
     '';
 
     meta = with stdenv.lib; {
+      description = "Network support for Lua";
       homepage = "http://w3.impa.br/~diego/software/luasocket/";
-      platforms = with platforms; darwin ++ linux ++ freebsd ++ illumos;
+      license = licenses.mit;
       maintainers = with maintainers; [ mornfall ];
+      platforms = with platforms; darwin ++ linux ++ freebsd ++ illumos;
     };
   };
 
   luxio = buildLuaPackage rec {
     name = "luxio-${version}";
     version = "13";
+
     src = fetchurl {
       url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2";
       sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz";
     };
+
     nativeBuildInputs = [ which pkgconfig ];
+
     postPatch = ''
       patchShebangs .
     '';
-    meta = {
-      platforms = stdenv.lib.platforms.unix;
-      license = stdenv.lib.licenses.mit;
-      description = "Lightweight UNIX I/O and POSIX binding for Lua";
-      maintainers = [ maintainers.richardipsum ];
-    };
+
     preBuild = ''
       makeFlagsArray=(
         INST_LIBDIR="$out/lib/lua/${lua.luaversion}"
@@ -329,23 +363,40 @@ let
         INSTALL=install
         );
     '';
+
+    meta = with stdenv.lib; {
+      description = "Lightweight UNIX I/O and POSIX binding for Lua";
+      homepage = "https://www.gitano.org.uk/luxio/";
+      license = licenses.mit;
+      maintainers = with maintainers; [ richardipsum ];
+      platforms = platforms.unix;
+    };
   };
 
   luazip = buildLuaPackage rec {
     name = "zip-${version}";
-    version = "1.2.3";
-    src = fetchzip {
-      url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip";
+    version = "2007-10-30";
+
+    src = fetchFromGitHub {
+      owner = "luaforge";
+      repo = "luazip";
+      rev = "0b8f5c958e170b1b49f05bc267bc0351ad4dfc44";
       sha256 = "0zrrwhmzny5zbpx91bjbl77gzkvvdi3qhhviliggp0aj8w3faxsr";
     };
-    buildInputs = [ unzip zziplib ];
+
+    buildInputs = [ zziplib ];
+
     patches = [ ../development/lua-modules/zip.patch ];
-    # does not currently work under lua 5.2
+
+    # Does not currently work under Lua 5.2 or LuaJIT.
     disabled = isLua52 || isLuaJIT;
-    meta = {
+
+    meta = with stdenv.lib; {
+      description = "Lua library to read files stored inside zip files";
       homepage = "https://github.com/luaforge/luazip";
-      platforms = stdenv.lib.platforms.linux;
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
+      maintainers = with maintainers; [ vyp ];
+      platforms = platforms.linux;
     };
   };
 
@@ -353,8 +404,10 @@ let
     name = "zlib-${version}";
     version = "1.1";
 
-    src = fetchzip {
-      url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz";
+    src = fetchFromGitHub {
+      owner = "brimworks";
+      repo = "lua-zlib";
+      rev = "v${version}";
       sha256 = "1520lk4xpf094xn2zallqgqhs0zb4w61l49knv9y8pmhkdkxzzgy";
     };
 
@@ -376,40 +429,49 @@ let
     preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}";
 
     meta = with stdenv.lib; {
+      description = "Simple streaming interface to zlib for Lua";
       homepage = https://github.com/brimworks/lua-zlib;
-      platforms = platforms.unix;
       license = licenses.mit;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
+      platforms = platforms.unix;
     };
   };
 
 
   luastdlib = buildLuaPackage {
     name = "stdlib";
+
     src = fetchzip {
       url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip";
       sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms";
     };
+
     nativeBuildInputs = [ autoreconfHook unzip ];
-    meta = {
-      homepage = "https://github.com/lua-stdlib/lua-stdlib/";
-      platforms = stdenv.lib.platforms.linux;
-      license = stdenv.lib.licenses.mit;
+
+    meta = with stdenv.lib; {
+      description = "General Lua libraries";
+      homepage = "https://github.com/lua-stdlib/lua-stdlib";
+      license = licenses.mit;
+      maintainers = with maintainers; [ vyp ];
+      platforms = platforms.linux;
     };
   };
 
   lrexlib = buildLuaPackage rec {
     name = "lrexlib-${version}";
     version = "2.8.0";
-    src = fetchzip {
-      url = "https://github.com/rrthomas/lrexlib/archive/rel-2-8-0.zip";
+
+    src = fetchFromGitHub {
+      owner = "rrthomas";
+      repo = "lrexlib";
+      rev = "rel-2-8-0";
       sha256 = "1c62ny41b1ih6iddw5qn81gr6dqwfffzdp7q6m8x09zzcdz78zhr";
     };
-    buildInputs = [ unzip luastdlib pcre luarocks oniguruma gnulib tre glibc ];
+
+    buildInputs = [ luastdlib pcre luarocks oniguruma gnulib tre glibc ];
 
     buildPhase = let
       luaVariable = ''LUA_PATH="${luastdlib}/share/lua/${lua.luaversion}/?/init.lua;${luastdlib}/share/lua/${lua.luaversion}/?.lua"'';
-
       pcreVariable = "PCRE_DIR=${pcre.out} PCRE_INCDIR=${pcre.dev}/include";
       onigVariable = "ONIG_DIR=${oniguruma}";
       gnuVariable = "GNU_INCDIR=${gnulib}/lib";
@@ -425,40 +487,47 @@ let
       cp -r luarocks/lib $out;
     '';
 
-    meta = {
-      homepage = "https://github.com/lua-stdlib/lua-stdlib/";
-      platforms = stdenv.lib.platforms.linux;
-      license = stdenv.lib.licenses.mit;
+    meta = with stdenv.lib; {
+      description = "Lua bindings of various regex library APIs";
+      homepage = "https://github.com/rrthomas/lrexlib";
+      license = licenses.mit;
+      maintainers = with maintainers; [ vyp ];
+      platforms = platforms.linux;
     };
   };
 
   luasqlite3 = buildLuaPackage rec {
     name = "sqlite3-${version}";
-    version = "2.1.1";
-    src = fetchzip {
-      url = "https://github.com/LuaDist/luasql-sqlite3/archive/2acdb6cb256e63e5b5a0ddd72c4639d8c0feb52d.zip";
-      sha256 = "17zsa0jzciildil9k4lb0rjn9s1nj80dy16pzx9bxqyi75pjf2d4";
+    version = "2.3.0";
+
+    src = fetchFromGitHub {
+      owner = "LuaDist";
+      repo = "luasql-sqlite3";
+      rev = version;
+      sha256 = "05k8zs8nsdmlwja3hdhckwknf7ww5cvbp3sxhk2xd1i3ij6aa10b";
     };
 
-    buildInputs = [ unzip sqlite ];
+    buildInputs = [ sqlite ];
 
     patches = [ ../development/lua-modules/luasql.patch ];
 
-    meta = {
+    meta = with stdenv.lib; {
+      description = "Database connectivity for Lua";
       homepage = "https://github.com/LuaDist/luasql-sqlite3";
-      platforms = stdenv.lib.platforms.linux;
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
+      maintainers = with maintainers; [ vyp ];
+      platforms = platforms.linux;
     };
   };
 
   lpeg = buildLuaPackage rec {
     name = "lpeg-${version}";
     version = "0.12";
+
     src = fetchurl {
       url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz";
       sha256 = "0xlbfw1w7l65a5qhnx5sfw327hkq1zcj8xmg4glfw6fj9ha4b9gg";
     };
-    buildInputs = [ unzip ];
 
     preBuild = ''
       makeFlagsArray=(CC=$CC);
@@ -472,32 +541,43 @@ let
       install -p re.lua $out/lib/lua/${lua.luaversion}
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
+      description = "Parsing Expression Grammars For Lua";
       homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/";
-      platforms = stdenv.lib.platforms.all;
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
+      maintainers = with maintainers; [ vyp ];
+      platforms = platforms.all;
     };
   };
 
   cjson = buildLuaPackage rec {
     name = "cjson-${version}";
     version = "2.1.0";
+
     src = fetchurl {
-      url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.1.0.tar.gz";
+      url = "http://www.kyne.com.au/~mark/software/download/lua-${name}.tar.gz";
       sha256 = "0y67yqlsivbhshg8ma535llz90r4zag9xqza5jx0q7lkap6nkg2i";
     };
+
     preBuild = ''
       sed -i "s|/usr/local|$out|" Makefile
     '';
+
     makeFlags = [ "LUA_VERSION=${lua.luaversion}" ];
+
     postInstall = ''
       rm -rf $out/share/lua/${lua.luaversion}/cjson/tests
     '';
+
     installTargets = "install install-extra";
+
     disabled = isLuaJIT;
-    meta = {
+
+    meta = with stdenv.lib; {
       description = "Lua C extension module for JSON support";
-      license = stdenv.lib.licenses.mit;
+      homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php";
+      license = licenses.mit;
+      maintainers = with maintainers; [ vyp ];
     };
   };
 
@@ -512,15 +592,7 @@ let
       sha256 = "09pbapjhyc3sn0jgx747shqr9286wqfzw02h43p4pk8fv2b766b9";
     };
 
-    meta = with stdenv.lib; {
-      description = "GObject-introspection based dynamic Lua binding to GObject based libraries";
-      homepage    = https://github.com/pavouk/lgi;
-      license     = "custom";
-      maintainers = with maintainers; [ lovek323 rasendubi ];
-      platforms   = platforms.unix;
-    };
-
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ glib gobjectIntrospection lua ];
 
     makeFlags = [ "LUA_VERSION=${lua.luaversion}" ];
@@ -528,31 +600,49 @@ let
     preBuild = ''
       sed -i "s|/usr/local|$out|" lgi/Makefile
     '';
+
+    meta = with stdenv.lib; {
+      description = "GObject-introspection based dynamic Lua binding to GObject based libraries";
+      homepage    = https://github.com/pavouk/lgi;
+      license     = licenses.mit;
+      maintainers = with maintainers; [ lovek323 rasendubi ];
+      platforms   = platforms.unix;
+    };
   };
 
   mpack = buildLuaPackage rec {
     name = "lua-mpack-${libmpack.version}";
+
+    # NOTE: For updating, new Lua mpack bindings live at:
+    # https://github.com/libmpack/libmpack-lua.
     src = libmpack.src;
     sourceRoot = "libmpack-${libmpack.rev}-src/binding/lua";
-  nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ libmpack ]; #libtool lua ];
+
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ libmpack ]; # ++ [ libtool lua ];
     dontBuild = true;
+
     preInstall = ''
       mkdir -p $out/lib/lua/${lua.luaversion}
     '';
+
     NIX_CFLAGS_COMPILE = "-Wno-error -fpic";
+
     installFlags = [
       "USE_SYSTEM_LUA=yes"
       "LUA_VERSION_MAJ_MIN="
       "LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}"
     ];
+
     # gcc -llua fails with luajit.
     disabled = isLuaJIT;
-    meta = {
-      description = "Simple implementation of msgpack in C Lua 5.1";
-      homepage = "https://github.com/tarruda/libmpack";
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-      license = stdenv.lib.licenses.mit;
+
+    meta = with stdenv.lib; {
+      description = "Lua bindings for libmpack";
+      homepage = "https://github.com/libmpack/libmpack-lua";
+      license = licenses.mit;
+      maintainers = with maintainers; [ vyp ];
+      platforms = with platforms; linux ++ darwin;
     };
   };
 
@@ -567,6 +657,14 @@ let
       sha256 = "0dhy0vklrhqrnmxb9pyqbfvkwwy86lwysk93pzg1j1zwprx366fj";
     };
 
+    buildInputs = [ lua ];
+
+    installPhase = ''
+      mkdir -p $out/lib/lua/${lua.luaversion}/
+      cp -r . $out/lib/lua/${lua.luaversion}/vicious/
+      printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' ..  package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua
+    '';
+
     meta = with stdenv.lib; {
       description = "Vicious widgets for window managers";
       homepage    = https://github.com/Mic92/vicious;
@@ -574,13 +672,6 @@ let
       maintainers = with maintainers; [ makefu mic92 ];
       platforms   = platforms.linux;
     };
-
-    buildInputs = [ lua ];
-    installPhase = ''
-      mkdir -p $out/lib/lua/${lua.luaversion}/
-      cp -r . $out/lib/lua/${lua.luaversion}/vicious/
-      printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' ..  package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua
-    '';
   };
 
 }; in self
-- 
GitLab


From e333df225e0cbeda543b577f3a7dee57741dec47 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 15 Oct 2017 18:07:27 -0500
Subject: [PATCH 018/877] robotfindskitten: install req'd data and put bin in
 $out/bin

---
 pkgs/games/robotfindskitten/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix
index 16e36a03dce..00d73f95bdb 100644
--- a/pkgs/games/robotfindskitten/default.nix
+++ b/pkgs/games/robotfindskitten/default.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses ];
 
+  makeFlags = [ "execgamesdir=$(out)/bin" ];
+
+  postInstall = ''
+    install -Dm644 {nki,$out/share/games/robotfindskitten}/vanilla.nki
+  '';
+
   meta = {
     description = "Yet another zen simulation; A simple find-the-kitten game";
     homepage = http://robotfindskitten.org/;
-- 
GitLab


From 2ef36f2ee58d3566374b09724d93ac8114796921 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 14 Oct 2017 13:17:50 +0800
Subject: [PATCH 019/877] neomutt: minor cleanups

 - neomutt has changed the binary name so we enable "mutt" via a wrapper script
   with a warning
 - we don't have to manually run the prepare.sh script as autoreconfHook handles
   everything for us
 - doc generation was previously trying to fetch DTDs from the net
---
 .../mailreaders/neomutt/default.nix           | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index a6cd17878b0..d9d2f201fdc 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,7 +1,19 @@
-{ stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl
+{ stdenv, fetchFromGitHub, which, autoreconfHook, writeScript, ncurses, perl
 , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
 
-stdenv.mkDerivation rec {
+let
+  muttWrapper = writeScript "mutt" ''
+    #!${stdenv.shell} -eu
+
+    echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.'
+    echo ""
+    echo 'This wrapper is provided for compatibility purposes only. You should start calling `neomutt` instead.'
+    echo ""
+    read -p 'Press any key to launch NeoMutt...' -n1 -s
+    exec neomutt "$@"
+  '';
+
+in stdenv.mkDerivation rec {
   version = "20171013";
   name = "neomutt-${version}";
 
@@ -12,24 +24,35 @@ stdenv.mkDerivation rec {
     sha256 = "0zn8imqfa76bxpkpy111c4vn6vjarbxc8gqv6m18qkksk0ly26l1";
   };
 
-  nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ];
   buildInputs = [
     cyrus_sasl gss gpgme kerberos libidn ncurses
     notmuch openssl perl lmdb
   ];
 
+  nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ];
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    for f in doc/*.{xml,xsl}*  ; do
+      substituteInPlace $f \
+        --replace http://docbook.sourceforge.net/release/xsl/current     ${docbook_xsl}/share/xml/docbook-xsl \
+        --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd
+    done
+  '';
+
   configureFlags = [
     "--enable-debug"
     "--enable-gpgme"
     "--enable-notmuch"
-    "--with-homespool=mailbox"
-    "--with-gss"
-    "--with-mailpath="
-    "--with-ssl"
-    "--with-sasl"
     "--with-curses"
+    "--with-gss"
+    "--with-homespool=mailbox"
     "--with-idn"
     "--with-lmdb"
+    "--with-mailpath="
+    "--with-sasl"
+    "--with-ssl"
 
     # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
     "ac_cv_path_SENDMAIL=sendmail"
@@ -40,9 +63,9 @@ stdenv.mkDerivation rec {
   # like pgpring, pgpewrap, ...
   NIX_LDFLAGS = "-lidn";
 
-  configureScript = "./prepare";
-
-  enableParallelBuilding = true;
+  postInstall = ''
+    cp ${muttWrapper} $out/bin/mutt
+  '';
 
   meta = with stdenv.lib; {
     description = "A small but very powerful text-based mail client";
-- 
GitLab


From b6b4783ca8e69fbedc1ce8f1688d06953d9f94b5 Mon Sep 17 00:00:00 2001
From: Marti Serra <marti.serra.coscollano@gmail.com>
Date: Tue, 17 Oct 2017 12:48:17 +0200
Subject: [PATCH 020/877] tribler: 7.0.0-rc2 -> 7.0.0-rc3

---
 pkgs/applications/networking/p2p/tribler/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index e5c0e30bce3..9d26a74f8bb 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -4,12 +4,11 @@
 stdenv.mkDerivation rec {
   pname = "tribler";
   name = "${pname}-${version}";
-  version = "7.0.0-rc2";
-  revision = "1d3ddb8";
+  version = "7.0.0-rc3";
 
   src = fetchurl {
     url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
-    sha256 = "0wlv32cw52c5khnrm218dccgn2l177933p4dhp7m50hipqfb0ly2";
+    sha256 = "0f1f8mzbk1ygkh8lv9y1s9mvslv12d94mxvmp3b4s2vm8w4syza7";
   };
 
   buildInputs = [
@@ -40,6 +39,8 @@ stdenv.mkDerivation rec {
     pythonPackages.decorator
     pythonPackages.feedparser
     pythonPackages.service-identity
+    pythonPackages.psutil
+    pythonPackages.meliae
   ];
 
   postPatch = ''
-- 
GitLab


From 318b3fb34e3dd5f8f3a86f6e60ade1ac3bce6305 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 19 Oct 2017 00:45:09 +0000
Subject: [PATCH 021/877] tixati: init at 2.55

---
 .../networking/p2p/tixati/default.nix         | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/p2p/tixati/default.nix

diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
new file mode 100644
index 00000000000..76034e6f735
--- /dev/null
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, glib, zlib, dbus, dbus_glib, gtk2, gdk_pixbuf, cairo, pango }:
+
+stdenv.mkDerivation rec {
+  name = "tixati-${version}";
+  version = "2.55";
+
+  src = fetchurl {
+    url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
+    sha256 = "02mha6lfcb0mg0y977bxa6xg8krpbsbzpm4b5xw6y6wign4d8a8w";
+  };
+
+  installPhase = ''
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+             --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus_glib gtk2 gdk_pixbuf cairo pango ]} \
+             tixati
+    install -D tixati         $out/bin/tixati
+    install -D tixati.desktop $out/share/applications/tixati.desktop
+    install -D tixati.png     $out/share/icons/tixati.png
+  '';
+
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    description = "Torrent client";
+    homepage = http://www.tixati.com;
+    license = licenses.free;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ volth ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9a3674ee6c..d604f410898 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16723,6 +16723,8 @@ with pkgs;
 
   tint2 = callPackage ../applications/misc/tint2 { };
 
+  tixati = callPackage ../applications/networking/p2p/tixati { };
+
   tkcvs = callPackage ../applications/version-management/tkcvs { };
 
   tla = callPackage ../applications/version-management/arch { };
-- 
GitLab


From 3e4b500529732c00fe0c3b33e51a8998fc6f03e6 Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Wed, 18 Oct 2017 22:04:01 -0700
Subject: [PATCH 022/877] maintainers: add Kevin Quick

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3116336db90..3565303dca4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -323,6 +323,7 @@
   konimex = "Muhammad Herdiansyah <herdiansyah@netc.eu>";
   koral = "Koral <koral@mailoo.org>";
   kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
+  kquick = "Kevin Quick <quick@sparq.org>";
   kragniz = "Louis Taylor <louis@kragniz.eu>";
   kristoff3r = "Kristoffer Søholm <k.soeholm@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
-- 
GitLab


From 6015fdc76aa9061af5c79e23c169072de4df5495 Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Wed, 18 Oct 2017 23:23:09 -0700
Subject: [PATCH 023/877] theft: add new theft development library package

---
 pkgs/development/libraries/theft/default.nix | 33 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/theft/default.nix

diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix
new file mode 100644
index 00000000000..00534413c7b
--- /dev/null
+++ b/pkgs/development/libraries/theft/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "0.4.3";
+  name = "theft-${version}";
+
+  src = fetchFromGitHub {
+    owner = "silentbicycle";
+    repo = "theft";
+    rev = "v${version}";
+    sha256 = "1ibh8np12lafnrsrvjbbzlyq45zq654939x0y22vdnc6s8dpbhw4";
+  };
+
+  preConfigure = "patchShebangs ./scripts/mk_bits_lut";
+  # doCheck = true;
+  
+  propagatedBuildInputs = [ ];
+
+  buildInputs = [ ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+  postInstall = ''
+      install -m644 vendor/greatest.h $out/include/
+    '';
+  
+  meta = {
+    description = "A C library for property-based testing.";
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://github.com/silentbicycle/theft/";
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.kquick ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9a3674ee6c..0be5b4b3c68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10766,6 +10766,8 @@ with pkgs;
 
   tet = callPackage ../development/tools/misc/tet { };
 
+  theft = callPackage ../development/libraries/theft { };
+
   thrift = callPackage ../development/libraries/thrift {
     inherit (pythonPackages) twisted;
   };
-- 
GitLab


From bb47bea024e692ed6c983bda2b48e7a25f377098 Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Thu, 19 Oct 2017 09:37:10 -0700
Subject: [PATCH 024/877] Enable checks and remove unnecessary lines.

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

diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix
index 00534413c7b..909df510dff 100644
--- a/pkgs/development/libraries/theft/default.nix
+++ b/pkgs/development/libraries/theft/default.nix
@@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = "patchShebangs ./scripts/mk_bits_lut";
-  # doCheck = true;
-  
-  propagatedBuildInputs = [ ];
-
-  buildInputs = [ ];
 
+  doCheck = true;
+  checkTarget = "test";
+  
   installFlags = [ "PREFIX=$(out)" ];
   postInstall = ''
       install -m644 vendor/greatest.h $out/include/
-- 
GitLab


From 6bfa45997b9bb5c177082d45682ed223c932a123 Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Thu, 19 Oct 2017 10:01:48 -0700
Subject: [PATCH 025/877] Remove trailing period from description per
 contribution guidelines.

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

diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix
index 909df510dff..345401dfa76 100644
--- a/pkgs/development/libraries/theft/default.nix
+++ b/pkgs/development/libraries/theft/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     '';
   
   meta = {
-    description = "A C library for property-based testing.";
+    description = "A C library for property-based testing";
     platforms = stdenv.lib.platforms.linux;
     homepage = "http://github.com/silentbicycle/theft/";
     license = stdenv.lib.licenses.isc;
-- 
GitLab


From 24eb66569527ec84eb35cd80ce407f2106c3a368 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 21 Oct 2017 02:27:09 -0500
Subject: [PATCH 026/877] cmake: setup CMAKE_FRAMEWORK_PATH

This tells cmake how to find macOS frameworks.

Fixes #26197
---
 pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index bf876e81cda..331f907ae61 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -84,6 +84,9 @@ makeCmakeFindLibs(){
         -L*)
           export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}"
           ;;
+        -F*)
+          export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag:2}"
+          ;;
         -isystem)
           isystem_seen=1
           ;;
-- 
GitLab


From bc2aaeb75caae20ececbb34d8abea789e94af3b1 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 21 Oct 2017 07:30:22 +0000
Subject: [PATCH 027/877] tixati: unfree license

---
 pkgs/applications/networking/p2p/tixati/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index 76034e6f735..d37f5293ef8 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Torrent client";
     homepage = http://www.tixati.com;
-    license = licenses.free;
+    license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ volth ];
   };
-- 
GitLab


From 18d286b6c9fb97434e8ef1a555fdc0b646335ef6 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Sat, 21 Oct 2017 22:29:45 +0100
Subject: [PATCH 028/877] plymouth: try to remove more references in themes

---
 nixos/modules/system/boot/plymouth.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index d45b1686c1e..595cb1a4f00 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -97,12 +97,26 @@ in
       moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)"
 
       mkdir -p $out/lib/plymouth/renderers
-      cp ${plymouth}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth
+      # module might come from a theme
+      cp ${themesEnv}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth
       cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers
 
       mkdir -p $out/share/plymouth/themes
       cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth
-      cp -r ${themesEnv}/share/plymouth/themes/{text,details,${cfg.theme}} $out/share/plymouth/themes
+
+      # copy themes into working directory for patching
+      mkdir themes
+      # use -L to copy the directories proper, not the symlinks to them
+      cp -r -L ${themesEnv}/share/plymouth/themes/{text,details,${cfg.theme}} themes
+
+      # patch out any attempted references to the theme or plymouth's themes directory
+      chmod -R +w themes
+      find themes -type f | while read file
+      do
+        sed -i "s,/nix/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file
+      done
+
+      cp -r themes/* $out/share/plymouth/themes
       cp ${cfg.logo} $out/share/plymouth/logo.png
     '';
 
-- 
GitLab


From e6a199b95d5bb24485c7b8eb7f2c51cadebaa558 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Sat, 21 Oct 2017 22:31:21 +0100
Subject: [PATCH 029/877] plasma5: set default theme for plymouth

---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index d7e72c4a7ae..a9cff5c9c37 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -193,6 +193,11 @@ in
         theme = "breeze";
       };
 
+      boot.plymouth = {
+        theme = mkDefault "breeze";
+        themePackages = mkDefault [ pkgs.breeze-plymouth ];
+      };
+
       security.pam.services.kde = { allowNullPassword = true; };
 
       # Doing these one by one seems silly, but we currently lack a better
-- 
GitLab


From 380bb673d46fbdcca42515d5a1a04c7385ff681f Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sun, 22 Oct 2017 16:06:34 +0200
Subject: [PATCH 030/877] vrb: init at 0.5.1

---
 pkgs/development/libraries/vrb/default.nix    | 34 +++++++++++++++++++
 .../libraries/vrb/removed_options.patch       | 13 +++++++
 .../vrb/unused-but-set-variable.patch         | 19 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/libraries/vrb/default.nix
 create mode 100644 pkgs/development/libraries/vrb/removed_options.patch
 create mode 100644 pkgs/development/libraries/vrb/unused-but-set-variable.patch

diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix
new file mode 100644
index 00000000000..4f72cc138ac
--- /dev/null
+++ b/pkgs/development/libraries/vrb/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "vrb-${version}";
+  version = "0.5.1";
+
+  src = fetchurl {
+    url = "http://vrb.sourceforge.net/download/${name}.tar.bz2";
+    sha256 = "d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f";
+  };
+
+  patches = [
+    ./removed_options.patch
+    ./unused-but-set-variable.patch
+  ];
+
+  postPatch = ''
+    patchShebangs configure
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/man/man3
+    cp -p vrb/man/man3/*.3 $out/share/man/man3/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A virtual ring buffer library written in C";
+    license     = licenses.lgpl21;
+    homepage    = http://vrb.sourceforge.net/;
+    maintainers = [ maintainers.bobvanderlinden ];
+    platforms   = platforms.linux;
+  };
+}
+
diff --git a/pkgs/development/libraries/vrb/removed_options.patch b/pkgs/development/libraries/vrb/removed_options.patch
new file mode 100644
index 00000000000..eda88e75184
--- /dev/null
+++ b/pkgs/development/libraries/vrb/removed_options.patch
@@ -0,0 +1,13 @@
+--- a/configure	2010-10-05 16:32:59.000000000 +0200
++++ b/configure	2010-10-05 16:33:08.000000000 +0200
+@@ -341,8 +341,8 @@
+     pgm_warn=( "${pgm_warn[@]}" -Winline )
+ fi
+ 
+-lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables )
+-pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables )
++lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions )
++pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions )
+ 
+ lib_cp_opt=( -pipe )
+ pgm_cp_opt=( -pipe )
diff --git a/pkgs/development/libraries/vrb/unused-but-set-variable.patch b/pkgs/development/libraries/vrb/unused-but-set-variable.patch
new file mode 100644
index 00000000000..43429255e8c
--- /dev/null
+++ b/pkgs/development/libraries/vrb/unused-but-set-variable.patch
@@ -0,0 +1,19 @@
+--- a/vrb/src/bin/vbuf.c1	2011-06-13 22:14:24.000000000 +0200
++++ b/vrb/src/bin/vbuf.c	2011-06-13 22:14:43.000000000 +0200
+@@ -426,7 +426,6 @@
+     int			opt_progress		;
+     int			output_fd		;
+     int			poll_time		;
+-    int			poll_num		;
+     int			poll_write		;
+     int			poll_read		;
+ 
+@@ -861,7 +860,7 @@
+ 	    poll_time = display_time - get_time_ms();
+ 	    if ( poll_time < 0 ) poll_time = 0;
+ 	}
+-	poll_num = poll( poll_list, 2, poll_time );
++	poll( poll_list, 2, poll_time );
+ 
+ 	//-----------------------
+ 	// Check for poll events.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 677357e4782..ef9b46699c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10898,6 +10898,8 @@ with pkgs;
 
   vmime = callPackage ../development/libraries/vmime { };
 
+  vrb = callPackage ../development/libraries/vrb { };
+
   vrpn = callPackage ../development/libraries/vrpn { };
 
   vsqlite = callPackage ../development/libraries/vsqlite { };
-- 
GitLab


From f906d6d18e87f4e2ee8a47d4f6040c77fd6c7f1e Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Sat, 21 Oct 2017 22:38:46 -0400
Subject: [PATCH 031/877] python36: 3.6.2 -> 3.6.3

---
 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 127c093501c..1614159a7ef 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -27,7 +27,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.6";
-  minorVersion = "2";
+  minorVersion = "3";
   minorVersionSuffix = "";
   pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "1ab4vlpdax1ihpiyiwchlgsk36apl4kgdw271wvl9l8ywhxpfacj";
+    sha256 = "1nl1raaagr4car787a2hmjv2dw6gqny53xfd6wisbgx4r5kxk9yd";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
-- 
GitLab


From a505abc9487ad2d6a069a9f236fc4156b7dd7c91 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 22 Oct 2017 13:58:28 +0200
Subject: [PATCH 032/877] libcap: already patch Make.Rules in prePatch

Make.Rules gets already included during compilation, so set paths before
invoking make. This fixes wrong paths in libcap.pc.
---
 pkgs/os-specific/linux/libcap/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 1cc8ab60d75..17cd40e427b 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -30,9 +30,8 @@ stdenv.mkDerivation rec {
 
     # ensure capsh can find bash in $PATH
     substituteInPlace progs/capsh.c --replace execve execvpe
-  '';
 
-  preInstall = ''
+    # set prefixes
     substituteInPlace Make.Rules \
       --replace 'prefix=/usr' "prefix=$lib" \
       --replace 'exec_prefix=' "exec_prefix=$out" \
-- 
GitLab


From 9bd930560292209b569158a0a591b59108dd4dd9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Oct 2017 08:33:11 -0400
Subject: [PATCH 033/877] curl: 7.56.0 -> 7.56.1

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

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index c01dbbaa3a7..d67b34371fe 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.56.0";
+  name = "curl-7.56.1";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "1pvr2bqfhk46bzq2x2hskmnq3wc8qxlps7apm9q1qiixb9ra8q6y";
+    sha256 = "142zidvlmrz31yx480nrhh47hl01d7jbaagin23pspl7cw1ng515";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
-- 
GitLab


From c62686fb4340462c2d8957f8598025f0d034d984 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 19 Oct 2017 16:20:27 +0800
Subject: [PATCH 034/877] kde-frameworks: 5.38 -> 5.39

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 608 +++++++++---------
 2 files changed, 309 insertions(+), 301 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 9f212c422f4..0e0372ad7ac 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.38/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.39/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 0672e48aba2..3a8ed594655 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,603 +3,611 @@
 
 {
   attica = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/attica-5.38.0.tar.xz";
-      sha256 = "12smdcd7lcyjqiw0bsk3lwivrl6cvmiqv5cqaw0gz8flhvk29w96";
-      name = "attica-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/attica-5.39.0.tar.xz";
+      sha256 = "15972518n4g65k391imkcsjikfsfhx8livdm6n0whag0aiz55haf";
+      name = "attica-5.39.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/baloo-5.38.0.tar.xz";
-      sha256 = "14522akyxg36lclfblp65xai95i9hiydqjhkmfkadjbq82wm9s9i";
-      name = "baloo-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/baloo-5.39.0.tar.xz";
+      sha256 = "06y8mv7v9y7syz04x0zicdm628k6za3p366xrzwafc43m159wyms";
+      name = "baloo-5.39.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/bluez-qt-5.38.0.tar.xz";
-      sha256 = "0hanmygp4smbvczxn4dj997z3bln32p017z0r26z89m2p0b2ylwv";
-      name = "bluez-qt-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/bluez-qt-5.39.0.tar.xz";
+      sha256 = "0j0072q0zc9hdpjbkqciqv18pwpdij74qrjph7whh66csjkr5ad1";
+      name = "bluez-qt-5.39.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/breeze-icons-5.38.0.tar.xz";
-      sha256 = "09afi6c4h31ycs6aa85lqbmn392zi532zf8fp7ll43xxjv9isac9";
-      name = "breeze-icons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/breeze-icons-5.39.0.tar.xz";
+      sha256 = "132bpgma1lqhrly48zz1f8jyg5z5pvnn1wnqxz6psvqhipw7fh5x";
+      name = "breeze-icons-5.39.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/extra-cmake-modules-5.38.0.tar.xz";
-      sha256 = "0ci3vdzdbcrbnxpqvf4hcwcrzz1ijhifp8b99wh3k53rinnai231";
-      name = "extra-cmake-modules-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/extra-cmake-modules-5.39.0.tar.xz";
+      sha256 = "1ldwzx2bzlzw7r31w8zy08j4cn9q7d1kszc5jb22zhfqpvbkc1dq";
+      name = "extra-cmake-modules-5.39.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/frameworkintegration-5.38.0.tar.xz";
-      sha256 = "0w1n3czgsnnmaqwypy3mpci8s4ppv9030zxw7ka7rsvwgkpqijq8";
-      name = "frameworkintegration-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/frameworkintegration-5.39.0.tar.xz";
+      sha256 = "136s8chyiac30czicqgkrc4abgm7c8b2ppnqwv9ngxpx7nsjgd2h";
+      name = "frameworkintegration-5.39.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kactivities-5.38.0.tar.xz";
-      sha256 = "0grm0cilc80g5ih2hqhwgwm35mlfnrs343j6ixkd9s0mflv2b798";
-      name = "kactivities-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kactivities-5.39.0.tar.xz";
+      sha256 = "0nkc1p7n6yvybcib6aqmnz08hwn3ryj1f9wbkiimgs0svr00sslq";
+      name = "kactivities-5.39.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kactivities-stats-5.38.0.tar.xz";
-      sha256 = "0s57iz04n3m4fpqrqflda6vpk4l1mnf0nyz1iyza382fb375afd2";
-      name = "kactivities-stats-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kactivities-stats-5.39.0.tar.xz";
+      sha256 = "18ghfqggwf38rmb1lkbv8ggxx71cp6ba3882kp5ccb7wwih51qcy";
+      name = "kactivities-stats-5.39.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kapidox-5.38.0.tar.xz";
-      sha256 = "1j4k75lhqdnsxmgyvblla0627qvgabxivw6limfdb3rdpmqdxj76";
-      name = "kapidox-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kapidox-5.39.0.tar.xz";
+      sha256 = "12nmsa1cg5amyawfxywlg8qsl01idi0jacrd8jzmvdj5m8sisw6n";
+      name = "kapidox-5.39.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/karchive-5.38.0.tar.xz";
-      sha256 = "0n5nxd3v9ljjff0r6k4xrvy5hj057b7c7jzcq258harl359d8m4k";
-      name = "karchive-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/karchive-5.39.0.tar.xz";
+      sha256 = "0rb8vr6lg8vx4f07swvlsyrxy4gj21aqfffk0cvhlsdz94j1phrw";
+      name = "karchive-5.39.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kauth-5.38.0.tar.xz";
-      sha256 = "12nyfbilz4v4b2i5x191iph3jj4lcpw7z1rh0xrv5y1v7dczk6i7";
-      name = "kauth-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kauth-5.39.0.tar.xz";
+      sha256 = "08bjxvv22y199skx4l9m8az165wz7inqqx7s8b7p5cjms4bvi15i";
+      name = "kauth-5.39.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kbookmarks-5.38.0.tar.xz";
-      sha256 = "0s230mcwmrg0qpz42sg804m96j2xpnwj4bdp0mfv08x3jasqpbrq";
-      name = "kbookmarks-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kbookmarks-5.39.0.tar.xz";
+      sha256 = "1xfabyc7hxmi1p0wqld0va5pl6bfwh50px4mvpxbnjdna6anw6z5";
+      name = "kbookmarks-5.39.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kcmutils-5.38.0.tar.xz";
-      sha256 = "0n6f2xvl5v8fwfxpdl6la1hb01dh4h1pcdrf05nn60v0rqg9f58b";
-      name = "kcmutils-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kcmutils-5.39.0.tar.xz";
+      sha256 = "1cz4haj83j59szl16r0mfh4zx93szrwkmb9mq2r21v46c8k5ldw0";
+      name = "kcmutils-5.39.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kcodecs-5.38.0.tar.xz";
-      sha256 = "0cnxhaj5jk7f3j9q4hzphc3nm3vdaqwy9xab5d4nvn1kv8vjv8ii";
-      name = "kcodecs-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kcodecs-5.39.0.tar.xz";
+      sha256 = "1q0l88nfbxgdy5lpm5xbcs749n9jyxhq7xsgqpf9c8irc7c1gw7f";
+      name = "kcodecs-5.39.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kcompletion-5.38.0.tar.xz";
-      sha256 = "0f955w67wrk15rdmglrk7k0xc5i6kah12bpb078xhzlyfackg52w";
-      name = "kcompletion-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kcompletion-5.39.0.tar.xz";
+      sha256 = "09jdc4pn7yjb7nagic38xiqdpv9fy4f2f4c1a5ynbli7x1r6l7ms";
+      name = "kcompletion-5.39.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kconfig-5.38.0.tar.xz";
-      sha256 = "0fi428dsr6qpa9336wcfic6hyix6l2p9s135w00qzdwhdkr4lx3r";
-      name = "kconfig-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kconfig-5.39.0.tar.xz";
+      sha256 = "011i48f07470igqqcz4hychbw0q85p0bh5dykpla4zwdldllsl1w";
+      name = "kconfig-5.39.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kconfigwidgets-5.38.0.tar.xz";
-      sha256 = "0w319d94wxn90dbbdfw5zrn2ddnv9vb7wldkpvvycq7yxrhsfw0x";
-      name = "kconfigwidgets-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kconfigwidgets-5.39.0.tar.xz";
+      sha256 = "1i6cniqsmn9sds8nj7bcsnbmlkq9m1yjwvr45mhal9rkhaas4xzw";
+      name = "kconfigwidgets-5.39.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kcoreaddons-5.38.0.tar.xz";
-      sha256 = "1m3mn9fhllwcidzji2l26k5yxzrqkbyjdly04nh3s5rf823dvqwv";
-      name = "kcoreaddons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kcoreaddons-5.39.0.tar.xz";
+      sha256 = "0qskv44siykyn8iiq99llibw3bk499ry7r3i8abx4ljjl717cvlz";
+      name = "kcoreaddons-5.39.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kcrash-5.38.0.tar.xz";
-      sha256 = "1a8hvyhwa112wx4ldadlrxpyda6qpial387j07dr1jq1cnzr0p11";
-      name = "kcrash-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kcrash-5.39.0.tar.xz";
+      sha256 = "1fv32l50h9rlc5s9iplyljcsrscivgdy2baghq7hbcs58xrjf1ws";
+      name = "kcrash-5.39.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdbusaddons-5.38.0.tar.xz";
-      sha256 = "1mw9sl82y2aj7l2xj1skrbxbyv55br60h6f61r4f1mqcaxaqj7qw";
-      name = "kdbusaddons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdbusaddons-5.39.0.tar.xz";
+      sha256 = "0hp85995n3193dvvdv48hv59b66dzd9p4iwnx2dmj797lghpnir3";
+      name = "kdbusaddons-5.39.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdeclarative-5.38.0.tar.xz";
-      sha256 = "1966sxzhdkzi2lwg5ixhrx0yg10plbvn9lsjgnj9crghaajsnf4b";
-      name = "kdeclarative-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdeclarative-5.39.0.tar.xz";
+      sha256 = "1l8wnyfz6qjqmcpdzavsb6m1r3ay1b2r186myymsyknr80yr2d7p";
+      name = "kdeclarative-5.39.0.tar.xz";
     };
   };
   kded = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kded-5.38.0.tar.xz";
-      sha256 = "0xsjzj5jx4wsrq5fnbv6raqlr11shz20p2mvypf5wfvq2c1vb5lb";
-      name = "kded-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kded-5.39.0.tar.xz";
+      sha256 = "0jv4ghl2gzfdkhk1in3vx39kigvpprvcb9xlzc5506mpfjc38ga5";
+      name = "kded-5.39.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/kdelibs4support-5.38.0.tar.xz";
-      sha256 = "06vlgziy212pwm4z9r8rbfa9ziwx3nkihy9b25m13gbh60baqapp";
-      name = "kdelibs4support-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/kdelibs4support-5.39.0.tar.xz";
+      sha256 = "03xjzhdvs497sk9bpz79crxlzwff198ivj4n5f0mwmnqc0100dfp";
+      name = "kdelibs4support-5.39.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdesignerplugin-5.38.0.tar.xz";
-      sha256 = "0rivjxgsxvsgk24lnzsqpzqr7m1i1faqnbby3rnkw2059z28l0y6";
-      name = "kdesignerplugin-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdesignerplugin-5.39.0.tar.xz";
+      sha256 = "1b7rn66wsyn9aipgvfmn2pq18g0zdjxb469126dj18fahg2k777f";
+      name = "kdesignerplugin-5.39.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdesu-5.38.0.tar.xz";
-      sha256 = "1c9j2zih7r0jph41kzxnxpri9snphm1k4w4rs1q6zawwz8a5kcr5";
-      name = "kdesu-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdesu-5.39.0.tar.xz";
+      sha256 = "03avzhs6a0p3cjv4kk9vavf6f64ffgs3pzhbdkfr76fh58h1v6wx";
+      name = "kdesu-5.39.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdewebkit-5.38.0.tar.xz";
-      sha256 = "1cncbjkgrbrnvwx3izjqh9hqiw9bg6aqaq09f8bdryvr8537b0zf";
-      name = "kdewebkit-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdewebkit-5.39.0.tar.xz";
+      sha256 = "05f0l3zw8cnvyavwwijwy5jx8dairhdbvg6ynpn7r5l10vawcf6x";
+      name = "kdewebkit-5.39.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdnssd-5.38.0.tar.xz";
-      sha256 = "101gygxrq2m3yfz6j0ldspib3pm3jjvqz505j3h15zj59qcwqw0x";
-      name = "kdnssd-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdnssd-5.39.0.tar.xz";
+      sha256 = "1c8d1wwr0hkdkgnq4k7lgkqwm1pj676i09l1kas256rzz6dcyl75";
+      name = "kdnssd-5.39.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kdoctools-5.38.0.tar.xz";
-      sha256 = "0fbv7i1930rl496psny7nfiixvsnaq535h1zggwkwv6i9dh7wpy9";
-      name = "kdoctools-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kdoctools-5.39.0.tar.xz";
+      sha256 = "17g4kf7mbjjxhii4nbhfpmhjs1q23mlh0d3fqyxxhm3pp02jg8ap";
+      name = "kdoctools-5.39.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kemoticons-5.38.0.tar.xz";
-      sha256 = "1c0991yd8jx2diy5ynl11h5qqyapn1dsir2gy04y8m90h944vdd5";
-      name = "kemoticons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kemoticons-5.39.0.tar.xz";
+      sha256 = "132gs69v43ms117ibdqmnhbyzzs5by76pfz7bd2zqwl4mq94hpgh";
+      name = "kemoticons-5.39.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kfilemetadata-5.38.0.tar.xz";
-      sha256 = "1815r9lx99h9kzbk67bfk41jya3y2hsi112fsgpv3m4mg028pklm";
-      name = "kfilemetadata-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kfilemetadata-5.39.0.tar.xz";
+      sha256 = "1mcxphjpayyq7v16b6c3zhb6c9vn67495xywfb9y8ysma1cdpshg";
+      name = "kfilemetadata-5.39.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.38.1";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kglobalaccel-5.38.1.tar.xz";
-      sha256 = "0si3bxxa6wj008j6rr6a1ljnsbmim4z0pqyx1z48ih4qamcfpkin";
-      name = "kglobalaccel-5.38.1.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kglobalaccel-5.39.0.tar.xz";
+      sha256 = "0wcbnwfi98cx8f99a2mcz2kg7mggz3hipfxv9s8ks6c80865kar1";
+      name = "kglobalaccel-5.39.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kguiaddons-5.38.0.tar.xz";
-      sha256 = "1jks0hwn665hlypl0qfhi5r0prqzrg1gv4skc88zp1kgx05kb9h1";
-      name = "kguiaddons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kguiaddons-5.39.0.tar.xz";
+      sha256 = "1az9i5bg7xd7kv7ajq8j8jab7zly683gyi90rmk54vfnn6igbq3f";
+      name = "kguiaddons-5.39.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/khtml-5.38.0.tar.xz";
-      sha256 = "0fa61va3dbwml40y4scxks223swlb8vf5730wr7rijl91lz1adgy";
-      name = "khtml-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/khtml-5.39.0.tar.xz";
+      sha256 = "097nbwv8ba48xmrga62j1irlkkc0l0f3971fp7225pzh1g3cg152";
+      name = "khtml-5.39.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/ki18n-5.38.0.tar.xz";
-      sha256 = "0z9arj2s4fn04vavl6ad3avl1p5yr3mgr2n802lmvy2wlqicy314";
-      name = "ki18n-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/ki18n-5.39.0.tar.xz";
+      sha256 = "1985qgihrch37b5gf7qw33bazahm3xb5v2nj43k6vdjxfg1clcay";
+      name = "ki18n-5.39.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kiconthemes-5.38.0.tar.xz";
-      sha256 = "01xa30r2cx312vbmz2c3x8vvna1cqb6fx91cjp4aivp9q4jwaz9a";
-      name = "kiconthemes-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kiconthemes-5.39.0.tar.xz";
+      sha256 = "1k4r263zz54497dgqaw9a74wqdklq4w353mc0g905k2g8arh7p9f";
+      name = "kiconthemes-5.39.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kidletime-5.38.0.tar.xz";
-      sha256 = "1i91w9hcb2k5n9qz8q7k2z44z9ss7r9i2zsg9vnl8am7dqqhmlsv";
-      name = "kidletime-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kidletime-5.39.0.tar.xz";
+      sha256 = "01h5pcr5kn11jby0zsz6igiwzf31hzip7h63dcsa8h67li4sibd8";
+      name = "kidletime-5.39.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kimageformats-5.38.0.tar.xz";
-      sha256 = "0q78shcwgczdm5ylhbp9fnq70w3hqzkbynp2vpyyg5pjaam8xjlp";
-      name = "kimageformats-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kimageformats-5.39.0.tar.xz";
+      sha256 = "1mnfdsxqnqdzhw3as77n1f1ddxpmab4slqlpwi4ih55xmgl85455";
+      name = "kimageformats-5.39.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kinit-5.38.0.tar.xz";
-      sha256 = "0k4i0zrwkz088vjkk7d7whwhkrjvqqhdigspzf58d1laryiy0jdf";
-      name = "kinit-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kinit-5.39.0.tar.xz";
+      sha256 = "0a2wl1vhsbb2x1cjd3wz7j3bp9kz1pxfc6mml7gpnq70qgk8hsn2";
+      name = "kinit-5.39.0.tar.xz";
     };
   };
   kio = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kio-5.38.0.tar.xz";
-      sha256 = "15qmr2ghrj7pgqxrgpvhdp9g5vaap9mzlmry6ayph75m1afb4fpl";
-      name = "kio-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kio-5.39.0.tar.xz";
+      sha256 = "091g4dbnals6c5wrj3xh3ws29wszysmb9ksyvyqf3d1lp9dfmjwn";
+      name = "kio-5.39.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kirigami2-5.38.0.tar.xz";
-      sha256 = "18k41j5ijmgmzgl2rv4ac0bnxlax3505zi1nmqm8bkdpznhfr13c";
-      name = "kirigami2-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kirigami2-5.39.0.tar.xz";
+      sha256 = "0spgylk4yjy74rs5d5b28qv72qz5ra9j3wfmk6vx2b6cvf1fw517";
+      name = "kirigami2-5.39.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kitemmodels-5.38.0.tar.xz";
-      sha256 = "0s20in4jjd2pvv9bn79lvgqqlf806hw014icp51f5hfknrhpdyjc";
-      name = "kitemmodels-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kitemmodels-5.39.0.tar.xz";
+      sha256 = "1bn0k0ya2phix6fyv8ax800ahncrkdzikz0sa3xrw5bq3iz1x6k9";
+      name = "kitemmodels-5.39.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kitemviews-5.38.0.tar.xz";
-      sha256 = "0ldi8qzs2sbhz8l57nshjrnwhjl9mhw90kcqw71cldp41wm0pps6";
-      name = "kitemviews-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kitemviews-5.39.0.tar.xz";
+      sha256 = "0pl899d1lz1dymdbq70485a8332z9i3s38dxnxv3cdwbla3xlsfh";
+      name = "kitemviews-5.39.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kjobwidgets-5.38.0.tar.xz";
-      sha256 = "0vp6nc73c9788nrib742k9nzqbx4m8m77ipqh9dnnkx4ggrhsd55";
-      name = "kjobwidgets-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kjobwidgets-5.39.0.tar.xz";
+      sha256 = "1z26555pkirdkfw8c9j1a863pqybklryfa30v3a59a0m9v2jdzfc";
+      name = "kjobwidgets-5.39.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/kjs-5.38.0.tar.xz";
-      sha256 = "0diw580k5kyv60bqhnxhqinlrn0b3p3n89iy0kdgjgnr6197fwy1";
-      name = "kjs-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/kjs-5.39.0.tar.xz";
+      sha256 = "0fkn308l6drj7pa94niqhcn2pqv7da7da5lq1nk8q6zlyg4nbcrn";
+      name = "kjs-5.39.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/kjsembed-5.38.0.tar.xz";
-      sha256 = "0nb07n54208gnmag7h3dhc8hri2s83ln1c9wq6c0xw7jchaz9z8a";
-      name = "kjsembed-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/kjsembed-5.39.0.tar.xz";
+      sha256 = "1i3qyxr409x82nqyck4qva63maxa2vvi07i0yxm6zqx5lvm9gkgb";
+      name = "kjsembed-5.39.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/kmediaplayer-5.38.0.tar.xz";
-      sha256 = "1qb2g8j871gf38i2dk2j9ags848fa3kqdjl3l4924hf28az0g736";
-      name = "kmediaplayer-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/kmediaplayer-5.39.0.tar.xz";
+      sha256 = "09ysw11br4k26bq6rvzcws2g565336p3gjkz4fxc8w2g3ma527p1";
+      name = "kmediaplayer-5.39.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/knewstuff-5.38.0.tar.xz";
-      sha256 = "1l4cmfcsljg7v5l6341fxcp7c7i615l8351l941dwcmw4yng0lj0";
-      name = "knewstuff-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/knewstuff-5.39.0.tar.xz";
+      sha256 = "1amflv96ybd6dqkc1chmz6d5crrl4dcq07fwsalxzx9mgr0z499r";
+      name = "knewstuff-5.39.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/knotifications-5.38.0.tar.xz";
-      sha256 = "1jvmv2hi3dbf0bd2b61l9s5lb1dx2rjl9z7pw1fb5j20910k6zgd";
-      name = "knotifications-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/knotifications-5.39.0.tar.xz";
+      sha256 = "0f38ca090p291d114fg3jz25lhwz7vad7s60ql4x3xwmdgaaw7dj";
+      name = "knotifications-5.39.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/knotifyconfig-5.38.0.tar.xz";
-      sha256 = "05hgglm6ypbaplxr43632zh5fmgsz6543110169k9fbjnczyhcyk";
-      name = "knotifyconfig-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/knotifyconfig-5.39.0.tar.xz";
+      sha256 = "09nk6sr6sp9a85lj4x9ac0ir4s5ac08835927b95d7m4ap2dbxrb";
+      name = "knotifyconfig-5.39.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kpackage-5.38.0.tar.xz";
-      sha256 = "0v4j3kqgg52rlmdxmd98aqw0hk7i2xqsw9mhhxfs9c7vm1x05sxn";
-      name = "kpackage-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kpackage-5.39.0.tar.xz";
+      sha256 = "1ibppkg9m77p0dcpfshcd891vlxcfgx6rk205gq6d5qxyqizygki";
+      name = "kpackage-5.39.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kparts-5.38.0.tar.xz";
-      sha256 = "19ba749pwnb7xvmr7lryn6z53zb49hqn0xq4j9fmbic95nh039zp";
-      name = "kparts-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kparts-5.39.0.tar.xz";
+      sha256 = "1r32jf2qbhqdjih9ff4n0ajd6s1cdncpq367mp5am31fz1jv3sr6";
+      name = "kparts-5.39.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kpeople-5.38.0.tar.xz";
-      sha256 = "0yd29436bgfw6jjjr9n38hx8561mrlgl5vynci6ng9bx1jflay0x";
-      name = "kpeople-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kpeople-5.39.0.tar.xz";
+      sha256 = "1s78dld3zlldhpk66s08v34zwi1k5ghivzbi7ab290sgrjc9afar";
+      name = "kpeople-5.39.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kplotting-5.38.0.tar.xz";
-      sha256 = "1hvfqm6i5fsyssb51w3yybsil8h9cbqgd2n8k0wnz99m8xifzn72";
-      name = "kplotting-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kplotting-5.39.0.tar.xz";
+      sha256 = "1diy1f23n6pih0s91kv1bp4mnnypnjl3pmi1xqni1v2cfwy0mnba";
+      name = "kplotting-5.39.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kpty-5.38.0.tar.xz";
-      sha256 = "0cgh8hixrplgc280652jlvk8ibcddmjvflwb0gjawd9iq7lcb66y";
-      name = "kpty-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kpty-5.39.0.tar.xz";
+      sha256 = "02h6dg3w3k58d1ydzyz6mhd1y5gds3k64wdsb84fnpxvlw46dlhn";
+      name = "kpty-5.39.0.tar.xz";
     };
   };
   kross = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/portingAids/kross-5.38.0.tar.xz";
-      sha256 = "1dccg214cqpyn3nninalpknglfmchz2k1fk4rlgq53wf4n6w23b7";
-      name = "kross-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/portingAids/kross-5.39.0.tar.xz";
+      sha256 = "1gh9gicr7ba8y3c0r7qpw2fj651fbbrhsy8gps8yll71axhxqvfh";
+      name = "kross-5.39.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/krunner-5.38.0.tar.xz";
-      sha256 = "16fhl5zm8scyxk83mpkavvzkn23qgzcblg315jy6klr5bz9jxgcm";
-      name = "krunner-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/krunner-5.39.0.tar.xz";
+      sha256 = "0gxs9z8mlb3s615ccrgkwyxww4jly48d8fkay33zwjaanqhkhgfl";
+      name = "krunner-5.39.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kservice-5.38.0.tar.xz";
-      sha256 = "0zaamvxhfx4xdy2m8spyhi0hdv6p0fn5hqn9pyi5l8xdixnwjc9d";
-      name = "kservice-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kservice-5.39.0.tar.xz";
+      sha256 = "0abz878yc8yir7iv5scn55d0g2nljnzhr9c81wa6ggjsw0h077hl";
+      name = "kservice-5.39.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/ktexteditor-5.38.0.tar.xz";
-      sha256 = "195ygv1j4wfvly31g22wxz9sshhqyi1yyf2mv1v63d9ci88v7rri";
-      name = "ktexteditor-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/ktexteditor-5.39.0.tar.xz";
+      sha256 = "1bk5wlvzjmfv7g9ab77asn055jp647zj69mfx2z3lvxb69swdnf5";
+      name = "ktexteditor-5.39.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/ktextwidgets-5.38.0.tar.xz";
-      sha256 = "120jxab8w1vhqcckda51r0x2pmfb2qd2h6inhivl72c4m5x89w7f";
-      name = "ktextwidgets-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/ktextwidgets-5.39.0.tar.xz";
+      sha256 = "0p6h165y03ir7qdf50kc77iq9plgvx39c8pz9dalvscvx42d2jaq";
+      name = "ktextwidgets-5.39.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kunitconversion-5.38.0.tar.xz";
-      sha256 = "10k0xfb11r7l1bdnlanqgdwwx8wrs8bmnswb2y85xxr7wwsqnlvc";
-      name = "kunitconversion-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kunitconversion-5.39.0.tar.xz";
+      sha256 = "04r1b2nc6vi56nfh6glhhd3d9v0ywxn2waibryjbszwrr39yhlzv";
+      name = "kunitconversion-5.39.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kwallet-5.38.0.tar.xz";
-      sha256 = "1qysdj4nmkxywj7bzqdc78ifnqjnkrz9qbp4a49acpng2y4zw1nw";
-      name = "kwallet-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kwallet-5.39.0.tar.xz";
+      sha256 = "1vlz9y3r1n6w7q9is60jsl9f7bm1djckdi9ibgzanwsp4k5ab0sz";
+      name = "kwallet-5.39.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kwayland-5.38.0.tar.xz";
-      sha256 = "0gd58nvyc39waj7vv2c68r59qqpv0jppm95548j2p924w48syjj0";
-      name = "kwayland-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kwayland-5.39.0.tar.xz";
+      sha256 = "0a9hi47nrsspkak88c9f6ind2i7q69zjmrgr5n7xsa4zxznwhx6x";
+      name = "kwayland-5.39.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kwidgetsaddons-5.38.0.tar.xz";
-      sha256 = "1yh48qxdqz3rk020wr897vkzsi4nhh37lxbg6211xrlirn0lzvj5";
-      name = "kwidgetsaddons-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kwidgetsaddons-5.39.0.tar.xz";
+      sha256 = "1d0d3ags15vr7ck031m6n5n3hw347siskzhb8rsgzghn6xnmbfdb";
+      name = "kwidgetsaddons-5.39.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kwindowsystem-5.38.0.tar.xz";
-      sha256 = "02xrin8lshvqkw12d0692z40h3g61f4crh28jcmi5zqlaxiyn5ic";
-      name = "kwindowsystem-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kwindowsystem-5.39.0.tar.xz";
+      sha256 = "1dys70va4h00ixxgxv52wbg8wi3jgsqckaikjqr34fzrmjh1lxqp";
+      name = "kwindowsystem-5.39.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kxmlgui-5.38.0.tar.xz";
-      sha256 = "12cmyhm05nkr9xj7cpnqihrlndfqn1kjkzhcn1ywj20y1gd3mxv4";
-      name = "kxmlgui-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kxmlgui-5.39.0.tar.xz";
+      sha256 = "0zwy11rh3yphl2346hmcahajxkgmrnfz1m8pd3vlnjs175dwz115";
+      name = "kxmlgui-5.39.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/kxmlrpcclient-5.38.0.tar.xz";
-      sha256 = "0g9ah59h8vq68yg4pfdbqx44xrs856wrr181rsdbsizj0qj3hyaa";
-      name = "kxmlrpcclient-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/kxmlrpcclient-5.39.0.tar.xz";
+      sha256 = "1j4a1n3ydln62m98h5p5lxlg1i7k5vzxb4f9kxkvzhw5gfpy78zs";
+      name = "kxmlrpcclient-5.39.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/modemmanager-qt-5.38.0.tar.xz";
-      sha256 = "18ham8lrxblywc634n49237js5y5k6qgjf5zrjc8gzapn934l89w";
-      name = "modemmanager-qt-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/modemmanager-qt-5.39.0.tar.xz";
+      sha256 = "0gdsp1017yjcfbq2jny7jz5rv7y4cavps5pfvg7zmylx0v057zk7";
+      name = "modemmanager-qt-5.39.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/networkmanager-qt-5.38.0.tar.xz";
-      sha256 = "10d28nrkppmmfl9pwq2hkrvi461acf29djdzala4l37mp4dwvbf8";
-      name = "networkmanager-qt-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/networkmanager-qt-5.39.0.tar.xz";
+      sha256 = "1jksv0zsdmkrid2f1m92fxw3gl6crcjaw43v5zra8h2m394iyr81";
+      name = "networkmanager-qt-5.39.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/oxygen-icons5-5.38.0.tar.xz";
-      sha256 = "0fk97r3br5myqpnfalz67l5hkamxc5vc5swa68wpg1xih6jc3iid";
-      name = "oxygen-icons5-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/oxygen-icons5-5.39.0.tar.xz";
+      sha256 = "1k1rns0fz5gvfnfwg60lrcw885cqmn814nzql9jvk07340w29s98";
+      name = "oxygen-icons5-5.39.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/plasma-framework-5.38.0.tar.xz";
-      sha256 = "1dvhqfi34v44h0wj0m68k477hmx53x9zsf4mh03xq164w1yz68sg";
-      name = "plasma-framework-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/plasma-framework-5.39.0.tar.xz";
+      sha256 = "1gaxk9mzwlyld09gqk29y3shvi6a1g1q3l849a9kl1hd07gr53x3";
+      name = "plasma-framework-5.39.0.tar.xz";
     };
   };
   prison = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/prison-5.38.0.tar.xz";
-      sha256 = "0prj3z6s3aighmk4qarfljca7j9cy7ypvgh8rv5di3jb2v4nbg4m";
-      name = "prison-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/prison-5.39.0.tar.xz";
+      sha256 = "1b0ji341xcamrd19z54r2nkm8cglbr4qfxyxmqzn8yc6icfl61nv";
+      name = "prison-5.39.0.tar.xz";
+    };
+  };
+  qqc2-desktop-style = {
+    version = "5.39.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.39/qqc2-desktop-style-5.39.0.tar.xz";
+      sha256 = "1q8ihhrnk2dh6bbmwkz822l5vv15y11qaj7gig1lf7xw5nr1i27v";
+      name = "qqc2-desktop-style-5.39.0.tar.xz";
     };
   };
   solid = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/solid-5.38.0.tar.xz";
-      sha256 = "1b3c5drx4m1x4ai0ziz0yan16a5s3ghf0py37mb92qyimq586lhh";
-      name = "solid-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/solid-5.39.0.tar.xz";
+      sha256 = "19bl7hzg1fya613vqhdxllh09csm6amrndnhfqnx90w4gb31p36r";
+      name = "solid-5.39.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/sonnet-5.38.0.tar.xz";
-      sha256 = "1355p88swnk828gsbnm3v4gryffnwbzjcdq49k8jwywzb65bnwxa";
-      name = "sonnet-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/sonnet-5.39.0.tar.xz";
+      sha256 = "1b5bfjbpb6l3c9j9k42shhnz9lqqxk2g607qx9ni0n2pr7w2p7w1";
+      name = "sonnet-5.39.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/syntax-highlighting-5.38.0.tar.xz";
-      sha256 = "101ng0l3jfg8x9bns9z38jk3iayijwcb299kf860vfy0nki8gf6l";
-      name = "syntax-highlighting-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/syntax-highlighting-5.39.0.tar.xz";
+      sha256 = "0b8sdkh9dqmqk3x48d25v4qhrqph0mv76v47skhvls9jspw7kzdc";
+      name = "syntax-highlighting-5.39.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.38.0";
+    version = "5.39.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.38/threadweaver-5.38.0.tar.xz";
-      sha256 = "1d89l9lknc1q25cz9r8iwc1a102q788mj01ghnl6ydss65rclvfv";
-      name = "threadweaver-5.38.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.39/threadweaver-5.39.0.tar.xz";
+      sha256 = "101bk8rzdysb3vi3vbbkh2s7sb1dhnsa8ncdvdsxqyyaya9ns4aw";
+      name = "threadweaver-5.39.0.tar.xz";
     };
   };
 }
-- 
GitLab


From 6aeaadfb8a83cf318521af224a7fb60366c9db85 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 19 Oct 2017 16:20:40 +0800
Subject: [PATCH 035/877] kwindowsystem: add missing dependencies

---
 .../libraries/kde-frameworks/kwindowsystem/default.nix         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index ffad3b1a7fd..c075adf0294 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -1,6 +1,7 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
+  libpthreadstubs, libXdmcp,
   qtbase, qttools, qtx11extras
 }:
 
@@ -11,7 +12,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qttools qtx11extras ];
+  buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ];
   propagatedBuildInputs = [ qtbase ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
-- 
GitLab


From 70b3fbde6e32d781c160156feffddbed6e6240d0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 21 Oct 2017 10:28:01 +0800
Subject: [PATCH 036/877] falkon: broken for now

---
 pkgs/applications/networking/browsers/falkon/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index b2067effb96..9356794bb5d 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
     license     = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];
     platforms   = platforms.unix;
+    broken      = true;
   };
 }
-- 
GitLab


From c41d794ecbdb56c9c576a1a7f59386d63ec48aed Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 21 Oct 2017 14:42:00 +0800
Subject: [PATCH 037/877] digikam: minor cleanups

---
 pkgs/applications/graphics/digikam/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 44ee807fe98..a62940ff703 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook
+{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
 
 # For `digitaglinktree`
 , perl, sqlite
@@ -33,8 +33,8 @@
 , liblqr1
 , libqtav
 , libusb1
-, mesa
 , marble
+, mesa
 , mysql
 , opencv3
 , pcre
@@ -53,11 +53,11 @@ mkDerivation rec {
   version = "5.7.0";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
+    url = "mirror://kde/stable/digikam/${name}.tar.xz";
     sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
 
   buildInputs = [
     bison
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab2d1dd75c0..13de557985c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17613,7 +17613,6 @@ with pkgs;
   digikam = libsForQt5.callPackage ../applications/graphics/digikam {
     inherit (plasma5) oxygen;
     inherit (kdeApplications) kcalcore;
-    boost = boost160;
   };
 
   displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {};
-- 
GitLab


From cf90441dea468632d640dc5e9c1fbdce397e53b5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 22 Oct 2017 12:31:26 +0800
Subject: [PATCH 038/877] ktexteditor: fix indenters

---
 pkgs/development/libraries/kde-frameworks/ktexteditor.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index 9e88c0a99fc..7fc11b1505c 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore, fetchpatch,
   extra-cmake-modules, perl,
   karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
   qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols
@@ -14,4 +14,9 @@ mkDerivation {
     qtxmlpatterns sonnet syntax-highlighting qtquickcontrols
   ];
   propagatedBuildInputs = [ kparts ];
+  patches = [ (fetchpatch {
+    url = "https://cgit.kde.org/ktexteditor.git/patch/?id=aeebeadb5f5955995c17de56cf83ba7166a132dd";
+    sha256 = "10a61w1qyw3czffl06xgccgd3yycz7s0hpg2vj0a24v05jhqiigf";
+    name = "ktextedtor_fix_indenters.patch";
+  })];
 }
-- 
GitLab


From 41df85dd1ba51abe225670ce39b2c7b30fb75da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Mon, 23 Oct 2017 08:53:32 +0200
Subject: [PATCH 039/877] coqPackages.QuickChick: remove support for coq 8.7

coqPackages_8_7.QuickChick won't build since Coq 8.7.0 is not yet supported
upstream.
---
 pkgs/development/coq-modules/QuickChick/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 688182f4e5e..af509dee29c 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -20,11 +20,6 @@ let param =
       sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9";
     };
 
-    "8.7" = {
-      version = "20170616";
-      rev = "366ee3f8e599b5cab438a63a09713f44ac544c5a";
-      sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9";
-    };
   }."${coq.coq-version}"
 ; in
 
-- 
GitLab


From 5072f4792e890c809a43763c8e0b283a22ee0c14 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 13:03:20 +0200
Subject: [PATCH 040/877] db{48,53,60,62}: add patch to fix CVE-2017-10140

---
 .../db/CVE-2017-10140-4.8-cwd-db_config.patch         | 11 +++++++++++
 .../libraries/db/CVE-2017-10140-cwd-db_config.patch   | 11 +++++++++++
 pkgs/development/libraries/db/db-4.8.nix              |  2 +-
 pkgs/development/libraries/db/db-5.3.nix              |  2 +-
 pkgs/development/libraries/db/db-6.0.nix              |  2 +-
 pkgs/development/libraries/db/db-6.2.nix              |  2 +-
 6 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch
 create mode 100644 pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch

diff --git a/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch b/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch
new file mode 100644
index 00000000000..ed916fcf4d1
--- /dev/null
+++ b/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch
@@ -0,0 +1,11 @@
+--- a/env/env_open.c.old	2017-06-26 10:32:11.011419981 +0200
++++ b/env/env_open.c	2017-06-26 10:32:46.893721233 +0200
+@@ -473,7 +473,7 @@
+ 	env->db_mode = mode == 0 ? DB_MODE_660 : mode;
+ 
+ 	/* Read the DB_CONFIG file. */
+-	if ((ret = __env_read_db_config(env)) != 0)
++	if (env->db_home != NULL && (ret = __env_read_db_config(env)) != 0)
+ 		return (ret);
+ 
+ 	/*
diff --git a/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch b/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch
new file mode 100644
index 00000000000..652e962bbe1
--- /dev/null
+++ b/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch
@@ -0,0 +1,11 @@
+--- db-5.3.28/src/env/env_open.c.old	2017-06-26 10:32:11.011419981 +0200
++++ db-5.3.28/src/env/env_open.c	2017-06-26 10:32:46.893721233 +0200
+@@ -473,7 +473,7 @@
+ 	env->db_mode = mode == 0 ? DB_MODE_660 : mode;
+ 
+ 	/* Read the DB_CONFIG file. */
+-	if ((ret = __env_read_db_config(env)) != 0)
++	if (env->db_home != NULL && (ret = __env_read_db_config(env)) != 0)
+ 		return (ret);
+ 
+ 	/*
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
index bce91e5a940..76e30e921ba 100644
--- a/pkgs/development/libraries/db/db-4.8.nix
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -3,7 +3,7 @@
 import ./generic.nix (args // rec {
   version = "4.8.30";
   sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
-  extraPatches = [ ./clang-4.8.patch ];
+  extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ];
 
   drvArgs.hardeningDisable = [ "format" ];
   drvArgs.doCheck = false;
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
index 066eca4e63d..7894e4c7326 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -3,5 +3,5 @@
 import ./generic.nix (args // rec {
   version = "5.3.28";
   sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
-  extraPatches = [ ./clang-5.3.patch ];
+  extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ];
 })
diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix
index b7c5667b883..bafca3bd52d 100644
--- a/pkgs/development/libraries/db/db-6.0.nix
+++ b/pkgs/development/libraries/db/db-6.0.nix
@@ -4,5 +4,5 @@ import ./generic.nix (args // rec {
   version = "6.0.20";
   sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0";
   license = stdenv.lib.licenses.agpl3;
-  extraPatches = [ ./clang-6.0.patch ];
+  extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ];
 })
diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix
index f897e3744af..96f7668aa90 100644
--- a/pkgs/development/libraries/db/db-6.2.nix
+++ b/pkgs/development/libraries/db/db-6.2.nix
@@ -4,5 +4,5 @@ import ./generic.nix (args // rec {
   version = "6.2.23";
   sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7";
   license = stdenv.lib.licenses.agpl3;
-  extraPatches = [ ./clang-6.0.patch ];
+  extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ];
 })
-- 
GitLab


From f269f319856f41ae562bf91a44e612d22f1e5f88 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 11:05:14 +0200
Subject: [PATCH 041/877] lame: 3.99.5 -> 3.100 for multiple CVEs

Fixes CVE-2017-9410, CVE-2017-9411, CVE-2017-9412.
---
 pkgs/development/libraries/lame/default.nix   |  8 ++---
 pkgs/development/libraries/lame/gcc-4.9.patch | 33 -------------------
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/development/libraries/lame/gcc-4.9.patch

diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index b324494faff..8ad7cb95a5d 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -23,15 +23,13 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "lame-${version}";
-  version = "3.99.5";
+  version = "3.100";
 
   src = fetchurl {
     url = "mirror://sourceforge/lame/${name}.tar.gz";
-    sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14";
+    sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx";
   };
 
-  patches = [ ./gcc-4.9.patch ];
-
   outputs = [ "out" "lib" "doc" ]; # a small single header
   outputMan = "out";
 
@@ -61,7 +59,7 @@ stdenv.mkDerivation rec {
     description = "A high quality MPEG Audio Layer III (MP3) encoder";
     homepage    = http://lame.sourceforge.net;
     license     = licenses.lgpl2;
-    maintainers = with maintainers; [ codyopel ];
+    maintainers = with maintainers; [ codyopel fpletz ];
     platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/lame/gcc-4.9.patch b/pkgs/development/libraries/lame/gcc-4.9.patch
deleted file mode 100644
index 59f8e00e4a8..00000000000
--- a/pkgs/development/libraries/lame/gcc-4.9.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-fix sse optimizations build on 32-bit with gcc 4.9
-http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=351af417bae0d09bd5a3753d1237f03adf591933
-
-xmm_quantize_sub.c: In function 'init_xrpow_core_sse':
-xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W
-psabi]
-     const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
-                  ^
-In file included from xmm_quantize_sub.c:37:0:
-/usr/lib/gcc/i686-w64-mingw32/4.9.0/include/xmmintrin.h:933:1: error: inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch
- _mm_loadu_ps (float const *__P)
- ^
-xmm_quantize_sub.c:65:18: error: called from here
-     const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
-                  ^
---- lame/libmp3lame/vector/xmm_quantize_sub.c.orig	2014-06-08 12:16:19.455468042 -0700
-+++ lame/libmp3lame/vector/xmm_quantize_sub.c	2014-06-08 12:16:09.592356980 -0700
-@@ -35,6 +35,7 @@
- #ifdef HAVE_XMMINTRIN_H
- 
- #include <xmmintrin.h>
-+#pragma GCC target("sse")
- 
- typedef union {
-     int32_t _i_32[4]; /* unions are initialized by its first member */
-@@ -124,6 +125,7 @@
- }
- 
- 
-+#pragma GCC target("sse2")
- void
- fht_SSE2(FLOAT * fz, int n)
- {
-- 
GitLab


From aebae6c20850ea1c29d2dad9d29b4db6c09e317c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 10:58:16 +0200
Subject: [PATCH 042/877] webkitgtk: 2.16.6 -> 2.18.1 for multiple CVEs

See https://webkitgtk.org/security/WSA-2017-0008.html
---
 pkgs/desktops/gnome-3/default.nix                   |  3 +--
 .../libraries/webkitgtk/{2.16.nix => 2.18.nix}      | 13 +++++--------
 .../development/libraries/wxwidgets/3.0/default.nix |  6 +++---
 pkgs/top-level/all-packages.nix                     |  6 +++---
 4 files changed, 12 insertions(+), 16 deletions(-)
 rename pkgs/development/libraries/webkitgtk/{2.16.nix => 2.18.nix} (88%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 10e5f97c38f..585f79ddea6 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -45,7 +45,7 @@ let
     hitori gnome-taquin
   ];
 
-  inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2
+  inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2
     clutter clutter-gst clutter_gtk cogl gtkvnc;
   inherit (pkgs.gnome2) ORBit2;
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
@@ -56,7 +56,6 @@ let
   gtkmm = gtkmm3;
   vala = pkgs.vala_0_32;
   gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
-  webkitgtk = webkitgtk216x;
 
 # Simplify the nixos module and gnome packages
   defaultIconTheme = adwaita-icon-theme;
diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.18.nix
similarity index 88%
rename from pkgs/development/libraries/webkitgtk/2.16.nix
rename to pkgs/development/libraries/webkitgtk/2.18.nix
index d6999353414..e1b520eb10b 100644
--- a/pkgs/development/libraries/webkitgtk/2.16.nix
+++ b/pkgs/development/libraries/webkitgtk/2.18.nix
@@ -4,7 +4,7 @@
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
 , libidn, libedit, readline, mesa, libintlOrEmpty
 , enableGeoLocation ? true, geoclue2, sqlite
-, gst-plugins-base
+, gst-plugins-base, gst-plugins-bad
 }:
 
 assert enableGeoLocation -> geoclue2 != null;
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.16.6";
+  version = "2.18.1";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw";
+    sha256 = "15fp7szmkpannx7avsynf0nv3y343qwq0fvq3rz2m2mw5wq7pnww";
   };
 
   # see if we can clean this up....
@@ -77,10 +77,7 @@ stdenv.mkDerivation rec {
   "-DENABLE_GTKDOC=OFF"
   ];
 
-  # XXX: WebKit2 missing include path for gst-plugins-base.
-  # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
-  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"
-                     + (optionalString stdenv.isDarwin " -lintl");
+  NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl";
 
   nativeBuildInputs = [
     cmake perl python2 ruby bison gperf
@@ -90,7 +87,7 @@ stdenv.mkDerivation rec {
   buildInputs = libintlOrEmpty ++ [
     gtk2 libwebp enchant libnotify gnutls pcre nettle libidn
     libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
-    sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core
+    sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core
   ] ++ optional enableGeoLocation geoclue2
     ++ (with xlibs; [ libXdmcp libXt libXtst ])
     ++ optionals stdenv.isDarwin [ libedit readline mesa ]
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 35300ed9419..2375de4b1bf 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -3,13 +3,13 @@
 , withMesa ? true, mesa_glu ? null, mesa_noglu ? null
 , compat24 ? false, compat26 ? true, unicode ? true
 , withGtk2 ? true
-, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null
+, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
 }:
 
 
 assert withMesa -> mesa_glu != null && mesa_noglu != null;
-assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null;
+assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null;
 
 with stdenv.lib;
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst-plugins-base GConf ]
     ++ optional withMesa mesa_glu
-    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x)
+    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x)
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfb50c82969..057f878dedc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10948,7 +10948,7 @@ with pkgs;
 
   wcslib = callPackage ../development/libraries/wcslib { };
 
-  webkitgtk = webkitgtk216x;
+  webkitgtk = webkitgtk218x;
 
   webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
     harfbuzz = harfbuzz-icu;
@@ -10956,9 +10956,9 @@ with pkgs;
     inherit (darwin) libobjc;
   };
 
-  webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix {
+  webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.16.nix {
     harfbuzz = harfbuzz-icu;
-    gst-plugins-base = gst_all_1.gst-plugins-base;
+    inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
   };
 
   webkitgtk217x = callPackage ../development/libraries/webkitgtk/2.17.nix {
-- 
GitLab


From 658335d6a88b623ab926dea99425e2716afa7f4e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 11:06:29 +0200
Subject: [PATCH 043/877] cdrdao: does not build with lame 3.100

---
 pkgs/tools/cd-dvd/cdrdao/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix
index 3b8040e2b91..25d94593f5e 100644
--- a/pkgs/tools/cd-dvd/cdrdao/default.nix
+++ b/pkgs/tools/cd-dvd/cdrdao/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lame, libvorbis, libmad, pkgconfig, libao}:
+{stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}:
 
 stdenv.mkDerivation {
   name = "cdrdao-1.2.3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   makeFlags = "RM=rm LN=ln MV=mv";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ lame libvorbis libmad libao ];
+  buildInputs = [ libvorbis libmad libao ];
 
   hardeningDisable = [ "format" ];
 
-- 
GitLab


From 30c739f7a1ba0b176cf6805f97248c804012a046 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Tue, 24 Oct 2017 13:32:34 +0200
Subject: [PATCH 044/877] pptp: correct reference to ${iproute}/bin/ip

A reference to /bin/ip was left hanging, causing failure when establishing a connection caused
pptp to try and manipulate roots.
---
 pkgs/tools/networking/pptp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix
index c2c41d92acb..6185f66b80e 100644
--- a/pkgs/tools/networking/pptp/default.nix
+++ b/pkgs/tools/networking/pptp/default.nix
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
   patchPhase =
     ''
       sed -e 's/install -o root/install/' -i Makefile
-      sed -e 's,/bin/ip,${iproute}/sbin/ip,' -i routing.c
     '';
   preConfigure =
     ''
-      makeFlagsArray=( PPPD=${ppp}/sbin/pppd BINDIR=$out/sbin \
-          MANDIR=$out/share/man/man8 PPPDIR=$out/etc/ppp )
+      makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \
+                       BINDIR=$out/sbin MANDIR=$out/share/man/man8 \
+                       PPPDIR=$out/etc/ppp )
     '';
 
   nativeBuildInputs = [ perl which ];
-- 
GitLab


From 4d92b5fb928d090b1faee93e2811f9c7f68085f4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 16:08:22 +0200
Subject: [PATCH 045/877] webkitgtk218x: fix evaluation

---
 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 88dd4d49fcf..9f6b1445298 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10952,7 +10952,7 @@ with pkgs;
     inherit (darwin) libobjc;
   };
 
-  webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.16.nix {
+  webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix {
     harfbuzz = harfbuzz-icu;
     inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
   };
-- 
GitLab


From 0967f0e858dd8eaca73278d98ccd7b7fc848cc82 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 24 Oct 2017 17:51:31 +0200
Subject: [PATCH 046/877] sqlite: 3.20.0 -> 3.20.1

---
 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 6dc09ddd39f..4a10f912883 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.20.0";
+  name = "sqlite-3.20.1";
 
   src = fetchurl {
-    url = "http://sqlite.org/2017/sqlite-autoconf-3200000.tar.gz";
-    sha256 = "1876dapm1xx5aqd2d8l7ymmkd2z9rybh99rp5f5rd4zz57vcc51q";
+    url = "http://sqlite.org/2017/sqlite-autoconf-3200100.tar.gz";
+    sha256 = "0hh7jnxfwvs2qlvmjwrgkvxb8sk4x8hj04m54fq9h1xw55dmjrpc";
   };
 
   outputs = [ "bin" "dev" "out" ];
-- 
GitLab


From f402c3aa78f0d6ad21fac8ef9dea288dcccabc3e Mon Sep 17 00:00:00 2001
From: Emanuele Peruffo <info@emanueleperuffo.com>
Date: Tue, 24 Oct 2017 21:12:01 +0200
Subject: [PATCH 047/877] robo3t: change .desktop name

Gnome does not permit to add the application to favorites if the .desktop name is different than the binary name.
See https://unix.stackexchange.com/questions/58824/how-do-i-add-eclipse-to-my-gnome-shell-favorites.
---
 pkgs/applications/misc/robo3t/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
index 5ebb2b1189a..fc7ff484239 100644
--- a/pkgs/applications/misc/robo3t/default.nix
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   desktopItem = makeDesktopItem {
-    name = "Robo3T";
+    name = "robo3t";
     exec = "robo3t";
     icon = icon;
     comment = "Query GUI for mongodb";
-- 
GitLab


From 0ddc8a303bec3df0e0a6c8f4e47d49134dedd72a Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 25 Oct 2017 10:08:37 +0100
Subject: [PATCH 048/877] nixos manual: suggest nixos-help as well

Part of improving #30760: users on a serial console can't switch ttys,
so providing another method to access the manual is useful.
---
 nixos/doc/manual/installation/installing.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 8c37643c08f..94d8e9d2e1a 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -16,7 +16,8 @@
   hardware.</para></listitem>
 
   <listitem><para>The NixOS manual is available on virtual console 8
-  (press Alt+F8 to access).</para></listitem>
+  (press Alt+F8 to access) or by running <command>nixos-help</command>.
+  </para></listitem>
 
   <listitem><para>You get logged in as <literal>root</literal>
   (with empty password).</para></listitem>
-- 
GitLab


From b2c5075e8ad442a8a2b42979ea9351e35dc647fe Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 25 Oct 2017 10:13:33 +0100
Subject: [PATCH 049/877] nixos-manual service: show nixos-help option

Part of improving accessibility (#30760). Makes the manual easier to
access e.g. on serial consoles.
---
 nixos/modules/services/misc/nixos-manual.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 515864ec2e2..41cadb4a6de 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -135,8 +135,9 @@ in
         };
       };
 
-    services.mingetty.helpLine = mkIf cfg.showManual
-      "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
+      services.mingetty.helpLine = "\nRun `nixos-help` "
+        + lib.optionalString cfg.showManual "or press <Alt-F${toString cfg.ttyNumber}> "
+        + "for the NixOS manual.";
 
   };
 
-- 
GitLab


From 02b15a418a86240ed5f9b61234f8594bab3f7e84 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 18 Oct 2017 23:24:31 +0200
Subject: [PATCH 050/877] shmig: init at 2017-07-24

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

diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix
new file mode 100644
index 00000000000..a397ba69697
--- /dev/null
+++ b/pkgs/development/tools/database/shmig/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub
+, withMySQL ? false, withPSQL ? false, withSQLite ? false
+, mariadb, postgresql, sqlite, gawk, which
+, lib
+}:
+
+stdenv.mkDerivation {
+  name = "shmig-2017-07-24";
+
+  src = fetchFromGitHub {
+    owner = "mbucc";
+    repo = "shmig";
+    rev = "aff54e03d13f8f95b422cf898505490a56152a4a";
+    sha256 = "08q94dka5yqkzkis3w7j1q8kc7d3kk7mb2drx8ms59jcqvp847j3";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postPatch = ''
+    patchShebangs .
+
+    substituteInPlace shmig \
+      --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mariadb}/bin/mysql"}" \
+      --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \
+      --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \
+      --replace "awk" "${gawk}/bin/awk" \
+      --replace "which" "${which}/bin/which"
+  '';
+
+  preBuild = ''
+    mkdir -p $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Minimalistic database migration tool with MySQL, PostgreSQL and SQLite support";
+    homepage = "https://github.com/mbucc/shmig";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9a3674ee6c..5c0ae179474 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6263,6 +6263,8 @@ with pkgs;
 
   serpent = callPackage ../development/compilers/serpent { };
 
+  shmig = callPackage ../development/tools/database/shmig { };
+
   smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
   smlnj = if stdenv.isDarwin
             then callPackage ../development/compilers/smlnj { }
-- 
GitLab


From 5e21db46dfe50a55a0bb929342dedbc80beda565 Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Wed, 25 Oct 2017 16:15:44 -0700
Subject: [PATCH 051/877] Fixed whitespace.

---
 pkgs/development/libraries/theft/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix
index 345401dfa76..a0110c5f22b 100644
--- a/pkgs/development/libraries/theft/default.nix
+++ b/pkgs/development/libraries/theft/default.nix
@@ -17,9 +17,7 @@ stdenv.mkDerivation rec {
   checkTarget = "test";
   
   installFlags = [ "PREFIX=$(out)" ];
-  postInstall = ''
-      install -m644 vendor/greatest.h $out/include/
-    '';
+  postInstall = "install -m644 vendor/greatest.h $out/include/";
   
   meta = {
     description = "A C library for property-based testing";
-- 
GitLab


From 1d1e0920d95af2127d92bfdc9650c673622a8eb0 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Thu, 26 Oct 2017 18:27:57 +0800
Subject: [PATCH 052/877] go: 1.8.4 -> 1.8.5

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

diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix
index 838032c9698..538c20bac72 100644
--- a/pkgs/development/compilers/go/1.8.nix
+++ b/pkgs/development/compilers/go/1.8.nix
@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.8.4";
+  version = "1.8.5";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "go";
     rev = "go${version}";
-    sha256 = "0p0m63y39pja3fkj43sdq0qv8kqljkz7d58bf9jbw0rjw2c9ml4a";
+    sha256 = "1ab021l3v29ciaxp738cjpbkh1chlsl6928672q3i82anmdzn5m5";
   };
 
   # perl is used for testing go vet
-- 
GitLab


From df04f0cb63f8df815ec95d284317373a14876b61 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Thu, 26 Oct 2017 18:28:08 +0800
Subject: [PATCH 053/877] go: 1.9.1 -> 1.9.2

---
 pkgs/development/compilers/go/1.9.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index a90985c2525..50fa2d97627 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "go";
     rev = "go${version}";
-    sha256 = "1p226lgsmiwgcvmiakac9i08304cq5ick23vmsk1vjcsh6dvz9i3";
+    sha256 = "07p4ld07r2nml2bsbfb8h51hqilbqyhhdlia99y1gk7ibvhybv8i";
   };
 
   # perl is used for testing go vet
@@ -123,10 +123,6 @@ stdenv.mkDerivation rec {
         url = "https://github.com/golang/go/commit/29415eb2b92e78481897c4161ba99f5b09fa6102.patch";
         sha256 = "01jkm4b2dazzjnfla7rdd0w2clzplga3zza6ybpmkjkk3i4bp73d";
       })
-      (fetchpatch {
-        url = "https://github.com/golang/go/commit/27e80f7c4d8001598367e15a1617fa524bd0fb11.patch";
-        sha256 = "1250nrc79jwcagkjqffn5srn78isykvjhvmqhwipwyqb99q85wcz";
-      })
     ];
 
   postPatch = optionalString stdenv.isDarwin ''
-- 
GitLab


From af5a75aeab28f512afc2ee729875020f2cfb80b1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 26 Oct 2017 14:09:48 +0200
Subject: [PATCH 054/877] zam-plugins: 3.8 -> 3.9

---
 pkgs/applications/audio/zam-plugins/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index 6067c5b1c75..f81aad4e2af 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "zam-plugins-${version}";
-  version = "3.8";
+  version = "3.9";
 
   src = fetchgit {
     url = "https://github.com/zamaudio/zam-plugins.git";
     deepClone = true;
-    rev = "830ab2e9dd1db8cf56d12c71057157e5d8e9fd74";
-    sha256 = "1hyly5inis59cvh0r7lyi203h8v5jh84ca9jpaljm53cvw6d93px";
+    rev = "4976cf204074c1dfaf344821e83e8d896b35107d";
+    sha256 = "1xgwl51sf2hgc5ikcnycyxaw9vy82lrcswn07b6av6i67qclm8f8";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 61efe055e8f68615da96a449d27df1d3aa07fd72 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 26 Oct 2017 14:46:40 +0100
Subject: [PATCH 055/877] mysql55: 5.5.57 -> 5.5.58

---
 pkgs/servers/sql/mysql/5.5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index 6a85d956a0c..28e7824cd42 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.57";
+  version = "5.5.58";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
-    sha256 = "113kynpfj45fffr62xack2657pds8mkhsgg77zj94ksj3qrbvhn1";
+    sha256 = "1f890376ld1qapl038sjh2ialdizys3sj96vfn4mqmb1ybx14scv";
   };
 
   patches = if stdenv.isCygwin then [
-- 
GitLab


From bbe660417b442ddfc6d2db76e8f60d478e806971 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 26 Oct 2017 14:46:57 +0100
Subject: [PATCH 056/877] mysql57: 5.7.19 -> 5.7.20

---
 pkgs/servers/sql/mysql/5.7.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index 5598a792633..687993e0dc5 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.7.19";
+  version = "5.7.20";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
-    sha256 = "1c8y54yk756179nx4dgg79dijmjdq5n8l057cnqsg70pjdpyfl9y";
+    sha256 = "11v4g3igigv3zvknv67qml8in6fjrbs2vnr3q6bg6f62nydm95sk";
   };
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''
-- 
GitLab


From 948934864dbf063e742456aa079aa65c0cd7321b Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 26 Oct 2017 02:33:55 +0200
Subject: [PATCH 057/877] mpg321: add pkg option to set libao default audio
 driver

Tested manually with "alsa" and "pulse" drivers.
---
 pkgs/applications/audio/mpg321/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index b68c44278ee..ee0ebf234ce 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -1,4 +1,8 @@
-{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib}:
+{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib
+# Specify default libao output plugin to use (e.g. "alsa", "pulse" …).
+# If null, it will use the libao system default.
+, defaultAudio ? null
+}:
 
 stdenv.mkDerivation rec {
   name = "mpg321-${version}";
@@ -11,9 +15,10 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  configureFlags = [
-    ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no"))
-  ];
+  configureFlags =
+    [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ]
+    ++ (stdenv.lib.optional (defaultAudio != null)
+         "--with-default-audio=${defaultAudio}");
 
   buildInputs = [libao libid3tag libmad zlib]
     ++ stdenv.lib.optional stdenv.isLinux alsaLib;
-- 
GitLab


From 8f3a2d699121461a2b359b12e792d32b6083bc2c Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Thu, 26 Oct 2017 17:12:42 +0200
Subject: [PATCH 058/877] borgbackup: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 4ff61d1ac95..219283de4cc 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/borgbackup/borg/releases/download/"
       + "${version}/${name}.tar.gz";
-    sha256 = "0vwyg0b4kxb0rspqwhvgi5c78dzimgkydf03wif27a40qhh1235l";
+    sha256 = "0iik5lq349cl87imlwra2pp0j36wjhpn8r1d3778azvvqpyjq2d5";
   };
 
   nativeBuildInputs = with python3Packages; [
-- 
GitLab


From 4cacf8699c5c3b38cd2d71271068b9c6654ae2c5 Mon Sep 17 00:00:00 2001
From: Stefan Lau <github@stefanlau.com>
Date: Sun, 15 Oct 2017 11:43:53 +0200
Subject: [PATCH 059/877] selendroid: fix selendroid-selenium command

---
 .../tools/selenium/selendroid/default.nix     | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix
index c2277214951..eac948db9bc 100644
--- a/pkgs/development/tools/selenium/selendroid/default.nix
+++ b/pkgs/development/tools/selenium/selendroid/default.nix
@@ -1,15 +1,25 @@
 { stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }:
 
 with stdenv.lib;
-
+let
+    name = "selendroid-standalone-${version}";
+    pluginName = "selendroid-grid-plugin-${version}";
+    version = "0.11.0";
+    srcs = {
+      jar = fetchurl {
+        url = "https://github.com/selendroid/selendroid/releases/download/${version}/${name}-with-dependencies.jar";
+        sha256 = "1p6k974pr2634q1g65wx243cxdqhac63x8w2gsmh6vnni0818clk";
+      };
+      gridPlugin = fetchurl {
+        url = "https://search.maven.org/remotecontent?filepath=io/selendroid/selendroid-grid-plugin/${version}/${pluginName}.jar";
+        sha256 = "1iazmdv2z0k03fa1xlfipwdf3s9j6404kkpfs5xdyy0513ah02a0";
+      };
+    };
+in
 stdenv.mkDerivation rec {
-  name = "selendroid-standalone-${version}";
-  version = "0.11.0";
 
-  src = fetchurl {
-    url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar";
-    sha256 = "1p6k974pr2634q1g65wx243cxdqhac63x8w2gsmh6vnni0818clk";
-  };
+  inherit name;
+  inherit version;
 
   unpackPhase = "true";
 
@@ -17,17 +27,21 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share/lib/selendroid
-    cp $src $out/share/lib/selendroid/${name}.jar
+    cp ${srcs.jar} $out/share/lib/selendroid/${name}.jar
+    cp ${srcs.gridPlugin} $out/share/lib/selendroid/${pluginName}.jar
+
     makeWrapper ${jdk}/bin/java $out/bin/selendroid \
       --add-flags "-jar $out/share/lib/selendroid/${name}.jar"
     makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \
       --add-flags "-Dfile.encoding=UTF-8" \
-      --add-flags "-cp \"$out/share/lib/selendroid/${name}.jar:${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar\"" \
-      --add-flags "org.openqa.grid.selenium.GridLauncherV3"
+      --add-flags "-cp ${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar:$out/share/lib/selendroid/${pluginName}.jar" \
+      --add-flags "org.openqa.grid.selenium.GridLauncherV3" \
+      --add-flags "-role hub" \
+      --add-flags "-capabilityMatcher io.selendroid.grid.SelendroidCapabilityMatcher"
   '';
 
   meta = {
-    homepage = https://code.google.com/p/selenium;
+    homepage = http://selendroid.io/;
     description = "Test automation for native or hybrid Android apps and the mobile web";
     maintainers = with maintainers; [ offline ];
     platforms = platforms.all;
-- 
GitLab


From e6a3089ec4c7599a8fddd235d550bb30ef9ad261 Mon Sep 17 00:00:00 2001
From: Stefan Lau <github@stefanlau.com>
Date: Sun, 15 Oct 2017 12:28:12 +0200
Subject: [PATCH 060/877] selendroid: 0.11.0 -> 0.17.0

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

diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix
index eac948db9bc..dcc3893ee0d 100644
--- a/pkgs/development/tools/selenium/selendroid/default.nix
+++ b/pkgs/development/tools/selenium/selendroid/default.nix
@@ -4,15 +4,15 @@ with stdenv.lib;
 let
     name = "selendroid-standalone-${version}";
     pluginName = "selendroid-grid-plugin-${version}";
-    version = "0.11.0";
+    version = "0.17.0";
     srcs = {
       jar = fetchurl {
         url = "https://github.com/selendroid/selendroid/releases/download/${version}/${name}-with-dependencies.jar";
-        sha256 = "1p6k974pr2634q1g65wx243cxdqhac63x8w2gsmh6vnni0818clk";
+        sha256 = "10lxdsgp711pv8r6dk2aagnbvnn1b25zfqjvz7plc73zqhx1dxvw";
       };
       gridPlugin = fetchurl {
         url = "https://search.maven.org/remotecontent?filepath=io/selendroid/selendroid-grid-plugin/${version}/${pluginName}.jar";
-        sha256 = "1iazmdv2z0k03fa1xlfipwdf3s9j6404kkpfs5xdyy0513ah02a0";
+        sha256 = "1x6cjmp2hpghbgbf8vss0qaj2n4sfl29wp3bc4k1s3hnnpccvz70";
       };
     };
 in
-- 
GitLab


From 74a2d53e0d2ae9a5b574a07483dc8aa790a8340e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 26 Oct 2017 17:42:14 +0100
Subject: [PATCH 061/877] buildkite-agent service: add bash to the
 runtimePackages

bash is necessary for nix-shell to work properly
---
 .../services/continuous-integration/buildkite-agent.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index b6d61f6c68b..9c06e1d43bb 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -33,8 +33,8 @@ in
       };
 
       runtimePackages = mkOption {
-        default = [ pkgs.nix ];
-        defaultText = "[ pkgs.nix ]";
+        default = [ pkgs.bash pkgs.nix ];
+        defaultText = "[ pkgs.bash pkgs.nix ]";
         description = "Add programs to the buildkite-agent environment";
         type = types.listOf types.package;
       };
-- 
GitLab


From daf53c9a102e695d9ca0c2b48b231e8f2517264b Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 26 Oct 2017 17:43:17 +0100
Subject: [PATCH 062/877] buildRustPackage: allow passthru overrides

Don't ignore the passthru that could be passed to the derivation
---
 pkgs/build-support/rust/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 2b32da11d1c..37ea264a53f 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -80,5 +80,5 @@ in stdenv.mkDerivation (args // {
     runHook postInstall
   '';
 
-  passthru = { inherit cargoDeps; };
+  passthru = { inherit cargoDeps; } // (args.passthru or {});
 })
-- 
GitLab


From 5a64e446ffc5c01c58f066060218dc358fe25e42 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 26 Oct 2017 22:01:11 +0200
Subject: [PATCH 063/877] tor: 0.3.1.7 -> 0.3.1.8

Quoth the release notes:

> It includes several bugfixes, including a bugfix for a crash issue that
had affected relays under memory pressure. It also adds a new directory
authority, Bastet.
---
 pkgs/tools/security/tor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 3daf30d2ff0..576189d9a85 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.3.1.7";
+  name = "tor-0.3.1.8";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${name}.tar.gz";
-    sha256 = "13y0v4zfla0vziy9kkahmhrwylv32ianjikcr46mwbxvji4dvx8x";
+    sha256 = "18dinpj03d036rashlad16lv7j2hba8gg742z07l37x5c242kxkx";
   };
 
   outputs = [ "out" "geoip" ];
-- 
GitLab


From 2b496a80ff6712b6e3e52d852c610ef4a20330de Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 26 Oct 2017 22:03:52 +0200
Subject: [PATCH 064/877] tor-browser-bundle-bin: 7.0.7 -> 7.0.8

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 56cab9de5d0..4464d490bc8 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.0.7";
+  version = "7.0.8";
 
   lang = "en-US";
 
@@ -108,7 +108,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1848j28majbb61r080g6dw0lmh7hbp515iidyjdrpgcwhazzg06j";
+      sha256 = "0bi4l4ma40ifsajvjpwv6ixphijqvb7yrci2jcyykh3j41ndfjf2";
     };
 
     "i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "08wvpymmyg16ifz23awnjy0pbva8xh1fdx2i8c1n18x3k12d5r7h";
+      sha256 = "182q1gb8jnk92wxr7m977yxcksa8d3zg90qbsja1raym2vhqaf73";
     };
   };
 in
-- 
GitLab


From e61ef03c0203b3230ad2a21e5652cbd820a452d5 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Fri, 27 Oct 2017 00:08:49 +0300
Subject: [PATCH 065/877] fd: 4.0.0 -> 5.0.0

---
 pkgs/tools/misc/fd/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 54d17e6f64c..09debd461dc 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -2,18 +2,23 @@
 
 rustPlatform.buildRustPackage rec {
   name = "fd-${version}";
-  version = "4.0.0";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
     rev = "v${version}";
-    sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv";
+    sha256 = "17y2fr3faaf32lv171ppkgi55v5zxq97jiilsgmjcn00rd9i6v0j";
   };
 
-  cargoSha256 = "1v9wg4dq4c7i85bkdhd79bj8gx7200z6np05wsyj2ycbv97p095j";
+  cargoSha256 = "17f4plyj6mnz0d9f4ykgbmddsdp6c3f6q4kmgj406p49xsf0jjkc";
 
-  meta = {
+  preFixup = ''
+    mkdir -p "$out/man/man1"
+    cp "$src/doc/fd.1" "$out/man/man1"
+  '';
+
+  meta = with stdenv.lib; {
     description = "A simple, fast and user-friendly alternative to find";
     longDescription = ''
       `fd` is a simple, fast and user-friendly alternative to `find`.
@@ -22,7 +27,7 @@ rustPlatform.buildRustPackage rec {
       it provides sensible (opinionated) defaults for 80% of the use cases.
     '';
     homepage = "https://github.com/sharkdp/fd";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
+    license = with licenses; [ asl20 /* or */ mit ];
+    platforms = platforms.all;
   };
 }
-- 
GitLab


From b72fcce2d99364b9a415dd82383e0b797352977b Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Thu, 26 Oct 2017 11:12:29 +1100
Subject: [PATCH 066/877] jsawk: init at 1.5-pre

---
 pkgs/tools/text/jsawk/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/text/jsawk/default.nix

diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix
new file mode 100644
index 00000000000..46d290b79ff
--- /dev/null
+++ b/pkgs/tools/text/jsawk/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, makeWrapper, spidermonkey }:
+
+stdenv.mkDerivation rec {
+  name = "jsawk-${version}";
+  version = "1.5-pre";
+  src = fetchFromGitHub {
+    owner = "micha";
+    repo = "jsawk";
+    rev = "5a14c4af3c7b59807701b70a954ecefc6f77e978";
+    sha256 = "0z3vdr3c8nvdrrxkjv9b4xg47mdb2hsknxpimw6shgwbigihapyr";
+  };
+  dontBuild = true;
+  buildInputs = [ makeWrapper ];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp $src/jsawk $out/bin/
+    wrapProgram $out/bin/jsawk \
+      --prefix PATH : "${spidermonkey}/bin"
+  '';
+
+  meta = {
+    description = "Jsawk is like awk, but for JSON";
+    homepage = https://github.com/micha/jsawk;
+    license = stdenv.lib.licenses.publicDomain;
+    maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b89e59463bd..da1072f82f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2814,6 +2814,8 @@ with pkgs;
 
   jrnl = callPackage ../applications/misc/jrnl { };
 
+  jsawk = callPackage ../tools/text/jsawk { };
+
   jscoverage = callPackage ../development/tools/misc/jscoverage { };
 
   jsduck = callPackage ../development/tools/jsduck { };
-- 
GitLab


From 21ad5f0ab6e22fc3bf651fcb21b3cb1066ba3e36 Mon Sep 17 00:00:00 2001
From: Peter Romfeld <peter.romfeld.hk@gmail.com>
Date: Fri, 27 Oct 2017 11:09:44 +0800
Subject: [PATCH 067/877] fastlane: 2.61.0 -> 2.62.1

---
 pkgs/tools/admin/fastlane/Gemfile.lock | 14 +++++++-------
 pkgs/tools/admin/fastlane/gemset.nix   | 24 ++++++++++++------------
 pkgs/tools/admin/fastlane/update       | 10 ++++++++++
 3 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100755 pkgs/tools/admin/fastlane/update

diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock
index 8f10ee22ddc..93cf658719c 100644
--- a/pkgs/tools/admin/fastlane/Gemfile.lock
+++ b/pkgs/tools/admin/fastlane/Gemfile.lock
@@ -24,7 +24,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.61.0)
+    fastlane (2.62.1)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -65,9 +65,9 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.5.3)
+    googleauth (0.6.1)
       faraday (~> 0.12)
-      jwt (~> 1.4)
+      jwt (>= 1.4, < 3.0)
       logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
@@ -78,7 +78,7 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     json (2.1.0)
-    jwt (1.5.6)
+    jwt (2.1.0)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -112,21 +112,21 @@ GEM
     terminal-notifier (1.8.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tty-screen (0.5.0)
+    tty-screen (0.5.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
     unicode-display_width (1.3.0)
     word_wrap (1.0.0)
-    xcodeproj (1.5.2)
+    xcodeproj (1.5.3)
       CFPropertyList (~> 2.3.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
     xcpretty (0.2.8)
       rouge (~> 2.0.7)
-    xcpretty-travis-formatter (0.0.4)
+    xcpretty-travis-formatter (1.0.0)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix
index c1285e43496..8e75f76ec35 100644
--- a/pkgs/tools/admin/fastlane/gemset.nix
+++ b/pkgs/tools/admin/fastlane/gemset.nix
@@ -137,10 +137,10 @@
     dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0n73748vw7y29ycx0rjdg9zvn8xhncq07zq1l4a16n5s82rb14iy";
+      sha256 = "1r6ci3rkrzsdk8cbxidzcjv94hbwq7ljwvm5whgxb8lcxcfl696k";
       type = "gem";
     };
-    version = "2.61.0";
+    version = "2.62.1";
   };
   gh_inspector = {
     source = {
@@ -163,10 +163,10 @@
     dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli";
+      sha256 = "13laklpf99m3qzq9n3vnc9dblgw7q05n1r16jlxsh4lxlaijr0sf";
       type = "gem";
     };
-    version = "0.5.3";
+    version = "0.6.1";
   };
   highline = {
     source = {
@@ -204,10 +204,10 @@
   jwt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4";
+      sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky";
       type = "gem";
     };
-    version = "1.5.6";
+    version = "2.1.0";
   };
   little-plugger = {
     source = {
@@ -393,10 +393,10 @@
   tty-screen = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "005rpl9l1r9i7wypb4kv057y01fxqvanznx62msx6z451cfjsfn3";
+      sha256 = "12qkjwpkgznvhwbywq2y7l5mcq2f4z404b0ip7xm4byg3827lh4h";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.5.1";
   };
   uber = {
     source = {
@@ -443,10 +443,10 @@
     dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v40167wxhjfczjqp7axvblivrzgbmqldaj9vb15pw45qh6xly51";
+      sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.5.3";
   };
   xcpretty = {
     dependencies = ["rouge"];
@@ -461,9 +461,9 @@
     dependencies = ["xcpretty"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wn5pcxja1jkc8y5b6s3pks5inc1vmjkq7fqmlbkl39z8l1vdis2";
+      sha256 = "15b5c0lxz2blmichfdlabzlbyw5nlh1ci898pxwb661m9bahz3ml";
       type = "gem";
     };
-    version = "0.0.4";
+    version = "1.0.0";
   };
 }
\ No newline at end of file
diff --git a/pkgs/tools/admin/fastlane/update b/pkgs/tools/admin/fastlane/update
new file mode 100755
index 00000000000..22d1e52e297
--- /dev/null
+++ b/pkgs/tools/admin/fastlane/update
@@ -0,0 +1,10 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p bash ruby bundler bundix
+
+rm Gemfile.lock
+bundler install
+bundix
+
+if [ "clean" == "$1" ]; then
+  rm -r ~/.gem
+fi
-- 
GitLab


From 4c61281b9298a248fdf8264451d1336cfe680028 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 27 Oct 2017 12:15:01 +0800
Subject: [PATCH 068/877] nodejs: 4.8.4 -> 4.8.5

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

diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index 24832b6b8be..d3ad4d11e4c 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "4.8.4";
+    version = "4.8.5";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
-      sha256 = "35fe633a48cbe93c79327161d9dc964ac9810f4ceb2ed8628487e6e14a15905b";
+      sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4";
     };
 
   })
-- 
GitLab


From de8b1b4b7b197d1fccd0e8d36ed0c6349b307174 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 27 Oct 2017 12:15:23 +0800
Subject: [PATCH 069/877] nodejs: 6.11.4 -> 6.11.5

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

diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index 58cfc9af9fc..e516d9b99b6 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -10,10 +10,10 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "6.11.4";
+    version = "6.11.5";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "0l6lmid8wfvvbq391x0k19crs63zf6kkcln79fn3d088wcsh8bsc";
+      sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w";
     };
   })
-- 
GitLab


From c07cf635c8ffdfd5f53fc760f7006412c348845c Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 27 Oct 2017 12:17:02 +0800
Subject: [PATCH 070/877] nodejs: 8.7.0 -> 8.8.0

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

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index 560df06b8c5..427de79b33e 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -10,13 +10,12 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "8.7.0";
+    version = "8.8.0";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "16mml3cwjnq7yf9yd67d2dybav3nvbnk89fkixs1wz7fd26d05ss";
+      sha256 = "1ksfj6h6vwaws52055mg80pm2bslw23kpx3a7ahraa6ngk934kw5";
     };
 
     patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
   })
-
-- 
GitLab


From 93cc9b93e01d9095317ecc6167291247e9db3b1d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 27 Oct 2017 12:59:52 +0800
Subject: [PATCH 071/877] kmplayer: add missing X dependencies

---
 pkgs/applications/video/kmplayer/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index 88055f2a824..44313f9499f 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -1,6 +1,7 @@
 {
   mkDerivation, lib, fetchurl,
   extra-cmake-modules, makeWrapper,
+  libpthreadstubs, libXdmcp,
   qtsvg, qtx11extras, ki18n, kdelibs4support, kio, kmediaplayer, kwidgetsaddons,
   phonon, cairo, mplayer
 }:
@@ -29,6 +30,7 @@ mkDerivation rec {
   nativeBuildInputs = [ extra-cmake-modules makeWrapper ];
 
   buildInputs = [
+    libpthreadstubs libXdmcp
     qtsvg qtx11extras ki18n kdelibs4support kio kmediaplayer kwidgetsaddons
     phonon cairo
   ];
-- 
GitLab


From 8f17abf29c769e6914ed585e7e56601c58877e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 12 Oct 2017 04:40:46 +0200
Subject: [PATCH 072/877] greg: init at 0.4.7

---
 pkgs/applications/audio/greg/default.nix | 26 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 ++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/audio/greg/default.nix

diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix
new file mode 100644
index 00000000000..e7a23b6f204
--- /dev/null
+++ b/pkgs/applications/audio/greg/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+with pythonPackages; buildPythonApplication rec {
+  pname = "greg";
+  version = "0.4.7";
+  name = pname + "-" + version;
+
+  disabled = !isPy3k;
+
+  src = fetchFromGitHub {
+    owner = "manolomartinez";
+    repo = pname;
+    rev = "v" + version;
+    sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v";
+  };
+
+  buildInputs = with pythonPackages; [ feedparser ];
+  propagatedBuildInputs = buildInputs;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/manolomartinez/greg";
+    description = "A command-line podcast aggregator";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 067464249bf..44369de2215 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1107,6 +1107,10 @@ with pkgs;
 
   gosu = callPackage ../tools/misc/gosu { };
 
+  greg = callPackage ../applications/audio/greg {
+    pythonPackages = python3Packages;
+  };
+
   gringo = callPackage ../tools/misc/gringo { scons = scons_2_5_1; };
 
   gti = callPackage ../tools/misc/gti { };
-- 
GitLab


From 6574d216646ae41c9713aca1c320c47bb01e5a80 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 26 Oct 2017 16:57:42 +0300
Subject: [PATCH 073/877] xwayland: enable acceleration with help of glamor

---
 pkgs/servers/x11/xorg/xwayland.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 28463dc6163..6de53faf771 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -17,6 +17,7 @@ overrideDerivation xorgserver (oldAttrs: {
     "--disable-xnest"
     "--disable-xquartz"
     "--disable-xwin"
+    "--enable-glamor"
     "--with-default-font-path="
     "--with-xkb-bin-directory=${xkbcomp}/bin"
     "--with-xkb-path=${xkeyboard_config}/etc/X11/xkb"
-- 
GitLab


From 0e4be9e5f07c8688abaf3f06b6976a662b993ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 27 Oct 2017 09:03:03 +0200
Subject: [PATCH 074/877] bully: 1.0-22 -> 1.1

---
 pkgs/tools/networking/bully/default.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix
index 3410d0e2c5c..81dd294d786 100644
--- a/pkgs/tools/networking/bully/default.nix
+++ b/pkgs/tools/networking/bully/default.nix
@@ -1,13 +1,15 @@
-{stdenv, fetchFromGitHub, openssl, libpcap}:
+{ stdenv, fetchFromGitHub, openssl, libpcap }:
 
 stdenv.mkDerivation rec {
+
   name = "bully-${version}";
-  version = "1.0-22";
+  version = "1.1";
+
   src = fetchFromGitHub {
-    sha256 = "0wk9jmcibd03gspnnr2qvfkw57rg94cwmi0kjpy1mgi05s6vlw1y";
-    rev = "v${version}";
+    sha256 = "1qvbbf72ryd85bp4v62fk93ag2sn25rj7kipgagbv22hnq8yl3zd";
+    rev = version;
     repo = "bully";
-    owner = "HorayNarea";
+    owner = "aanarchyy";
   };
   buildInputs = [ openssl libpcap ];
 
@@ -21,11 +23,11 @@ stdenv.mkDerivation rec {
     mv bully $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point";
-    homepage = https://github.com/Lrs121/bully;
-    maintainers = [ stdenv.lib.maintainers.edwtjo ];
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://github.com/aanarchyy/bully;
+    maintainers = with maintainers; [ edwtjo ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From c70773b35b2df6081bc8faa2839c108555689d28 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 27 Oct 2017 11:05:10 +0200
Subject: [PATCH 075/877] android-studio: 2.3.3.0 -> 3.0.0.18

---
 pkgs/applications/editors/android-studio/packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 4e834afa9d0..cf63feb860e 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -1,4 +1,4 @@
-{  stdenv, callPackage, fetchurl, makeFontsConf }:
+{ stdenv, callPackage, fetchurl, makeFontsConf }:
 let
   mkStudio = opts: callPackage (import ./common.nix opts) {
     fontsConf = makeFontsConf {
@@ -6,11 +6,11 @@ let
     };
   };
 in rec {
-  stable = mkStudio rec {
+  stable = mkStudio {
     pname = "android-studio";
-    version = "2.3.3.0";
-    build = "162.4069837";
-    sha256Hash = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
+    version = "3.0.0.18"; # "Android Studio 3.0"
+    build = "171.4408382";
+    sha256Hash = "18npm7ckdybj6vc2vndr0wd50da19m9z2j7wld2mdidnl5ggk4br";
 
     meta = with stdenv.lib; {
       description = "The Official IDE for Android (stable version)";
-- 
GitLab


From e4d0173d1f4a140d322b180032a68179ac5c04ad Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 27 Oct 2017 11:05:17 +0200
Subject: [PATCH 076/877] android-studio-preview: 3.0.0.17 -> 3.1.0.0

---
 pkgs/applications/editors/android-studio/packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index cf63feb860e..6f8440f7b1f 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -25,16 +25,16 @@ in rec {
     };
   };
 
-  preview = mkStudio rec {
+  preview = mkStudio {
     pname = "android-studio-preview";
-    version = "3.0.0.17"; # "Android Studio 3.0 RC 2"
-    build = "171.4402976";
-    sha256Hash = "18f5cq1dcmyjxaq520kqjac332bpp35pis02yplh6gzp65i4bvvf";
+    version = "3.1.0.0"; # "Android Studio 3.1 Canary 1"
+    build = "171.4415322";
+    sha256Hash = "08xgwv6mg2zxys9dqjfz66h60g640ni3snyb89ij0fkmd28rbxgj";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";
       homepage = https://developer.android.com/studio/preview/index.html;
-      maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ];
+      maintainers = with stdenv.lib.maintainers; [ primeos ];
     };
   };
 }
-- 
GitLab


From 669b4c4e1b00128026dd0d763b6ffbea91477417 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 27 Oct 2017 11:32:35 +0200
Subject: [PATCH 077/877] pythonPackages.raven: 6.2.0 -> 6.2.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 cf670a40c6c..1bbee9a7ea4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7583,11 +7583,11 @@ in {
   };
 
   raven = buildPythonPackage rec {
-    name = "raven-6.2.0";
+    name = "raven-6.2.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/r/raven/${name}.tar.gz";
-      sha256 = "1jmr9kpajfh6fvxbym6fdybmlr14216y0dkbial7ris9pi1pwhf5";
+      sha256 = "1zkh8llsfng5viz8cpf9j74v30705hv80vb5g6gha1ij7v60p8y0";
     };
 
     # way too many dependencies to run tests
-- 
GitLab


From 3e29dd00fc43f585995dc470e7bb9717f6d9f46e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Oct 2017 11:50:31 +0200
Subject: [PATCH 078/877] wget: 1.19.1 -> 1.19.2 for multiple CVEs

Fixes CVE-2017-13089, CVE-2017-13090.
---
 pkgs/tools/networking/wget/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 1a260f910e2..b6bbae65e69 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,24 +1,19 @@
 { stdenv, fetchurl, gettext, pkgconfig, perl
 , libidn2, zlib, pcre, libuuid, libiconv
-, IOSocketSSL, LWP, python3
+, IOSocketSSL, LWP, python3, lzip
 , libpsl ? null
 , openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.19.1";
+  name = "wget-1.19.2";
 
   src = fetchurl {
-    url = "mirror://gnu/wget/${name}.tar.xz";
-    sha256 = "1ljcfhbkdsd0zjfm520rbl1ai62fc34i7c45sfj244l8f6b0p58c";
+    url = "mirror://gnu/wget/${name}.tar.lz";
+    sha256 = "01yzal7xm85543x02bij3capnigr063d6c5vc039f8n5s9d796nm";
   };
 
   patches = [
     ./remove-runtime-dep-on-openssl-headers.patch
-    (fetchurl {
-      name = "CVE-2017-6508";
-      url = "http://git.savannah.gnu.org/cgit/wget.git/patch/?id=4d729e322fae359a1aefaafec1144764a54e8ad4";
-      sha256 = "14r0c5y3w3gavxp2d9yq8xji82izi5sx0sjv6jpmk6zp6cnr7cjf";
-    })
   ];
 
   preConfigure = ''
@@ -34,7 +29,7 @@ stdenv.mkDerivation rec {
     export LIBS="-liconv -lintl"
   '';
 
-  nativeBuildInputs = [ gettext pkgconfig perl ];
+  nativeBuildInputs = [ gettext pkgconfig perl lzip ];
   buildInputs = [ libidn2 libiconv zlib pcre libuuid ]
     ++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ]
     ++ stdenv.lib.optional (openssl != null) openssl
-- 
GitLab


From 4c26199ad704f56342526d39aef7cc2ec6e12d10 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Oct 2017 02:23:15 +0200
Subject: [PATCH 079/877] SDL2: 2.0.5 -> 2.0.7 for CVE-2017-2888

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

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 877b10f69a3..3216a130f67 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "SDL2-${version}";
-  version = "2.0.5";
+  version = "2.0.7";
 
   src = fetchurl {
     url = "http://www.libsdl.org/release/${name}.tar.gz";
-    sha256 = "11c75qj1qxmx67iwkvf9z4x69phk301pdn86zzr6jncnap7kh824";
+    sha256 = "0pjdpxla5kh1w1b0shxrx97a116vyy31njxi0jhyvqhk8d6cfdgf";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 5feccdc0883476beff328fed368b21d30849704a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Oct 2017 03:20:29 +0200
Subject: [PATCH 080/877] SDL2_mixer: 2.0.1 -> 2.0.2

---
 pkgs/development/libraries/SDL2_mixer/default.nix   | 10 ++++++----
 .../libraries/SDL2_mixer/libmodplug.patch           | 13 -------------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/SDL2_mixer/libmodplug.patch

diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index c0fdbf921a6..6eada0c83e5 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -4,19 +4,21 @@
 
 stdenv.mkDerivation rec {
   name = "SDL2_mixer-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
-    sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s";
+    sha256 = "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf";
   };
 
+  preAutoreconf = ''
+    aclocal
+  '';
+
   nativeBuildInputs = [ autoreconfHook pkgconfig which ];
 
   propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ];
 
-  patches = [ ./libmodplug.patch ];
-
   configureFlags = [ "--disable-music-ogg-shared" ]
     ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl";
 
diff --git a/pkgs/development/libraries/SDL2_mixer/libmodplug.patch b/pkgs/development/libraries/SDL2_mixer/libmodplug.patch
deleted file mode 100644
index 63ed2732ebf..00000000000
--- a/pkgs/development/libraries/SDL2_mixer/libmodplug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.in b/configure.in
-index d511646..77dc3fe 100644
---- a/configure.in
-+++ b/configure.in
-@@ -258,7 +258,7 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_modplug = xyes; then
-             have_libmodplug_lib=yes
-         ], [dnl
-             AC_CHECK_HEADER([libmodplug/modplug.h], [have_libmodplug_hdr=yes])
--            AC_CHECK_LIB([modplug], [have_libmodplug_lib=yes])
-+            AC_CHECK_LIB([modplug], [ModPlug_Load], [have_libmodplug_lib=yes])
-         ])
- 
-     if test x$have_libmodplug_hdr = xyes -a x$have_libmodplug_lib = xyes; then
-- 
GitLab


From bea3425568ddd210360c6c089569426b844f2f61 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Oct 2017 03:23:38 +0200
Subject: [PATCH 081/877] SDL2_image: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index 78e0f4ed972..548f8e686ba 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "SDL2_image-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
-    sha256 = "0r3z1l7fdn76qkpy7snpkcjqz8dkv2zp6lsqpq25q4m5xsyaygis";
+    sha256 = "1s3ciydixrgv34vlf45ak5syq5nlfaqf19wf162lbz4ixxd0gpvj";
   };
 
   buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ];
-- 
GitLab


From f5c74a2cae718972e29fb15089750969f8b9a2fb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 27 Oct 2017 12:38:58 +0200
Subject: [PATCH 082/877] perl-File-LibMagic: 1.15 -> 1.16

---
 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 0cd34e1a2f5..c8dc8a59ed2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5535,10 +5535,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileLibMagic = buildPerlPackage rec {
-    name = "File-LibMagic-1.15";
+    name = "File-LibMagic-1.16";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "2c7fb54912caf2c22d06b02d6a88edad970e0f8b017634dc30eec46e53763e84";
+      sha256 = "c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60";
     };
     buildInputs = [ TestFatal pkgs.file ];
     makeMakerFlags = "--lib=${pkgs.file}/lib";
-- 
GitLab


From 85e79da31b30a2cca824e3dcbbeb886038ba8d03 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 27 Oct 2017 07:47:56 -0400
Subject: [PATCH 083/877] linux: 4.9.58 -> 4.9.59

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index e1f3fe63ea0..72959dd7a9e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.58";
+  version = "4.9.59";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "19r1ybrfqjh2cmpvljd94cwag34kly7pzih2j5m4nr49hsi153vl";
+    sha256 = "16rj4wg8psh3d47x8disk275nzzv26drvp03hi0r44mxw0lmd53k";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 2c373d818d69e72ae7686a15deaafd7ef9b3bd98 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 27 Oct 2017 07:48:05 -0400
Subject: [PATCH 084/877] linux: 4.13.9 -> 4.13.10

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix
index 77d137f9453..8d4df067c83 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.13.9";
+  version = "4.13.10";
   extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "13ra6psp6w3rf5vzmvhg88v2nh8zq20xl0r92728b8x9vgj1bp51";
+    sha256 = "0c33v0y4hyklhz7i00sjrj2cpn6zlwc7qjj7w2zzxmnr9yn90c6x";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From eae5dfe134355ee14fff71cb4eff1c8b9d80815f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 27 Oct 2017 08:03:25 -0400
Subject: [PATCH 085/877] sbt: 1.0.2 -> 1.0.3

---
 pkgs/development/tools/build-managers/sbt/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index e5f68365e42..134aa859091 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, jre }:
+{ stdenv, fetchurl, jre, bc }:
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchurl {
     urls = [
@@ -10,13 +10,18 @@ stdenv.mkDerivation rec {
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
       "https://cocl.us/sbt-${version}.tgz"
     ];
-    sha256 = "1w1f6nsdq3inxhqhy69mgljfjr51n1v1s8i51gcg11rd2bc67w63";
+    sha256 = "041cv25gxqsi3rlglw5d8aqgdzb6y5ak3f52dwqvzrrj854vyx13";
   };
 
   patchPhase = ''
     echo -java-home ${jre.home} >>conf/sbtopts
+
+    substituteInPlace bin/sbt-launch-lib.bash \
+      --replace "| bc)" "| ${bc}/bin/bc)"
   '';
 
+  buildInputs = [ bc ];
+
   installPhase = ''
     mkdir -p $out/share/sbt $out/bin
     cp -ra . $out/share/sbt
-- 
GitLab


From a86e48acaec82c8156990e62fba6bf85e0a451b5 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Fri, 27 Oct 2017 10:36:40 +0300
Subject: [PATCH 086/877] ocamlPackages.topkg: 0.8.1 -> 0.9.1

---
 pkgs/development/ocaml-modules/topkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix
index fa238a84b35..ecd806ecadc 100644
--- a/pkgs/development/ocaml-modules/topkg/default.nix
+++ b/pkgs/development/ocaml-modules/topkg/default.nix
@@ -6,11 +6,11 @@ else
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-topkg-${version}";
-  version = "0.8.1";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "http://erratique.ch/software/topkg/releases/topkg-${version}.tbz";
-    sha256 = "18rrh6fmf708z7dd30amljmcgaypj3kk49jrmrj68r4wnw8004j8";
+    sha256 = "1slrzbmyp81xhgsfwwqs2d6gxzvqx0gcp34rq00h5iblhcq7myx6";
   };
 
   nativeBuildInputs = [ opam ];
-- 
GitLab


From 1b2a0e0f45b3265fbf7545d4ec5f758786970692 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Fri, 27 Oct 2017 14:14:29 +0300
Subject: [PATCH 087/877] ocamlPackages.reason: 2.0.0 -> 3.0.0

---
 pkgs/development/compilers/reason/default.nix | 44 ++++++-------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index e364f536c88..a4f0442d9d1 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -1,41 +1,20 @@
 { stdenv, makeWrapper, buildOcaml, fetchFromGitHub,
   ocaml, opam, topkg, menhir, merlin_extend, ppx_tools_versioned, utop }:
 
-let 
-  version = "2.0.0";
+buildOcaml rec {
+  name = "reason";
+  version = "3.0.0";
+
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "reason";
     rev = version;
-    sha256 = "0l3lwfvppplah707rq5nqjav2354lq6d7xfflfigkzhn74hlx6iy";
+    sha256 = "0vj3y9vlm9gqvj9grmb9n487avbrj4q5611m7wv1bsdpndvv96jr";
   };
-  meta = with stdenv.lib; {
-    homepage = https://facebook.github.io/reason/;
-    description = "Facebook's friendly syntax to OCaml";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.volth ];
-  };
-
-  reason-parser = buildOcaml {
-    name = "reason-parser";
-    inherit version src meta;
-    sourceRoot = "reason-${version}-src/reason-parser";
 
-    minimumSupportedOcamlVersion = "4.02";
+  propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
 
-    propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
-    buildInputs = [ opam topkg ];
-
-    createFindlibDestdir = true;
-
-    inherit (topkg) installPhase;
-  };
-in
-buildOcaml {
-  name = "reason";
-  inherit version src meta;
-
-  buildInputs = [ makeWrapper opam topkg reason-parser utop ];
+  buildInputs = [ makeWrapper opam topkg utop menhir opam topkg ];
 
   buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
 
@@ -48,10 +27,15 @@ buildOcaml {
   installPhase = ''
     ${topkg.installPhase}
 
-    wrapProgram $out/bin/reup \
-      --prefix PATH : "${opam}/bin"
     wrapProgram $out/bin/rtop \
       --prefix PATH : "${utop}/bin" \
       --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
   '';
+
+  meta = with stdenv.lib; {
+    homepage = https://facebook.github.io/reason/;
+    description = "Facebook's friendly syntax to OCaml";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.volth ];
+  };
 }
-- 
GitLab


From 7b64943e8b731994eba1bdab48bc3479c5c0500c Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 27 Oct 2017 12:05:19 +0800
Subject: [PATCH 088/877] util-linux: 2.30.2 -> 2.31

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

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 3d4309b7177..f54f3ab311a 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -4,15 +4,15 @@
 let
   version = lib.concatStringsSep "." ([ majorVersion ]
     ++ lib.optional (patchVersion != "") patchVersion);
-  majorVersion = "2.30";
-  patchVersion = "2";
+  majorVersion = "2.31";
+  patchVersion = "";
 
 in stdenv.mkDerivation rec {
   name = "util-linux-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
-    sha256 = "1p494mwd8v6p6mpmmjybkc7bz1qwp9x4cdi8hdvp2nwvkr4fanvv";
+    sha256 = "12nw108xjhm63sh2n5a0qs33vpvbvb6rln96l9j50p7wykf7rgpr";
   };
 
   patches = [
-- 
GitLab


From 3fa77a19efd1a0b2cfaaf064a428c421cf98d2d1 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 27 Oct 2017 15:28:51 +0100
Subject: [PATCH 089/877] kanboard: 1.0.46 -> 1.0.48

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

diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index b37d12c362f..7995c8875b8 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "kanboard-${version}";
-  version = "1.0.46";
+  version = "1.0.48";
 
   src = fetchzip {
-    url = "https://kanboard.net/${name}.zip";
-    sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a";
+    url = "https://github.com/kanboard/kanboard/releases/download/v${version}/${name}.zip";
+    sha256 = "0ipyijlfcnfqlz9n20wcnaf9pw404a675x404pm9h2n4ld8x6m5v";
   };
 
   dontBuild = true;
-- 
GitLab


From 978bba8415072379186ecb9c79a6d59d3dd2fbf4 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 27 Oct 2017 15:38:05 +0100
Subject: [PATCH 090/877] autotrace: mark as insecure

---
 .../graphics/autotrace/default.nix            | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix
index c0ce81b3b42..7af7c8986f2 100644
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/pkgs/applications/graphics/autotrace/default.nix
@@ -66,5 +66,59 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [ hodapp ];
     license = licenses.gpl2;
+    knownVulnerabilities = [
+      "CVE-2013-1953"
+      "CVE-2016-7392"
+      "CVE-2017-9151"
+      "CVE-2017-9152"
+      "CVE-2017-9153"
+      "CVE-2017-9154"
+      "CVE-2017-9155"
+      "CVE-2017-9156"
+      "CVE-2017-9157"
+      "CVE-2017-9158"
+      "CVE-2017-9159"
+      "CVE-2017-9160"
+      "CVE-2017-9161"
+      "CVE-2017-9162"
+      "CVE-2017-9163"
+      "CVE-2017-9164"
+      "CVE-2017-9165"
+      "CVE-2017-9166"
+      "CVE-2017-9167"
+      "CVE-2017-9168"
+      "CVE-2017-9169"
+      "CVE-2017-9170"
+      "CVE-2017-9171"
+      "CVE-2017-9172"
+      "CVE-2017-9173"
+      "CVE-2017-9174"
+      "CVE-2017-9175"
+      "CVE-2017-9176"
+      "CVE-2017-9177"
+      "CVE-2017-9178"
+      "CVE-2017-9179"
+      "CVE-2017-9180"
+      "CVE-2017-9181"
+      "CVE-2017-9182"
+      "CVE-2017-9183"
+      "CVE-2017-9184"
+      "CVE-2017-9185"
+      "CVE-2017-9186"
+      "CVE-2017-9187"
+      "CVE-2017-9188"
+      "CVE-2017-9189"
+      "CVE-2017-9190"
+      "CVE-2017-9191"
+      "CVE-2017-9192"
+      "CVE-2017-9193"
+      "CVE-2017-9194"
+      "CVE-2017-9195"
+      "CVE-2017-9196"
+      "CVE-2017-9197"
+      "CVE-2017-9198"
+      "CVE-2017-9199"
+      "CVE-2017-9200"
+    ];
   };
 }
-- 
GitLab


From f2cc452874aea5f1e0433c71f9303d233b2d8603 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 27 Oct 2017 10:13:03 -0400
Subject: [PATCH 091/877] minikube: 0.22.3 -> 0.23.0

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

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 32c697ea83a..00ee3a3771e 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -15,15 +15,15 @@ let
   # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
   # currently https://storage.googleapis.com/minikube/k8s_releases.json
 
-  localkube-version = "1.7.5";
+  localkube-version = "1.8.0";
   localkube-binary = fetchurl {
     url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
-    sha256 = "1kn4lwnn961r19hqnkgr13np80zqk2fhp8xkhrvxzq6v6shk7gfz";
+    sha256 = "09mv1g9i0d14brvvp2wxgmfqvgp0na5dbm4z76a660q1fxszvgqc";
   };
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.22.3";
+  version = "0.23.0";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -31,7 +31,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "0jcfw0yrd4vqyiyhg15cy2knn2fjw91das8id4famz5gl6dnlm28";
+    sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h";
   };
 
   # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
-- 
GitLab


From a7449bf4d8d72da1b70708e8a284d3851e96def8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 27 Oct 2017 17:41:47 +0200
Subject: [PATCH 092/877] libvirt-python: 3.6.0 -> 3.8.0

This fixes an eval error introduced by
17a069276faec303d173aa5ef23cf95ea5233690.

The reason the evaluation fails is because there's an assertion on the
version of the Python library in order to be in par with the top-level
libvirt package.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @fpletz
---
 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 1bbee9a7ea4..5987c77b01c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23982,13 +23982,13 @@ EOF
   };
 
   libvirt = let
-    version = "3.6.0";
+    version = "3.8.0";
   in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
 
     src = pkgs.fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc";
+      sha256 = "02spx8kfcsnqwsshd7bk2plyic2lbpwzg16sf3csh0avck5akjsz";
     };
 
     nativeBuildInputs = [ pkgs.pkgconfig ];
-- 
GitLab


From 41ba309136a0fecb684a5732a22a8f228263a56e Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Fri, 27 Oct 2017 18:06:34 +0200
Subject: [PATCH 093/877] gitlab-runner: 10.0.2 -> 10.1.0

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 430e46f2303..44e4f494ff2 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "10.0.2";
+  version = "10.1.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "14lrc9frigym93ppphmdhwnbhk7xz5drpai3d29gyi1z4xsm1jaq";
+    sha256 = "0h8fwqsr8ibd82jxq4pc9p8x7af0i8jyrrsj13p4daqhla0srxr4";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "013bly0xswzkf2kwi2pr2ryd880h63n8pya2ccv4z77hxs80cfmp";
+    sha256 = "0bzj8zr6d5ab5bjlbw7q3iwn19ha8fksymrvw6cyzs4qacfsj54w";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0hr964r7bcff74sna0b8w3d2ip0hs441ijlhplh2xzqnzpbvx2jq";
+    sha256 = "0knvjmxcscyr6v5b9vvyvm8w6p58a1h6nfcvf13dxp59psm71q00";
   };
 
   patches = [ ./fix-shell-path.patch ];
-- 
GitLab


From a924cd2bebf71ac17dc5645246c9d8fe5b02814c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 27 Oct 2017 12:14:54 -0400
Subject: [PATCH 094/877] sbt: No need for bc buildInput

---
 pkgs/development/tools/build-managers/sbt/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 134aa859091..4dacfd0568a 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
       --replace "| bc)" "| ${bc}/bin/bc)"
   '';
 
-  buildInputs = [ bc ];
-
   installPhase = ''
     mkdir -p $out/share/sbt $out/bin
     cp -ra . $out/share/sbt
-- 
GitLab


From 7ce848309e6d64820af1e96045c5386992e90a4a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 25 Oct 2017 20:04:35 +0200
Subject: [PATCH 095/877] python.pkgs: updates

---
 .../python-modules/APScheduler/default.nix    |  4 +--
 .../python-modules/Cython/default.nix         |  4 +--
 .../python-modules/MechanicalSoup/default.nix | 18 ++++++++--
 .../python-modules/Nikola/default.nix         |  4 +--
 .../python-modules/aiofiles/default.nix       |  4 +--
 .../python-modules/aiohttp/default.nix        |  4 +--
 .../python-modules/alembic/default.nix        |  4 +--
 .../python-modules/altair/default.nix         |  4 +--
 .../python-modules/aniso8601/default.nix      |  4 +--
 .../python-modules/asana/default.nix          |  6 ++--
 .../python-modules/asn1crypto/default.nix     |  4 +--
 .../python-modules/astropy/default.nix        |  4 +--
 .../python-modules/async_timeout/default.nix  |  4 +--
 .../python-modules/autobahn/default.nix       |  4 +--
 .../backports_tempfile/default.nix            | 35 +++++++++++++++++++
 .../backports_weakref/default.nix             |  4 +--
 .../python-modules/bayespy/default.nix        |  4 +--
 pkgs/development/python-modules/bcrypt.nix    |  4 +--
 .../python-modules/bokeh/default.nix          |  4 +--
 .../python-modules/breathe/default.nix        |  4 +--
 .../python-modules/buildout-nix/default.nix   |  4 +--
 .../python-modules/cement/default.nix         |  4 +--
 .../python-modules/cffi/default.nix           |  4 +--
 .../python-modules/cheroot/default.nix        |  4 +--
 .../python-modules/credstash/default.nix      |  4 +--
 .../python-modules/dask/default.nix           |  4 +--
 .../python-modules/devpi-common/default.nix   |  4 +--
 .../python-modules/discogs_client/default.nix |  4 +--
 .../python-modules/discordpy/default.nix      |  4 +--
 .../django-picklefield/default.nix            |  4 +--
 .../python-modules/django_redis/default.nix   |  4 +--
 .../python-modules/django_tagging/default.nix |  4 +--
 .../djangorestframework/default.nix           |  4 +--
 .../python-modules/docker_compose.nix         |  6 ++--
 pkgs/development/python-modules/dulwich.nix   |  4 +--
 .../python-modules/dyn/default.nix            |  4 +--
 .../easy-thumbnails/default.nix               |  4 +--
 .../python-modules/edward/default.nix         |  4 +--
 .../python-modules/faker/default.nix          |  4 +--
 .../python-modules/feedgen/default.nix        |  7 ++--
 .../python-modules/fiona/default.nix          |  4 +--
 .../python-modules/flake8/default.nix         |  4 +--
 .../python-modules/folium/default.nix         |  4 +--
 .../python-modules/fonttools/default.nix      |  4 +--
 .../python-modules/ftfy/default.nix           |  4 +--
 .../python-modules/gensim/default.nix         |  4 +--
 .../python-modules/gpy/default.nix            |  4 +--
 .../python-modules/hidapi/default.nix         |  4 +--
 .../python-modules/hieroglyph/default.nix     |  4 +--
 pkgs/development/python-modules/htmlmin.nix   |  4 +--
 .../python-modules/httpbin/default.nix        |  6 +++-
 .../python-modules/ipython/default.nix        |  4 +--
 .../python-modules/ipywidgets/default.nix     |  4 +--
 .../python-modules/jedi/default.nix           |  8 +++--
 .../python-modules/joblib/default.nix         |  4 +--
 .../python-modules/jsbeautifier/default.nix   |  4 +--
 .../python-modules/keepkey/default.nix        |  4 +--
 pkgs/development/python-modules/ldap.nix      |  4 +--
 .../python-modules/ledgerblue/default.nix     |  4 +--
 .../python-modules/libagent/default.nix       |  4 +--
 .../python-modules/libtmux/default.nix        |  4 +--
 .../python-modules/llvmlite/default.nix       |  4 +--
 .../python-modules/m2r/default.nix            |  4 +--
 .../python-modules/magic-wormhole/default.nix |  4 +--
 .../marshmallow-sqlalchemy/default.nix        |  4 +--
 .../python-modules/marshmallow/default.nix    |  4 +--
 .../python-modules/matplotlib/default.nix     |  8 ++---
 .../python-modules/meliae/default.nix         |  4 +--
 .../python-modules/mnemonic/default.nix       |  4 +--
 .../python-modules/multidict/default.nix      |  4 +--
 .../python-modules/netcdf4/default.nix        |  4 +--
 pkgs/development/python-modules/nltk.nix      |  4 +--
 .../python-modules/node-semver/default.nix    |  4 +--
 .../python-modules/numba/default.nix          |  4 +--
 .../python-modules/numpy/default.nix          |  4 +--
 .../python-modules/openpyxl/default.nix       |  4 +--
 .../python-modules/os-testr/default.nix       |  6 ++--
 .../python-modules/oslo-config/default.nix    |  4 +--
 .../python-modules/paramz/default.nix         |  4 +--
 .../python-modules/parso/default.nix          | 25 +++++++++++++
 .../python-modules/path.py/default.nix        |  4 +--
 .../python-modules/pathspec/default.nix       |  4 +--
 .../python-modules/piexif/default.nix         |  4 +--
 .../python-modules/pillow/default.nix         |  4 +--
 .../python-modules/pip-tools/default.nix      | 10 +++---
 .../python-modules/plaster/default.nix        |  4 +--
 .../python-modules/plotly/default.nix         |  4 +--
 .../python-modules/pomegranate/default.nix    |  4 +--
 .../python-modules/portend/default.nix        |  4 +--
 .../python-modules/premailer/default.nix      |  4 +--
 pkgs/development/python-modules/pyaes.nix     |  4 +--
 .../python-modules/pycryptodomex/default.nix  |  4 +--
 .../python-modules/pyflakes/default.nix       |  4 +--
 .../python-modules/pyjwkest/default.nix       |  4 +--
 .../python-modules/pylint/default.nix         |  4 +--
 .../python-modules/pyrtlsdr/default.nix       |  4 +--
 .../python-modules/pytest-asyncio/default.nix |  4 +--
 .../python-modules/pytest-xdist/default.nix   |  4 +--
 .../python-modules/pytest/default.nix         |  4 +--
 .../python-modules/python-stdnum/default.nix  |  4 +--
 .../python-modules/relatorio/default.nix      |  4 +--
 .../python-modules/requests_ntlm/default.nix  |  4 +--
 .../python-modules/scikitlearn/default.nix    |  4 +--
 .../python-modules/scipy/default.nix          |  9 ++---
 .../python-modules/semver/default.nix         |  4 +--
 .../python-modules/serpy/default.nix          |  4 +--
 .../python-modules/setuptools/default.nix     |  4 +--
 .../python-modules/sounddevice/default.nix    |  6 ++--
 .../python-modules/sphinx/default.nix         |  4 +--
 .../python-modules/sqlalchemy/default.nix     |  4 +--
 .../python-modules/sqlmap/default.nix         |  4 +--
 .../python-modules/stevedore/default.nix      |  4 +--
 .../python-modules/stripe/default.nix         |  4 +--
 .../python-modules/tempora/default.nix        |  4 +--
 .../python-modules/testtools/default.nix      | 11 +++---
 .../testtools_support_unittest2.patch         | 22 ------------
 .../python-modules/tqdm/default.nix           |  4 +--
 .../python-modules/twisted/default.nix        |  4 +--
 .../python-modules/txaio/default.nix          |  4 +--
 .../python-modules/typed-ast/default.nix      |  4 +--
 .../ukpostcodeparser/default.nix              |  4 +--
 .../python-modules/uritools/default.nix       |  4 +--
 .../widgetsnbextension/default.nix            |  4 +--
 .../python-modules/yamllint/default.nix       |  4 +--
 .../python-modules/yapf/default.nix           |  4 +--
 .../python-modules/yarl/default.nix           |  4 +--
 .../python-modules/zeep/default.nix           |  9 +++--
 .../python-modules/zetup/default.nix          |  4 +--
 .../python-modules/zodb/default.nix           |  4 +--
 .../python-modules/zodbpickle/default.nix     |  4 +--
 .../python-modules/zope_interface/default.nix |  4 +--
 pkgs/development/tools/mypy/default.nix       |  4 +--
 pkgs/top-level/python-packages.nix            |  4 +++
 133 files changed, 366 insertions(+), 294 deletions(-)
 create mode 100644 pkgs/development/python-modules/backports_tempfile/default.nix
 create mode 100644 pkgs/development/python-modules/parso/default.nix
 delete mode 100644 pkgs/development/python-modules/testtools/testtools_support_unittest2.patch

diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index a556aebc47e..a9b5faf6006 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -20,12 +20,12 @@
 
 buildPythonPackage rec {
   pname = "APScheduler";
-  version = "3.3.1";
+  version = "3.4.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b";
+    sha256 = "b51118a8ed014104f7e440456dcbd90f2015aea7bcc34c57e307fb34bc746316";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 0513f67e569..e507b89bbbb 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -14,11 +14,11 @@
 buildPythonPackage rec {
   pname = "Cython";
   name = "${pname}-${version}";
-  version = "0.26.1";
+  version = "0.27.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c2e63c4794161135adafa8aa4a855d6068073f421c83ffacc39369497a189dd5";
+    sha256 = "265dacf64ed8c0819f4be9355c39beaa13dc2ad2f85237a2c4e478f5ce644b48";
   };
 
   # With Python 2.x on i686-linux or 32-bit ARM this test fails because the
diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix
index a022fd9fc41..56e2cf501ed 100644
--- a/pkgs/development/python-modules/MechanicalSoup/default.nix
+++ b/pkgs/development/python-modules/MechanicalSoup/default.nix
@@ -1,19 +1,31 @@
 { fetchPypi, buildPythonPackage, lib
-, requests, beautifulsoup4, six }:
+, requests, beautifulsoup4, six
+, pytestrunner, requests-mock, pytestcov, pytest
+}:
 
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "MechanicalSoup";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wh93rml446ipx603n5z5i5bpan46pzliq6sw76d0ms9w7w2658d";
+    sha256 = "38a6ca35428196be94f87f8f036ee4a88b1418d1f77e5634ad92acfaa22c28da";
   };
 
+  checkInputs = [ pytest pytestrunner requests-mock pytestcov ];
+
   propagatedBuildInputs = [ requests beautifulsoup4 six ];
 
+  # Requires network
+  doCheck = false;
+
+  postPatch = ''
+    # Is in setup_requires but not used in setup.py...
+    substituteInPlace setup.py --replace "'pytest-runner'," ""
+  '';
+
   meta = with lib; {
     description = "A Python library for automating interaction with websites";
     homepage = https://github.com/hickford/MechanicalSoup;
diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index fe8597f4d48..f281a02d49b 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -30,7 +30,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Nikola";
-  version = "7.8.9";
+  version = "7.8.10";
 
   # Nix contains only Python 3 supported version of doit, which is a dependency
   # of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c85bf293a245a34057fb55236fc2f2c5d28e9ef1c375889f443bca1d86924df4";
+    sha256 = "e242c3d0dd175d95a0baf5268b108081ba160b83ceafec8c9bc2ec0a24a56537";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix
index d1c6e279064..9139c62618a 100644
--- a/pkgs/development/python-modules/aiofiles/default.nix
+++ b/pkgs/development/python-modules/aiofiles/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "aiofiles";
-  version = "0.3.1";
+  version = "0.3.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6c4936cea65175277183553dbc27d08b286a24ae5bd86f44fbe485dfcf77a14a";
+    sha256 = "852a493a877b73e11823bfd4e8e5ef2610d70d12c9eaed961bcd9124d8de8c10";
   };
 
   disabled = pythonOlder "3.3";
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 72b28d01cea..19e94471c86 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "2.2.5";
+  version = "2.3.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af5bfdd164256118a0a306b3f7046e63207d1f8cba73a67dcc0bd858dcfcd3bc";
+    sha256 = "04f58bbcc9ae6f9aec30b9219ae47fa3c31586c77679405720545738ea62236e";
   };
 
   disabled = pythonOlder "3.4";
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 45bea1fe687..e40e3008563 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "alembic";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8bdcb4babaa16b9a826f8084949cc2665cb328ecf7b89b3224b0ab85bd16fd05";
+    sha256 = "042851ebe9efa07be6dc1395b1793b6c1d8964a39b73a0ce1649e2bcd41ea732";
   };
 
   buildInputs = [ pytest pytestcov mock coverage ];
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 7e9701906ef..d3cdc0f43f2 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "altair";
-  version = "1.2.0";
+  version = "1.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n";
+    sha256 = "c1303f77f1ba4d632f2958c83c0f457b2b969860b1ac9adfb872aefa1780baa7";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix
index 95eda37d3f2..6e61e84a5d5 100644
--- a/pkgs/development/python-modules/aniso8601/default.nix
+++ b/pkgs/development/python-modules/aniso8601/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "aniso8601";
-  version = "1.2.1";
+  version = "1.3.0";
   name = "${pname}-${version}";
 
   meta = with stdenv.lib; {
@@ -16,6 +16,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e7ba4f42d3aea75909c79b1f4c4614768b4f13fbb98fc658a7b6061ddb0be47c";
+    sha256 = "c3b5246f5601b6ae5671911bc4ee5b3e3fe94752e8afab5ce074d8b1232952f1";
   };
 }
diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
index 346257db098..41a111c3167 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "asana";
-  version = "0.6.2";
+  version = "0.6.5";
   name = "${pname}-${version}";
 
   meta = {
@@ -15,10 +15,10 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0skai72392n3i1c4bl3hn2kh5lj990qsbasdwkbjdcy6vq57jggf";
+    sha256 = "eab8d24c2a4670b541b75da2f4bf5b995fe71559c1338da53ce9039f7b19c9a0";
   };
 
-  buildInputs = [ pytest ];
+  checkInputs = [ pytest ];
   propagatedBuildInputs = [ requests requests_oauthlib six ];
 
   patchPhase = ''
diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix
index a34879e5596..eedaac50fac 100644
--- a/pkgs/development/python-modules/asn1crypto/default.nix
+++ b/pkgs/development/python-modules/asn1crypto/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "asn1crypto";
-  version = "0.22.0";
+  version = "0.23.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a";
+    sha256 = "0874981329cfebb366d6584c3d16e913f2a0eb026c9463efcc4aaf42a9d94d70";
   };
 
   # No tests included
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index ba73c232c89..12f00be0cb7 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -7,13 +7,13 @@
 buildPythonPackage rec {
   
   pname = "astropy";
-  version = "2.0.1";
+  version = "2.0.2";
 
   name = "${pname}-${version}";
   doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook.
   src = fetchPypi {
     inherit pname version;
-    sha256 = "25e0881a392a2e03b4a705cf9592f01894d23f64797323b21387efa8ea9ec03e";
+    sha256 = "4544a422b1173d79b2d65ba74c627f04a5fd8530d97fb604752d657d754e103d";
   };
 
   propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires
diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
index 94c2379b0e1..650517d44d9 100644
--- a/pkgs/development/python-modules/async_timeout/default.nix
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname = "async-timeout";
-  version = "1.3.0";
+  version = "2.0.0";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "f4651f122a9877049930ce31a8422bc202a47937627295fe5e411b2c2083481f";
+    sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566";
   };
 
   buildInputs = [ pytestrunner ];
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 8d647a9b52e..5a6121aaf7f 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "autobahn";
-  version = "17.8.1";
+  version = "17.9.3";
 
   src = fetchurl {
     url = "mirror://pypi/a/${pname}/${name}.tar.gz";
-    sha256 = "72b1b1e30bd41d52e7454ef6fe78fe80ebf2341a747616e2cd854a76203a0ec4";
+    sha256 = "206a3a579a580ca3ce2532ac12ec52d447135c9ace7c4bf6065b832a7cff25ba";
   };
 
   # Upstream claim python2 support, but tests require pytest-asyncio which
diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/pkgs/development/python-modules/backports_tempfile/default.nix
new file mode 100644
index 00000000000..5a04b6afd67
--- /dev/null
+++ b/pkgs/development/python-modules/backports_tempfile/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, python
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, backports_weakref
+}:
+
+buildPythonPackage rec {
+  pname = "backports.tempfile";
+  version = "1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1c648c452e8770d759bdc5a5e2431209be70d25484e1be24876cf2168722c762";
+  };
+
+  buildInputs = [ setuptools_scm ];
+
+  propagatedBuildInputs = [ backports_weakref ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover -s tests
+  '';
+
+  # requires https://pypi.org/project/backports.test.support
+  doCheck = false;
+
+  meta = {
+    description = "Backport of new features in Python's tempfile module";
+    license = lib.licenses.psfl;
+    homepage = https://github.com/pjdelport/backports.tempfile;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix
index 0528fa405ae..6ad69b80b6d 100644
--- a/pkgs/development/python-modules/backports_weakref/default.nix
+++ b/pkgs/development/python-modules/backports_weakref/default.nix
@@ -9,10 +9,10 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "backports.weakref";
-  version = "1.0rc1";
+  version = "1.0.post1";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14i8m3lspykdfpzf50grij3z286j9q8f32f2bnwdicv659qvy4w8";
+    sha256 = "bc4170a29915f8b22c9e7c4939701859650f2eb84184aee80da329ac0b9825c2";
   };
 
   buildInputs = [ setuptools_scm ];
diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix
index 9f99708b071..a1b49da34a4 100644
--- a/pkgs/development/python-modules/bayespy/default.nix
+++ b/pkgs/development/python-modules/bayespy/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "bayespy";
-  version = "0.5.10";
+  version = "0.5.12";
   name = "${pname}-${version}";
 
   # Python 2 not supported and not some old Python 3 because MPL doesn't support
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01cwd88ri29zy6qpvnqzljkgc44n7a17yijizr73blcnh4dz5n1w";
+    sha256 = "9609a3e85f88434a47c8263f40567cd24363d0e10d236354630b670fca313c00";
   };
 
   checkInputs = [ pytest glibcLocales ];
diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt.nix
index d159ff8fe90..72800d2f6c2 100644
--- a/pkgs/development/python-modules/bcrypt.nix
+++ b/pkgs/development/python-modules/bcrypt.nix
@@ -4,13 +4,13 @@
 with stdenv.lib;
 
 buildPythonPackage rec {
-  version = "3.1.3";
+  version = "3.1.4";
   pname = "bcrypt";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
-    sha256 = "6645c8d0ad845308de3eb9be98b6fd22a46ec5412bfc664a423e411cdd8f5488";
+    sha256 = "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d";
   };
   buildInputs = [ pycparser mock pytest py ];
   propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi;
diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index a1ae95e6d5d..61bfe7121cb 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -34,11 +34,11 @@
 buildPythonPackage rec {
   pname = "bokeh";
   name = "${pname}${version}";
-  version = "0.12.9";
+  version = "0.12.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00jx3yycy6fziihz45hwj1dsh520h3vmypp28mw0877rxpxl2yxg";
+    sha256 = "6465fae82e94223f16584645b38d34a73d95712870f29c0244649c2cbf2c8393";
   };
 
   disabled = isPyPy;
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 6f539f15222..1397dc6876f 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,13 @@
 { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.7.2";
+  version = "4.7.3";
   pname = "breathe";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/b/breathe/${name}.tar.gz";
-    sha256 = "dd15efc66d65180e4c994edd15fcb642812ad04ac9c36738b28bf248d7c0be32";
+    sha256 = "d0b0e029daba6c3889d15d6c2dd4b0e9d468dc631d41021d0576c1b0dabee302";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index fcb46f4bac1..70c6f3baaf1 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "zc.buildout";
-  version = "2.9.4";
+  version = "2.9.5";
   name = "${pname}-nix-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "df56cc55735e984510986c633090ad0d64f59d7e42d1aac57ecf04ab183d1053";
+    sha256 = "dce840ea379e2ff10bae27465778708704e0a4287cde92eb6c7961f5b0277cfa";
   };
 
   patches = [ ./nix.patch ];
diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix
index 2ed704e3482..3fbdb500af8 100644
--- a/pkgs/development/python-modules/cement/default.nix
+++ b/pkgs/development/python-modules/cement/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "cement";
   name = "${pname}-${version}";
-  version = "2.8.2";
+  version = "2.10.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7";
+    sha256 = "d50c5980bf3e2456e515178ba097d16e36be0fbcab7811a60589d22f45b64f55";
   };
 
   # Disable test tests since they depend on a memcached server running on
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index cced78c0c6a..5c99e77af56 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -2,12 +2,12 @@
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
-  version = "1.10.0";
+  version = "1.11.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mffyilq4qycm8gs4wkgb18rnqil8a9blqq77chdlshzxc8jkc5k";
+    sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index c20cbabe0d6..8447f7fea50 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "cheroot";
-  version = "5.5.0";
+  version = "5.8.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fhyk8lgs2blfx4zjvwsy6f0ynrs5fwnnr3qf07r6c4j3gwlkqsr";
+    sha256 = "5c0531fd732700b1fb3e6e7079dc3aefbdf29e9136925633d93f009cb87d70a3";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index 9f61018ceab..810a6a7bd8e 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname    = "credstash";
-  version = "1.13.3";
+  version = "1.13.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1x2dh4rs5sahb8h2xznhq7srcm2zl9ykc72a8iqpq4dz7l9k7x7i";
+    sha256 = "676cc03a6143dec260c78aeef09d08a64faf27c411f8a94f6d9338e985879f81";
   };
 
   propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ];
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index b1d39e493b7..c319e6535e9 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "0.15.2";
+  version = "0.15.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "abe6758540fdbc260f14ee71cebc3ab88682e24ff147afa89375b7006f57d3ed";
+    sha256 = "cb93b8260f5f854ccf26b52bdc700600a08e6b7527085c7b7d63c04238bab9ea";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
index 971d53e3ddd..082f2baeceb 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -2,12 +2,12 @@
 
 with pythonPackages;buildPythonPackage rec {
   pname = "devpi-common";
-  version = "3.2.0rc1";
+  version = "3.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ws35g1r0j2xccsna4r6fc9a08przfi28kf9hciq3rmd6ndbr9c9";
+    sha256 = "d89634a57981ed43cb5dcd25e00c9454ea111189c5ddc08d945b3d5187ada5fd";
   };
 
   propagatedBuildInputs = [ requests py ];
diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix
index d6891b0e157..ae56fd5f7e5 100644
--- a/pkgs/development/python-modules/discogs_client/default.nix
+++ b/pkgs/development/python-modules/discogs_client/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "discogs-client";
-  version = "2.2.0";
+  version = "2.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1kjm4zyxlkv8cjyd4zl0yslbkmfz4ga9nm3d2glpw3nmvmvajn40";
+    sha256 = "9e32b5e45cff41af8025891c71aa3025b3e1895de59b37c11fd203a8af687414";
   };
 
   propagatedBuildInputs = [ requests oauthlib ];
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
index c9ae73b1661..e11ee54f1a6 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -11,13 +11,13 @@
 
 let
   pname = "discord.py";
-  version = "0.16.11";
+  version = "0.16.12";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "eb3c6faa7d4570cce05533d0742bbcb768629e2b3ba9e1cc79c05833db91ac4d";
+    sha256 = "17fb8814100fbaf7a79468baa432184db6cef3bbea4ad194fe297c7407d50108";
   };
 
   propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];
diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix
index 20a1c3dc221..1b54213e2af 100644
--- a/pkgs/development/python-modules/django-picklefield/default.nix
+++ b/pkgs/development/python-modules/django-picklefield/default.nix
@@ -3,7 +3,7 @@
 buildPythonPackage rec {
   pname = "django-picklefield";
   name = "${pname}-${version}";
-  version = "0.3.2";
+  version = "1.0.0";
 
   meta = {
     description = "A pickled object field for Django";
@@ -13,6 +13,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qlsbp3798ii68ny9zlz2ppkna00jf7i4hmjal3p8433gi18md7s";
+    sha256 = "61e3ba7f6df82d8df9e6be3a8c55ef589eb3bf926c3d25d2b7949b07eae78354";
   };
 }
diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix
index 42f2cde8113..5c00ef60417 100644
--- a/pkgs/development/python-modules/django_redis/default.nix
+++ b/pkgs/development/python-modules/django_redis/default.nix
@@ -2,12 +2,12 @@
   mock, django, redis, msgpack }:
 buildPythonPackage rec {
   pname = "django-redis";
-  version = "4.5.0";
+  version = "4.8.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "170dbk1wmdg0mxp5m3376zz54dyxmhmhnswrccf0jnny1wqcgpsp";
+    sha256 = "5229da5b07ccb8d3e3e9ee098c0b7c03e20eba48634bc456697dd73d62c68b19";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix
index 6207408e012..b6fcddd528f 100644
--- a/pkgs/development/python-modules/django_tagging/default.nix
+++ b/pkgs/development/python-modules/django_tagging/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "django-tagging";
-  version = "0.4.5";
+  version = "0.4.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q";
+    sha256 = "210b32af8372b8f68f261fdb7394075669222608d1e6a3bbf2031d59c826eb68";
   };
 
   # error: invalid command 'test'
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 648ee019682..62e291306d8 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchurl, django }:
 buildPythonPackage rec {
-  version = "3.6.4";
+  version = "3.7.1";
   pname = "djangorestframework";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
-    sha256 = "de8ac68b3cf6dd41b98e01dcc92dc0022a5958f096eafc181a17fa975d18ca42";
+    sha256 = "305b2c6564ca46d3b558ba21110ed717135c467adf1a6dfd192bd85f4bb04d50";
   };
 
   # Test settings are missing
diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix
index 18d68e4ea5d..91a0c4183c9 100644
--- a/pkgs/development/python-modules/docker_compose.nix
+++ b/pkgs/development/python-modules/docker_compose.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchurl, pythonOlder
+{ stdenv, buildPythonApplication, fetchPypi, pythonOlder
 , mock, pytest, nose
 , pyyaml, backports_ssl_match_hostname, colorama, docopt
 , dockerpty, docker, ipaddress, jsonschema, requests
@@ -10,8 +10,8 @@ buildPythonApplication rec {
   pname = "docker-compose";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0yg58m5kk22kihbra0h40miqnbdmkirjr9y47wns613sdikrymmg";
   };
 
diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich.nix
index bbf43ce615c..778c8c984c8 100644
--- a/pkgs/development/python-modules/dulwich.nix
+++ b/pkgs/development/python-modules/dulwich.nix
@@ -3,13 +3,13 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.18.2";
+  version = "0.18.4";
   pname = "dulwich";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/dulwich/${name}.tar.gz";
-    sha256 = "284d0000b21ac12f94bcd5eb3d7dcc42da51e5506b9a53a11c615b46da906d9b";
+    sha256 = "b4baace48dde5e0a76f37b251c246c7e1829bda0617679f00cbade0e70a5ac5b";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix
index e4bbe4e071d..881f51b69aa 100644
--- a/pkgs/development/python-modules/dyn/default.nix
+++ b/pkgs/development/python-modules/dyn/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "dyn";
-  version = "1.6.3";
+  version = "1.8.0";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xq90fliix5nbv934s3wf2pahmx6m2b9y0kqwn192c76qh7xlzib";
+    sha256 = "4ab3cd9a1478674cf2d2aa6740fb0ddf77daaa9ab3e35e5d2bc92f60301f8523";
   };
 
   buildInputs = [ glibcLocales ];
diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix
index 79743f8ac0d..38e201849c1 100644
--- a/pkgs/development/python-modules/easy-thumbnails/default.nix
+++ b/pkgs/development/python-modules/easy-thumbnails/default.nix
@@ -5,7 +5,7 @@
 buildPythonPackage rec {
   pname = "easy-thumbnails";
   name = "${pname}-${version}";
-  version = "2.4.1";
+  version = "2.4.2";
 
   meta = {
     description = "Easy thumbnails for Django";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0w228b6hx8k4r15v7z62hyg99qp6xp4mdkgqs1ah64fyqxp1riaw";
+    sha256 = "8cad7ea4fb2b800284e842d8a44f685cbc1968535be04c24a4bbf6e6dbc550c4";
   };
 
   propagatedBuildInputs = [ django pillow ];
diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
index 93ac292282a..d29174209a9 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "edward";
-  version = "1.3.3";
+  version = "1.3.4";
   name  = "${pname}-${version}";
 
   disabled = !(isPy27 || pythonAtLeast "3.4");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "104d58321c5040235b3039ae3215c3c7881073e6aa88bb0b8ca1141ca87c4891";
+    sha256 = "10d6d7886235f4b9fa4ba401daef87c27937a04d2763f507643d730e51de37b6";
   };
 
   # disabled for now due to Tensorflow trying to create files in $HOME:
diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 3a2a0a64ce6..02926e0fd74 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -8,12 +8,12 @@ assert pythonOlder "3.3" -> ipaddress != null;
 
 buildPythonPackage rec {
   pname = "Faker";
-  version = "0.7.18";
+  version = "0.8.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "310b20f3c497a777622920dca314d90f774028d49c7ee7ccfa96ca4b9d9bf429";
+    sha256 = "3c98dd04bba667ecfddb77fcd0dfd19b376b258d21beeaf5b95578826e275a83";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix
index 9ad28e52baa..e8bdb78f731 100644
--- a/pkgs/development/python-modules/feedgen/default.nix
+++ b/pkgs/development/python-modules/feedgen/default.nix
@@ -2,17 +2,18 @@
 
 buildPythonPackage rec {
   pname = "feedgen";
-  version = "0.5.1";
+  version = "0.6.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3a344b5e3662e9012d095a081a7f216f188dccf3a8f44ad7882960fef05e6787";
+    sha256 = "e5a1f2a8aaed06dae325e6024aa7083e90655c6cbddeb3671249b3895c135762";
   };
 
   propagatedBuildInputs = [ dateutil lxml ];
 
-  doCheck = true;
+  # No tests in archive
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Python module to generate ATOM feeds, RSS feeds and Podcasts.";
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index 42e8e423bdd..d53a29d182f 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "Fiona";
-  version = "1.7.9";
+  version = "1.7.9.post1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fmdgpfnifaqfqwkfiwkpk19wmpi9avmh8a7jqylqi578jvp3fwi";
+    sha256 = "68e8a925b23e3987845c11b0fdd6378fdec4316fe8ba767a935151b6ee1fc607";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix
index f7f78e709f9..89b554f3e68 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/pkgs/development/python-modules/flake8/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "flake8";
-  version = "3.4.1";
+  version = "3.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c20044779ff848f67f89c56a0e4624c04298cd476e25253ac0c36f910a1a11d8";
+    sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0";
   };
 
   buildInputs = [ pytest mock pytestrunner ];
diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix
index 387da64219d..71aabd75d75 100644
--- a/pkgs/development/python-modules/folium/default.nix
+++ b/pkgs/development/python-modules/folium/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "folium";
-  version = "0.3.0";
+  version = "0.5.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7729ddd6766b9c5dab17b3709e2387935fd5c655872f1cbab7b7036474415217";
+    sha256 = "748944521146d85c6cd6230acf234e885864cd0f42fea3758d655488517e5e6e";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index c037decbc87..1dfc22f769b 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.15.1";
+  version = "3.17.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8df4b605a28e313f0f9e0a79502caba4150a521347fdbafc063e52fee34912c2";
+    sha256 = "1c4f26bf32cd58d5881bfe1f42e5f0a1637a58452a60ae1623999f3ae7da0e24";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index aced6675495..b1ba77ab868 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -11,11 +11,11 @@ buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "ftfy";
   # latest is 5.1.1, buy spaCy requires 4.4.3
-  version = "4.4.3";
+  version = "5.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";
+    sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78";
   };
 
   propagatedBuildInputs = [ html5lib wcwidth];
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 2d953abd53c..ea5fc12e432 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -13,10 +13,10 @@
 buildPythonPackage rec {
   pname = "gensim";
   name = "${pname}-${version}";
-  version = "2.3.0";
+  version = "3.0.1";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7d0dccc7d2c576e270037949874800b7cfbc86ef081ff981483f612cd18e223f";
+    sha256 = "4827012f6f020ac4f4067c2a2a88542391917113faaa417505e1ee8a1e7e2650";
   };
 
   propagatedBuildInputs = [ smart_open numpy six scipy
diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
index 0bdc7247b3d..bc48a7490aa 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "GPy";
-  version = "1.7.7";
+  version = "1.8.4";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b4siirlkqic1lsn9bi9mnp8fpbpw1ijwv0z2i6r2zdrk3d6szs1";
+    sha256 = "38c1202f1790952b88c298224139ee5b14d4518e3ddc6186c60db2ece016d8c1";
   };
 
   # running tests produces "ImportError: cannot import name 'linalg_cython'"
diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix
index 697bc1cd0e3..212fd5c957d 100644
--- a/pkgs/development/python-modules/hidapi/default.nix
+++ b/pkgs/development/python-modules/hidapi/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "hidapi";
-  version = "0.7.99.post20";
+  version = "0.7.99.post21";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1k7z5m7xsqy8j4qkjy4pfxdx4hm36ha68vi65z6smvnyg4zgv22z";
+    sha256 = "e0be1aa6566979266a8fc845ab0e18613f4918cf2c977fe67050f5dc7e2a9a97";
   };
 
   propagatedBuildInputs = [ libusb1 udev cython ];
diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix
index 9e97e56c134..27d4b8a15b8 100644
--- a/pkgs/development/python-modules/hieroglyph/default.nix
+++ b/pkgs/development/python-modules/hieroglyph/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "hieroglyph";
-  version = "0.7.1";
+  version = "1.0.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/h/hieroglyph/${name}.tar.gz";
-    sha256 = "0rswfk7x6zlj1z8388f153k3zn2h52k5h9b6p57pn7kqagsjilcb";
+    sha256 = "8e137f0b1cd60c47b870011089790d3c8ddb74fcf409a75ddf2c7f2516ff337c";
   };
 
   propagatedBuildInputs = [ sphinx ];
diff --git a/pkgs/development/python-modules/htmlmin.nix b/pkgs/development/python-modules/htmlmin.nix
index 35f86479a4e..2206b3559ba 100644
--- a/pkgs/development/python-modules/htmlmin.nix
+++ b/pkgs/development/python-modules/htmlmin.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "htmlmin";
-  version = "0.1.10";
+  version = "0.1.11";
   name = "${pname}-${version}";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ca5c5dfbb0fa58562e5cbc8dc026047f6cb431d4333504b11853853be448aa63";
+    sha256 = "f27fb96fdddeb1725ee077be532c7bea23288c69d0e996e7798f24fae7a14e5e";
   };
 
   # Tests run fine in a normal source checkout, but not when being built by nix.
diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix
index 72917fdd771..d11d6b3668f 100644
--- a/pkgs/development/python-modules/httpbin/default.nix
+++ b/pkgs/development/python-modules/httpbin/default.nix
@@ -5,7 +5,8 @@
 , markupsafe
 , decorator
 , itsdangerous
-, six }:
+, six
+}:
 
 buildPythonPackage rec {
   pname = "httpbin";
@@ -19,6 +20,9 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ];
 
+  # No tests
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/kennethreitz/httpbin;
     description = "HTTP Request & Response Service";
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index af5bf5c4faa..ac26573f4a7 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -21,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "6.1.0";
+  version = "6.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5c53e8ee4d4bec27879982b9f3b4aa2d6e3cfd7b26782d250fa117f85bb29814";
+    sha256 = "51c158a6c8b899898d1c91c6b51a34110196815cc905f9be0fa5878e19355608";
   };
 
   prePatch = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
index ce0aed4964d..14b03e5e282 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "ipywidgets";
-  version = "7.0.0";
+  version = "7.0.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "63e454202f72796044e99846881c33767c47fa050735dc1f927657b9cd2b7fcd";
+    sha256 = "f98b4c3719097c9d2e6489f303db520b20bd4de3e0b1d6d4f92f81bfe3c2a0c8";
   };
 
   # Tests are not distributed
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 5d904ee311f..6cdf784dc3b 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
 
 buildPythonPackage rec {
   pname = "jedi";
-  version = "0.10.2";
+  version = "0.11.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7abb618cac6470ebbd142e59c23daec5e6e063bfcecc8a43a037d2ab57276f4e";
+    sha256 = "f6d5973573e76b1fd2ea75f6dcd6445d02d41ff3af5fc61b275b4e323d1dd396";
   };
 
   checkInputs = [ pytest glibcLocales tox pytestcov ];
 
+  propagatedBuildInputs = [ parso ];
+
   checkPhase = ''
     LC_ALL="en_US.UTF-8" py.test test
   '';
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index f6ead8c8266..0efd110d1de 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -12,10 +12,10 @@
 buildPythonPackage rec {
   pname = "joblib";
   name = "${pname}-${version}";
-  version = "0.10.3";
+  version = "0.11";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "29b2965a9efbc90a5fe66a389ae35ac5b5b0c1feabfc7cab7fd5d19f429a071d";
+    sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085";
   };
 
   checkInputs = [ nose sphinx numpydoc ];
diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix
index c199b2f50db..47bbdb5d07b 100644
--- a/pkgs/development/python-modules/jsbeautifier/default.nix
+++ b/pkgs/development/python-modules/jsbeautifier/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "jsbeautifier";
-  version = "1.6.14";
+  version = "1.7.4";
   name = "jsbeautifier-1.6.14";
 
   propagatedBuildInputs = [ six ];
@@ -11,7 +11,7 @@ buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz";
-    sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2";
+    sha256 = "7fc14f279117a55a5e854602f6e8c1cb178c6d83f7cf75e2e9f50678fe11079e";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix
index 3e58e9e3e03..8eba12dfcea 100644
--- a/pkgs/development/python-modules/keepkey/default.nix
+++ b/pkgs/development/python-modules/keepkey/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "keepkey";
-  version = "0.7.3";
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
+    sha256 = "95c8d5127919f9fc4bb0120b05f92efc8f526d4a68122ac18e63509571ac45a2";
   };
 
   propagatedBuildInputs = [ protobuf hidapi ];
diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
index c67fdcd548f..635308f3760 100644
--- a/pkgs/development/python-modules/ldap.nix
+++ b/pkgs/development/python-modules/ldap.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "python-ldap";
-  version = "2.4.41";
+  version = "2.4.45";
   name = "${pname}-${version}";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6d430ecf040f2fc704ee316d3390cb1f5419c191371e1e131baef54a0e42cef0";
+    sha256 = "824fde180a53772e23edc031c4dd64ac1af4a3eade78f00d9d510937d562f64e";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index 0bee4dd47b5..9b2499cd5b2 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "ledgerblue";
-  version = "0.1.15";
+  version = "0.1.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "42cbcd74615576294142d56eb9eaa7e1b67f9dd87eeb24d713336b56e8c01c5c";
+    sha256 = "eba56b887339fb5f8582771e4e398df4fa5a017183b908d4f8950588157c1504";
   };
 
   buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index 5318142fe70..cca10794258 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "libagent";
-  version = "0.9.2";
+  version = "0.9.5";
 
   src = fetchPypi{
     inherit pname version;
-    sha256 = "d6c6dccc0a7693fc966f5962604a69a800e044ac5add3dd030c34cfd4d64311f";
+    sha256 = "982b81c19dc9ee1158dc32fedbe1c36aff2b6872fa0dd42173b639b965ccfb2e";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 2f041f0da4a..b9404ab5ec3 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "libtmux";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c7407aa4103d40f50f99432bf4dffe0b4591f976956b2dd7ee7bbf53ad138bd9";
+    sha256 = "12e5006e59b7d98af5d1a9294f9c8ff2829ac2c1c6ae23dc73c280100b15f485";
   };
 
   buildInputs = [ pytest_29 ];
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index 5de795f84ef..57deaf3caf3 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -11,13 +11,13 @@
 buildPythonPackage rec {
   pname = "llvmlite";
   name = "${pname}-${version}";
-  version = "0.19.0";
+  version = "0.20.0";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "fbaeb3d584e0f6bac82a33776e9b5f0b5b4a3415a03edeff5d66f6176f0edbe2";
+    sha256 = "b2f174848df16bb9195a07fec102110a06d018da736bd9b3570a54d44c797c29";
   };
 
   propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index 066a9856e50..e493596cfa5 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "m2r";
   name = "${pname}-${version}";
-  version = "0.1.11";
+  version = "0.1.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7e69fe9b2752926c33399709e354da3bcca60043c7bf5e727b7126ec3a5db7db";
+    sha256 = "adfb86ebb7ff3fcd3ebb27ce8cd6f795c409a13f0c03363e265f17419ce5b9ab";
   };
 
   propagatedBuildInputs = [ mistune docutils ];
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index cc1e663209e..b21643b4547 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -22,12 +22,12 @@
 
 buildPythonPackage rec {
   pname = "magic-wormhole";
-  version = "0.10.2";
+  version = "0.10.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "55a423247faee7a0644d25f37760495978cd494ba0274fefd8cd1fad493954ee";
+    sha256 = "48465d58f9c0d729dc586627cf280830e7ed59f9e7999946ae1d763c6b8db999";
   };
 
   checkInputs = [ mock ];
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index a024d73037f..656f7f44f96 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -5,7 +5,7 @@
 buildPythonPackage rec {
   pname = "marshmallow-sqlalchemy";
   name = "${pname}-${version}";
-  version = "0.13.1";
+  version = "0.13.2";
 
   meta = {
     homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0082ca2wwc9bymzkp1mr1l5h6rq0k1csv3vcq8ab24x0hdyg5qgk";
+    sha256 = "9804ef2829f781f469a06528d107c2a763f109c687266ab8b1f000f9684184ae";
   };
 
   propagatedBuildInputs = [ marshmallow sqlalchemy ];
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index 17325d3204d..afb60801dc9 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -5,7 +5,7 @@
 buildPythonPackage rec {
   pname = "marshmallow";
   name = "${pname}-${version}";
-  version = "2.13.5";
+  version = "2.14.0";
 
   meta = {
     homepage = "https://github.com/marshmallow-code/marshmallow";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "048rzdkvnais51xdiy27nail5vxjb4ggw3vd60prn1q11lf16wig";
+    sha256 = "09943a460026b9a61c3f4cedd0e5ccfed7cfce3271debd19e3f97df561088718";
   };
 
   propagatedBuildInputs = [ dateutil simplejson ];
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 03a03007cf9..345a21ecddf 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, buildPythonPackage, pycairo
+{ stdenv, fetchurl, python, buildPythonPackage, pycairo, backports_functools_lru_cache
 , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado
 , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32
 , enableGhostscript ? false, ghostscript ? null, gtk3
@@ -20,13 +20,13 @@ assert enableTk -> (tcl != null)
 assert enableQt -> pyqt4 != null;
 
 buildPythonPackage rec {
-  version = "2.0.2";
+  version = "2.1.0";
   pname = "matplotlib";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/m/matplotlib/${name}.tar.gz";
-    sha256 = "0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1";
+    sha256 = "4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs =
     [ cycler dateutil nose numpy pyparsing tornado freetype
-      libpng pkgconfig mock pytz
+      libpng pkgconfig mock pytz backports_functools_lru_cache
     ]
     ++ stdenv.lib.optional enableGtk2 pygtk
     ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]
diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix
index a52d695ac81..9fa46ce6863 100644
--- a/pkgs/development/python-modules/meliae/default.nix
+++ b/pkgs/development/python-modules/meliae/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "meliae";
-  version = "0.4.0";
+  version = "0.4.0.final.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16gcgjzcjlbfarwlj18fn089bz34kzfw8varbzxsi9ma0amijrcp";
+    sha256 = "976519ab02aaa6a8fb5f596dc4dd9f64fc9510b00e054979566e51c9be7cec99";
   };
 
   disabled = isPy3k;
diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix
index 9f71fdb8e74..ad144302417 100644
--- a/pkgs/development/python-modules/mnemonic/default.nix
+++ b/pkgs/development/python-modules/mnemonic/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "mnemonic";
-  version = "0.17";
+  version = "0.18";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/m/${pname}/${name}.tar.gz";
-    sha256 = "1hq6xb47jagfqf65iwcrh0065mj3521d2mxmahg7vfraihqyqdjn";
+    sha256 = "02a7306a792370f4a0c106c2cf1ce5a0c84b9dbd7e71c6792fdb9ad88a727f1d";
   };
 
   propagatedBuildInputs = [ pbkdf2 ];
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 4141b69f0cd..cf05cbff631 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -8,13 +8,13 @@
 
 let
   pname = "multidict";
-  version = "3.1.3";
+  version = "3.3.0";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "875f80a046e7799b40df4b015b8fc5dae91697936872a8d7362c909a02ec6d12";
+    sha256 = "e76909da2fad6966281d4e0e4ccfd3c3025699ebcc30806afa09fa1384c3532b";
   };
 
   checkInputs = [ pytest psutil ];
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 75b4723b0b5..0ef864d33e2 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -4,13 +4,13 @@
 buildPythonPackage rec {
   pname = "netCDF4";
   name = "${pname}-${version}";
-  version = "1.2.9";
+  version = "1.3.0";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
-    sha256 = "259edab1f03b1c1b93bdbaa804d50211a0c9d8a15eee4f23988b5685c6c0d2c0";
+    sha256 = "1982372aeacc6b36054d90d8cb54ee9506b66b6f44d5cff10e2ffb162aad5476";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/nltk.nix b/pkgs/development/python-modules/nltk.nix
index 302bd89be02..d30e030a049 100644
--- a/pkgs/development/python-modules/nltk.nix
+++ b/pkgs/development/python-modules/nltk.nix
@@ -1,13 +1,13 @@
 { fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }:
 
 buildPythonPackage rec {
-  version = "3.2.4";
+  version = "3.2.5";
   pname = "nltk";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz";
-    sha256 = "8682ae52f5de4f2ba7b77bd78222a38575ad01ef29946214b254dfdf93a3a0eb";
+    sha256 = "2661f9971d983db314bbebd51ba770811a362c6597fd0f303bb1d3beadcb4834";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
index 0bd569fd4ad..8c518f9b7ff 100644
--- a/pkgs/development/python-modules/node-semver/default.nix
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
-  version = "0.1.1";
+  version = "0.2.0";
   pname = "node-semver";
 
   buildInputs = [ pytest tox ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b3xiqgl436q33grbkh4chpfchl8i2dmcpggbb2q4vgv3vjy97p2";
+    sha256 = "c32bfc976fd9e003c4a15665e5fe9f337366ba6b60aeb34e4479da9d7bbb0081";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 840df876938..b0d7ae72c95 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -14,13 +14,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.34.0";
+  version = "0.35.0";
   pname = "numba";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/numba/${name}.tar.gz";
-    sha256 = "4f86df9212cb2678598e6583973ef1df978f3e3ba497b4dc6f91848887710577";
+    sha256 = "11564937757605bee590c5758c73cfe9fd6d569726b56d970316a6228971ecc3";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index ffb74021d8d..2d575d8742a 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "numpy";
-  version = "1.13.2";
+  version = "1.13.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1fmq8923q91xyjf6fngl0n6jlysryyzx06288b5qdvv97mlfpklh";
+    sha256 = "36ee86d5adbabc4fa2643a073f93d5504bdfed37a149a3a49f4dde259f35a750";
   };
 
   disabled = isPyPy;
diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index a214af5eab7..9a94848000c 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "openpyxl";
-  version = "2.4.8";
+  version = "2.4.9";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ee7551efb70648fa8ee569c2b6a6dbbeff390cc94b321da5d508a573b90a4f17";
+    sha256 = "95e007f4d121f4fd73f39a6d74a883c75e9fa9d96de91d43c1641c103c3a9b18";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/os-testr/default.nix b/pkgs/development/python-modules/os-testr/default.nix
index d97c525b17a..baafc44d10d 100644
--- a/pkgs/development/python-modules/os-testr/default.nix
+++ b/pkgs/development/python-modules/os-testr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, python,
+{ stdenv, buildPythonPackage, fetchPypi, python,
   pbr, Babel, testrepository, subunit, testtools,
   coverage, oslosphinx, oslotest, testscenarios, six, ddt 
 }:
@@ -7,8 +7,8 @@ buildPythonPackage rec {
   pname = "os-testr";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/o/os-testr/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "d8a60bd56c541714a5cab4d1996c8ddfdb5c7c35393d55be617803048c170837";
   };
 
diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix
index fce8c21284c..de91a507f17 100644
--- a/pkgs/development/python-modules/oslo-config/default.nix
+++ b/pkgs/development/python-modules/oslo-config/default.nix
@@ -3,12 +3,12 @@ debtcollector, rfc3986, pyyaml, oslo-i18n }:
 
 buildPythonPackage rec {
   pname = "oslo.config";
-  version = "4.12.0";
+  version = "4.13.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pa9lajsadyq47bmxx12dxlcmnqsqlgnb55hwqas26lgnb2073dx";
+    sha256 = "882e5f1dcc0e5b0d7af877b2df0e2692113c5975db8cbbbf0dd3d2b905aefc0b";
   };
 
   propagatedBuildInputs = [ pbr six netaddr stevedore debtcollector rfc3986 pyyaml oslo-i18n ];
diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index 5137485a58f..3d9fd2afaca 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "paramz";
-  version = "0.7.4";
+  version = "0.8.5";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1r4mayzp7cb5w1kz45sw65is9j3p60h0yyp8hdhsx393rr4n82nn";
+    sha256 = "297e59b48e57e78e15f547b1af8b21ddfd19a6312d70b9dc07c7262711adfed9";
   };
 
   propagatedBuildInputs = [ numpy scipy six decorator ];
diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix
new file mode 100644
index 00000000000..26617826e12
--- /dev/null
+++ b/pkgs/development/python-modules/parso/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "parso";
+  version = "0.1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "c5279916bb417aa2bf634648ff895cf35dce371d7319744884827bfad06f8d7b";
+  };
+
+  checkInputs = [ pytest ];
+
+  meta = {
+    description = "A Python Parser";
+    homepage = https://github.com/davidhalter/parso;
+    license = lib.licenses.mit;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix
index a40635b8d33..cf5c5ee06cd 100644
--- a/pkgs/development/python-modules/path.py/default.nix
+++ b/pkgs/development/python-modules/path.py/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "path.py";
-  version = "10.3.1";
+  version = "10.4";
   name = "path.py-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "412706be1cd8ab723c77829f9aa0c4d4b7c7b26c7b1be0275a6841c3cb1001e0";
+    sha256 = "c63c75777c8a01f7b273c0065a8ea1e3ba0c9b369fa4a2601831e412b2c4881a";
   };
 
   checkInputs = [ pytest pytestrunner ];
diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix
index f3995758521..bf74906d9e5 100644
--- a/pkgs/development/python-modules/pathspec/default.nix
+++ b/pkgs/development/python-modules/pathspec/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname   = "pathspec";
-  version = "0.5.3";
+  version = "0.5.5";
   name    = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "54478a66a360f4ebe4499c9235e4206fca5dec837b8e272d1ce37e0a626cc64d";
+    sha256 = "72c495d1bbe76674219e307f6d1c6062f2e1b0b483a5e4886435127d0df3d0d3";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix
index 2c921959852..c4aa8dcf16c 100644
--- a/pkgs/development/python-modules/piexif/default.nix
+++ b/pkgs/development/python-modules/piexif/default.nix
@@ -3,7 +3,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "piexif";
-  version = "1.0.12";
+  version = "1.0.13";
 
   # pillow needed for unit tests
   buildInputs = [ pillow ];
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "15dvdr7b5xxsbsq5k6kq8h0xnzrkqzc08dzlih48a21x27i02bii";
+    sha256 = "1d3dde03bd6298393645bc11d585b67a6ea98fd7e9e1aded6d5d6ec3e4cfbdda";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 9161e8a43b6..4be9c911f71 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -3,12 +3,12 @@
   freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11}:
 buildPythonPackage rec {
   pname = "Pillow";
-  version = "4.2.1";
+  version = "4.3.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wq0fiw964bj5rdmw66mhbfsjnmb13bcdr42krpk2ig5f1cgc967";
+    sha256 = "a97c715d44efd5b4aa8d739b8fad88b93ed79f1b33fc2822d5802043f3b1b527";
   };
 
   doCheck = !stdenv.isDarwin && !isPyPy;
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 5fa03a18aaa..2c297d8d719 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first, setuptools_scm, glibcLocales }:
+{ stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first
+, setuptools_scm, glibcLocales, mock }:
+
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "1.9.0";
+  version = "1.10.1";
   name = "pip-tools-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pip-tools/${name}.tar.gz";
-    sha256 = "0mjdpq2zjn8n4lzn9l2myh4bv0l2f6751k1rdpgdm8k3fargw1h7";
+    sha256 = "37b85d69ceed97337aeefb3e52e41fe0884a505c874757a5bbaa58d92b533ce0";
   };
 
   LC_ALL = "en_US.UTF-8";
-  buildInputs = [ pytest glibcLocales ];
+  checkInputs = [ pytest glibcLocales mock ];
   propagatedBuildInputs = [ pip click six first setuptools_scm ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix
index 9f370a9c0fb..75c0bdc00f1 100644
--- a/pkgs/development/python-modules/plaster/default.nix
+++ b/pkgs/development/python-modules/plaster/default.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "plaster";
-  version = "0.5";
+  version = "1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0z48pis4qyhyqj3ia82r04diaa153dw66wrpbly06hdzvhw8j0ia";
+    sha256 = "8351c7c7efdf33084c1de88dd0f422cbe7342534537b553c49b857b12d98c8c3";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index ac3c4f1d324..2744805a504 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "2.0.15";
+  version = "2.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ecd16a11778674c63615a590e22f79307801eaf009b399bf7e46c486dec8f99";
+    sha256 = "ff6899dc11907b1efb944f79f9583b2e30ba2964bb009145f3580bf30b4d9ee4";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix
index 94c3295f029..2884ac9ddc4 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/pkgs/development/python-modules/pomegranate/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pomegranate";
-  version = "0.7.7";
+  version = "0.8.0";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b5b7a6256778fc4097ee77caec28ec845ec1fee3d701f3f26f83860b2d45c453";
+    sha256 = "6b03d05bffbe46c674800652cf273a8d338a2e40001b763cd6925aac0b578a43";
   };
 
   propagatedBuildInputs = [ numpy scipy cython networkx joblib ];
diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix
index cb418678a99..bd13c63c404 100644
--- a/pkgs/development/python-modules/portend/default.nix
+++ b/pkgs/development/python-modules/portend/default.nix
@@ -5,14 +5,14 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "portend";
-  version = "2.1.2";
+  version = "2.2";
 
   buildInputs = [ pytest pytest-sugar pytest-warnings setuptools_scm ];
   propagatedBuildInputs = [ tempora ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dx8b1rn64ymx5s4mdzlw5hz59qi167z7nny36dl75ghlldn41w4";
+    sha256 = "bc48d3d99e1eaf2e9406c729f8848bfdaf87876cd3560dc3ec6c16714f529586";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix
index f2f8c0f89fd..006b99518a8 100644
--- a/pkgs/development/python-modules/premailer/default.nix
+++ b/pkgs/development/python-modules/premailer/default.nix
@@ -5,7 +5,7 @@
 buildPythonPackage rec {
   pname = "premailer";
   name = "${pname}-${version}";
-  version = "3.0.1";
+  version = "3.1.1";
 
   meta = {
     description = "Turns CSS blocks into style attributes ";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0cmlvqx1dvy16k5q5ylmr43nlfpb9k2zl3q7s4kzhf0lml4wqwaf";
+    sha256 = "fd07dadc47345f7d44a0587bd65a37c45886f19c44b3ec94904761e4b2d39124";
   };
 
   buildInputs = [ mock nose ];
diff --git a/pkgs/development/python-modules/pyaes.nix b/pkgs/development/python-modules/pyaes.nix
index c2feb2e239c..6104e72a37b 100644
--- a/pkgs/development/python-modules/pyaes.nix
+++ b/pkgs/development/python-modules/pyaes.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyaes";
-  version = "1.6.0";
+  version = "1.6.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0bp9bjqy1n6ij1zb86wz9lqa1dhla8qr1d7w2kxyn7jbj56sbmcw";
+    sha256 = "02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix
index 1d1ac67732a..35a7213306f 100644
--- a/pkgs/development/python-modules/pycryptodomex/default.nix
+++ b/pkgs/development/python-modules/pycryptodomex/default.nix
@@ -3,7 +3,7 @@
 buildPythonPackage rec {
   pname = "pycryptodomex";
   name = "${pname}-${version}";
-  version = "3.4.5";
+  version = "3.4.7";
 
   meta = {
     description = "A self-contained cryptographic library for Python";
@@ -13,6 +13,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1n5w5ls5syapmb39kavqgz2sa9pinzx4c9dvwa2147gj0hkh87wj";
+    sha256 = "52aa2e540d06d63636e4b5356957c520611e28a88386bad4d18980e4b00e0b5a";
   };
 }
diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix
index fbb0de6f0ce..b1f1619d910 100644
--- a/pkgs/development/python-modules/pyflakes/default.nix
+++ b/pkgs/development/python-modules/pyflakes/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyflakes";
-  version = "1.5.0";
+  version = "1.6.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1x1pcca4a24k4pw8x1c77sgi58cg1wl2k38mp8a25k608pzls3da";
+    sha256 = "8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805";
   };
 
   buildInputs = [ unittest2 ];
diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/pkgs/development/python-modules/pyjwkest/default.nix
index 03cea021be8..563c0a09284 100644
--- a/pkgs/development/python-modules/pyjwkest/default.nix
+++ b/pkgs/development/python-modules/pyjwkest/default.nix
@@ -5,7 +5,7 @@
 buildPythonPackage rec {
   pname = "pyjwkest";
   name = "${pname}-${version}";
-  version = "1.3.2";
+  version = "1.4.0";
 
   meta = {
     description = "Implementation of JWT, JWS, JWE and JWK";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11rrswsmma3wzi2qnmq929323yc6i9fkjsv8zr7b3vajd72yr49d";
+    sha256 = "128e3c81d02993ac4cd7e29ef7aac767d91daa59380e6883ae589092945e4aad";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 8c0fd1b7a8f..afe3bf8e503 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pylint";
-  version = "1.7.2";
+  version = "1.7.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69";
+    sha256 = "1f65b3815c3bf7524b845711d54c4242e4057dd93826586620239ecdfe591fb1";
   };
 
   buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];
diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix
index 274e5b61c14..0d50686f892 100644
--- a/pkgs/development/python-modules/pyrtlsdr/default.nix
+++ b/pkgs/development/python-modules/pyrtlsdr/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pyrtlsdr";
-  version = "0.2.5";
+  version = "0.2.7";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dd041143b68628c713c2227c78c40b0b4a0cb5d08df116f7bdc5f83c529be0e4";
+    sha256 = "7942fe2e7821d09206002ea7e820e694094b3f964885123eb6eee1167f39b8da";
   };
 
   buildInputs = [ pypandoc pandoc ];
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 605c970cedc..0918b5db1db 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -2,13 +2,13 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-asyncio";
-  version = "0.6.0";
+  version = "0.8.0";
 
   disabled = !isPy3k;
 
   src = fetchurl {
     url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-    sha256 = "e5c6786ece4b3bbb0cca1bf68bf089756a62760e3764dc84eaee39bfab70289b";
+    sha256 = "f32804bb58a66e13a3eda11f8942a71b1b6a30466b0d2ffe9214787aab0e172e";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index dc1a31a8922..e993a67c49f 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-xdist";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7924d45c2430191fe3679a58116c74ceea13307d7822c169d65fd59a24b3a4fe";
+    sha256 = "433e82f9b34986a4e4b2be38c60e82cca3ac64b7e1b38f4d8e3e118292939712";
   };
 
   buildInputs = [ pytest setuptools_scm pytest-forked];
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 32ad71de704..42a591e58b6 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -2,7 +2,7 @@
 , setuptools_scm
 }:
 buildPythonPackage rec {
-  version = "3.2.1";
+  version = "3.2.3";
   pname = "pytest";
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce";
+    sha256 = "27fa6617efc2869d3e969a3e75ec060375bfb28831ade8b5cdd68da3a741dc3c";
   };
 
   buildInputs = [ hypothesis setuptools_scm ];
diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
index 8e8fa61e9bc..a78b1ffbee2 100644
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -1,14 +1,14 @@
 { lib, fetchurl, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
-  version = "1.6";
+  version = "1.7";
   pname = "python-stdnum";
   name = "${pname}-${version}";
   # Failing tests and dependency issue on Py3k
   disabled = isPy3k;
   src = fetchurl {
     url = "mirror://pypi/p/python-stdnum/${name}.tar.gz";
-    sha256 = "157a0aef01b1e846ddd11252dc516637da6b3347e32f0130825b7fae1d8b4655";
+    sha256 = "987c25e1047e8742131bcf29dac7a406987adb1463465749e2daaba8cb19d264";
   };
   meta = {
     homepage = http://arthurdejong.org/python-stdnum/;
diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
index 1010766cf2d..5e1ea8b4642 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -3,10 +3,10 @@
 buildPythonPackage rec {
   pname = "relatorio";
   name = "${pname}-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
   src = fetchurl {
     url = "mirror://pypi/r/relatorio/${name}.tar.gz";
-    sha256 = "efd68d96573b15c59c24a8f420ed14210ce51de535a8470d14381f2bed69d845";
+    sha256 = "744f1e39313f037a0ab52a154338ece151d83e5442a9278db1f8ce450ce6c2cd";
   };
   propagatedBuildInputs = [
     genshi
diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix
index c475ff85ff3..51f194a79cf 100644
--- a/pkgs/development/python-modules/requests_ntlm/default.nix
+++ b/pkgs/development/python-modules/requests_ntlm/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "requests_ntlm";
-  version = "1.0.0";
+  version = "1.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hb689p2jyb867c2wlq5mjkqxgc0jq6lxv3rmhw8rq9qangk3jjk";
+    sha256 = "9189c92e8c61ae91402a64b972c4802b2457ce6a799d658256ebf084d5c7eb71";
   };
 
   propagatedBuildInputs = [ ntlm-auth requests ];
diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index eb669adff45..b2826588a28 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "scikit-learn";
-  version = "0.19.0";
+  version = "0.19.1";
   name = "${pname}-${version}";
   disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07q261l9145c9xr8b4pcsa08ih1ifhclp05i4xwg43cyamkwpx94";
+    sha256 = "5ca0ad32ee04abe0d4ba02c8d89d501b4e5e0304bdf4d45c2e9875a735b323a0";
   };
 
   buildInputs = [ nose pillow gfortran glibcLocales ];
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index f4e4518ef16..df2e569076a 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -1,16 +1,17 @@
-{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, numpy}:
+{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}:
 
 buildPythonPackage rec {
   pname = "scipy";
-  version = "0.19.1";
+  version = "1.0.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
-    sha256 = "a19a2ca7a7336495ec180adeaa0dfdcf41e96dbbee90d51c3ed828ba570884e6";
+    sha256 = "87ea1f11a0e9ec08c264dc64551d501fa307289460705f6fccd84cbfc7926d10";
   };
 
-  buildInputs = [ gfortran nose numpy.blas ];
+  checkInputs = [ nose pytest ];
+  buildInputs = [ gfortran numpy.blas ];
   propagatedBuildInputs = [ numpy ];
 
   # Remove tests because of broken wrapper
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index f2f3069fbf9..9a309d1e3b9 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "semver";
-  version = "2.7.8";
+  version = "2.7.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a6212f5c552452e306502ac8476bbca48af62db29c4528fdd91d319d0a44b07b";
+    sha256 = "1ffb55fb86a076cf7c161e6b5931f7da59f15abe217e0f24cea96cc8eec50f42";
   };
 
   # No tests in archive
diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix
index e2ecbdcb67a..2414b97e94a 100644
--- a/pkgs/development/python-modules/serpy/default.nix
+++ b/pkgs/development/python-modules/serpy/default.nix
@@ -5,7 +5,7 @@
 buildPythonPackage rec {
   pname = "serpy";
   name = "${pname}-${version}";
-  version = "0.1.1";
+  version = "0.2.0";
 
   meta = {
     description = "ridiculously fast object serialization";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0r9wn99x9nbqxfancnq9jh3cn83i1b6gc79xj0ipnxixp661yj5i";
+    sha256 = "7e62e242321b208362966d5ab32b45df93b1cb88da4ce6260277da060b4f7475";
   };
 
   buildInputs = [ flake8 py pyflakes tox ];
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 1c6fb414a73..818468d0fca 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -8,13 +8,13 @@
 # Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
   pname = "setuptools";
-  version = "36.4.0";
+  version = "36.6.0";
   name = "${python.libPrefix}-${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "2758b0270fe8ceec42f336ee5b411e60dc8579febc27bb3ba9b794dc7f0239ae";
+    sha256 = "62074589522a798da243f47348f38020d55b6c945652e2f2c09d3a96299812b7";
   };
 
   buildInputs = [ python wrapPython unzip ];
diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
index 0413366c550..050a59c6e92 100644
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -9,11 +9,11 @@
 buildPythonPackage rec {
   pname = "sounddevice";
   name = "${pname}-${version}";
-  version = "0.3.8";
+  version = "0.3.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dc5ec8534c3831ab133c497721f3aaeed4f5084b0eda842f0c0ada09f2f066dc";
+    sha256 = "1c9e833f8c8ccc67c0291c3448b29e9acc548fe56d15ee6f7fdd7037e00319f8";
   };
 
   propagatedBuildInputs = [ cffi numpy portaudio ];
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   prePatch = ''
-    substituteInPlace sounddevice.py --replace "'portaudio'" "'${portaudio}/lib/libportaudio.so.2'"
+    substituteInPlace src/sounddevice.py --replace "'portaudio'" "'${portaudio}/lib/libportaudio.so.2'"
   '';
 
   meta = {
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index a96a31824f7..e83ab1c724a 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -27,10 +27,10 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Sphinx";
-  version = "1.6.3";
+  version = "1.6.5";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af8bdb8c714552b77d01d4536e3d6d2879d6cb9d25423d29163d5788e27046e6";
+    sha256 = "c6de5dbdbb7a0d7d2757f4389cc00e8f6eb3c49e1772378967a12cfcf2cfe098";
   };
   LC_ALL = "en_US.UTF-8";
 
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 27a3c4ac2ae..ed1c32df555 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -11,11 +11,11 @@
 buildPythonPackage rec {
   pname = "SQLAlchemy";
   name = "${pname}-${version}";
-  version = "1.1.13";
+  version = "1.1.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898";
+    sha256 = "f1191e29e35b6fe1aef7175a09b1707ebb7bd08d0b17cb0feada76c49e5a2d1e";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index b976524ba69..7156d86bb80 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.1.9";
+  version = "1.1.10";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3387ba58383f4e8131f109b40e2b001dec436f38cd9b9b78d38871b8608fdd9e";
+    sha256 = "90db96664955c6a576b495c973bd3976b9d4eaffaea205c0343ac7e8f8147cbe";
   };
 
   # No tests in archive
diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index 0625dd851e5..1955320fd26 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "stevedore";
-  version = "1.25.0";
+  version = "1.27.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c8a373b90487b7a1b52ebaa3ca5059315bf68d9ebe15b2203c2fa675bd7e1e7e";
+    sha256 = "236468dae36707069e8b3bdb455e9f1be090b1e6b937f4ac0c56a538d6f50be0";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 8755a1d4b63..7edfb9c4f0e 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "1.62.1";
+  version = "1.70.0";
   name = "${pname}-${version}";
 
   # Tests require network connectivity and there's no easy way to disable
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7cc83b8d405a48d8a792640761519c64e373ad3514ea8bb4a9a5128f98b0b679";
+    sha256 = "ee77103d2d18fe6369f23c40c93067425c5ed67e08b1a7678e681217e8fa8062";
   };
 
   buildInputs = [ unittest2 mock ];
diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index a8eba4cb3a0..1ac6c4a54d0 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "tempora";
-  version = "1.8";
+  version = "1.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b29d19r8h5my9kzzywi9khn1qzvk3qzp08k0f4rrsa7qks930l4";
+    sha256 = "9ea980c63be54f83d2a466fccc6eeef96a409f74c5034764fb328b0d43247e96";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix
index d1f3a5feeaa..7b432154b60 100644
--- a/pkgs/development/python-modules/testtools/default.nix
+++ b/pkgs/development/python-modules/testtools/default.nix
@@ -8,11 +8,15 @@
 , unittest2
 , traceback2
 , isPy3k
+, fixtures
+, pyrsistent
 }:
 
+# testtools 2.0.0 and up has a circular run-time dependency on futures
+
 buildPythonPackage rec {
   pname = "testtools";
-  version = "1.8.0";
+  version = "1.9.0";
   name = "${pname}-${version}";
 
   # Python 2 only judging from SyntaxError
@@ -20,12 +24,11 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca";
+    sha256 = "b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644";
   };
 
-  propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 ];
+  propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ];
   buildInputs = [ traceback2 ];
-  patches = [ ./testtools_support_unittest2.patch ];
 
   # No tests in archive
   doCheck = false;
diff --git a/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch b/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch
deleted file mode 100644
index 545e5f01ec0..00000000000
--- a/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e600d12980ccb807ba1ca3fb6a4da1d0b89c02f6 Mon Sep 17 00:00:00 2001
-From: Robert Collins <robertc@robertcollins.net>
-Date: Wed, 1 Jul 2015 15:46:28 +1200
-Subject: [PATCH] Fix tests with unittest2 1.1.0 and higher.
-
-Change-Id: I4613d47852fbf901819f197f6e388ccaa717b53e
----
- testtools/tests/test_run.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/testtools/tests/test_run.py b/testtools/tests/test_run.py
-index ead716b..433b6f8 100644
---- a/testtools/tests/test_run.py
-+++ b/testtools/tests/test_run.py
-@@ -201,6 +201,7 @@ def test_run_list_failed_import(self):
-             run.main, ['prog', 'discover', '-l', broken.package.base, '*.py'], out)
-         self.assertEqual(2, exc.args[0])
-         self.assertThat(out.getvalue(), DocTestMatches("""\
-+unittest2.loader._FailedTest.runexample
- Failed to import test module: runexample
- Traceback (most recent call last):
-   File ".../loader.py", line ..., in _find_test_path
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index bc6d7c2fba9..95039cc591f 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.15.0";
+  version = "4.19.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6ec1dc74efacf2cda936b4a6cf4082ce224c76763bdec9f17e437c8cfcaa9953";
+    sha256 = "7ca803c2ea268c6bdb541e2dac74a3af23cf4bf7b4132a6a78926d255f8c8df1";
   };
 
   buildInputs = [ nose coverage glibcLocales flake8 ];
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 8acbfc91a41..a064a7c98b4 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -14,11 +14,11 @@
 buildPythonPackage rec {
   pname = "Twisted";
   name = "${pname}-${version}";
-  version = "17.5.0";
+  version = "17.9.0";
 
   src = fetchurl {
     url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
-    sha256 = "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i";
+    sha256 = "0da1a7e35d5fcae37bc9c7978970b5feb3bc82822155b8654ec63925c05af75c";
   };
 
   propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ];
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 27ce7a99fa7..b4662c640a3 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "txaio";
-  version = "2.8.1";
+  version = "2.8.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fe2e0e4d3a06705f86bbd351fdd1f39dae61755e44162375e024acbf32eafddb";
+    sha256 = "484cd6c4cdd3f6081b87188f3b2b9a36e02fba6816e8256917c4f6571b567571";
   };
 
   buildInputs = [ pytest mock ];
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index 481ff67dd97..0a073cca0c5 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,11 +1,11 @@
 { buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }:
 buildPythonPackage rec {
   pname = "typed-ast";
-  version = "1.0.4";
+  version = "1.1.0";
   name = "${pname}-${version}";
   src = fetchPypi{
     inherit pname version;
-    sha256 = "73f09aac0119f6664a3f471a1ec1c9b719f572bc9212913cea96a78b22c2e96e";
+    sha256 = "57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa";
   };
   # Only works with Python 3.3 and newer;
   disabled = pythonOlder "3.3";
diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix
index d7d56bed881..c0748b6b53b 100644
--- a/pkgs/development/python-modules/ukpostcodeparser/default.nix
+++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "UkPostcodeParser";
-  version = "1.1.1";
+  version = "1.1.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b7a7ac19d48897637c7aaa2f2970288f1c260e4a99140bf04c6086cf65576c6b";
+    sha256 = "930264efa293db80af0103a4fe9c161b06365598d24bb6fe5403f3f57c70530e";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix
index d680c29e224..99b648b0ee1 100644
--- a/pkgs/development/python-modules/uritools/default.nix
+++ b/pkgs/development/python-modules/uritools/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "uritools";
   name = "uritools-${version}";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20d7881a947cd3c3bb452e2b541f44acc52febe9c4e3f6d05c55d559fb208c50";
+    sha256 = "a7b58a249a851ef5fff1bc513b940653f0d4841a6668e02431c1297f05efeec3";
   };
 
   propagatedBuildInputs = [ ipaddress ];
diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
index 80c5abeb47c..760af59918a 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -8,11 +8,11 @@
 buildPythonPackage rec {
   pname = "widgetsnbextension";
   name = "${pname}-${version}";
-  version = "3.0.2";
+  version = "3.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e8890d87c80782ee4ea3ed9afffc89a0af8b4ff475d1608d900f728ea55f041c";
+    sha256 = "3fbedb4ae0883f48af2397c65a8f9fbf8ed868f1808db70f8aa72f25d391fa9b";
   };
 
   propagatedBuildInputs = [ notebook ];
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index 2923fcaf3eb..859bd62f998 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "yamllint";
-  version = "1.8.1";
+  version = "1.9.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "048743567ca9511e19222233ebb53795586a2cede07b79e801577e0a9b4f173c";
+    sha256 = "75295a7cbfb3529e02551d4e95c2e3eb85d66292bedcfb463d25d71308065e34";
   };
 
   checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index 4bdfbccadf1..2ded73d5250 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "yapf";
-  version = "0.17.0";
+  version = "0.19.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5472f4c95ab9b9fe9f5bf74ece3c986bfafa1f98ad9e1e296d4c35d291c97856";
+    sha256 = "701b076a4916e3cfbba345e0297dcd54a02fd0fdcae1f43346f8a043c3bbd052";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 046b749ffa7..1275178d5d0 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -8,12 +8,12 @@
 
 let
   pname = "yarl";
-  version = "0.12.0";
+  version = "0.13.0";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "fc0f71ffdce882b4d4b287b0b3a68d9f2557ab14cc2c10ce4df714c42512cbde";
+    sha256 = "25fe681a982f2cec567df8abac7cbd2ac27016e4aec89193945cab0643bfdb42";
   };
 
   buildInputs = [ pytest pytestrunner ];
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 0f19e7f4e5d..e00d6c7e24b 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -20,17 +20,18 @@
 , pytestcov
 , requests-mock
 , testtools
+, tornado
 }:
 
 let
   pname = "zeep";
-  version = "2.3.0";
+  version = "2.4.0";
 in buildPythonPackage {
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b01d81c61d7b7858b7be001615d3c995a371815f5e6902c914fea9beba30b716";
+    sha256 = "8631e2735c5f2219eb18ca4f0615ae482455628518508f69c3690dbfb8238aee";
   };
 
   propagatedBuildInputs = [
@@ -47,6 +48,10 @@ in buildPythonPackage {
   # testtools dependency not supported for py3k
   doCheck = !isPy3k;
 
+  checkInputs = [
+    tornado
+  ];
+
   buildInputs = if isPy3k then [] else [
     freezegun
     mock
diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix
index 0c1ece54fb6..c6b5900c627 100644
--- a/pkgs/development/python-modules/zetup/default.nix
+++ b/pkgs/development/python-modules/zetup/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "zetup";
-  version = "0.2.34";
+  version = "0.2.42";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0k4lm51b5qjy7yxy3n5z8vc5hlvjcsfsvwjgqzkr0pisysar1kpf";
+    sha256 = "6c9e25249f3014ed2162398772ccf1a5e8a4e9e66c74e3c7f6683945a6a3d84c";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index a4855c23865..5a318b5d040 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
     pname = "ZODB";
-    version = "5.2.4";
+    version = "5.3.0";
     name = "${pname}-${version}";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1pya0inkkxaqmi14gp796cidf894nz64n603zk670jj9xz0wkhgc";
+      sha256 = "633c2f89481d8ebc55639b59216f7d16d07b44a94758850c0b887006967214f3";
     };
 
     propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix
index f51b30ab51e..9438e8ca54f 100644
--- a/pkgs/development/python-modules/zodbpickle/default.nix
+++ b/pkgs/development/python-modules/zodbpickle/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "zodbpickle";
-  version = "0.6.0";
+  version = "0.7.0";
   name = "${pname}-${version}";
   disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665";
+    sha256 = "95a247fb17bce980af8d548af70ac5bd1bad22773f242eb8efa24428efa909a8";
   };
 
   # fails..
diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix
index 7af2d11e25c..32f756a3cdd 100644
--- a/pkgs/development/python-modules/zope_interface/default.nix
+++ b/pkgs/development/python-modules/zope_interface/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "zope.interface";
-  version = "4.4.2";
+  version = "4.4.3";
   name = "${pname}-${version}";
   
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4e59e427200201f69ef82956ddf9e527891becf5b7cde8ec3ce39e1d0e262eb0";
+    sha256 = "d6d26d5dfbfd60c65152938fcb82f949e8dada37c041f72916fef6621ba5c5ce";
   };
 
   propagatedBuildInputs = [ zope_event ];
diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix
index 9f568504317..6dc57afb51e 100644
--- a/pkgs/development/tools/mypy/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -3,14 +3,14 @@
 buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "mypy";
-  version = "0.521";
+  version = "0.540";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9d30df20cd937b80cfc6007d75426f27a232789cfa288c63bf9370f2542c9658";
+    sha256 = "5d82f51e228a88e5de6ac1d6699dd09e250ce7de217a5ff1256e317266e738ec";
   };
 
   propagatedBuildInputs = [ lxml typed-ast ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5987c77b01c..f0a8553dc38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1191,6 +1191,8 @@ in {
     };
   };
 
+  backports_tempfile = callPackage ../development/python-modules/backports_tempfile { };
+
   backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {};
 
   babelfish = buildPythonPackage rec {
@@ -15101,6 +15103,8 @@ in {
     };
   };
 
+  parso = callPackage ../development/python-modules/parso { };
+
   partd = buildPythonPackage rec {
     name = "partd-${version}";
     version = "0.3.7";
-- 
GitLab


From 97c7b69e250b4f6d19ce6737815615c38568cee5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 27 Oct 2017 22:20:20 +0200
Subject: [PATCH 096/877] systemd: remove udev attributes

---
 pkgs/misc/drivers/foo2zjs/default.nix   | 2 +-
 pkgs/os-specific/linux/lvm2/default.nix | 2 +-
 pkgs/top-level/all-packages.nix         | 6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix
index 14ceb405d68..bfc8271ad65 100644
--- a/pkgs/misc/drivers/foo2zjs/default.nix
+++ b/pkgs/misc/drivers/foo2zjs/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     "PIXMAPS=$(out)/share/pixmaps"
     "UDEVBIN=$(out)/bin"
     "UDEVDIR=$(out)/etc/udev/rules.d"
-    "UDEVD=${systemd.udev.bin}/sbin/udevd"
+    "UDEVD=${systemd}/sbin/udevd"
     "LIBUDEVDIR=$(out)/lib/udev/rules.d"
     "USBDIR=$(out)/etc/hotplug/usb"
     "FOODB=$(out)/share/foomatic/db/source"
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 1a36c669577..6382b90f168 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   preConfigure =
     ''
       substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
-        --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm
+        --replace /usr/bin/udevadm ${systemd}/bin/udevadm
 
       sed -i /DEFAULT_SYS_DIR/d Makefile.in
       sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b89e59463bd..c5854f1f9f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12956,11 +12956,7 @@ with pkgs;
 
   systemd = callPackage ../os-specific/linux/systemd {
     utillinux = utillinuxMinimal; # break the cyclic dependency
-  }
-    // {
-      udev.bin = systemd;     # ${systemd.udev.bin}/bin/udevadm
-      udev.lib = libudev.out; # ${systemd.udev.lib}/lib/libudev.*
-    };
+  };
 
   # standalone cryptsetup generator for systemd
   systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { };
-- 
GitLab


From 0c6afc94bc331a155228dc374b041e2cd5e7c04c Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Fri, 27 Oct 2017 22:22:33 +0200
Subject: [PATCH 097/877] datefudge: 1.21 => 1.22

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

diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix
index 13c2938f63b..2c2d778697a 100644
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/pkgs/tools/system/datefudge/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "datefudge";
-  version = "1.2.1";
+  version = "1.22";
   name = "${pname}-${version}";
 
   src = fetchgit {
-    sha256 = "0l83kn6c3jr3wzs880zfa64rw81cqjjk55gjxz71rjf2balp64ps";
+    sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c";
     url = "git://anonscm.debian.org/users/robert/datefudge.git";
-    rev = "cd141c63bebe9b579109b2232b5e83db18f222c2";
+    rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6";
   };
 
   patchPhase = ''
-- 
GitLab


From e0d83c66cf8a188854965d21cd08137570e72f1f Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Fri, 27 Oct 2017 22:26:09 +0200
Subject: [PATCH 098/877] duckmarines: 1.0b => 1.0c

---
 pkgs/games/duckmarines/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix
index fc4a006a6a9..b4dca34b11f 100644
--- a/pkgs/games/duckmarines/default.nix
+++ b/pkgs/games/duckmarines/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "duckmarines";
-  version = "1.0b";
+  version = "1.0c";
 
   icon = fetchurl {
     url = "http://tangramgames.dk/img/thumb/duckmarines.png";
-- 
GitLab


From 51babe0fa88ecaec80917ece4e84d9cef39c7eb5 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 27 Oct 2017 23:11:50 +0200
Subject: [PATCH 099/877] shotwell: 0.27.0 -> 0.27.1

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

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index a3be867d6ed..b0a6f7caf88 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -8,12 +8,12 @@
 stdenv.mkDerivation rec {
   version = "${major}.${minor}";
   major = "0.27";
-  minor = "0";
+  minor = "1";
   name = "shotwell-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "03vwp314kckr67p7shrysqpr95hc3326lk3bv40g11i9clsik1a2";
+    sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
-- 
GitLab


From 9711aac642b184a63498dd4bbf8a572721be53c8 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 27 Oct 2017 23:05:12 +0000
Subject: [PATCH 100/877] nixUnstable: rename to nix-unstable

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 4359682d96a..f41e002a766 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -160,7 +160,7 @@ in rec {
   }) // { perl-bindings = nixStable; };
 
   nixUnstable = (lib.lowPrio (common rec {
-    name = "nix-1.12${suffix}";
+    name = "nix-unstable-1.12${suffix}";
     suffix = "pre5663_c7af84ce";
     src = fetchFromGitHub {
       owner = "NixOS";
-- 
GitLab


From f8ce957263d4ff2fc910f99511ceb16a20381101 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 15 Oct 2017 13:26:20 -0400
Subject: [PATCH 101/877] expat: Don't run tests when cross-compiling

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

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 6533997de2f..77b826acc03 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   outputMan = "dev"; # tiny page for a dev tool
 
-  doCheck = true;
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
 
   preCheck = ''
     patchShebangs ./run.sh
-- 
GitLab


From bba7c214ff4b4b42733fe197eac323d4d1b7d1aa Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 15 Oct 2017 14:01:40 -0400
Subject: [PATCH 102/877] libunistring: Don't run tests when cross-compiling

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

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index c4acc0627af..42376b61f42 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   # XXX: There are test failures on non-GNU systems, see
   # http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html .
-  doCheck = stdenv ? glibc;
+  doCheck = (stdenv ? glibc) && (stdenv.hostPlatform == stdenv.buildPlatform);
 
   meta = {
     homepage = http://www.gnu.org/software/libunistring/;
-- 
GitLab


From 97c1211f95f13acdc2bd87717924fdceea20804c Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 15 Oct 2017 14:13:36 -0400
Subject: [PATCH 103/877] libidn: Don't run tests when cross-compiling

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

diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 3de9cf1e0db..df92693de5a 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];
 
-  doCheck = ! stdenv.isDarwin;
+  doCheck = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin;
 
   hardeningDisable = [ "format" ];
 
-- 
GitLab


From 6b1a2b3089d4307e10f87618325ce17dc1e6f934 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 15 Oct 2017 15:36:30 -0400
Subject: [PATCH 104/877] boehm-gc: Don't run tests when cross-compiling

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

diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index e4311c0a5e9..1ac96e2b4f0 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     [ "--enable-cplusplus" ]
     ++ lib.optional enableLargeConfig "--enable-large-config";
 
-  doCheck = true;
+  doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
 
   # Don't run the native `strip' when cross-compiling.
   dontStrip = hostPlatform != buildPlatform;
-- 
GitLab


From 99932a894f560d903e65229e157275ec9a5ee94c Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 15 Oct 2017 15:39:35 -0400
Subject: [PATCH 105/877] gdbm: Don't run tests when cross-compiling

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

diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index c6313dec90c..3b78225a447 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx";
   };
 
-  doCheck = true;
+  doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
 
   # Linking static stubs on cygwin requires correct ordering.
   # Consider upstreaming this.
-- 
GitLab


From 09ce1ebd8fed514147070aa17a95b0b501d8baf5 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 15 Oct 2017 16:54:36 -0400
Subject: [PATCH 106/877] libxml2: Don't run tests when cross-compiling

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

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 28b6faa436a..bf38a954d60 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = !stdenv.isDarwin;
+  doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin;
 
   crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
     # creating the DLL is broken ATM
-- 
GitLab


From de347ad65f69557ca27056d707f0414b25bb7575 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Wed, 18 Oct 2017 00:48:49 -0400
Subject: [PATCH 107/877] lzo: Don't run tests when cross-compiling

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

diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index 8739c9d25d5..e8f8a6ab9bb 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
 
   meta = with stdenv.lib; {
     description = "Real-time data (de)compression library";
-- 
GitLab


From 3ed6239d6bdde9eb1774299d6b921781113865ae Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Thu, 26 Oct 2017 21:53:57 -0400
Subject: [PATCH 108/877] gnutls: Don't run tests when cross-compiling

---
 pkgs/development/libraries/gnutls/generic.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 0b633f0a2f1..d2947cd7c6b 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -12,7 +12,8 @@ assert guileBindings -> guile != null;
 let
   # XXX: Gnulib's `test-select' fails on FreeBSD:
   # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
-  doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4";
+  doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"
+      && stdenv.buildPlatform == stdenv.hostPlatform;
 in
 stdenv.mkDerivation {
   name = "gnutls-${version}";
-- 
GitLab


From 765fbe8f105edae51187c538488d5072b4ac18a7 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 27 Oct 2017 17:05:38 -0400
Subject: [PATCH 109/877] libtiff: Don't run testsuite when cross-compiling

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

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index f43db801f24..ee21f3df7ac 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
 
   meta = with stdenv.lib; {
     description = "Library and utilities for working with the TIFF image file format";
-- 
GitLab


From 0c0834f0180bb0ffc577be3cbd4c24540624f9e5 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 27 Oct 2017 17:04:58 -0400
Subject: [PATCH 110/877] libjpeg-turbo: Don't run testsuite when
 cross-compiling

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

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index 1023c8ae505..77f9d999de4 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
   checkTarget = "test";
 
   meta = with stdenv.lib; {
-- 
GitLab


From 9754285f5bf1ea96397a7ff6acd3c9059f235fd3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 28 Oct 2017 11:20:47 +0800
Subject: [PATCH 111/877] neomutt: 20171013 -> 20171027

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

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index d9d2f201fdc..4b522518e3f 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -14,14 +14,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "20171013";
+  version = "20171027";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "0zn8imqfa76bxpkpy111c4vn6vjarbxc8gqv6m18qkksk0ly26l1";
+    sha256 = "0pwc5zdxc9h23658dfkzndfj1ld3ijyvcxmsiv793y3i4dig0s3n";
   };
 
   buildInputs = [
-- 
GitLab


From e6061d737b088733ab443e38cf97b6420b1970b7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 28 Oct 2017 03:58:21 +0200
Subject: [PATCH 112/877] python.pkgs.nbmerge: init at unstable-2017-10-23

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

diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix
new file mode 100644
index 00000000000..df6c774bfbe
--- /dev/null
+++ b/pkgs/development/python-modules/nbmerge/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nbformat
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "nbmerge";
+  version = "unstable-2017-10-23";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jbn";
+    repo = pname;
+    rev = "fc0ba95e8422340317358ffec4404235defbc06a";
+    sha256 = "1cn550kjadnxc1sx2xy814248fpzrj3lgvrmsbrwmk03vwaa2hmi";
+  };
+
+  propagatedBuildInputs = [ nbformat ];
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    patchShebangs .
+    nosetests -v
+    PATH=$PATH:$out/bin ./cli_tests.sh
+  '';
+
+  meta = {
+    description = "A tool to merge/concatenate Jupyter (IPython) notebooks";
+    inherit (src.meta) homepage;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ globin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0a8553dc38..8df85f143bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12702,6 +12702,8 @@ in {
 
   nbformat = callPackage ../development/python-modules/nbformat { };
 
+  nbmerge = callPackage ../development/python-modules/nbmerge { };
+
   nbxmpp = buildPythonPackage rec {
     name = "nbxmpp-${version}";
     version = "0.5.5";
-- 
GitLab


From 2da692dfc17a15cc18e9609889cfc38b991499c6 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 27 Oct 2017 12:01:29 +0800
Subject: [PATCH 113/877] unbound: 1.6.6 -> 1.6.7

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

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index cb462a2cedd..b124352fd7b 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.6.6";
+  version = "1.6.7";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "145kska9a63yf32y3jg91y5ikcmsb7qvbcm7a8k6fgh96gf18awp";
+    sha256 = "17qwfmlls0w9kpkya3dlpn44b3kr87wsswzg3gawc13hh8yx8ysf";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
-- 
GitLab


From b972139a59f5647c399afcb71db9929edaec7768 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 17:07:43 +0800
Subject: [PATCH 114/877] dpkg: 1.18.24 -> 1.19.0.4 (#30854)

* dpkg: 1.18.24 -> 1.19.0.4

* dpkg: just use one substituteInPlace call
---
 .../tools/package-management/dpkg/default.nix | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 53c39003483..63431e29fac 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }:
+{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "dpkg-${version}";
-  version = "1.18.24";
+  version = "1.19.0.4";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "1d6p22vk1b9v16q96mwaz9w2xr4ly28yamkh49md9gq67qfhhlyq";
+    sha256 = "02lrwrkl2g1jwj71088rwswx07a1zq1jkq7193lbvy8jj2qnp9lq";
   };
 
   configureFlags = [
@@ -31,6 +31,24 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  patchPhase = ''
+    patchShebangs .
+
+    # Dpkg commands sometimes calls out to shell commands
+    substituteInPlace lib/dpkg/dpkg.h \
+       --replace '"dpkg-deb"' \"$out/bin/dpkg-deb\" \
+       --replace '"dpkg-split"' \"$out/bin/dpkg-split\" \
+       --replace '"dpkg-query"' \"$out/bin/dpkg-query\" \
+       --replace '"dpkg-divert"' \"$out/bin/dpkg-divert\" \
+       --replace '"dpkg-statoverride"' \"$out/bin/dpkg-statoverride\" \
+       --replace '"dpkg-trigger"' \"$out/bin/dpkg-trigger\" \
+       --replace '"dpkg"' \"$out/bin/dpkg\" \
+       --replace '"debsig-verify"' \"$out/bin/debsig-verify\" \
+       --replace '"rm"' \"${coreutils}/bin/rm\" \
+       --replace '"cat"' \"${coreutils}/bin/cat\" \
+       --replace '"diff"' \"${coreutils}/bin/diff\"
+  '';
+
   buildInputs = [ perl zlib bzip2 xz ];
   nativeBuildInputs = [ makeWrapper ];
 
-- 
GitLab


From 9f28f2dd38bbc6b156a4f1798a47b32588611535 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@speicherleck.de>
Date: Sat, 28 Oct 2017 00:16:39 +0200
Subject: [PATCH 115/877] sshlatex: init at 0.7

---
 lib/maintainers.nix                         |  1 +
 pkgs/tools/typesetting/sshlatex/default.nix | 38 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/typesetting/sshlatex/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b71b5d7aa54..5a9a9428c4e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -268,6 +268,7 @@
   htr = "Hugo Tavares Reis <hugo@linux.com>";
   iand675 = "Ian Duncan <ian@iankduncan.com>";
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
+  iblech = "Ingo Blechschmidt <iblech@speicherleck.de>";
   igsha = "Igor Sharonov <igor.sharonov@gmail.com>";
   ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>";
   infinisil = "Silvan Mosberger <infinisil@icloud.com>";
diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix
new file mode 100644
index 00000000000..bfc1a8eb162
--- /dev/null
+++ b/pkgs/tools/typesetting/sshlatex/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "sshlatex-${version}";
+  version = "0.7";
+
+  src = fetchFromGitHub {
+    owner = "iblech";
+    repo = "sshlatex";
+    rev = "${version}";
+    sha256 = "02h81i8n3skg9jnlfrisyg5bhqicrn6svq64kp20f70p64s3d7ix";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = let
+    binPath = stdenv.lib.makeBinPath [ openssh perl gnutar bash inotify-tools ];
+  in ''
+    mkdir -p $out/bin
+    cp sshlatex $out/bin
+    wrapProgram $out/bin/sshlatex --prefix PATH : "${binPath}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A collection of hacks to efficiently run LaTeX via ssh";
+    longDescription = ''
+      sshlatex is a tool which uploads LaTeX source files to a remote, runs
+      LaTeX there, and streams the resulting PDF file to the local host.
+      Because sshlatex prestarts LaTeX with the previous run's preamble,
+      thereby preloading the required LaTeX packages, it is also useful in a
+      purely local setting.
+    '';
+    homepage = https://github.com/iblech/sshlatex;
+    license = stdenv.lib.licenses.gpl3Plus;  # actually dual-licensed gpl3Plus | lppl13cplus
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.iblech ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ca4b33ecf3..be0f18ca106 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4486,6 +4486,8 @@ with pkgs;
 
   sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { };
 
+  sshlatex = callPackage ../tools/typesetting/sshlatex { };
+
   sshuttle = callPackage ../tools/security/sshuttle { };
 
   ssldump = callPackage ../tools/networking/ssldump { };
-- 
GitLab


From 436c8fd28739b20ab3f4448c249c528ba3267034 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Thu, 26 Oct 2017 23:42:06 +0200
Subject: [PATCH 116/877] 389-ds-base: fix homepage url

---
 pkgs/servers/ldap/389/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 637b7dd8b92..5ef909a6d09 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   passthru.version = version;
 
   meta = with stdenv.lib; {
-    homepage = https://directory.fedoraproject.org/;
+    homepage = http://www.port389.org/;
     description = "Enterprise-class Open Source LDAP server for Linux";
     license = licenses.gpl2;
     platforms = platforms.linux;
-- 
GitLab


From 817d51aa8f0a4810c15b4b16461e1d3ebca9e6e9 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Thu, 26 Oct 2017 23:39:33 +0200
Subject: [PATCH 117/877] a2ps: fix homepage url

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

diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix
index 2535354aa22..f423bd7ea1c 100644
--- a/pkgs/tools/text/a2ps/default.nix
+++ b/pkgs/tools/text/a2ps/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       (page number, printing date, file name or supplied header), line numbering, symbol substitution as
       well as pretty printing for a wide range of programming languages.
     '';
-    homepage = http://www.inf.enst.fr/~demaille/a2ps/index.html;
+    homepage = https://www.gnu.org/software/a2ps/;
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.bennofs ];
     platforms = platforms.linux;
-- 
GitLab


From 6fc47b0c58bd631fcdc27b31e8565d8dba6a87fd Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Thu, 26 Oct 2017 23:30:19 +0200
Subject: [PATCH 118/877] amdapp-sdk: fix homepage url

---
 pkgs/development/misc/amdapp-sdk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix
index fc2981f7f1f..7775716a712 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@@ -99,7 +99,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support";
-    homepage = http://developer.amd.com/tools/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/;
+    homepage = http://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/;
     license = licenses.amd;
     maintainers = [ maintainers.offline ];
     platforms = [ "i686-linux" "x86_64-linux" ];
-- 
GitLab


From 19828e85b13b9ab738305b4eee4c4a5472c5d39a Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Thu, 26 Oct 2017 23:26:26 +0200
Subject: [PATCH 119/877] appstream: fix homepage url

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

diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index d2b605c4f19..b79f274b9c3 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
   cmakeFlags = ''
     -DSTEMMING=off
     '';
-      
+
   meta = with stdenv.lib; {
     description = "Software metadata handling library";
-    homepage    = "http://www.freedesktop.org/wiki/Distributions/AppStream/Software/";
+    homepage    = https://www.freedesktop.org/wiki/Distributions/AppStream/;
     longDescription =
     ''
       AppStream is a cross-distro effort for building Software-Center applications
-- 
GitLab


From 01e47d6bb5379cf78c5c72276a88e8219dd829e9 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Thu, 26 Oct 2017 23:40:38 +0200
Subject: [PATCH 120/877] arp-scan: fix homepage url

---
 pkgs/tools/misc/arp-scan/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix
index f8adedc7c24..760757190c3 100644
--- a/pkgs/tools/misc/arp-scan/default.nix
+++ b/pkgs/tools/misc/arp-scan/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
       Arp-scan is a command-line tool that uses the ARP protocol to discover
       and fingerprint IP hosts on the local network.
     '';
-    homepage = http://www.nta-monitor.com/tools-resources/security-tools/arp-scan;
+    homepage = http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
-- 
GitLab


From 06c154386ee245597f6b32c5063bdf3e21720e14 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 28 Oct 2017 12:22:26 +0300
Subject: [PATCH 121/877] claws-mail: Split dev output

Closure goes 484M -> 469M.
---
 pkgs/applications/networking/mailreaders/claws-mail/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 01978a4da7e..cccfdbc7560 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
     sha256 = "0hlm2jipyr4z6izlrpvabpz4ivh49i13avnm848kr1nv68pkq2cd";
   };
 
+  outputs = [ "out" "dev" ];
+
   patches = [ ./mime.patch ];
 
   hardeningDisable = [ "format" ];
-- 
GitLab


From abf222ad384304ce7477c8556571bc893c8f5a75 Mon Sep 17 00:00:00 2001
From: David Izquierdo <david@izquierdofernandez.com>
Date: Sat, 21 Oct 2017 13:33:08 +0200
Subject: [PATCH 122/877] libtbb: init at 2018_U1

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

diff --git a/pkgs/development/libraries/libtbb/default.nix b/pkgs/development/libraries/libtbb/default.nix
new file mode 100644
index 00000000000..1422f6c5ceb
--- /dev/null
+++ b/pkgs/development/libraries/libtbb/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, tree }: 
+
+stdenv.mkDerivation rec {
+  name = "libtbb-${version}";
+  version = "2018_U1";
+
+  src = fetchFromGitHub {
+    owner = "01org";
+    repo = "tbb";
+    rev = "${version}";
+    sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw";
+  };
+
+  buildInputs = [ tree ];
+
+  installPhase = ''
+    mkdir -p "$out"/usr/include "$out"/lib
+    install -m755 build/linux_*/*.so* "$out"/lib/
+    cp -a include/tbb "$out"/usr/include/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.threadingbuildingblocks.org/";
+    description = "High level abstract threading library";
+    platforms = platforms.unix;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ dizfer ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0a2fe24a30..8b219f6be7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3119,6 +3119,8 @@ with pkgs;
 
   libsrs2 = callPackage ../development/libraries/libsrs2 { };
 
+  libtbb = callPackage ../development/libraries/libtbb { };
+
   libtermkey = callPackage ../development/libraries/libtermkey { };
 
   libtelnet = callPackage ../development/libraries/libtelnet { };
-- 
GitLab


From 301fc3a33dd02dad3ff2d96f13b0b0b727df72fe Mon Sep 17 00:00:00 2001
From: David Izquierdo <david@izquierdofernandez.com>
Date: Sun, 22 Oct 2017 19:05:11 +0200
Subject: [PATCH 123/877] maintainers: add dizfer

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 5a9a9428c4e..9fb5a64540a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -161,6 +161,7 @@
   dgonyeo = "Derek Gonyeo <derek@gonyeo.com>";
   dipinhora = "Dipin Hora <dipinhora+github@gmail.com>";
   disassembler = "Samuel Leathers <disasm@gmail.com>";
+  dizfer = "David Izquierdo <david@izquierdofernandez.com>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
   DmitryTsygankov = "Dmitry Tsygankov <dmitry.tsygankov@gmail.com>";
   dmjio = "David Johnson <djohnson.m@gmail.com>";
-- 
GitLab


From 38368c42fc06129b7efcb804e25fee16da0319dc Mon Sep 17 00:00:00 2001
From: David Izquierdo <david@izquierdofernandez.com>
Date: Sat, 28 Oct 2017 11:17:09 +0200
Subject: [PATCH 124/877] steam-runtime-wrapped: add libtbb

---
 pkgs/games/steam/runtime-wrapped.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 1ec9fc7d5d9..4c3faa07418 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -57,6 +57,7 @@ let
     glew110
     openssl
     libidn
+    libtbb
 
     # Other things from runtime
     xlibs.libXinerama
-- 
GitLab


From 7dff2c53d4c346df8febf2006c6143097b473236 Mon Sep 17 00:00:00 2001
From: David Izquierdo <david@izquierdofernandez.com>
Date: Sat, 28 Oct 2017 11:18:26 +0200
Subject: [PATCH 125/877] steam-runtime-wrapped: switch curl to use gnutls

---
 pkgs/games/steam/runtime-wrapped.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 4c3faa07418..73c010d645f 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -26,7 +26,7 @@ let
     xlibs.libICE
     gnome2.GConf
     freetype
-    curl
+    (curl.override { gnutlsSupport = true; sslSupport = false; })
     nspr
     nss
     fontconfig
-- 
GitLab


From b2f199404f84f30dd42e464707e48274a649c9b6 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Thu, 26 Oct 2017 17:21:57 +0200
Subject: [PATCH 126/877] buku: 3.3.1 -> 3.4

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

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index a0955dceced..8aa191c0f3c 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,14 +1,14 @@
 { stdenv, python3, fetchFromGitHub }:
 
 with python3.pkgs; buildPythonApplication rec {
-  version = "3.3.1";
+  version = "3.4";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
     rev = "v${version}";
-    sha256 = "1byq8jgv1rb67ygibk0vzgz5ri1il4q4hpg23z5q0ml27fif9hw3";
+    sha256 = "0v0wvsxw78g6yl606if25k1adghr5764chwy1kl7dsxvchqwvmg0";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From da3c404e58fad73763b34e1e4a1d798edc15b46b Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Sun, 22 Oct 2017 23:36:30 +0400
Subject: [PATCH 127/877] chromium: 62.0.3202.62 -> 62.0.3202.75

also fix beta/dev build - use harfbuzz from sources

Unfortunatelly after [0] chromium doesn't support using harfbuzz provided by
system while using vendored version of freetype.
Disabling usage of separate harfbuzz for now.

[0] https://chromium-review.googlesource.com/c/chromium/src/+/696241
---
 .../networking/browsers/chromium/common.nix    | 10 ++++++++--
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 63483b4da71..42d606ae224 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -60,10 +60,13 @@ let
     in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
 
   gnSystemLibraries = [
-    "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
+    "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
     # "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
     # "re2" # fails with linker errors
     # "ffmpeg" # https://crbug.com/731766
+  ] ++ optionals (versionRange "62" "63") [
+    "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
+                  # so we can't build with one from system and other from source
   ];
 
   opusWithCustomModes = libopus.override {
@@ -76,7 +79,10 @@ let
     libpng libcap
     xdg_utils yasm minizip libwebp
     libusb1 re2 zlib
-    ffmpeg harfbuzz-icu libxslt libxml2
+    ffmpeg libxslt libxml2
+  ] ++ optionals (versionRange "62" "63") [
+    harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together
+                 # so we can't build with one from system and other from source
   ];
 
   # build paths and release info
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 5fe20b9a981..0cf6df0e5cc 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8";
-    sha256bin64 = "10d1v9sa0wnnhjz6ria315aml20v1jl2bnkhcqi125rqk5fw9wrq";
-    version = "62.0.3202.62";
+    sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
+    sha256bin64 = "1ca9p82k7a9h416vwldzy84ww5psv3kbvh5xdys3j3cwaxxa0b4q";
+    version = "63.0.3239.18";
   };
   dev = {
-    sha256 = "0dx9n9j1apngs4gc1n0kyccczm58045l342jr06azaw5yamsk8xb";
-    sha256bin64 = "1syqi1fx3kkn7865m6ldicg9cxcg1pfy9l1fr2k5mcqxsdblcyyv";
-    version = "63.0.3239.9";
+    sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
+    sha256bin64 = "1hq3qz7b5nmnck5sfbaa8d25khv88ylnq10dhbp76ahz4ixn9f7k";
+    version = "63.0.3239.18";
   };
   stable = {
-    sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8";
-    sha256bin64 = "1ijpv76wbxgwcvgr3nd9ciyyf26z56gxw4caga4x6600pa2lm8wq";
-    version = "62.0.3202.62";
+    sha256 = "0k4hvmhaspw3f2scjjcam9dwnkrrzzibnx9sq5b1p56bgd2zxka9";
+    sha256bin64 = "0c4g2h1kcpksx0whf784hs7w62xbgsvq42fvzs0lfjgs11s8fm0x";
+    version = "62.0.3202.75";
   };
 }
-- 
GitLab


From 1adcef7caff0386060d895a31b98a6f610e7b237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 28 Oct 2017 07:48:15 -0200
Subject: [PATCH 128/877] e17gtk: 3.22.1 -> 3.22.2

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

diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix
index 3fbb77816d3..f0bb2bf729d 100644
--- a/pkgs/misc/themes/e17gtk/default.nix
+++ b/pkgs/misc/themes/e17gtk/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "e17gtk-${version}";
-  version = "3.22.1";
+  version = "3.22.2";
 
   src = fetchFromGitHub {
     owner = "tsujan";
     repo = "E17gtk";
     rev = "V${version}";
-    sha256 = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8";
+    sha256 = "1qwj1hmdlk8sdqhkrh60p2xg4av1rl0lmipdg5j0i40318pmiml1";
   };
 
   installPhase = ''
-- 
GitLab


From e730815e38eee3da61bd81e99837c165f9cc529c Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Fri, 27 Oct 2017 21:41:18 +0200
Subject: [PATCH 129/877] nodejs: 8.8.0 -> 8.8.1

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

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index 427de79b33e..49cc205c024 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "8.8.0";
+    version = "8.8.1";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "1ksfj6h6vwaws52055mg80pm2bslw23kpx3a7ahraa6ngk934kw5";
+      sha256 = "0ymmhw41n5a81qkxvq7lrssis4y53jh5gxs2k6s2v6brnxxc9qjw";
     };
 
     patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
-- 
GitLab


From 632b071279c12c4d3e06f1edeaec4e196c1fa425 Mon Sep 17 00:00:00 2001
From: Daniel Ehlers <danielehlers@mindeye.net>
Date: Thu, 26 Oct 2017 10:53:23 +0200
Subject: [PATCH 130/877] nullmailer: 2.0 -> 2.1

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

diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix
index be923ff2305..f17f3ed2de7 100644
--- a/pkgs/servers/mail/nullmailer/default.nix
+++ b/pkgs/servers/mail/nullmailer/default.nix
@@ -4,12 +4,12 @@ assert tls -> gnutls != null;
 
 stdenv.mkDerivation rec {
 
-  version = "2.0";
+  version = "2.1";
   name = "nullmailer-${version}";
 
   src = fetchurl {
     url = "http://untroubled.org/nullmailer/nullmailer-${version}.tar.gz";
-    sha256 = "112ghdln8q9yljc8kp9mc3843mh0fyb4rig2v4q2dzy1l324q3yp";
+    sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild";
   };
 
   buildInputs = stdenv.lib.optional tls gnutls;
-- 
GitLab


From ad1bf413911d732b0677188bb77808ce0d7fe6f4 Mon Sep 17 00:00:00 2001
From: Yuri Aisaka <yuriaisaka@users.noreply.github.com>
Date: Sat, 28 Oct 2017 20:23:42 +0900
Subject: [PATCH 131/877] skktools: init at 1.3.3 (#30778)

---
 .../inputmethods/skk/skktools/default.nix     | 45 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/skk/skktools/default.nix

diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix
new file mode 100644
index 00000000000..8661da66b92
--- /dev/null
+++ b/pkgs/tools/inputmethods/skk/skktools/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }:
+
+# Note (2017-10-24, yuriaisaka):
+# - Version 1.3.3 dates from Jul. 19, 2013.
+# - The latest commit to the github repo dates from Mar. 05, 2017
+# - The repo since appears to have become a kitchen sink place to keep
+#   misc tools to handle SKK dictionaries, and these tools have runtime
+#   dependencies on a Ruby interpreter etc.
+# - We for the moment do not package them to keep the dependencies slim.
+#   Probably, shall package the newer tools as skktools-extra in the future.
+stdenv.mkDerivation rec {
+  name = "skktools-${version}";
+  version = "1.3.3";
+  src = fetchFromGitHub {
+    owner = "skk-dev";
+    repo = "skktools";
+    rev = "c8816fe720604d4fd79f3552e99e0430ca6f2769";
+    sha256 = "11v1i5gkxvfsipigc1w1m16ijzh85drpl694kg6ih4jfam1q4vdh";
+  };
+  # # See "12.2. Package naming"
+  # name = "skktools-unstable-${version}";
+  # version = "2017-03-05";
+  # src = fetchFromGitHub {
+  #   owner = "skk-dev";
+  #   repo = "skktools";
+  #   rev = "e14d98e734d2fdff611385c7df65826e94d929db";
+  #   sha256 = "1k9zxqybl1l5h0a8px2awc920qrdyp1qls50h3kfrj3g65d08aq2";
+  # };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gdbm glib ];
+
+  meta = {
+    description = "A collection of tools to edit SKK dictionaries";
+    longDescription = ''
+      This package provides a collection of tools to manipulate
+      (merge, sort etc.) the dictionaries formatted for SKK Japanese
+      input method.
+    '';
+    homepage = https://github.com/skk-dev/skktools;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b219f6be7c..27a494a1315 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1476,6 +1476,8 @@ with pkgs;
 
   m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
 
+  skktools = callPackage ../tools/inputmethods/skk/skktools { };
+
   ibus = callPackage ../tools/inputmethods/ibus {
     inherit (gnome3) dconf glib;
   };
-- 
GitLab


From 288740ad69526df10cb328cbdde89d23b2f66b1c Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 21 Sep 2017 02:36:39 +0200
Subject: [PATCH 132/877] webkitgtk: 2.16.6 -> 2.18.2

remove references to 216x

CVE-2017-7087
CVE-2017-7089
CVE-2017-7090
CVE-2017-7091
CVE-2017-7092
CVE-2017-7093
CVE-2017-7095
CVE-2017-7096
CVE-2017-7098
CVE-2017-7100
CVE-2017-7102
CVE-2017-7104
CVE-2017-7107
CVE-2017-7109
CVE-2017-7111
CVE-2017-7117
CVE-2017-7120

closes #29796
---
 pkgs/desktops/gnome-3/default.nix                  |  3 +--
 .../libraries/webkitgtk/{2.16.nix => 2.18.nix}     | 14 +++++++-------
 .../libraries/wxwidgets/3.0/default.nix            |  6 +++---
 pkgs/top-level/all-packages.nix                    |  4 ++--
 4 files changed, 13 insertions(+), 14 deletions(-)
 rename pkgs/development/libraries/webkitgtk/{2.16.nix => 2.18.nix} (89%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 10e5f97c38f..585f79ddea6 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -45,7 +45,7 @@ let
     hitori gnome-taquin
   ];
 
-  inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2
+  inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2
     clutter clutter-gst clutter_gtk cogl gtkvnc;
   inherit (pkgs.gnome2) ORBit2;
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
@@ -56,7 +56,6 @@ let
   gtkmm = gtkmm3;
   vala = pkgs.vala_0_32;
   gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
-  webkitgtk = webkitgtk216x;
 
 # Simplify the nixos module and gnome packages
   defaultIconTheme = adwaita-icon-theme;
diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.18.nix
similarity index 89%
rename from pkgs/development/libraries/webkitgtk/2.16.nix
rename to pkgs/development/libraries/webkitgtk/2.18.nix
index d6999353414..036dc8f0a54 100644
--- a/pkgs/development/libraries/webkitgtk/2.16.nix
+++ b/pkgs/development/libraries/webkitgtk/2.18.nix
@@ -4,7 +4,7 @@
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
 , libidn, libedit, readline, mesa, libintlOrEmpty
 , enableGeoLocation ? true, geoclue2, sqlite
-, gst-plugins-base
+, gst-plugins-base, gst-plugins-bad
 }:
 
 assert enableGeoLocation -> geoclue2 != null;
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.16.6";
+  version = "2.18.2";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -42,12 +42,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw";
+    sha256 = "1ry8zvv6k01g9p7agg326n0ziqpqjxd49h5w1b2is6rjnpqv6k5i";
   };
 
   # see if we can clean this up....
 
-  patches = [ ./finding-harfbuzz-icu.patch ]
+  patches = [ ./finding-harfbuzz-icu.patch ./gstreamergl-2.17.patch ]
      ++ optionals stdenv.isDarwin [
     ./PR-152650-2.patch
     ./PR-153138.patch
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   # XXX: WebKit2 missing include path for gst-plugins-base.
   # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
-  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"
+  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0"
                      + (optionalString stdenv.isDarwin " -lintl");
 
   nativeBuildInputs = [
@@ -88,9 +88,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = libintlOrEmpty ++ [
-    gtk2 libwebp enchant libnotify gnutls pcre nettle libidn
+    gtk2 libwebp enchant libnotify gnutls pcre nettle libidn sqlite
     libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
-    sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core
+    gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core
   ] ++ optional enableGeoLocation geoclue2
     ++ (with xlibs; [ libXdmcp libXt libXtst ])
     ++ optionals stdenv.isDarwin [ libedit readline mesa ]
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 35300ed9419..0a4350ed81d 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -3,13 +3,13 @@
 , withMesa ? true, mesa_glu ? null, mesa_noglu ? null
 , compat24 ? false, compat26 ? true, unicode ? true
 , withGtk2 ? true
-, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null
+, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
 }:
 
 
 assert withMesa -> mesa_glu != null && mesa_noglu != null;
-assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null;
+assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null;
 
 with stdenv.lib;
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst-plugins-base GConf ]
     ++ optional withMesa mesa_glu
-    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x)
+    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk)
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27a494a1315..925e0f7eac8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10968,7 +10968,7 @@ with pkgs;
 
   wcslib = callPackage ../development/libraries/wcslib { };
 
-  webkitgtk = webkitgtk216x;
+  webkitgtk = webkitgtk218x;
 
   webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
     harfbuzz = harfbuzz-icu-58;
@@ -10976,7 +10976,7 @@ with pkgs;
     inherit (darwin) libobjc;
   };
 
-  webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix {
+  webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix {
     harfbuzz = harfbuzz-icu;
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
-- 
GitLab


From 43e020ac2fef1376270da1664091b5c493b81bb4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 28 Oct 2017 14:42:47 +0300
Subject: [PATCH 133/877] giblib: Split into multiple outputs

Or it propagates imlib2.dev.
---
 pkgs/development/libraries/giblib/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix
index 17847695f97..b166a69043e 100644
--- a/pkgs/development/libraries/giblib/default.nix
+++ b/pkgs/development/libraries/giblib/default.nix
@@ -8,9 +8,25 @@ stdenv.mkDerivation rec {
     sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp";
   };
 
+  outputs = [ "out" "dev" ];
+  setOutputFlags = false;
+
+  preConfigure = ''
+    configureFlagsArray+=(
+      --includedir=$dev/include
+    )
+  '';
+
   buildInputs = [ xlibsWrapper ];
   propagatedBuildInputs = [ imlib2 ];
 
+  postFixup = ''
+    moveToOutput bin/giblib-config "$dev"
+
+    # Doesn't contain useful stuff
+    rm -rf $out/share/doc
+  '';
+
   meta = {
     homepage = http://linuxbrit.co.uk/giblib/;
     description = "wrapper library for imlib2, and other stuff";
-- 
GitLab


From 0d6822be2bcb3898f6686eb232a8fc0a87e97348 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 28 Oct 2017 13:52:25 +0200
Subject: [PATCH 134/877] Revert "webkitgtk: 2.16.6 -> 2.18.2"

This already went to staging, sorry

This reverts commit 288740ad69526df10cb328cbdde89d23b2f66b1c.
---
 pkgs/desktops/gnome-3/default.nix                  |  3 ++-
 .../libraries/webkitgtk/{2.18.nix => 2.16.nix}     | 14 +++++++-------
 .../libraries/wxwidgets/3.0/default.nix            |  6 +++---
 pkgs/top-level/all-packages.nix                    |  4 ++--
 4 files changed, 14 insertions(+), 13 deletions(-)
 rename pkgs/development/libraries/webkitgtk/{2.18.nix => 2.16.nix} (89%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 585f79ddea6..10e5f97c38f 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -45,7 +45,7 @@ let
     hitori gnome-taquin
   ];
 
-  inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2
+  inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2
     clutter clutter-gst clutter_gtk cogl gtkvnc;
   inherit (pkgs.gnome2) ORBit2;
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
@@ -56,6 +56,7 @@ let
   gtkmm = gtkmm3;
   vala = pkgs.vala_0_32;
   gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
+  webkitgtk = webkitgtk216x;
 
 # Simplify the nixos module and gnome packages
   defaultIconTheme = adwaita-icon-theme;
diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.16.nix
similarity index 89%
rename from pkgs/development/libraries/webkitgtk/2.18.nix
rename to pkgs/development/libraries/webkitgtk/2.16.nix
index 036dc8f0a54..d6999353414 100644
--- a/pkgs/development/libraries/webkitgtk/2.18.nix
+++ b/pkgs/development/libraries/webkitgtk/2.16.nix
@@ -4,7 +4,7 @@
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
 , libidn, libedit, readline, mesa, libintlOrEmpty
 , enableGeoLocation ? true, geoclue2, sqlite
-, gst-plugins-base, gst-plugins-bad
+, gst-plugins-base
 }:
 
 assert enableGeoLocation -> geoclue2 != null;
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.18.2";
+  version = "2.16.6";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -42,12 +42,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "1ry8zvv6k01g9p7agg326n0ziqpqjxd49h5w1b2is6rjnpqv6k5i";
+    sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw";
   };
 
   # see if we can clean this up....
 
-  patches = [ ./finding-harfbuzz-icu.patch ./gstreamergl-2.17.patch ]
+  patches = [ ./finding-harfbuzz-icu.patch ]
      ++ optionals stdenv.isDarwin [
     ./PR-152650-2.patch
     ./PR-153138.patch
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   # XXX: WebKit2 missing include path for gst-plugins-base.
   # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
-  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0"
+  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"
                      + (optionalString stdenv.isDarwin " -lintl");
 
   nativeBuildInputs = [
@@ -88,9 +88,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = libintlOrEmpty ++ [
-    gtk2 libwebp enchant libnotify gnutls pcre nettle libidn sqlite
+    gtk2 libwebp enchant libnotify gnutls pcre nettle libidn
     libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
-    gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core
+    sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core
   ] ++ optional enableGeoLocation geoclue2
     ++ (with xlibs; [ libXdmcp libXt libXtst ])
     ++ optionals stdenv.isDarwin [ libedit readline mesa ]
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 0a4350ed81d..35300ed9419 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -3,13 +3,13 @@
 , withMesa ? true, mesa_glu ? null, mesa_noglu ? null
 , compat24 ? false, compat26 ? true, unicode ? true
 , withGtk2 ? true
-, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null
+, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
 }:
 
 
 assert withMesa -> mesa_glu != null && mesa_noglu != null;
-assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null;
+assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null;
 
 with stdenv.lib;
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst-plugins-base GConf ]
     ++ optional withMesa mesa_glu
-    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk)
+    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x)
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 925e0f7eac8..27a494a1315 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10968,7 +10968,7 @@ with pkgs;
 
   wcslib = callPackage ../development/libraries/wcslib { };
 
-  webkitgtk = webkitgtk218x;
+  webkitgtk = webkitgtk216x;
 
   webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
     harfbuzz = harfbuzz-icu-58;
@@ -10976,7 +10976,7 @@ with pkgs;
     inherit (darwin) libobjc;
   };
 
-  webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix {
+  webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix {
     harfbuzz = harfbuzz-icu;
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
-- 
GitLab


From 9812babaef0cc71098568fbb12c6968b726f8cce Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 28 Oct 2017 14:52:52 +0300
Subject: [PATCH 135/877] xorg.xf86inputlibinput: Split dev output

Closure goes from 160M -> 42M
---
 pkgs/servers/x11/xorg/overrides.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index fa22717b035..87dfeb3cfa7 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -321,8 +321,9 @@ in
       url = "mirror://xorg/individual/driver/${name}.tar.bz2";
       sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb";
     };
+    outputs = [ "out" "dev" ];
     buildInputs = attrs.buildInputs ++ [ args.libinput ];
-    installFlags = "sdkdir=\${out}/include/xorg";
+    installFlags = "sdkdir=\${dev}/include/xorg";
   };
 
   xf86inputsynaptics = attrs: attrs // {
-- 
GitLab


From ea8a4a2e431fca881c17cbe57df044cd8e5e8dfc Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 13 Dec 2016 01:38:56 +0100
Subject: [PATCH 136/877] dropbox: comment update commands

---
 pkgs/applications/networking/dropbox/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 89a473f0cd0..06ac05da36d 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -22,6 +22,11 @@
 # them with our own.
 
 let
+  ## Prefetch commands to run after update, from this directory:
+  ## e.g. with Emacs: C-u M-x shell-command
+  # nix-prefetch-url ../../../../ -A dropbox.src
+  # nix-prefetch-url ../../../../ -A pkgsi686Linux.dropbox.src
+
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
   version = "37.4.29";
-- 
GitLab


From 5eccf40eb4c0aefab11de880c91f6f3ab12a9c0f Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 16 Aug 2017 09:10:46 +0200
Subject: [PATCH 137/877] i2p: 0.9.30 -> 0.9.31

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

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index e13ada5994c..cf26ec61139 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec {
 in
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.30";
+  name = "i2p-0.9.31";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "03hrirmah3ba9ygql487jy233nsxkfjyz82mmyppazi0mcgiass1";
+    sha256 = "1v2my5jqcj8zidxij34h0lpa533rr6ianzz8yld01sxi6gg41w28";
   };
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];
-- 
GitLab


From 59b35013bcf22cb9f32372c0019d7b1a0f91b0d8 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 29 Sep 2017 20:40:15 +0200
Subject: [PATCH 138/877] imlib2: enable libid3tag support

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

diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 8d26cabc9b5..54c70197af4 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig
-, freetype
+, freetype, libid3tag
 , x11Support ? true, xlibsWrapper ? null }:
 
 with stdenv.lib;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0wm2q2xlkbm71k7mw2jyzbxgzylrkcj5yh6nq58w5gybhp98qs9z";
   };
 
-  buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype ]
+  buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ]
     ++ optional x11Support xlibsWrapper;
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From d6ee81e912c5dbfb7db23387c31996b258d0193f Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 28 Jul 2017 12:08:32 +0200
Subject: [PATCH 139/877] dwarf-fortress-packages.dwarf-therapist: update for
 df 43.05

Similar to the LNP, we use Hello71's fork, which features support for
the (first 64bit) version 43.05 of Dwarf Fortress.

http://dffd.bay12games.com/file.php?id=12762
---
 .../dwarf-therapist/default.nix               | 33 +++++++++++--------
 .../dwarf-therapist/wrapper.nix               |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index bfdedcdd133..e7ef9a02eb7 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -1,29 +1,34 @@
-{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmake, texlive }:
+{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, cmake, texlive, ninja }:
 
 stdenv.mkDerivation rec {
   name = "dwarf-therapist-original-${version}";
-  version = "37.0.0";
+  version = "37.0.0-Hello71";
 
   src = fetchFromGitHub {
-    owner = "splintermind";
+    ## We use `Hello71`'s fork for 43.05 support
+    # owner = "splintermind";
+    owner = "Hello71";
     repo = "Dwarf-Therapist";
-    rev = "v${version}";
-    sha256 = "0dw86b4x5hjhb7h4ynvwjgcinpqywfc5l48ljb5sahz08rfnx63d";
+    rev = "42ccaa71f6077ebdd41543255a360c3470812b97";
+    sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz";
   };
 
   outputs = [ "out" "layouts" ];
   buildInputs = [ qtbase qtdeclarative ];
-  nativeBuildInputs = [ texlive qmake ];
+  nativeBuildInputs = [ texlive cmake ninja ];
 
-  enableParallelBuilding = false;
+  configurePhase = ''
+    cmake -GNinja
+  '';
+
+  buildPhase = ''
+    ninja -j$NIX_BUILD_CORES
+  '';
 
-  # Move layout files so they cannot be found by Therapist
-  postInstall = ''
-    mkdir -p $layouts
-    mv $out/share/dwarftherapist/memory_layouts/* $layouts
-    rmdir $out/share/dwarftherapist/memory_layouts
-    # Useless symlink
-    rm $out/bin/dwarftherapist
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ./DwarfTherapist $out/bin/DwarfTherapist
+    cp -r ./share/memory_layouts $layouts
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index cbc8d31e675..3a1a52d44cd 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -3,7 +3,7 @@
 let
   df = dwarf-fortress-original;
   dt = dwarf-therapist-original;
-  inifile = "linux/v0${df.baseVersion}.${df.patchVersion}.ini";
+  inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini";
   dfHashFile = "${df}/hash.md5";
 
 in symlinkJoin {
-- 
GitLab


From 24ea0938066d53e4f43fb208a5f2ce506c682b38 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 19 Jun 2017 02:48:02 +0200
Subject: [PATCH 140/877] dwarf-fortress-packages.soundSense: init 2016-1_196

---
 pkgs/games/dwarf-fortress/default.nix         |  2 ++
 pkgs/games/dwarf-fortress/soundsense.nix      | 35 +++++++++++++++++++
 pkgs/games/dwarf-fortress/wrapper/default.nix | 11 +++++-
 .../dwarf-fortress/wrapper/soundSense.in      | 10 ++++++
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/games/dwarf-fortress/soundsense.nix
 create mode 100644 pkgs/games/dwarf-fortress/wrapper/soundSense.in

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index d26258081fc..c759c4c60da 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -11,6 +11,8 @@ let
       inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
     };
 
+    soundSense = callPackage ./soundsense.nix { };
+
     dwarf-fortress-unfuck = callPackage ./unfuck.nix { };
 
     dwarf-fortress = callPackage ./wrapper {
diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix
new file mode 100644
index 00000000000..c87f42d58c0
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/soundsense.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchzip, dos2unix
+, soundPack ? stdenv.mkDerivation {
+    name = "soundsense-soundpack";
+    src = fetchzip {
+      url = "http://df.zweistein.cz/soundsense/soundpack.zip";
+      sha256 = "0qz0mjkp7wp0gxk3ws2x760awv8c9lkacj2fn9bz3gqqnq262ffa";
+    };
+    installPhase = ''
+      cp -r . $out
+    '';
+}}:
+
+stdenv.mkDerivation rec {
+  version = "2016-1_196";
+  dfVersion = "0.43.05";
+  inherit soundPack;
+  name = "soundsense-${version}";
+  src = fetchzip {
+    url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip";
+    sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk";
+  };
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+  nativeBuildInputs = [ dos2unix ];
+  buildPhase = ''
+    dos2unix soundSense.sh
+    chmod +x soundSense.sh
+  '';
+  installPhase = ''
+    mkdir $out
+    cp -R . $out/soundsense
+    ln -s $out/soundsense/dfhack $out/hack
+    ln -s $soundPack $out/soundsense/packs
+  '';
+  passthru = { inherit version dfVersion; };
+}
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 15b51631b33..232e0b7b3b5 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll
 , enableDFHack ? false, dfhack
+, enableSoundSense ? false, soundSense, jdk
 , themes ? {}
 , theme ? null
 }:
@@ -13,13 +14,14 @@ let
   # These are in inverse order for first packages to override the next ones.
   pkgs = lib.optional (theme != null) ptheme
          ++ lib.optional enableDFHack dfhack
+         ++ lib.optional enableSoundSense soundSense
          ++ [ dwarf-fortress-original ];
 
   env = buildEnv {
     name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}";
 
     paths = pkgs;
-    pathsToLink = [ "/" "/hack" ];
+    pathsToLink = [ "/" "/hack" "/hack/scripts" ];
     ignoreCollisions = true;
 
     postBuild = lib.optionalString enableDFHack ''
@@ -44,6 +46,7 @@ stdenv.mkDerivation rec {
 
   runDF = ./dwarf-fortress.in;
   runDFHack = ./dfhack.in;
+  runSoundSense = ./soundSense.in;
 
   buildCommand = ''
     mkdir -p $out/bin
@@ -57,6 +60,12 @@ stdenv.mkDerivation rec {
       --subst-var-by stdenv_shell ${stdenv.shell} \
       --subst-var dfInit
     chmod 755 $out/bin/dfhack
+  '' + lib.optionalString enableSoundSense ''
+    substitute $runSoundSense $out/bin/soundsense \
+      --subst-var-by stdenv_shell ${stdenv.shell} \
+      --subst-var-by jre ${jdk.jre} \
+      --subst-var dfInit
+    chmod 755 $out/bin/soundsense
   '';
 
   preferLocalBuild = true;
diff --git a/pkgs/games/dwarf-fortress/wrapper/soundSense.in b/pkgs/games/dwarf-fortress/wrapper/soundSense.in
new file mode 100644
index 00000000000..28357ed7579
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/wrapper/soundSense.in
@@ -0,0 +1,10 @@
+#!@stdenv_shell@ -e
+
+source @dfInit@
+
+for p in soundsense/*; do
+  update_path "$p"
+done
+
+cd "$DF_DIR"
+PATH=@jre@/bin exec $DF_DIR/soundsense/soundSense.sh
-- 
GitLab


From 85056ee698bdf85dc0db9ca0865dc2b0a2c16ed4 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 1 Oct 2017 21:26:51 +0200
Subject: [PATCH 141/877] dwarf-fortress-packages.dfhack: add stoneSense
 support

---
 pkgs/games/dwarf-fortress/default.nix         |  1 +
 pkgs/games/dwarf-fortress/dfhack/default.nix  | 14 ++++++-----
 .../dfhack/fix-stonesense.patch               | 23 +++++++++++++++++++
 .../dwarf-fortress/dfhack/skip-ruby.patch     | 10 --------
 pkgs/games/dwarf-fortress/stonesense.nix      | 15 ++++++++++++
 pkgs/games/dwarf-fortress/wrapper/default.nix |  9 ++++++--
 pkgs/games/dwarf-fortress/wrapper/dfhack.in   |  2 +-
 7 files changed, 55 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
 delete mode 100644 pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch
 create mode 100644 pkgs/games/dwarf-fortress/stonesense.nix

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index c759c4c60da..bdd55b5aeda 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -12,6 +12,7 @@ let
     };
 
     soundSense = callPackage ./soundsense.nix { };
+    stoneSense = callPackage ./stonesense.nix { };
 
     dwarf-fortress-unfuck = callPackage ./unfuck.nix { };
 
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 0df91bb8df0..dbb3e7c32e2 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, cmake, writeScriptBin
-, perl, XMLLibXML, XMLLibXSLT
-, zlib
+{ stdenv, lib, fetchgit, cmake, writeScriptBin, callPackage
+, perl, XMLLibXML, XMLLibXSLT, zlib
+, enableStoneSense ? false,  allegro5, mesa
 }:
 
 let
@@ -43,11 +43,12 @@ in stdenv.mkDerivation rec {
     inherit rev sha256;
   };
 
-  patches = [ ./skip-ruby.patch ];
+  patches = [ ./fix-stonesense.patch ];
 
   nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
   # We don't use system libraries because dfhack needs old C++ ABI.
-  buildInputs = [ zlib ];
+  buildInputs = [ zlib ]
+             ++ lib.optionals enableStoneSense [ allegro5 mesa ];
 
   preConfigure = ''
     # Trick build system into believing we have .git
@@ -59,7 +60,8 @@ in stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH"
   '';
 
-  cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" ];
+  cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ]
+            ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
new file mode 100644
index 00000000000..da860cd5562
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
@@ -0,0 +1,23 @@
+From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001
+From: Herwig Hochleitner <hhochleitner@gmail.com>
+Date: Sun, 1 Oct 2017 18:01:43 +0200
+Subject: [PATCH] include <GL/glext.h>
+
+this fixes `GLhandleARB` not being defined
+---
+ plugins/stonesense/common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h
+index eb36691..ef45389 100644
+--- a/plugins/stonesense/common.h
++++ b/plugins/stonesense/common.h
+@@ -31,6 +31,8 @@ using namespace df::enums;
+ #include <allegro5/allegro_opengl.h>
+ #include <allegro5/utf8.h>
+ 
++#include <GL/glext.h>
++
+ // allegro leaks X headers, undef some of it here:
+ #undef TileShape
+ #undef None
\ No newline at end of file
diff --git a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch
deleted file mode 100644
index 877f6c3d215..00000000000
--- a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt
-index f1ef12ac..0976e18a 100644
---- a/plugins/ruby/CMakeLists.txt
-+++ b/plugins/ruby/CMakeLists.txt
-@@ -1,5 +1,5 @@
- # Allow build system to turn off downloading of libruby.so.
--OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." ON)
-+OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." OFF)
- 
- IF (DOWNLOAD_RUBY)
diff --git a/pkgs/games/dwarf-fortress/stonesense.nix b/pkgs/games/dwarf-fortress/stonesense.nix
new file mode 100644
index 00000000000..52de513ac8f
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/stonesense.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "stonesense";
+  src = fetchFromGitHub {
+    owner = "DFHack";
+    repo = "stonesense";
+    rev = "be793a080e66db1ff79ac284070632ec1a896708";
+    sha256 = "1kibqblxp16z75zm48kk59w483933rkg4w339f28fcrbpg4sn92s";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [ "-DDFHACK_BUILD_ARCH=64" ];
+}
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 232e0b7b3b5..05e851db6f8 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -1,11 +1,16 @@
 { stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll
 , enableDFHack ? false, dfhack
 , enableSoundSense ? false, soundSense, jdk
+, enableStoneSense ? false
 , themes ? {}
 , theme ? null
 }:
 
 let
+  dfhack_ = dfhack.override {
+    inherit enableStoneSense;
+  };
+
   ptheme =
     if builtins.isString theme
     then builtins.getAttr theme themes
@@ -13,7 +18,7 @@ let
 
   # These are in inverse order for first packages to override the next ones.
   pkgs = lib.optional (theme != null) ptheme
-         ++ lib.optional enableDFHack dfhack
+         ++ lib.optional enableDFHack dfhack_
          ++ lib.optional enableSoundSense soundSense
          ++ [ dwarf-fortress-original ];
 
@@ -26,7 +31,7 @@ let
 
     postBuild = lib.optionalString enableDFHack ''
       rm $out/hack/symbols.xml
-      substitute ${dfhack}/hack/symbols.xml $out/hack/symbols.xml \
+      substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \
         --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \
                   $(cat ${dwarf-fortress-original}/hash.md5)
     '';
diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in
index c8d8d287403..4cf884ebed2 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in
@@ -2,7 +2,7 @@
 
 source @dfInit@
 
-for i in dfhack.init-example dfhack-config/default hack/*; do
+for i in dfhack.init-example dfhack-config/default hack/* stonesense/*; do
   update_path "$i"
 done
 
-- 
GitLab


From c7bd01c0c927ce7eecc2035c163e16d7d73975f1 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 4 Feb 2017 22:18:59 +0100
Subject: [PATCH 142/877] stumpwm-git: 20160617 -> 20170203

---
 pkgs/applications/window-managers/stumpwm/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                       | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index 6d5e53b7088..215b8c38ece 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -23,9 +23,9 @@ let
       patches = [ ./fix-module-path.patch ];
     };
     "git" = {
-        name = "git-20160617";
-        rev = "7d5b5eb76aa656baf5a8713f514937765f66b10a";
-        sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb";
+        name = "git-20170203";
+        rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97";
+        sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70";
         patches = [];
     };
   }.${version};
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
     sbcl
     lispPackages.clx
     lispPackages.cl-ppcre
+    lispPackages.alexandria
     xdpyinfo
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27a494a1315..b0b88968c82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16624,6 +16624,7 @@ with pkgs;
 
   stumpwm-git = stumpwm.override {
     version = "git";
+    inherit sbcl lispPackages;
   };
 
   sublime = callPackage ../applications/editors/sublime { };
-- 
GitLab


From e05135d80e8cfd34c44ccfae78ab9b765c8af75f Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 1 Apr 2017 04:23:23 +0200
Subject: [PATCH 143/877] virtualbox: expose extensionPack in meta

This way it can be added to system.extraDependencies to save it from gc
---
 pkgs/applications/virtualization/virtualbox/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index fbc0cc5ded0..97d3b3c49b5 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -197,5 +197,6 @@ in stdenv.mkDerivation {
     homepage = http://www.virtualbox.org/;
     maintainers = [ lib.maintainers.sander ];
     platforms = lib.platforms.linux;
+    inherit extensionPack;
   };
 }
-- 
GitLab


From eb3f736afdc3c288a33f35c18d08ad289009b876 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 14 Oct 2016 18:35:18 +0200
Subject: [PATCH 144/877] emacsPackages.gn: init 2017-09-21

---
 .../editors/emacs-modes/gn/default.nix        | 20 +++++++++++++++++++
 pkgs/top-level/emacs-packages.nix             |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/gn/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/gn/default.nix b/pkgs/applications/editors/emacs-modes/gn/default.nix
new file mode 100644
index 00000000000..39e7d1abf38
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/gn/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation {
+  name = "gn-mode-2017-09-21";
+  src = fetchgit {
+    url = "https://chromium.googlesource.com/chromium/src/tools/gn";
+    rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36";
+    sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866";
+  };
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp/
+    cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/
+  '';
+}
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index e7c98cc3869..dbddc05a23e 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -307,6 +307,8 @@ let
     inherit lib;
   };
 
+  gn = callPackage ../applications/editors/emacs-modes/gn { };
+
   shorten = melpaBuild rec {
     pname   = "shorten";
     version = circe.version;
-- 
GitLab


From 4a180dac60e066f52268b69820bafa89dc4ba0d3 Mon Sep 17 00:00:00 2001
From: Jonas Schwabe <jonas@jnugh.de>
Date: Sat, 28 Oct 2017 15:35:57 +0200
Subject: [PATCH 145/877] gdm: fix restart of display-manager after
 nixos-rebuild - fix restart of display-manager due to a conflict with
 getty@tty1 - fixes #21439

---
 nixos/modules/services/x11/display-managers/gdm.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 83c5c95dae7..45a67ac040b 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -125,7 +125,6 @@ in
       "getty@tty1.service"
     ];
 
-    systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
     systemd.services.display-manager.serviceConfig = {
       # Restart = "always"; - already defined in xserver.nix
       KillMode = "mixed";
-- 
GitLab


From 54f8dfda534825ed792631736e64669d855ebee8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 27 Oct 2017 17:57:03 -0400
Subject: [PATCH 146/877] xen: Create XSA patch directory

---
 pkgs/applications/virtualization/xen/4.5.nix  | 271 ++----
 pkgs/applications/virtualization/xen/4.8.nix  |  86 +-
 .../virtualization/xen/xsa-patches.nix        | 774 ++++++++++++++++++
 3 files changed, 844 insertions(+), 287 deletions(-)
 create mode 100644 pkgs/applications/virtualization/xen/xsa-patches.nix

diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 614122a3b24..308913adf89 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -32,13 +32,15 @@ let
     udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
     alsaLib
   ];
+
+  xsa = import ./xsa-patches.nix { inherit fetchpatch; };
 in
 
 callPackage (import ./generic.nix (rec {
   version = "4.5.5";
 
   src = fetchurl {
-    url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
+    url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
     sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2";
   };
 
@@ -183,227 +185,52 @@ callPackage (import ./generic.nix (rec {
     ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
     ++ optional (withInternalOVMF) "--enable-ovmf";
 
-  patches =
-    [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
-      ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
-      ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
-      (xsaPatch {
-        name = "190-4.5";
-        sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm";
-      })
-      (xsaPatch {
-        name = "191-4.6";
-        sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg";
-      })
-      (xsaPatch {
-        name = "192-4.5";
-        sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm";
-      })
-      (xsaPatch {
-        name = "193-4.5";
-        sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
-      })
-      (xsaPatch {
-        name = "195";
-        sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7";
-      })
-      (xsaPatch {
-        name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject";
-        sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
-      })
-      (xsaPatch {
-        name = "196-0002-x86-svm-Fix-injection-of-software-interrupts";
-        sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
-      })
-      (xsaPatch {
-        name = "198";
-        sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9";
-      })
-      (xsaPatch {
-        name = "200-4.6";
-        sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7";
-      })
-      (xsaPatch {
-        name = "202-4.6";
-        sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
-      })
-      (xsaPatch {
-        name = "204-4.5";
-        sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
-      })
-      (xsaPatch {
-        name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit";
-        sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4";
-      })
-      (xsaPatch {
-        name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-";
-        sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx";
-      })
-      (xsaPatch {
-        name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire";
-        sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s";
-      })
-      (xsaPatch {
-        name = "206-4.5/0004-oxenstored-remove-some-unused-parameters";
-        sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk";
-      })
-      (xsaPatch {
-        name = "206-4.5/0005-oxenstored-refactor-request-processing";
-        sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv";
-      })
-      (xsaPatch {
-        name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio";
-        sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg";
-      })
-      (xsaPatch {
-        name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat";
-        sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz";
-      })
-      (xsaPatch {
-        name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict";
-        sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g";
-      })
-      (xsaPatch {
-        name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti";
-        sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b";
-      })
-      (xsaPatch {
-        name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0";
-        sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj";
-      })
-      (xsaPatch {
-        name = "206-4.5/0011-oxenstored-comments-explaining-some-variables";
-        sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p";
-      })
-      (xsaPatch {
-        name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit";
-        sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8";
-      })
-      (xsaPatch {
-        name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit";
-        sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl";
-      })
-      (xsaPatch {
-        name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-";
-        sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb";
-      })
-      (xsaPatch {
-        name = "206-4.5/0015-oxenstored-support-commit-history-tracking";
-        sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj";
-      })
-      (xsaPatch {
-        name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-";
-        sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy";
-      })
-      (xsaPatch {
-        name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end";
-        sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps";
-      })
-      (xsaPatch {
-        name = "206-4.5/0018-oxenstored-track-commit-history";
-        sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd";
-      })
-      (xsaPatch {
-        name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa";
-        sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h";
-      })
-      (xsaPatch {
-        name = "206-4.5/0020-oxenstored-allow-self-conflicts";
-        sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy";
-      })
-      (xsaPatch {
-        name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions";
-        sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8";
-      })
-      (xsaPatch {
-        name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit";
-        sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy";
-      })
-      (xsaPatch {
-        name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging";
-        sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7";
-      })
-      (xsaPatch {
-        name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function";
-        sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8";
-      })
-      (xsaPatch {
-        name = "207";
-        sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
-      })
-      (xsaPatch {
-        name = "212";
-        sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d";
-      })
-      (xsaPatch {
-        name = "213-4.5";
-        sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm";
-      })
-      (xsaPatch {
-        name = "214";
-        sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk";
-      })
-      (xsaPatch {
-        name = "215";
-        sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs";
-      })
-      (xsaPatch {
-        name = "217-4.5";
-        sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4";
-      })
-      (xsaPatch {
-        name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures";
-        sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq";
-      })
-      (xsaPatch {
-        name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race";
-        sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k";
-      })
-      (xsaPatch {
-        name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry";
-        sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc";
-      })
-      (xsaPatch {
-        name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses";
-        sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2";
-      })
-      (xsaPatch {
-        name = "219-4.5";
-        sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm";
-      })
-      (xsaPatch {
-        name = "220-4.5";
-        sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp";
-      })
-      (xsaPatch {
-        name = "221";
-        sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26";
-      })
-      (xsaPatch {
-        name = "222-1-4.6";
-        sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf";
-      })
-      (xsaPatch {
-        name = "222-2-4.5";
-        sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd";
-      })
-      (xsaPatch {
-        name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
-        sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h";
-      })
-      (xsaPatch {
-        name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to";
-        sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq";
-      })
-      (xsaPatch {
-        name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m";
-        sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08";
-      })
-      (xsaPatch {
-        name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
-        sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav";
-      })
-    ];
+  patches = with xsa; flatten [
+    ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
+    ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
+    ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
+    XSA_190
+    XSA_191
+    XSA_192
+    XSA_193
+    XSA_195
+    XSA_196
+    XSA_198
+    XSA_200
+    XSA_202_45
+    XSA_204_45
+    XSA_206_45
+    XSA_207
+    XSA_212
+    XSA_213_45
+    XSA_214
+    XSA_215
+    XSA_217_45
+    XSA_218_45
+    XSA_219_45
+    XSA_220_45
+    XSA_221
+    XSA_222_45
+    XSA_223
+    XSA_224_45
+    XSA_227_45
+    XSA_230
+    XSA_231_45
+    XSA_232
+    XSA_233
+    XSA_234_45
+    XSA_235_45
+    XSA_236_45
+    XSA_237_45
+    XSA_238_45
+    XSA_239_45
+    XSA_240_45
+    XSA_241
+    XSA_242
+    XSA_243_45
+    XSA_244_45
+    XSA_245
+  ];
 
   # Fix build on Glibc 2.24.
   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 3429545557a..259dd72a960 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -27,6 +27,8 @@ let
     inherit sha256;
   });
 
+  xsa = import ./xsa-patches.nix { inherit fetchpatch; };
+
   qemuDeps = [
     udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
     alsaLib
@@ -34,11 +36,11 @@ let
 in
 
 callPackage (import ./generic.nix (rec {
-  version = "4.8.1";
+  version = "4.8.2";
 
   src = fetchurl {
-    url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
-    sha256 = "158kb1w61jmwxi3fc560s4269hhpxrin9xhm60ljj52njhxias8x";
+    url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
+    sha256 = "1ydgwbn8ab0s16jrbi3wzaa6j0y3zk0j8pay458qcgayk3qc476b";
   };
 
   # Sources needed to build tools and firmwares.
@@ -141,68 +143,22 @@ callPackage (import ./generic.nix (rec {
     ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
     ++ optional (withInternalOVMF) "--enable-ovmf";
 
-  patches =
-    [ (xsaPatch {
-        name = "213-4.8";
-        sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2";
-      })
-      (xsaPatch {
-        name = "214";
-        sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk";
-      })
-      (xsaPatch {
-        name = "217";
-        sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj";
-      })
-      (xsaPatch {
-        name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race";
-        sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd";
-      })
-      (xsaPatch {
-        name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry";
-        sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc";
-      })
-      (xsaPatch {
-        name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses";
-        sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9";
-      })
-      (xsaPatch {
-        name = "219-4.8";
-        sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq";
-      })
-      (xsaPatch {
-        name = "220-4.8";
-        sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5";
-      })
-      (xsaPatch {
-        name = "221";
-        sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26";
-      })
-      (xsaPatch {
-        name = "222-1";
-        sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2";
-      })
-      (xsaPatch {
-        name = "222-2-4.8";
-        sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin";
-      })
-      (xsaPatch {
-        name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
-        sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4";
-      })
-      (xsaPatch {
-        name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to";
-        sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck";
-      })
-      (xsaPatch {
-        name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m";
-        sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2";
-      })
-      (xsaPatch {
-        name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
-        sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f";
-      })
-    ];
+  patches = with xsa; flatten [
+    XSA_231
+    XSA_232
+    XSA_233
+    XSA_234_48
+    XSA_236
+    XSA_237_48
+    XSA_238
+    XSA_239
+    XSA_240_48
+    XSA_241
+    XSA_242
+    XSA_243_48
+    XSA_244
+    XSA_245
+  ];
 
   # Fix build on Glibc 2.24.
   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
new file mode 100644
index 00000000000..fd85c85f22b
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -0,0 +1,774 @@
+{ fetchpatch }:
+
+let
+  xsaPatch = { name , sha256 }: (fetchpatch {
+    url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
+    inherit sha256;
+  });
+in rec {
+  # 4.5
+  XSA_190 = (xsaPatch {
+    name = "190-4.5";
+    sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm";
+  });
+
+  # 4.5
+  XSA_191 = (xsaPatch {
+    name = "191-4.6";
+    sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg";
+  });
+
+  # 4.5
+  XSA_192 = (xsaPatch {
+    name = "192-4.5";
+    sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm";
+  });
+
+  # 4.5
+  XSA_193 = (xsaPatch {
+    name = "193-4.5";
+    sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
+  });
+
+  # 4.5
+  XSA_195 = (xsaPatch {
+    name = "195";
+    sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7";
+  });
+
+  # 4.5
+  XSA_196 = [
+    (xsaPatch {
+      name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject";
+      sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
+    })
+    (xsaPatch {
+      name = "196-0002-x86-svm-Fix-injection-of-software-interrupts";
+      sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
+    })
+  ];
+
+  # 4.5
+  XSA_198 = (xsaPatch {
+    name = "198";
+    sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9";
+  });
+
+  # 4.5
+  XSA_200 = (xsaPatch {
+    name = "200-4.6";
+    sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7";
+  });
+
+  # 4.5
+  XSA_202_45 = (xsaPatch {
+    name = "202-4.6";
+    sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
+  });
+
+  # 4.8
+  XSA_202 = (xsaPatch {
+    name = "202";
+    sha256 = "0j1d5akcjgx8w2c6w6p9znv77fkmps0880m2xgpbgs1ra9grshm1";
+  });
+
+  # 4.8
+  XSA_203 = (xsaPatch {
+    name = "203";
+    sha256 = "1s1q7xskvpg87ivwfaiqr0cj3ajdkhkhpmpikfkvq127h8hhmd8j";
+  });
+
+  # 4.5
+  XSA_204_45 = (xsaPatch {
+    name = "204-4.5";
+    sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
+  });
+
+  # 4.8
+  XSA_204 = (xsaPatch {
+    name = "204-4.8";
+    sha256 = "0rs498s4w2alz3h6jhlr2y0ni630vhggmxbrd1p1p3gcv8p6zzrr";
+  });
+
+  # 4.5
+  XSA_206_45 = [
+    (xsaPatch {
+      name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit";
+      sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4";
+    })
+    (xsaPatch {
+      name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-";
+      sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx";
+    })
+    (xsaPatch {
+      name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire";
+      sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s";
+    })
+    (xsaPatch {
+      name = "206-4.5/0004-oxenstored-remove-some-unused-parameters";
+      sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk";
+    })
+    (xsaPatch {
+      name = "206-4.5/0005-oxenstored-refactor-request-processing";
+      sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv";
+    })
+    (xsaPatch {
+      name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio";
+      sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg";
+    })
+    (xsaPatch {
+      name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat";
+      sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz";
+    })
+    (xsaPatch {
+      name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict";
+      sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g";
+    })
+    (xsaPatch {
+      name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti";
+      sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b";
+    })
+    (xsaPatch {
+      name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0";
+      sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj";
+    })
+    (xsaPatch {
+      name = "206-4.5/0011-oxenstored-comments-explaining-some-variables";
+      sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p";
+    })
+    (xsaPatch {
+      name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit";
+      sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8";
+    })
+    (xsaPatch {
+      name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit";
+      sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl";
+    })
+    (xsaPatch {
+      name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-";
+      sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb";
+    })
+    (xsaPatch {
+      name = "206-4.5/0015-oxenstored-support-commit-history-tracking";
+      sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj";
+    })
+    (xsaPatch {
+      name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-";
+      sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy";
+    })
+    (xsaPatch {
+      name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end";
+      sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps";
+    })
+    (xsaPatch {
+      name = "206-4.5/0018-oxenstored-track-commit-history";
+      sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd";
+    })
+    (xsaPatch {
+      name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa";
+      sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h";
+    })
+    (xsaPatch {
+      name = "206-4.5/0020-oxenstored-allow-self-conflicts";
+      sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy";
+    })
+    (xsaPatch {
+      name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions";
+      sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8";
+    })
+    (xsaPatch {
+      name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit";
+      sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy";
+    })
+    (xsaPatch {
+      name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging";
+      sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7";
+    })
+    (xsaPatch {
+      name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function";
+      sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8";
+    })
+  ];
+
+  # 4.8
+  XSA_206 = [
+    (xsaPatch {
+      name = "206-4.8/0001-xenstored-apply-a-write-transaction-rate-limit";
+      sha256 = "1c81d93i3qx7l38f9af0sd84w5x51zvn262mzl25ilcklql4kzl6";
+    })
+    (xsaPatch {
+      name = "206-4.8/0002-xenstored-Log-when-the-write-transaction-rate-limit-";
+      sha256 = "0b8iw409wi1x6p0swpnr51lcdlla1lgxjv5f910sj4wl96bca84q";
+    })
+    (xsaPatch {
+      name = "206-4.8/0003-oxenstored-comments-explaining-some-variables";
+      sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p";
+    })
+    (xsaPatch {
+      name = "206-4.8/0004-oxenstored-handling-of-domain-conflict-credit";
+      sha256 = "020rw7hgc0dmhr4admz91kd99b4z1bdpji47nsy1255bjgvwc01k";
+    })
+    (xsaPatch {
+      name = "206-4.8/0005-oxenstored-ignore-domains-with-no-conflict-credit";
+      sha256 = "1ilhcgyn803bxvfbqv0ihfrh9jfpp0lidkv7i4613f9v9vjm8q0h";
+    })
+    (xsaPatch {
+      name = "206-4.8/0006-oxenstored-add-transaction-info-relevant-to-history-";
+      sha256 = "1dbd9pzda6hn9wj9pck44dlgz9nxvch3bzgrpaivanww8llxdfzz";
+    })
+    (xsaPatch {
+      name = "206-4.8/0007-oxenstored-support-commit-history-tracking";
+      sha256 = "1jfr56c22fqkhj6fnv1ha7zsid86zm9l0nihpb8m932xgc4a6h9h";
+    })
+    (xsaPatch {
+      name = "206-4.8/0008-oxenstored-only-record-operations-with-side-effects-";
+      sha256 = "1y845hj8krjdrirbd2jx4jqgnylwjv7bxnk7474lkld5kdnlbjyf";
+    })
+    (xsaPatch {
+      name = "206-4.8/0009-oxenstored-discard-old-commit-history-on-txn-end";
+      sha256 = "1lcr9gz2b77x74sr1flfymyyz4xzs04iv88rc1633ibyqxmvk0lx";
+    })
+    (xsaPatch {
+      name = "206-4.8/0010-oxenstored-track-commit-history";
+      sha256 = "1qwnivak4y038mpby75aaz0y70r0l3yc3hsz6wl5x0b74q6yy0ja";
+    })
+    (xsaPatch {
+      name = "206-4.8/0011-oxenstored-blame-the-connection-that-caused-a-transa";
+      sha256 = "0p2w5ddyhc6d95dnlxzc5k77j063p02d53ab7m7ijfm7m6gknq8y";
+    })
+    (xsaPatch {
+      name = "206-4.8/0012-oxenstored-allow-self-conflicts";
+      sha256 = "1571l81m30cbmqm4pk33q33p3dy58sfy2lnkl2wbgl2b3mkk657l";
+    })
+    (xsaPatch {
+      name = "206-4.8/0013-oxenstored-do-not-commit-read-only-transactions";
+      sha256 = "15985wl635w22dddjyx5l97b5p6m55mzv5ygk7xr0jx7mi192f9x";
+    })
+    (xsaPatch {
+      name = "206-4.8/0014-oxenstored-don-t-wake-to-issue-no-conflict-credit";
+      sha256 = "08672w4gaf2n3r8xy09h874gh5lg2vnrkjzq6xzvzdhdl092mipw";
+    })
+    (xsaPatch {
+      name = "206-4.8/0015-oxenstored-transaction-conflicts-improve-logging";
+      sha256 = "0ck98ms0py8wjsc38pbx6222x7n6l90zckfa7m7nnszsyc0sxxad";
+    })
+    (xsaPatch {
+      name = "206-4.8/0016-oxenstored-trim-history-in-the-frequent_ops-function";
+      sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8";
+    })
+  ];
+
+  # 4.5 - 4.8
+  XSA_207 = (xsaPatch {
+    name = "207";
+    sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
+  });
+
+  # 4.8
+  XSA_210 = (xsaPatch {
+    name = "210";
+    sha256 = "02mykxqxnsrd0sr4ij022j8y7618wzi2a6j6j761vx8qgmh11xai";
+  });
+
+  # 4.5 - 4.8
+  XSA_212 = (xsaPatch {
+    name = "212";
+    sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d";
+  });
+
+  # 4.5
+  XSA_213_45 = (xsaPatch {
+    name = "213-4.5";
+    sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm";
+  });
+
+  # 4.8
+  XSA_213 = (xsaPatch {
+    name = "213-4.8";
+    sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2";
+  });
+
+  # 4.5 - 4.8
+  XSA_214 = (xsaPatch {
+    name = "214";
+    sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk";
+  });
+
+  # 4.5
+  XSA_215 = (xsaPatch {
+    name = "215";
+    sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs";
+  });
+
+  # 4.5
+  XSA_217_45 = (xsaPatch {
+    name = "217-4.5";
+    sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4";
+  });
+
+  # 4.6 - 4.8
+  XSA_217 = (xsaPatch {
+    name = "217";
+    sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj";
+  });
+
+  # 4.5
+  XSA_218_45 = [
+    (xsaPatch {
+      name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures";
+      sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq";
+    })
+    (xsaPatch {
+      name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race";
+      sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k";
+    })
+    (xsaPatch {
+      name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry";
+      sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc";
+    })
+    (xsaPatch {
+      name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses";
+      sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2";
+    })
+  ];
+
+  # 4.8
+  XSA_218 = [
+    (xsaPatch {
+      name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race";
+      sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd";
+    })
+    (xsaPatch {
+      name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry";
+      sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc";
+    })
+    (xsaPatch {
+      name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses";
+      sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9";
+    })
+  ];
+
+  # 4.5
+  XSA_219_45 = (xsaPatch {
+    name = "219-4.5";
+    sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm";
+  });
+
+  # 4.8
+  XSA_219 = (xsaPatch {
+    name = "219-4.8";
+    sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq";
+  });
+
+  # 4.5
+  XSA_220_45 = (xsaPatch {
+    name = "220-4.5";
+    sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp";
+  });
+
+  # 4.8
+  XSA_220 = (xsaPatch {
+    name = "220-4.8";
+    sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5";
+  });
+
+  # 4.5 - 4.8
+  XSA_221 = (xsaPatch {
+    name = "221";
+    sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26";
+  });
+
+  # 4.5
+  XSA_222_45 = [
+    (xsaPatch {
+      name = "222-1-4.6";
+      sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf";
+    })
+    (xsaPatch {
+      name = "222-2-4.5";
+      sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd";
+    })
+  ];
+
+  # 4.8
+  XSA_222 = [
+    (xsaPatch {
+      name = "222-1";
+      sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2";
+    })
+    (xsaPatch {
+      name = "222-2-4.8";
+      sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin";
+    })
+  ];
+
+  # 4.5 - 4.8
+  XSA_223 = (xsaPatch {
+    name = "223";
+    sha256 = "0803gjgcbq9vaz2mq0v5finf1fq8iik1g4hqsjqhjxvspn8l70c5";
+  });
+
+  # 4.5
+  XSA_224_45 = [
+    (xsaPatch {
+      name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
+      sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h";
+    })
+    (xsaPatch {
+      name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to";
+      sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq";
+    })
+    (xsaPatch {
+      name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m";
+      sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08";
+    })
+    (xsaPatch {
+      name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
+      sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav";
+    })
+  ];
+
+  # 4.8
+  XSA_224 = [
+    (xsaPatch {
+      name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
+      sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4";
+    })
+    (xsaPatch {
+      name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to";
+      sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck";
+    })
+    (xsaPatch {
+      name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m";
+      sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2";
+    })
+    (xsaPatch {
+      name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
+      sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f";
+    })
+  ];
+
+  # 4.6 - 4.8
+  XSA_225 = (xsaPatch {
+    name = "225";
+    sha256 = "0lcp2bs0r849xnvhrdf8s821v36cqdbzk8lwz6chrjhjalk6ha2g";
+  });
+
+  # 4.5
+  XSA_226_45 = [
+    (xsaPatch {
+      name = "226-4.5/0001-gnttab-dont-use-possibly-unbounded-tail-calls";
+      sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg";
+    })
+    (xsaPatch {
+      name = "226-4.5/0002-gnttab-fix-transitive-grant-handling";
+      sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc";
+    })
+  ];
+
+  # 4.8 - 4.9
+  XSA_226 = [
+    (xsaPatch {
+      name = "226-4.9/0001-gnttab-dont-use-possibly-unbounded-tail-calls";
+      sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg";
+    })
+    (xsaPatch {
+      name = "226-4.9/0002-gnttab-fix-transitive-grant-handling";
+      sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc";
+    })
+  ];
+
+  # 4.5
+  XSA_227_45 = (xsaPatch {
+    name = "227-4.5";
+    sha256 = "1qfjfisgqm4x98qw54x2qrvgjnvvzizx9p1pjhcnsps9q6g1y3x8";
+  });
+
+  # 4.8 - 4.9
+  XSA_227 = (xsaPatch {
+    name = "227";
+    sha256 = "0zdcm43i5n08rh7rrnb0fcssvd4fgawwmizsa16w2ak7pzvgmg94";
+  });
+
+  # 4.8
+  XSA_228_48 = (xsaPatch {
+    name = "228-4.8";
+    sha256 = "085pnzwyv0rdb51hv5vhbhwfyxl0wg8sxcm912gjq8z7da5cv10n";
+  });
+
+  # 4.9
+  XSA_228 = (xsaPatch {
+    name = "228";
+    sha256 = "0c9nvfpnr5ira7ha3fszhvvh71nsxrvmzrab56xwjhl2dbw2yy23";
+  });
+
+  # 4.5 - 4.9
+  XSA_230 = (xsaPatch {
+    name = "230";
+    sha256 = "10x0j7wmzkrwycs1ng89fgjzvzh8vsdd4c5nb68b3j1azdx4ld83";
+  });
+
+  # 4.5
+  XSA_231_45 = (xsaPatch {
+    name = "231-4.5";
+    sha256 = "06gwx2f1lg51dfk2b4zxp7wv9c4pxdi87pg2asvmxqc78ir7l5s6";
+  });
+
+  # 4.8 - 4.9
+  XSA_231 = (xsaPatch {
+    name = "231-4.9";
+    sha256 = "09r8xxq2fd52wrk6i0y0sk3nbidfg6pzzrkx327hfmdjj76iyz3b";
+  });
+
+  # 4.5 - 4.9
+  XSA_232 = (xsaPatch {
+    name = "232";
+    sha256 = "0n6irjpmraa3hbxxm64a1cplc6y6g07x7v2fmlpvn70ql3fs0220";
+  });
+
+  # 4.5 - 4.9
+  XSA_233 = (xsaPatch {
+    name = "233";
+    sha256 = "1w3m8349cqav56av63w6jzvlsv4jw5rimwvskr9pq2rcbk2dx8kf";
+  });
+
+  # 4.5
+  XSA_234_45 = (xsaPatch {
+    name = "234-4.5";
+    sha256 = "1ji6hbgybb4gbgz5l5fis9midnvjbddzam8d63377rkzdyb3yz9f";
+  });
+
+  # 4.8
+  XSA_234_48 = (xsaPatch {
+    name = "234-4.8";
+    sha256 = "08n1pf7z5y67dmay1ap39bi81clgkx82fpmfn7jsh8k4aw94jrsa";
+  });
+
+  # 4.9
+  XSA_234 = (xsaPatch {
+    name = "234-4.9";
+    sha256 = "1znmxg432is0virw8321gax8zqq2zcmi2pc5p2j31sixylixsvzx";
+  });
+
+  # 4.5
+  XSA_235_45 = (xsaPatch {
+    name = "235-4.5";
+    sha256 = "0hhgnql2gji111020z4wiyzg23wqs6ymanb67rg11p4qad1fp3ff";
+  });
+
+  # 4.8 - 4.9
+  XSA_235 = (xsaPatch {
+    name = "235-4.9";
+    sha256 = "1rj4jkmh79wm30jq9f8x65qv3al8l91zc3m5s23q0x6abn3pfb9z";
+  });
+
+  # 4.5
+  XSA_236_45 = (xsaPatch {
+    name = "236-4.5";
+    sha256 = "0hcla86x81wykssd2967gblp7fzx61290p4ls4v0hcyxdg2bs2yz";
+  });
+
+  # 4.8 - 4.9
+  XSA_236 = (xsaPatch {
+    name = "236-4.9";
+    sha256 = "0vqxy7mgflga05l33j3488fwxmdw3p9yxj4ylhk9n3nw8id72ghq";
+  });
+
+  # 4.5
+  XSA_237_45 = [
+    (xsaPatch {
+      name = "237-4.5/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device";
+      sha256 = "0hjxs20jhls4i0iph45a0qpw4znkm04gv74jmwhw84gy4hrhzq3b";
+    })
+    (xsaPatch {
+      name = "237-4.5/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s";
+      sha256 = "0ki8nmbc2g1l9wnqsph45a2k4c6dk5s7jvdlxg3zznyiyxjcv8yn";
+    })
+    (xsaPatch {
+      name = "237-4.5/0003-x86-MSI-disallow-redundant-enabling";
+      sha256 = "1hdz83qrjaqnihz8ji186dypxiblbfpgyb01j9m5alhk4whjqvp1";
+    })
+    (xsaPatch {
+      name = "237-4.5/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error";
+      sha256 = "0csdfn9kzn1k94pg3fcwsgqw14wcd4myi1jkcq5alj1fmkhw4wmk";
+    })
+    (xsaPatch {
+      name = "237-4.5/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook";
+      sha256 = "14b73rkvbkd1a2gh9kp0zrvv2d3kfwkiv24fg9agh4hrf2w3nx7y";
+    })
+  ];
+
+  # 4.8
+  XSA_237_48 = [
+    (xsaPatch {
+      name = "237-4.8/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device";
+      sha256 = "0qjisp37lwi2611mp7fbbm1s7m0bx726rrg79dnxs2mj0skw59iv";
+    })
+    (xsaPatch {
+      name = "237-4.8/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s";
+      sha256 = "05q1dny13jrqhjfwak7r635mqp9chpibjvn8b7d90japc1nzpq62";
+    })
+    (xsaPatch {
+      name = "237-4.8/0003-x86-MSI-disallow-redundant-enabling";
+      sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd";
+    })
+    (xsaPatch {
+      name = "237-4.8/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error";
+      sha256 = "06nrq0bx3p9ipab2r1why6qm4g32dj0x5q24hfkwc6ih0l9xwf8h";
+    })
+    (xsaPatch {
+      name = "237-4.8/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook";
+      sha256 = "1nbg7bjw2hv55gnkhf6chkh35va6brs08acq1d5jxncl6kv0amc1";
+    })
+  ];
+
+  # 4.9
+  XSA_237 = [
+    (xsaPatch {
+      name = "237-4.9/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device";
+      sha256 = "1cbl24mqxa62h0wgsnrpcs6y6vs53znzj7g8dfsbmf74xwrd4px6";
+    })
+    (xsaPatch {
+      name = "237-4.9/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s";
+      sha256 = "0p60148j18b78pxz0dx5ymh1gyrhg2cgmxq0jxmbk090bc4jql35";
+    })
+    (xsaPatch {
+      name = "237-4.9/0003-x86-MSI-disallow-redundant-enabling";
+      sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd";
+    })
+    (xsaPatch {
+      name = "237-4.9/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error";
+      sha256 = "0q95z5641amni53agimnzbspva53p0hz5wl16zaz2yhnjasj5pzr";
+    })
+    (xsaPatch {
+      name = "237-4.9/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook";
+      sha256 = "0bnqx9w7ppgx8wxj2zw09z0rkv1jzn3r0bd76cz0r22wz29fsdp2";
+    })
+  ];
+
+  # 4.5
+  XSA_238_45 = (xsaPatch {
+    name = "238-4.5";
+    sha256 = "1x2fg5vfv5jc084h5gjm6fq0nxjpzvi96px3sqzz4pvsvy4y4i1z";
+  });
+
+  # 4.8 - 4.9
+  XSA_238 = (xsaPatch {
+    name = "238";
+    sha256 = "1cbmg1bi5ajh7qbwsl92ynaxw2c3p7i24p3wds81r4n93r0y5dxk";
+  });
+
+  # 4.5
+  XSA_239_45 = (xsaPatch {
+    name = "239-4.5";
+    sha256 = "06bi8q3973yajxsdj7pcqarvb56q2gisxdiy0cpbyffbmpkfv3h6";
+  });
+
+  # 4.8 - 4.9
+  XSA_239 = (xsaPatch {
+    name = "239";
+    sha256 = "1a9r8j7167s43ds5i7v7mm4y970vjnbhhkrjzpmzlcx8kcz96vh3";
+  });
+
+  # 4.5
+  XSA_240_45 = [
+    (xsaPatch {
+      name = "240-4.5/0001-x86-limit-linear-page-table-use-to-a-single-level";
+      sha256 = "0pmf10mbnmb88y7mly8s2l0j88cg0ayhkcnmj1zbjrkjmpccv395";
+    })
+    (xsaPatch {
+      name = "240-4.5/0002-x86-mm-Disable-PV-linear-pagetables-by-default";
+      sha256 = "19f096ra3xndvzkjjasx73p2g25hfkm905px0p3yakwll0qzd029";
+    })
+  ];
+
+  # 4.8
+  XSA_240_48 = [
+    (xsaPatch {
+      name = "240-4.8/0001-x86-limit-linear-page-table-use-to-a-single-level";
+      sha256 = "0m44qhhqk2pdwqg8g28pypqrylq6iw00k9qrzf6qd0iza2y42kgj";
+    })
+    (xsaPatch {
+      name = "240-4.8/0002-x86-mm-Disable-PV-linear-pagetables-by-default";
+      sha256 = "1jd720wvngj9wq3fprdhakxvqlff0jd8zcx2pd3vsn2qvjbvr2gf";
+    })
+  ];
+
+  # 4.9
+  XSA_240 = [
+    (xsaPatch {
+      name = "240-4.9/0001-x86-limit-linear-page-table-use-to-a-single-level";
+      sha256 = "1759ni80aifakm44g4cc6pnmbcn1xjic8j66fvj0vibm0wqk6xck";
+    })
+    (xsaPatch {
+      name = "240-4.9/0002-x86-mm-Disable-PV-linear-pagetables-by-default";
+      sha256 = "0g6dpi006p5cjxw5d8h33p0429fdmdm6nqzj0m63ralpqvns3ib5";
+    })
+  ];
+
+  # 4.5 - 4.8
+  XSA_241 = (xsaPatch {
+    name = "241-4.8";
+    sha256 = "16zb75kzs98f4mdxhbyczk5mbh9dvn6j3yhfafki34x1dfdnq4pj";
+  });
+
+  # 4.9
+  XSA_241_49 = (xsaPatch {
+    name = "241-4.9";
+    sha256 = "0xlhin7wkhmlnbp9mqcbq3q4drdwb5la482ja9nwkhi8i867p6wc";
+  });
+
+  # 4.5 - 4.9
+  XSA_242 = (xsaPatch {
+    name = "242-4.9";
+    sha256 = "0yx3x0i2wybsm7lzdffxa2mm866bjl4ipbb9vipnw77dyg705zpr";
+  });
+
+  # 4.5
+  XSA_243_45 = [
+    (xsaPatch {
+      name = "243-4.6-1";
+      sha256 = "1cqanpyysa7px0j645z4jw9yqsvv6cbh7yq1b86ap134axfifcan";
+    })
+    (xsaPatch {
+      name = "243-4.5-2";
+      sha256 = "0wbcgw4m0nzm2902jnda2020l7bd5adkq8j5myi1zmsfzbq03hwn";
+    })
+  ];
+
+  # 4.8
+  XSA_243_48 = (xsaPatch {
+    name = "243-4.8";
+    sha256 = "1q60zn55l9wpq45nrxh0av59sjz0jg8pkjm1gkyywkdsgg4fg5z4";
+  });
+
+  # 4.9
+  XSA_243 = (xsaPatch {
+    name = "243";
+    sha256 = "06fnbnh9zlsbkqih9ipnb7a8gly54m7lp17d854j1r370ad3c4yg";
+  });
+
+  # 4.5
+  XSA_244_45 = (xsaPatch {
+    name = "244-4.5";
+    sha256 = "05ci3vdl1ywfjpzcvsy1k52whxjk8pxzj7dh3r94yqasr56i5v2l";
+  });
+
+  # 4.8 - 4.9
+  XSA_244 = (xsaPatch {
+    name = "244";
+    sha256 = "10308xsgmhb0vg6fk0ql8v94zifv6dcv6vkaicryfp405yj2rzkm";
+  });
+
+  # 4.5 - 4.9
+  XSA_245 = [
+    (xsaPatch {
+      name = "245/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in";
+      sha256 = "12brsgbn7xwakalsn10afykgqmx119mqg6vjj3v2b1pnmf4ss0w8";
+    })
+    (xsaPatch {
+      name = "245/0002-xen-arm-Correctly-report-the-memory-region-in-the-du";
+      sha256 = "1k6z5r7wnrswsczn2j3a1mc4nvxqm4ydj6n6rvgqizk2pszdkqg8";
+    })
+  ];
+}
-- 
GitLab


From 77046bed8a0946dbaace1d38ca49e3d85e3c6894 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 28 Oct 2017 17:39:59 +0300
Subject: [PATCH 147/877] cudnn7: 7.0 -> 7.0.3

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

diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index db66d854588..574899d3a89 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -30,16 +30,16 @@ in
   };
 
   cudnn_cudatoolkit8 = generic rec {
-    version = "7.0";
+    version = "7.0.3";
     cudatoolkit = cudatoolkit8;
     srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
-    sha256 = "19yjdslrslwv5ic4vgpzb0fa0mqbgi6a66b7gc66vdc9n9589398";
+    sha256 = "0gzwadxcyirr2zgiikdapnm860x3gcfwfxh5xn3s47zaa03x4kg4";
   };
 
   cudnn_cudatoolkit9 = generic rec {
-    version = "7.0";
+    version = "7.0.3";
     cudatoolkit = cudatoolkit9;
     srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
-    sha256 = "1ld5x819vya6p2ppmr7i3lz9ac2y81kssgbzgd0lsign7r2qjapc";
+    sha256 = "1ycy413cq9y9yxj20djqv05aarn3qzcy2md3dvvjpvhc269kwn09";
   };
 }
-- 
GitLab


From a71e80db8b9a99d59ad13f2dbce477e3276a2ee1 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@speicherleck.de>
Date: Sat, 28 Oct 2017 16:22:07 +0200
Subject: [PATCH 148/877] nat-traverse: init at 0.7

---
 .../tools/networking/nat-traverse/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/networking/nat-traverse/default.nix

diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix
new file mode 100644
index 00000000000..0972e767758
--- /dev/null
+++ b/pkgs/tools/networking/nat-traverse/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, perl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "nat-traverse-${version}";
+  version = "0.7";
+
+  src = fetchurl {
+    url = "https://www.speicherleck.de/iblech/nat-traverse/nat-traverse-${version}.tar.bz2";
+    sha256 = "0knwnqsjwv7sa5wjb863ghabs7s269a73qwkmxpsbngjw9s0j2ih";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+    cp nat-traverse $out/bin
+    gzip -c nat-traverse.1 > $out/share/man/man1/nat-traverse.1.gz
+    wrapProgram $out/bin/nat-traverse --prefix PATH : "${stdenv.lib.makeBinPath [ perl ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "NAT gateway traversal utility";
+    longDescription = ''
+      nat-traverse establishes direct connections between nodes which are
+      behind NAT gateways, i.e. hosts which do not have public IP addresses.
+      This is done using an UDP NAT traversal technique. Additionally, it's
+      possible to setup a small VPN by using pppd on top of nat-traverse.
+
+      nat-traverse does not need an external server on the Internet, and it
+      isn't necessary to reconfigure the involved NAT gateways, either.
+      nat-traverse works out-of-the-box.
+    '';
+    homepage = https://www.speicherleck.de/iblech/nat-traverse/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.iblech ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b219f6be7c..d49e89f25a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3458,6 +3458,8 @@ with pkgs;
 
   nasty = callPackage ../tools/security/nasty { };
 
+  nat-traverse = callPackage ../tools/networking/nat-traverse { };
+
   nawk = callPackage ../tools/text/nawk { };
 
   nbd = callPackage ../tools/networking/nbd { };
-- 
GitLab


From 6ce41476599a8a0c06a9d9617767a8536b538d5f Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Sat, 28 Oct 2017 21:04:44 +0700
Subject: [PATCH 149/877] ahoviewer: 1.4.8 -> 1.4.9

- Add xzfc to maintainers
---
 pkgs/applications/graphics/ahoviewer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 986e16834f7..2d42a479999 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "ahoviewer-${version}";
-  version = "1.4.8";
+  version = "1.4.9";
 
   src = fetchFromGitHub {
     owner = "ahodesuka";
     repo = "ahoviewer";
     rev = version;
-    sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4";
+    sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx";
   };
 
   enableParallelBuilding = true; 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/ahodesuka/ahoviewer;
     description = "A GTK2 image viewer, manga reader, and booru browser";
-    maintainers = [ maintainers.skrzyp ];
+    maintainers = with maintainers; [ skrzyp xzfc ];
     license = licenses.mit;
     platforms = platforms.allBut [ "darwin" "cygwin" ];
   };
-- 
GitLab


From 036f9ec235da9a7d96d2032e140dfc891c99278d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 28 Oct 2017 17:39:56 +0200
Subject: [PATCH 150/877] ecdsautils: init 0.4.0

---
 pkgs/tools/security/ecdsautils/default.nix | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/security/ecdsautils/default.nix

diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix
new file mode 100644
index 00000000000..2766c2c07a4
--- /dev/null
+++ b/pkgs/tools/security/ecdsautils/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, pkgs }:
+
+stdenv.mkDerivation rec {
+  version = "0.4.0";
+  name = "ecdsautils-${version}";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "tcatm";
+    repo = "ecdsautils";
+    rev = "07538893fb6c2a9539678c45f9dbbf1e4f222b46";
+    sha256 = "18sr8x3qiw8s9l5pfi7r9i3ayplz4jqdml75ga9y933vj7vs0k4d";
+  };
+
+  nativeBuildInputs = with pkgs; [ cmake pkgconfig doxygen ];
+  buildInputs = with pkgs; [ libuecc  ];
+
+  meta = with stdenv.lib; {
+    description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)";
+    homepage = https://github.com/tcatm/ecdsautils/;
+    license = with licenses; [ mit bsd2 ];
+    maintainers = with maintainers; [ andir ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0b88968c82..a45a9a756e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -574,6 +574,8 @@ with pkgs;
 
   dkimpy = pythonPackages.dkimpy;
 
+  ecdsautils = callPackage ../tools/security/ecdsautils { };
+
   elvish = callPackage ../shells/elvish { };
 
   encryptr = callPackage ../tools/security/encryptr {
-- 
GitLab


From 274f71e18cb19e4d918a8137519e8fbbcb033375 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Mon, 9 Oct 2017 20:39:36 -0700
Subject: [PATCH 151/877] pythonPackages.affinity: init at 0.1.0

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

diff --git a/pkgs/development/python-modules/affinity/default.nix b/pkgs/development/python-modules/affinity/default.nix
new file mode 100644
index 00000000000..f2cb2ef6445
--- /dev/null
+++ b/pkgs/development/python-modules/affinity/default.nix
@@ -0,0 +1,16 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "affinity";
+  version = "0.1.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6";
+  };
+  meta = {
+    description = "control processor affinity on windows and linux";
+    homepage    = http://cheeseshop.python.org/pypi/affinity;
+    license     = with lib.licenses; [ psfl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a10f4e9830a..6a0573a7f7a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -105,6 +105,8 @@ in {
 
   aenum = callPackage ../development/python-modules/aenum { };
 
+  affinity = callPackage ../development/python-modules/affinity { };
+
   agate = callPackage ../development/python-modules/agate { };
 
   agate-dbf = callPackage ../development/python-modules/agate-dbf { };
-- 
GitLab


From 11d3143f91df02a9c3cc19f6d8fd4f8a283b97a3 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Mon, 9 Oct 2017 20:39:50 -0700
Subject: [PATCH 152/877] matrix-synapse: 0.22.1 -> 0.24.1

Also fix use of buildPythonApplication where buildPythonPackage is
more appropriate.
---
 pkgs/servers/matrix-synapse/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index c7c33928714..73498e5b884 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub }:
 let
-  matrix-angular-sdk = pythonPackages.buildPythonApplication rec {
+  matrix-angular-sdk = pythonPackages.buildPythonPackage rec {
     name = "matrix-angular-sdk-${version}";
     version = "0.6.8";
 
@@ -9,7 +9,7 @@ let
       sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2";
     };
   };
-  matrix-synapse-ldap3 = pythonPackages.buildPythonApplication rec {
+  matrix-synapse-ldap3 = pythonPackages.buildPythonPackage rec {
     name = "matrix-synapse-ldap3-${version}";
     version = "0.1.2";
 
@@ -24,24 +24,24 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.22.1";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "06kqqsfqmziff7i99yyxqvkqjm7fwi56abc2vy25g9kqzpdvkay7";
+    sha256 = "08w8sawq0nj28dzi9wc4rsg9z2qv528djj4zbcs5c4yc3mylq1nq";
   };
 
   patches = [ ./matrix-synapse.patch ];
 
   propagatedBuildInputs = with pythonPackages; [
-    blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1
+    blist canonicaljson daemonize dateutil frozendict pillow pyasn1
     pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests
     signedjson systemd twisted ujson unpaddedbase64 pyyaml
     matrix-angular-sdk bleach netaddr jinja2 psycopg2
     psutil msgpack lxml matrix-synapse-ldap3
-    phonenumbers jsonschema
+    phonenumbers jsonschema affinity bcrypt
   ];
 
   # Checks fail because of Tox.
-- 
GitLab


From e76d8af3752bff3b8e0967e9b90601fd04229dff Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 28 Oct 2017 13:42:32 -0400
Subject: [PATCH 153/877] linux-copperhead: 4.13.9.a -> 4.13.10.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index a93e4a96119..6ab59a497b6 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.13.9";
+  version = "4.13.10";
   revision = "a";
-  sha256 = "0v2ki1vgmg8yifnflbhryrv7pxvyf0157ysngc1n1hcqyypq4sji";
+  sha256 = "0m4yxdcll1zvvvagpjf9s7vw7dmad22qbakhc50as3ixyd7w5ah6";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
-- 
GitLab


From 5ac01066f20c0dc649eaaf4a64ddca9bcd761a50 Mon Sep 17 00:00:00 2001
From: Sam Parkinson <sam@sam.today>
Date: Thu, 26 Oct 2017 14:53:39 +1100
Subject: [PATCH 154/877] gradio: init at 6.0.2

---
 lib/maintainers.nix                           |  1 +
 ...-install-script-that-hardcodes-paths.patch | 23 ++++++
 pkgs/applications/audio/gradio/default.nix    | 72 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 98 insertions(+)
 create mode 100644 pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
 create mode 100644 pkgs/applications/audio/gradio/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9fb5a64540a..1bddc33c1d1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -550,6 +550,7 @@
   ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";
   rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>";
   s1lvester = "Markus Silvester <s1lvester@bockhacker.me>";
+  samdroid-apps = "Sam Parkinson <sam@sam.today>";
   samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   sargon = "Daniel Ehlers <danielehlers@mindeye.net>";
diff --git a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
new file mode 100644
index 00000000000..3a6296baaa6
--- /dev/null
+++ b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
@@ -0,0 +1,23 @@
+From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001
+From: Sam Parkinson <sam@sam.today>
+Date: Thu, 26 Oct 2017 14:50:13 +1100
+Subject: [PATCH] Remove post-install script that hardcodes paths
+
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 25f3e1a..18b43bd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -21,4 +21,5 @@ subdir('src')
+ # subdir('tests')
+ # TODO: unit tests
+ 
+-meson.add_install_script('meson_post_install.sh')
++# This does not work for nixos; it hard-codes paths
++# meson.add_install_script('meson_post_install.sh')
+-- 
+2.14.2
+
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
new file mode 100644
index 00000000000..2f4bde92167
--- /dev/null
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchFromGitHub, pkgconfig
+, gcc
+, python3
+, gsettings_desktop_schemas
+, desktop_file_utils
+, glib
+, gtk3
+, intltool
+, libsoup
+, json_glib
+, wrapGAppsHook
+, meson
+, ninja
+, vala
+, sqlite
+, gst_all_1
+, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
+}:
+let
+  version = "6.0.2";
+
+in stdenv.mkDerivation rec {
+  name = "gradio-${version}";
+
+  src = fetchFromGitHub {
+    owner = "haecker-felix";
+    repo = "gradio";
+    rev = "v${version}";
+    sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+
+    meson
+    ninja
+    vala
+
+    python3
+  ];
+  buildInputs = [
+    sqlite
+
+    glib
+    intltool
+    libsoup
+    json_glib
+
+    gtk3
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+
+    wrapGAppsHook
+    desktop_file_utils
+    gsettings_desktop_schemas
+  ] ++ gst_plugins;
+
+  enableParallelBuilding = true;
+  postInstall = ''
+    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+  '';
+
+  patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/haecker-felix/gradio;
+    description = "A GTK3 app for finding and listening to internet radio stations";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.samdroid-apps ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0b88968c82..98bd9178624 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14617,6 +14617,8 @@ with pkgs;
 
   rhythmbox = callPackage ../applications/audio/rhythmbox { };
 
+  gradio = callPackage ../applications/audio/gradio { };
+
   puddletag = callPackage ../applications/audio/puddletag { };
 
   w_scan = callPackage ../applications/video/w_scan { };
-- 
GitLab


From 08e06e7d223d89a9dee247daab7c505b0e0513ee Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 28 Oct 2017 16:30:48 +0200
Subject: [PATCH 155/877] borgbackup: add flokli as maintainer

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

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 4ff61d1ac95..acd75941524 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -45,6 +45,6 @@ python3Packages.buildPythonApplication rec {
     homepage = https://borgbackup.github.io/;
     license = licenses.bsd3;
     platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
-    maintainers = with maintainers; [ nckx ];
+    maintainers = with maintainers; [ nckx flokli ];
   };
 }
-- 
GitLab


From f3b311af44bee935912f58a38a2344011e3ce78c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 28 Oct 2017 14:13:48 +0200
Subject: [PATCH 156/877] borgbackup: fix ssh binary location

Otherwise, borg might be unable to find its location
---
 pkgs/tools/backup/borg/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index acd75941524..7dc6299ef47 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3Packages, acl, lz4, openssl }:
+{ stdenv, fetchurl, python3Packages, acl, lz4, openssl, openssh }:
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
@@ -27,6 +27,10 @@ python3Packages.buildPythonApplication rec {
     export BORG_LZ4_PREFIX="${lz4.dev}"
   '';
 
+  makeWrapperArgs = [
+    ''--prefix PATH ':' "${openssh}/bin"''
+  ];
+
   postInstall = ''
     make -C docs singlehtml
     mkdir -p $out/share/doc/borg
-- 
GitLab


From 443e7bf5f49faebebb7469ead93660b5596fad4d Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@speicherleck.de>
Date: Sat, 28 Oct 2017 22:42:18 +0200
Subject: [PATCH 157/877] maintainers.nix: fix tiny typo

---
 lib/maintainers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9fb5a64540a..a68891b0a0e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -66,7 +66,7 @@
   aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
   bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
   badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
-  balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
+  balajisivaraman = "Balaji Sivaraman <sivaraman.balaji@gmail.com>";
   barrucadu = "Michael Walker <mike@barrucadu.co.uk>";
   basvandijk = "Bas van Dijk <v.dijk.bas@gmail.com>";
   Baughn = "Svein Ove Aas <sveina@gmail.com>";
-- 
GitLab


From 4cbf66b578629b1d8f94d570aaafa00b3993644c Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Sun, 29 Oct 2017 00:42:42 +0300
Subject: [PATCH 158/877] rust-bindgen: 0.30.0 -> 0.31.1

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

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 1240e7cc38f..d304560515c 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -4,13 +4,13 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rust-bindgen-${version}";
-  version = "0.30.0";
+  version = "0.31.1";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "02ic48qng76rvwa54i8zkvqgr8kfsyj3axc08naylzcvwzp84bsf";
+    sha256 = "0b0nr42vvxzrykzn11mwk1h9cqn87fh8423wwrs3h8vpk5jqg55i";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib"
   '';
 
-  cargoSha256 = "128skg31lc9v8i7ghfb3wyiazivqfvzhi1mvmjcl0gkx1hi5006v";
+  cargoSha256 = "1pjyancb5w9rrxirwx8ghhjbnfcc2r0ha5bfnmlfamj8aaaqdc5w";
 
   doCheck = false; # A test fails because it can't find standard headers in NixOS
 
-- 
GitLab


From 8ac360ed953c2557bd9b7676a1a932d0c878f1dc Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 28 Oct 2017 19:15:58 +0300
Subject: [PATCH 159/877] libid3tag: Split into multiple outputs

---
 .../libraries/libid3tag/default.nix           | 19 ++++++++++++++-----
 .../development/libraries/libid3tag/id3tag.pc |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index b03d7643f0f..a153001a960 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -1,24 +1,33 @@
 {stdenv, fetchurl, writeText, zlib, gperf}:
 
 stdenv.mkDerivation rec {
-  version = "0.15.1b";
-
   name = "libid3tag-${version}";
+  version = "0.15.1b";
 
   src = fetchurl {
     url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz;
     sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151";
   };
 
+  outputs = [ "out" "dev" ];
+  setOutputFlags = false;
+
   propagatedBuildInputs = [ zlib gperf ];
 
   patches = [ ./debian-patches.patch ];
 
+  preConfigure = ''
+    configureFlagsArray+=(
+      --includedir=$dev/include
+    )
+  '';
+
   postInstall = ''
-    mkdir -p $out/lib/pkgconfig
-    cp ${./id3tag.pc} $out/lib/pkgconfig/id3tag.pc
-    substituteInPlace $out/lib/pkgconfig/id3tag.pc \
+    mkdir -p $dev/lib/pkgconfig
+    cp ${./id3tag.pc} $dev/lib/pkgconfig/id3tag.pc
+    substituteInPlace $dev/lib/pkgconfig/id3tag.pc \
       --subst-var-by out $out \
+      --subst-var-by dev $dev \
       --subst-var-by version "${version}"
   '';
 
diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/development/libraries/libid3tag/id3tag.pc
index 854f1783cae..e3df7b3f9df 100644
--- a/pkgs/development/libraries/libid3tag/id3tag.pc
+++ b/pkgs/development/libraries/libid3tag/id3tag.pc
@@ -1,7 +1,7 @@
 prefix=@out@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include
+includedir=@dev@/include
 
 Name: libid3tag
 Description: ID3 tag manipulation library
-- 
GitLab


From e5144470632d704778c56a2acc3394ef548d09e6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 28 Oct 2017 19:17:42 +0300
Subject: [PATCH 160/877] geoclue2: Split into multiple outputs

---
 pkgs/development/libraries/geoclue/2.0.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index 64d61d64bb6..483ee39c2da 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [
     pkgconfig intltool wrapGAppsHook
   ];
@@ -21,6 +23,8 @@ stdenv.mkDerivation rec {
      dbus dbus_glib avahi
    ] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
 
+  propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ];
+
   preConfigure = ''
      substituteInPlace configure --replace "-Werror" ""
   '';
@@ -35,7 +39,9 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl";
 
-  propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ];
+  postInstall = ''
+    sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|"
+  '';
 
   meta = with stdenv.lib; {
     description = "Geolocation framework and some data providers";
-- 
GitLab


From 90e8e0b782ef3bfeb0d75782302612fe0ee63dff Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 28 Oct 2017 19:17:54 +0300
Subject: [PATCH 161/877] geoclue: Split into multiple outputs

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

diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index f7529000539..ff65ca97eb7 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ];
 
-- 
GitLab


From b676aa045fc446e9fd49749ef6c3de68401db02b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 29 Oct 2017 01:36:59 +0300
Subject: [PATCH 162/877] eaglemode: Mark broken

The build just endlessly spams:

Say yes, no or always: Use of uninitialized value $ln in pattern match (m//) at make.pl line 626.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 629.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 632.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 636.
---
 pkgs/applications/misc/eaglemode/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 1e5bf8a48ed..d83eb1ed86a 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ viric ];
     platforms = platforms.linux;
-    hydraPlatforms = [];
+    broken = true;
   };
 }
-- 
GitLab


From c9ac187c3c2c6da622578d9168ab9152c7d457c9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Oct 2017 01:48:47 +0300
Subject: [PATCH 163/877] tbb: 4.4-u2 -> 2018_U1, merge with libtbb

Remove libtbb derivation as a duplicate.
---
 pkgs/development/libraries/libtbb/default.nix | 30 -------------------
 pkgs/development/libraries/tbb/default.nix    | 28 ++++++++---------
 pkgs/games/steam/runtime-wrapped.nix          |  2 +-
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 15 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/development/libraries/libtbb/default.nix

diff --git a/pkgs/development/libraries/libtbb/default.nix b/pkgs/development/libraries/libtbb/default.nix
deleted file mode 100644
index 1422f6c5ceb..00000000000
--- a/pkgs/development/libraries/libtbb/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchFromGitHub, tree }: 
-
-stdenv.mkDerivation rec {
-  name = "libtbb-${version}";
-  version = "2018_U1";
-
-  src = fetchFromGitHub {
-    owner = "01org";
-    repo = "tbb";
-    rev = "${version}";
-    sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw";
-  };
-
-  buildInputs = [ tree ];
-
-  installPhase = ''
-    mkdir -p "$out"/usr/include "$out"/lib
-    install -m755 build/linux_*/*.so* "$out"/lib/
-    cp -a include/tbb "$out"/usr/include/
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://www.threadingbuildingblocks.org/";
-    description = "High level abstract threading library";
-    platforms = platforms.unix;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dizfer ];
-  };
-}
-
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index a8a0d5dc2b3..b8aedd46096 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation {
-  name = "tbb-4.4-u2";
+stdenv.mkDerivation rec {
+  name = "tbb-${version}";
+  version = "2018_U1";
 
-  src = fetchurl {
-    url = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20151115oss_src.tgz";
-    sha256 = "1fvprkjdxj7529hr1qkzkxkk18mx6zllrpiwglq4k3y1hpyc9m9x";
+  src = fetchFromGitHub {
+    owner = "01org";
+    repo = "tbb";
+    rev = version;
+    sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw";
   };
 
-  checkTarget = "test";
-  doCheck = false;
-
   installPhase = ''
     mkdir -p $out/{lib,share/doc}
     cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/
@@ -21,10 +21,10 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Intel Thread Building Blocks C++ Library";
-    homepage = http://threadingbuildingblocks.org/;
-    license = stdenv.lib.licenses.lgpl3Plus;
+    homepage = "http://threadingbuildingblocks.org/";
+    license = licenses.asl20;
     longDescription = ''
       Intel Threading Building Blocks offers a rich and complete approach to
       expressing parallelism in a C++ program. It is a library that helps you
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
       represents a higher-level, task-based parallelism that abstracts platform
       details and threading mechanisms for scalability and performance.
     '';
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ peti thoughtpolice ];
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ peti thoughtpolice dizfer ];
   };
 }
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 73c010d645f..388e5cc3a6c 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -57,7 +57,7 @@ let
     glew110
     openssl
     libidn
-    libtbb
+    tbb
 
     # Other things from runtime
     xlibs.libXinerama
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98bd9178624..eb25d0296c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3121,8 +3121,6 @@ with pkgs;
 
   libsrs2 = callPackage ../development/libraries/libsrs2 { };
 
-  libtbb = callPackage ../development/libraries/libtbb { };
-
   libtermkey = callPackage ../development/libraries/libtermkey { };
 
   libtelnet = callPackage ../development/libraries/libtelnet { };
-- 
GitLab


From a9e5a846db5f4e57a86ace6dccde22944da8af8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= <k.soeholm@gmail.com>
Date: Sun, 29 Oct 2017 01:39:03 +0200
Subject: [PATCH 164/877] python: pwntools 3.7.1 -> 3.10.0

Also moved to a seperate module
---
 .../python-modules/pwntools/default.nix       | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-------------
 2 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/pwntools/default.nix

diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix
new file mode 100644
index 00000000000..57f7c2c317d
--- /dev/null
+++ b/pkgs/development/python-modules/pwntools/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, Mako, packaging, pysocks, pygments, ROPGadget
+, capstone, paramiko, pip, psutil
+, pyelftools, pypandoc, pyserial, dateutil
+, requests, tox, pandoc, unicorn, intervaltree }:
+
+buildPythonPackage rec {
+  version = "3.10.0";
+  pname = "pwntools";
+  name = "pwntools-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1l8hb30mwxqd1y7r5ihd7kzmjm2mz6m5aiphd3hwzmxkmxbxj8zk";
+  };
+
+  propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pandoc unicorn intervaltree ];
+
+  disabled = isPy3k;
+
+  meta = with stdenv.lib; {
+    homepage = "http://pwntools.com";
+    description = "CTF framework and exploit development library";
+    license = licenses.mit;
+    maintainers = with maintainers; [ bennofs kristoff3r ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30ffa523cbf..e81063a6169 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26396,25 +26396,7 @@ EOF
     };
   };
 
-  pwntools = buildPythonPackage rec {
-    name = "pwntools-${version}";
-    version = "3.7.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pwntools/${name}.tar.gz";
-      sha256 = "1c0n97cf3nql3n6sxpbp43x1byhkgfbpbl2b22h8nllgb8n0z9l0";
-    };
-    propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pkgs.pandoc unicorn intervaltree ];
-
-    disabled = isPy3k;
-
-    meta = {
-      homepage = "http://pwntools.com";
-      description = "CTF framework and exploit development library";
-      license = licenses.mit;
-      maintainers = with maintainers; [ bennofs ];
-    };
-  };
+  pwntools = callPackage ../development/python-modules/pwntools { };
 
   ROPGadget = callPackage ../development/python-modules/ROPGadget { };
 
-- 
GitLab


From 7efd5abe4888d6270acd4b2cf6b736d24438cd0f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 29 Oct 2017 01:47:46 +0200
Subject: [PATCH 165/877] python-cffi: fix clang build

---
 pkgs/development/python-modules/cffi/clang.patch | 13 +++++++++++++
 pkgs/development/python-modules/cffi/default.nix |  6 ++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/cffi/clang.patch

diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch
new file mode 100644
index 00000000000..27674edb58b
--- /dev/null
+++ b/pkgs/development/python-modules/cffi/clang.patch
@@ -0,0 +1,13 @@
+diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py
+index a3277b0..0d6e2c3 100644
+--- a/testing/cffi1/test_recompiler.py
++++ b/testing/cffi1/test_recompiler.py
+@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False):
+         char32_t foo_4bytes(char32_t);
+     """)
+     lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """
+-    #if !defined(__cplusplus) || __cplusplus < 201103L
++    #if !defined(__cplusplus)
+     typedef uint_least16_t char16_t;
+     typedef uint_least32_t char32_t;
+     #endif
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 5c99e77af56..3389a6fd705 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }:
+{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }:
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
@@ -10,13 +10,15 @@ if isPyPy then null else buildPythonPackage rec {
     sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6";
   };
 
+  patches = stdenv.lib.optional isPy27 ./clang.patch;
+
   outputs = [ "out" "dev" ];
 
   propagatedBuildInputs = [ libffi pycparser ];
   buildInputs = [ pytest ];
 
   # The tests use -Werror but with python3.6 clang detects some unreachable code.
-  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];
 
   checkPhase = ''
     py.test
-- 
GitLab


From 2ede55a37b1b6c93cd776ec4032458e656dfd70a Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 29 Oct 2017 02:03:12 +0200
Subject: [PATCH 166/877] virtualbox: move extensionPack from meta to passthru

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

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 97d3b3c49b5..4f6da3c7cd9 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -190,13 +190,15 @@ in stdenv.mkDerivation {
     cp -rv out/linux.*/${buildType}/bin/src "$modsrc"
   '';
 
-  passthru = { inherit version; /* for guest additions */ };
+  passthru = {
+    inherit version;       # for guest additions
+    inherit extensionPack; # for inclusion in profile to prevent gc
+  };
 
   meta = {
     description = "PC emulator";
     homepage = http://www.virtualbox.org/;
     maintainers = [ lib.maintainers.sander ];
     platforms = lib.platforms.linux;
-    inherit extensionPack;
   };
 }
-- 
GitLab


From 68b2eeb1cbc1a674c65362ea45f4cdb0c0bf12b4 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Sun, 29 Oct 2017 02:04:16 +0200
Subject: [PATCH 167/877] chez: 9.4 -> 9.5

---
 pkgs/development/compilers/chez/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index e4ceb40cad6..b85d32326a1 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name    = "chez-scheme-${version}";
-  version = "9.4-${dver}";
-  dver    = "20160507";
+  version = "9.5-${dver}";
+  dver    = "20171012";
 
   src = fetchgit {
     url    = "https://github.com/cisco/chezscheme.git";
-    rev    = "65df1d1f7c37f5b5a93cd7e5b475dda9dbafe03c";
-    sha256 = "1b273il3njnn04z55w1hnygvcqllc6p5qg9mcwh10w39fwsd8fbs";
+    rev    = "adb3b7bb22ddaa1ba91b98b6f4a647427c3a4d9b";
+    sha256 = "0hiynf7g0q77ipqxjsqdm2zb0m15bl1hhp615fn3i2hv0qz5a4xr";
     fetchSubmodules = true;
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   */
   patchPhase = ''
     substituteInPlace ./configure \
-      --replace "git submodule init && git submodule update || exit 1" ""
+      --replace "git submodule init && git submodule update || exit 1" "true"
 
     substituteInPlace ./workarea \
       --replace "/bin/ln" "${coreutils}/bin/ln" \
-- 
GitLab


From 376f7aa7612d9c63dede4ddd15078f49e9c67eb5 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Sun, 29 Oct 2017 12:02:26 +0800
Subject: [PATCH 168/877] Update nix-prefetch-git

s/understand/understood/
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index a180509a326..17962d08acc 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -39,7 +39,7 @@ usage(){
 
 Options:
       --out path      Path where the output would be stored.
-      --url url       Any url understand by 'git clone'.
+      --url url       Any url understood by 'git clone'.
       --rev ref       Any sha1 or references (such as refs/heads/master)
       --hash h        Expected hash.
       --deepClone     Clone the entire repository.
-- 
GitLab


From 49e66285b2795433dcf91f05ff884e6cd78bf2f7 Mon Sep 17 00:00:00 2001
From: Evan Wallace <mankarse.git@alethrea.net>
Date: Sun, 29 Oct 2017 05:21:30 +0000
Subject: [PATCH 169/877] tbb: clang support Added compiler and stdver
 parameters, to support non-gcc compilers, and enable perfect exception
 forwarding (std::exception_ptr) on platforms where C++11 is not enabled by
 default

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

diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index b8aedd46096..13b1970866e 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
 
-stdenv.mkDerivation rec {
+with stdenv.lib; stdenv.mkDerivation rec {
   name = "tbb-${version}";
   version = "2018_U1";
 
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw";
   };
 
+  makeFlags = concatStringsSep " " (
+    optional (compiler != null) "compiler=${compiler}" ++
+    optional (stdver != null) "stdver=${stdver}"
+  );
+
   installPhase = ''
     mkdir -p $out/{lib,share/doc}
     cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/
@@ -21,7 +26,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Intel Thread Building Blocks C++ Library";
     homepage = "http://threadingbuildingblocks.org/";
     license = licenses.asl20;
-- 
GitLab


From 94c4a6c0b1961a5cba988f6ba8e7cf7ea2c72794 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 10:12:24 +0100
Subject: [PATCH 170/877] Revert "Merge pull request #30913 from
 LnL7/darwin-cffi"

This reverts commit f20a36fcd8feed3671b4c1591dbf4a018eef4cd3, reversing
changes made to 15350df8d925a335e9004b6ce7219a6215df41d0.

I accidentally pressed the Merge button.
---
 pkgs/development/python-modules/cffi/clang.patch | 13 -------------
 pkgs/development/python-modules/cffi/default.nix |  6 ++----
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/python-modules/cffi/clang.patch

diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch
deleted file mode 100644
index 27674edb58b..00000000000
--- a/pkgs/development/python-modules/cffi/clang.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py
-index a3277b0..0d6e2c3 100644
---- a/testing/cffi1/test_recompiler.py
-+++ b/testing/cffi1/test_recompiler.py
-@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False):
-         char32_t foo_4bytes(char32_t);
-     """)
-     lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """
--    #if !defined(__cplusplus) || __cplusplus < 201103L
-+    #if !defined(__cplusplus)
-     typedef uint_least16_t char16_t;
-     typedef uint_least32_t char32_t;
-     #endif
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 3389a6fd705..5c99e77af56 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }:
+{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }:
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
@@ -10,15 +10,13 @@ if isPyPy then null else buildPythonPackage rec {
     sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6";
   };
 
-  patches = stdenv.lib.optional isPy27 ./clang.patch;
-
   outputs = [ "out" "dev" ];
 
   propagatedBuildInputs = [ libffi pycparser ];
   buildInputs = [ pytest ];
 
   # The tests use -Werror but with python3.6 clang detects some unreachable code.
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];
+  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code";
 
   checkPhase = ''
     py.test
-- 
GitLab


From 77d3869f27cca4b47507cb5e1341838cb5575170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 29 Oct 2017 10:18:18 +0100
Subject: [PATCH 171/877] colpack: init at 1.0.10

---
 .../science/math/colpack/default.nix          | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/science/math/colpack/default.nix

diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix
new file mode 100644
index 00000000000..29785363b04
--- /dev/null
+++ b/pkgs/applications/science/math/colpack/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }:
+
+stdenv.mkDerivation rec {
+
+  pname = "ColPack";
+  version = "1.0.10";
+  name = pname + "-" + version;
+
+  src = fetchFromGitHub {
+    owner = "CSCsw";
+    repo = pname;
+    rev = "v" + version;
+    sha256 = "1p05vry940mrjp6236c0z83yizmw9pk6ly2lb7d8rpb7j9h03glr";
+  };
+
+  buildInputs = [ autoconf automake gettext libtool ];
+
+  configurePhase = ''
+    autoreconf -vif
+    ./configure --prefix=$out --enable-openmp
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A package comprising of implementations of algorithms for
+    vertex coloring and derivative computation";
+    homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8027db8bfde..042c3888022 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -892,6 +892,8 @@ with pkgs;
 
   colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {};
 
+  colpack = callPackage ../applications/science/math/colpack { };
+
   consul = callPackage ../servers/consul { };
 
   consul-ui = callPackage ../servers/consul/ui.nix { };
-- 
GitLab


From 9acbfbc7b72f3dbf1afcb64f77602c475a47bd5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 29 Oct 2017 10:20:12 +0100
Subject: [PATCH 172/877] shogun: init at 6.0.0

---
 .../machine-learning/shogun/default.nix       | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/science/machine-learning/shogun/default.nix

diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
new file mode 100644
index 00000000000..9d736694cbd
--- /dev/null
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig
+# data, compression
+, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy
+# maths
+, blas, eigen, nlopt, lp_solve, colpack
+# libraries
+, libarchive, liblapack, libxml2
+# extra support
+, pythonSupport ? true, pythonPackages ? null
+, opencvSupport ? false, opencv ? null
+}:
+
+assert pythonSupport -> pythonPackages != null;
+assert opencvSupport -> opencv != null;
+
+stdenv.mkDerivation rec {
+
+  pname = "shogun";
+  version = "6.0.0";
+  name = pname + "-" + version;
+
+  src = fetchFromGitHub {
+    owner = pname + "-toolbox";
+    repo = pname;
+    rev = pname + "_" + version;
+    sha256 = "0f2zwzvn5apvwypkfkq371xp7c5bdb4g1fwqfh8c2d57ysjxhmgf";
+    fetchSubmodules = true;
+  };
+
+  CCACHE_DIR=".ccache";
+
+  buildInputs = with lib; [
+      blas bzip2 ccache cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo
+      protobuf nlopt snappy swig (libarchive.dev) liblapack libxml2
+    ]
+    ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ])
+    ++ optional  (opencvSupport) opencv;
+
+  cmakeFlags = with lib; []
+    ++ (optional (pythonSupport) "-DPythonModular=ON")
+    ++ (optional (opencvSupport) "-DOpenCV=ON")
+    ;
+
+  meta = with stdenv.lib; {
+    description = "A toolbox which offers a wide range of efficient and unified machine learning methods";
+    homepage = "http://shogun-toolbox.org/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 042c3888022..596051f4ea7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15808,6 +15808,8 @@ with pkgs;
     libmlt = mlt;
   };
 
+  shogun = callPackage ../applications/science/machine-learning/shogun { };
+
   smplayer = libsForQt5.callPackage ../applications/video/smplayer { };
 
   smtube = libsForQt56.callPackage ../applications/video/smtube {};
-- 
GitLab


From 0767d2984bcfd61e49af8d849e022c33cfb6aad8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 29 Oct 2017 10:23:00 +0100
Subject: [PATCH 173/877] nixops: update to 1.5.2

(cherry picked from commit c291a107760888106cf50aa1e54ee4e7c8dd5eb1)
---
 pkgs/tools/package-management/nixops/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 1467faac8e3..daecb8746ea 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.5.1";
+  version = "1.5.2";
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
-    sha256 = "0pba9c8ya4hvqmg458p74g69hb06lh0f5bsgw7dsi8pjrcb0624g";
+    sha256 = "00y2arc5rffvy6xmx4p6ibpjyc61k8dkiabq7ccwwjgckz1d2dpb";
   };
 })
-- 
GitLab


From 3f3eb6ca64534c1bfcafe23a78e6cc7a711e7137 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 29 Oct 2017 01:47:46 +0200
Subject: [PATCH 174/877] python-cffi: fix clang build

---
 pkgs/development/python-modules/cffi/clang.patch | 13 +++++++++++++
 pkgs/development/python-modules/cffi/default.nix |  6 ++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/cffi/clang.patch

diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch
new file mode 100644
index 00000000000..27674edb58b
--- /dev/null
+++ b/pkgs/development/python-modules/cffi/clang.patch
@@ -0,0 +1,13 @@
+diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py
+index a3277b0..0d6e2c3 100644
+--- a/testing/cffi1/test_recompiler.py
++++ b/testing/cffi1/test_recompiler.py
+@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False):
+         char32_t foo_4bytes(char32_t);
+     """)
+     lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """
+-    #if !defined(__cplusplus) || __cplusplus < 201103L
++    #if !defined(__cplusplus)
+     typedef uint_least16_t char16_t;
+     typedef uint_least32_t char32_t;
+     #endif
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 5c99e77af56..b0524b4121a 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }:
+{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }:
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
@@ -10,13 +10,15 @@ if isPyPy then null else buildPythonPackage rec {
     sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6";
   };
 
+  patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch;
+
   outputs = [ "out" "dev" ];
 
   propagatedBuildInputs = [ libffi pycparser ];
   buildInputs = [ pytest ];
 
   # The tests use -Werror but with python3.6 clang detects some unreachable code.
-  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];
 
   checkPhase = ''
     py.test
-- 
GitLab


From f6b0aa8ad5263998ad252f451f80240c89b9f8da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 10:59:03 +0100
Subject: [PATCH 175/877] pythonPackages.bitstring: 3.1.2 -> 3.1.5

* fetchurl -> fetchPypi
* Tests work now
* Update homepage
---
 pkgs/top-level/python-packages.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e81063a6169..c7192b0a415 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1942,19 +1942,19 @@ in {
 
 
   bitstring = buildPythonPackage rec {
-    name = "bitstring-3.1.2";
+    pname = "bitstring";
+    version = "3.1.5";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "https://python-bitstring.googlecode.com/files/${name}.zip";
-      sha256 = "1i1p3rkj4ad108f23xyib34r4rcy571gy65paml6fk77knh0k66p";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1";
+      extension = "zip";
     };
 
-    # error: invalid command 'test'
-    doCheck = false;
-
     meta = {
       description = "Module for binary data manipulation";
-      homepage = https://code.google.com/p/python-bitstring/;
+      homepage = "https://github.com/scott-griffiths/bitstring";
       license = licenses.mit;
       platforms = platforms.linux;
       maintainers = with maintainers; [ bjornfor ];
-- 
GitLab


From 2e44d576fd5789ca945799e622992ca8afedabce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 11:05:52 +0100
Subject: [PATCH 176/877] pythonPackages.demjson: 1.6 -> 2.2.4

* fetchurl -> fetchPypi
* Tests work now.
* jsonlint is installed for us by package buildsys.
* Disable for python3.6 (build/test error).
---
 pkgs/top-level/python-packages.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7192b0a415..4cafeab8d40 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4853,20 +4853,16 @@ in {
 
 
   demjson = buildPythonPackage rec {
-    name = "demjson-1.6";
+    pname = "demjson";
+    version = "2.2.4";
+    name = "${pname}-${version}";
+    disabled = isPy36;
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/demjson/${name}.tar.gz";
-      sha256 = "0abf7wqqq7rk1sycy47ayn5p93yy7gjq50cb2z69wmik1qqrr60x";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
     };
 
-    doCheck = false; # there are no tests
-
-    preFixup = ''
-      mkdir -p "$out/bin"
-      cp jsonlint "$out/bin/"
-    '';
-
     meta = {
       description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
       homepage = http://deron.meranda.us/python/demjson/;
-- 
GitLab


From 235a31b79fdde8b265eca804f4e6f652f710516b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 11:10:26 +0100
Subject: [PATCH 177/877] pythonPackages.pyodbc: 3.0.7 -> 4.0.19

* fetchurl -> fetchPypi
* Update homepage (old page still works, but tells user to got to
  github).
---
 pkgs/top-level/python-packages.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4cafeab8d40..c5a9ca660ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17079,19 +17079,21 @@ in {
 
 
   pyodbc = buildPythonPackage rec {
-    name = "pyodbc-3.0.7";
+    pname = "pyodbc";
+    version = "4.0.19";
+    name = "${pname}-${version}";
     disabled = isPyPy;  # use pypypdbc instead
 
-    src = pkgs.fetchurl {
-      url = "https://pyodbc.googlecode.com/files/${name}.zip";
-      sha256 = "0ldkm8xws91j7zbvpqb413hvdz8r66bslr451q3qc0xi8cnmydfq";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg";
     };
 
     buildInputs = with self; [ pkgs.libiodbc ];
 
     meta = {
       description = "Python ODBC module to connect to almost any database";
-      homepage = https://code.google.com/p/pyodbc/;
+      homepage = "https://github.com/mkleehammer/pyodbc";
       license = licenses.mit;
       platforms = platforms.linux;
       maintainers = with maintainers; [ bjornfor ];
-- 
GitLab


From 0b93dbe9d63895e1ba845bc15dcd5f107958097a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 11:13:57 +0100
Subject: [PATCH 178/877] pythonPackages.robotsuite: 1.4.2 -> 2.0.0

* fetchurl -> fetchPypi
* Remove commented out doCheck
---
 pkgs/top-level/python-packages.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c5a9ca660ec..b1cc38f5bf7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18807,17 +18807,15 @@ in {
 
 
   robotsuite = buildPythonPackage rec {
-    version = "1.4.2";
-    name = "robotsuite-${version}";
+    pname = "robotsuite";
+    version = "2.0.0";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/robotsuite/${name}.zip";
-      sha256 = "0sw09vrvwv3gzqb6jvhbrz09l6nzzj3i9av34qjddqfwq7cr1bla";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z";
     };
 
-    # error: invalid command 'test'
-    #doCheck = false;
-
     buildInputs = with self; [ unittest2 ];
     propagatedBuildInputs = with self; [ robotframework lxml ];
 
-- 
GitLab


From 335add9e0c187e070e349328f2a2c5cfb992544d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 29 Oct 2017 09:31:15 +0100
Subject: [PATCH 179/877] vdirsyncer: added requests_oauthlib to
 propagatedBuildInputs

vdirsyncer requires `requests_oauthlib` in order to work with google
calendar sync services
---
 pkgs/tools/misc/vdirsyncer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 731a194cc6a..17798057ec3 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -18,6 +18,7 @@ pythonPackages.buildPythonApplication rec {
     click click-log click-threading
     requests_toolbelt
     requests
+    requests_oauthlib # required for google oauth sync
     atomicwrites
   ];
 
-- 
GitLab


From b1e23a87b18be0077292eefffe660a233fa33123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 11:40:45 +0100
Subject: [PATCH 180/877] pythonPackages.bitstring: move to python-modules/

Easier maintenance when expressions are in separate files.
---
 .../python-modules/bitstring/default.nix      | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +------------------
 2 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/bitstring/default.nix

diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix
new file mode 100644
index 00000000000..f6c56646dcb
--- /dev/null
+++ b/pkgs/development/python-modules/bitstring/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "bitstring";
+  version = "3.1.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1";
+    extension = "zip";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Module for binary data manipulation";
+    homepage = "https://github.com/scott-griffiths/bitstring";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b1cc38f5bf7..2759ec20121 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1940,26 +1940,7 @@ in {
     };
   };
 
-
-  bitstring = buildPythonPackage rec {
-    pname = "bitstring";
-    version = "3.1.5";
-    name = "${pname}-${version}";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1";
-      extension = "zip";
-    };
-
-    meta = {
-      description = "Module for binary data manipulation";
-      homepage = "https://github.com/scott-griffiths/bitstring";
-      license = licenses.mit;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  bitstring = callPackage ../development/python-modules/bitstring { };
 
   blaze = callPackage ../development/python-modules/blaze { };
 
-- 
GitLab


From 013da4ef669359ee0f5e8605870cb618e3579f0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 11:43:27 +0100
Subject: [PATCH 181/877] pythonPackages.demjson: move to python-modules/

Easier maintenance when expressions are in separate files.
---
 .../python-modules/demjson/default.nix        | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +------------------
 2 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/demjson/default.nix

diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix
new file mode 100644
index 00000000000..4f5d7a11bd8
--- /dev/null
+++ b/pkgs/development/python-modules/demjson/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy36 }:
+
+buildPythonPackage rec {
+  pname = "demjson";
+  version = "2.2.4";
+  name = "${pname}-${version}";
+  disabled = isPy36;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
+    homepage = http://deron.meranda.us/python/demjson/;
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ bjornfor ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2759ec20121..b7624cef55e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4832,26 +4832,7 @@ in {
     };
   };
 
-
-  demjson = buildPythonPackage rec {
-    pname = "demjson";
-    version = "2.2.4";
-    name = "${pname}-${version}";
-    disabled = isPy36;
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
-    };
-
-    meta = {
-      description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
-      homepage = http://deron.meranda.us/python/demjson/;
-      license = licenses.lgpl3Plus;
-      maintainers = with maintainers; [ bjornfor ];
-      platforms = platforms.all;
-    };
-  };
+  demjson = callPackage ../development/python-modules/demjson { };
 
   derpconf = self.buildPythonPackage rec {
     name = "derpconf-0.4.9";
-- 
GitLab


From 7357b369d51dee7e9eadf60d0da88ffb6f1ed6a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 11:45:46 +0100
Subject: [PATCH 182/877] pythonPackages.pyodbc: move to python-modules/

Easier maintenance when expressions are in separate files.
---
 .../python-modules/pyodbc/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +------------------
 2 files changed, 24 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyodbc/default.nix

diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
new file mode 100644
index 00000000000..c09e15f4bfb
--- /dev/null
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy, libiodbc }:
+
+buildPythonPackage rec {
+  pname = "pyodbc";
+  version = "4.0.19";
+  name = "${pname}-${version}";
+  disabled = isPyPy;  # use pypypdbc instead
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg";
+  };
+
+  buildInputs = [ libiodbc ];
+
+  meta = with stdenv.lib; {
+    description = "Python ODBC module to connect to almost any database";
+    homepage = "https://github.com/mkleehammer/pyodbc";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b7624cef55e..da15c8f0073 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17039,28 +17039,7 @@ in {
     };
   };
 
-
-  pyodbc = buildPythonPackage rec {
-    pname = "pyodbc";
-    version = "4.0.19";
-    name = "${pname}-${version}";
-    disabled = isPyPy;  # use pypypdbc instead
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg";
-    };
-
-    buildInputs = with self; [ pkgs.libiodbc ];
-
-    meta = {
-      description = "Python ODBC module to connect to almost any database";
-      homepage = "https://github.com/mkleehammer/pyodbc";
-      license = licenses.mit;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  pyodbc = callPackage ../development/python-modules/pyodbc { };
 
   pyocr = callPackage ../development/python-modules/pyocr { };
 
-- 
GitLab


From 489cdc23fca3562d757295bf9a9b4ee01e45aee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 11:47:54 +0100
Subject: [PATCH 183/877] pythonPackages.robotsuite: move to python-modules/

Easier maintenance when expressions are in separate files.
---
 .../python-modules/robotsuite/default.nix     | 21 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +------------------
 2 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/robotsuite/default.nix

diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix
new file mode 100644
index 00000000000..2dd672c0109
--- /dev/null
+++ b/pkgs/development/python-modules/robotsuite/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, unittest2, robotframework, lxml }:
+
+buildPythonPackage rec {
+  pname = "robotsuite";
+  version = "2.0.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z";
+  };
+
+  buildInputs = [ unittest2 ];
+  propagatedBuildInputs = [ robotframework lxml ];
+
+  meta = with stdenv.lib; {
+    description = "Python unittest test suite for Robot Framework";
+    homepage = http://github.com/collective/robotsuite/;
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da15c8f0073..e3e0d78cb80 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18746,27 +18746,7 @@ in {
     };
   };
 
-
-  robotsuite = buildPythonPackage rec {
-    pname = "robotsuite";
-    version = "2.0.0";
-    name = "${pname}-${version}";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z";
-    };
-
-    buildInputs = with self; [ unittest2 ];
-    propagatedBuildInputs = with self; [ robotframework lxml ];
-
-    meta = {
-      description = "Python unittest test suite for Robot Framework";
-      homepage = http://github.com/collective/robotsuite/;
-      license = licenses.gpl3;
-    };
-  };
-
+  robotsuite = callPackage ../development/python-modules/robotsuite { };
 
   robotframework-ride = buildPythonPackage rec {
     version = "1.2.3";
-- 
GitLab


From 208e5c99c46fd9d9f2300931a44cd698edc8d0b9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 29 Oct 2017 11:20:31 +0100
Subject: [PATCH 184/877] pyte: init at 0.7.0

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

diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix
new file mode 100644
index 00000000000..2bd71070581
--- /dev/null
+++ b/pkgs/development/python-modules/pyte/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }:
+
+buildPythonPackage rec {
+  pname = "pyte";
+  version = "0.7.0";
+  name  = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7";
+  };
+
+  propagatedBuildInputs = [ wcwidth ];
+
+  checkInputs = [ pytest pytestrunner ];
+
+  # tries to write to os.path.dirname(__file__) in test_input_output
+  checkPhase = ''
+    py.test -k "not test_input_output"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple VTXXX-compatible linux terminal emulator";
+    homepage = https://github.com/selectel/pyte;
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ flokli ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf670a40c6c..7887cd75754 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12493,6 +12493,8 @@ in {
     };
   };
 
+  pyte = callPackage ../development/python-modules/pyte { };
+
   graphviz = buildPythonPackage rec {
     name = "graphviz-${version}";
     version = "0.5.2";
-- 
GitLab


From 11bba268fe886968617c20c2c394139e7c92b807 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 29 Oct 2017 11:21:18 +0100
Subject: [PATCH 185/877] curtsies: init at 0.2.11

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

diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix
new file mode 100644
index 00000000000..a1e5f235235
--- /dev/null
+++ b/pkgs/development/python-modules/curtsies/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, pytest, wcwidth }:
+
+buildPythonPackage rec {
+  pname = "curtsies";
+  version = "0.2.11";
+  name  = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc";
+  };
+
+  propagatedBuildInputs = [ blessings wcwidth pyte ];
+
+  checkInputs = [ nose mock pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Curses-like terminal wrapper, with colored strings!";
+    homepage = https://pypi.python.org/pypi/curtsies;
+    license = licenses.mit;
+    maintainers = with maintainers; [ flokli ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7887cd75754..de92d478c22 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3367,6 +3367,8 @@ in {
     doCheck = false;
   };
 
+  curtsies = callPackage ../development/python-modules/curtsies { };
+
   oslo-vmware = buildPythonPackage rec {
     name = "oslo.vmware-${version}";
     version = "1.22.0";
-- 
GitLab


From c463a8e0c5bbc7e18215278d290f4b977eafd473 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 29 Oct 2017 12:12:42 +0100
Subject: [PATCH 186/877] urwid: move into separate file, use fetchPypi instead
 of fetchurl

---
 .../python-modules/urwid/default.nix          | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +------------------
 2 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/urwid/default.nix

diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
new file mode 100644
index 00000000000..129f4821e87
--- /dev/null
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage (rec {
+  pname = "urwid";
+  version = "1.3.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A full-featured console (xterm et al.) user interface library";
+    homepage = http://excess.org/urwid;
+    repositories.git = git://github.com/wardi/urwid.git;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ garbas ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de92d478c22..e4e1560f227 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21977,25 +21977,7 @@ in {
 
   urlgrabber = callPackage ../development/python-modules/urlgrabber {};
 
-  urwid = buildPythonPackage (rec {
-    name = "urwid-1.3.1";
-
-    # multiple:  NameError: name 'evl' is not defined
-    doCheck = false;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/u/urwid/${name}.tar.gz";
-      sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng";
-    };
-
-    meta = {
-      description = "A full-featured console (xterm et al.) user interface library";
-      homepage = http://excess.org/urwid;
-      repositories.git = git://github.com/wardi/urwid.git;
-      license = licenses.lgpl21;
-      maintainers = with maintainers; [ garbas ];
-    };
-  });
+  urwid = callPackage ../development/python-modules/urwid {};
 
   urwidtrees = buildPythonPackage rec {
     name = "urwidtrees-${rev}";
-- 
GitLab


From 978a9ba0cd649e65cb8abe720570f0e6c9dad7a2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 29 Oct 2017 11:21:40 +0100
Subject: [PATCH 187/877] bpython: 0.12 -> 0.17

---
 .../python-modules/bpython/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +------------
 2 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/bpython/default.nix

diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix
new file mode 100644
index 00000000000..515494b5f93
--- /dev/null
+++ b/pkgs/development/python-modules/bpython/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchurl, pygments, greenlet, curtsies, urwid, requests, mock }:
+
+buildPythonPackage rec {
+  pname = "bpython";
+  version = "0.17";
+  name  = "${pname}-${version}";
+
+  # 0.17 is still missing on PyPI, https://github.com/bpython/bpython/issues/706
+  src = fetchurl {
+    url = "https://bpython-interpreter.org/releases/${pname}-${version}.tar.gz";
+    sha256 = "13fyyx06645ikvmj9zmkixr12kzk1c3a3f9s9i2rvaczjycn82lz";
+  };
+
+  propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ];
+
+  checkInputs = [ mock ];
+
+  # tests fail: https://github.com/bpython/bpython/issues/712
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A fancy curses interface to the Python interactive interpreter";
+    homepage = "https://bpython-interpreter.org/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ flokli ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4e1560f227..f9bcff478e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2078,23 +2078,7 @@ in {
     };
   };
 
-
-  bpython = buildPythonPackage rec {
-     name = "bpython-0.12";
-     src = pkgs.fetchurl {
-       url = "http://www.bpython-interpreter.org/releases/bpython-0.12.tar.gz";
-       sha256 = "1ilf58qq7sazmcgg4f1wswbhcn2gb8qbbrpgm6gf0j2lbm60gabl";
-     };
-
-     propagatedBuildInputs = with self; [ pygments ];
-     doCheck = false;
-
-     meta = {
-       description = "UNKNOWN";
-       homepage = "UNKNOWN";
-       maintainers = with maintainers; [ domenkozar ];
-     };
-   };
+  bpython = callPackage ../development/python-modules/bpython {};
 
   bsddb3 = buildPythonPackage rec {
     name = "bsddb3-${version}";
-- 
GitLab


From dccfe68ade164c6d3242bf1ba24d5482d02fb88e Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Sun, 29 Oct 2017 12:16:03 +0100
Subject: [PATCH 188/877] ZODB 5.3.0: fix broken tests

Re #30892
---
 .../zodb/ZODB-5.3.0-fix-tests.patch           | 29 +++++++++++++++++++
 .../python-modules/zodb/default.nix           |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch

diff --git a/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch b/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch
new file mode 100644
index 00000000000..b6bcedea91a
--- /dev/null
+++ b/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch
@@ -0,0 +1,29 @@
+Tests are kind of broken in ZODB-5.3.0. Fix setup code and disable one
+especially problematic test.
+
+diff -u ZODB-5.3.0/setup.py ZODB-5.3.0/setup.py
+--- ZODB-5.3.0/setup.py	2017-08-30 14:55:10.000000000 +0200
++++ ZODB-5.3.0/setup.py	2017-10-29 11:34:17.277953730 +0100
+@@ -85,7 +85,10 @@
+                     mod = __import__(
+                         _modname(dirpath, base, os.path.splitext(filename)[0]),
+                         {}, {}, ['*'])
+-                    _unittests_only(suite, mod.test_suite())
++                    try:
++                        _unittests_only(suite, mod.test_suite())
++                    except AttributeError:
++                        pass
+         elif 'tests.py' in filenames:
+             mod = __import__(_modname(dirpath, base, 'tests'), {}, {}, ['*'])
+             _unittests_only(suite, mod.test_suite())
+diff -u ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py
+--- ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py	2017-08-30 14:55:10.000000000 +0200
++++ ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py	2017-10-29 11:35:10.348240386 +0100
+@@ -1184,7 +1184,4 @@
+         #unittest.makeSuite(Test_do_backup),  #TODO
+         unittest.makeSuite(Test_do_recover),
+         unittest.makeSuite(Test_do_verify),
+-        # N.B.:  this test take forever to run (~40sec on a fast laptop),
+-        # *and* it is non-deterministic.
+-        unittest.makeSuite(MonteCarloTests),
+     ])
diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 5a318b5d040..232acaec506 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -25,6 +25,10 @@ buildPythonPackage rec {
       sha256 = "633c2f89481d8ebc55639b59216f7d16d07b44a94758850c0b887006967214f3";
     };
 
+    patches = [
+      ./ZODB-5.3.0-fix-tests.patch
+    ];
+
     propagatedBuildInputs = [
       manuel
       transaction
-- 
GitLab


From dde8ded1efa87b1284bff9301b58ebf771d025f6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 12:24:45 +0100
Subject: [PATCH 189/877] python.pkgs.ipython_genutils: move expression

---
 .../ipython_genutils/default.nix              | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +---------------
 2 files changed, 31 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/ipython_genutils/default.nix

diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython_genutils/default.nix
new file mode 100644
index 00000000000..503ccb37d57
--- /dev/null
+++ b/pkgs/development/python-modules/ipython_genutils/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, glibcLocales
+}:
+
+buildPythonPackage rec {
+  pname = "ipython_genutils";
+  version = "0.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8";
+  };
+
+  checkInputs = [ nose glibcLocales ];
+
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests
+  '';
+
+  meta = {
+    description = "Vestigial utilities from IPython";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3e0d78cb80..8caf6aaaff9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10503,30 +10503,7 @@ in {
 
   ipython_6 = callPackage ../development/python-modules/ipython { };
 
-  ipython_genutils = buildPythonPackage rec {
-    version = "0.2.0";
-    name = "ipython_genutils-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipython_genutils/${name}.tar.gz";
-      sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8";
-    };
-
-    LC_ALL = "en_US.UTF-8";
-    buildInputs = with self; [ nose pkgs.glibcLocales ];
-
-    checkPhase = ''
-      nosetests -v ipython_genutils/tests
-    '';
-
-    meta = {
-      description = "Vestigial utilities from IPython";
-      homepage = http://ipython.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
-
+  ipython_genutils = callPackage ../development/python-modules/ipython_genutils { };
 
   ipywidgets = callPackage ../development/python-modules/ipywidgets { };
 
-- 
GitLab


From 6e5276f0abd34fde52e6750cb041a7fc8fac9365 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 12:27:47 +0100
Subject: [PATCH 190/877] python.pkgs.multipledispatch: move expression

---
 .../multipledispatch/default.nix              | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +--------------
 2 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/multipledispatch/default.nix

diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix
new file mode 100644
index 00000000000..d1c39210607
--- /dev/null
+++ b/pkgs/development/python-modules/multipledispatch/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "multipledispatch";
+  version = "0.4.9";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    homepage = http://github.com/mrocklin/multipledispatch/;
+    description = "A relatively sane approach to multiple dispatch in Python";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8caf6aaaff9..b1fb4958eea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12163,25 +12163,7 @@ in {
     propagatedBuildInputs = with self; [ eventlib application gnutls ];
   };
 
-  multipledispatch = buildPythonPackage rec {
-    name = "multipledispatch-${version}";
-    version = "0.4.9";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/multipledispatch/${name}.tar.gz";
-      sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2";
-    };
-
-    # No tests in archive
-    doCheck = false;
-
-    meta = {
-      homepage = http://github.com/mrocklin/multipledispatch/;
-      description = "A relatively sane approach to multiple dispatch in Python";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  multipledispatch = callPackage ../development/python-modules/multipledispatch { };
 
   multiprocess = buildPythonPackage rec {
     name = "multiprocess-${version}";
-- 
GitLab


From 59d1dc6c58d56af53f388e3b5542603a0889ebd4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 12:31:48 +0100
Subject: [PATCH 191/877] python.pkgs.toolz: move expression

---
 .../python-modules/toolz/default.nix          | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +--------------
 2 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/toolz/default.nix

diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix
new file mode 100644
index 00000000000..36b85bce3ac
--- /dev/null
+++ b/pkgs/development/python-modules/toolz/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec{
+  pname = "toolz";
+  version = "0.8.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa";
+  };
+
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    # https://github.com/pytoolz/toolz/issues/357
+    rm toolz/tests/test_serialization.py
+    nosetests toolz/tests
+  '';
+
+  meta = {
+    homepage = "http://github.com/pytoolz/toolz/";
+    description = "List processing tools and functional utilities";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b1fb4958eea..7245b37c51b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21303,30 +21303,7 @@ in {
     };
   };
 
-  toolz = buildPythonPackage rec{
-    name = "toolz-${version}";
-    version = "0.8.2";
-
-    src = pkgs.fetchurl{
-      url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
-      sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa";
-    };
-
-    buildInputs = with self; [ nose ];
-
-    checkPhase = ''
-      # https://github.com/pytoolz/toolz/issues/357
-      rm toolz/tests/test_serialization.py
-      nosetests toolz/tests
-    '';
-
-    meta = {
-      homepage = "http://github.com/pytoolz/toolz/";
-      description = "List processing tools and functional utilities";
-      license = "licenses.bsd3";
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  toolz = callPackage ../development/python-modules/toolz { };
 
   tox = buildPythonPackage rec {
     name = "tox-${version}";
-- 
GitLab


From b4b62e6e65f42e1d5999eb12b4da04817c92b0cd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 12:43:45 +0100
Subject: [PATCH 192/877] python.pkgs.cytoolz: move expression

---
 .../python-modules/cytoolz/default.nix        | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 28 +-------------
 2 files changed, 38 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/cytoolz/default.nix

diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix
new file mode 100644
index 00000000000..dcb4e9474c3
--- /dev/null
+++ b/pkgs/development/python-modules/cytoolz/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPyPy
+, nose
+, toolz
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "cytoolz";
+  version = "0.8.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552";
+  };
+
+  # Extension types
+  disabled = isPyPy;
+
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ toolz ];
+
+  # Disable failing test https://github.com/pytoolz/cytoolz/issues/97
+  checkPhase = ''
+    NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages}
+  '';
+
+  meta = {
+    homepage = "http://github.com/pytoolz/cytoolz/";
+    description = "Cython implementation of Toolz: High performance functional utilities";
+    license = "licenses.bsd3";
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7245b37c51b..868f156ce82 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3243,33 +3243,7 @@ in {
 
   cython = callPackage ../development/python-modules/Cython { };
 
-  cytoolz = buildPythonPackage rec {
-    name = "cytoolz-${version}";
-    version = "0.8.2";
-
-    src = pkgs.fetchurl{
-      url = "mirror://pypi/c/cytoolz/cytoolz-${version}.tar.gz";
-      sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552";
-    };
-
-    # Extension types
-    disabled = isPyPy;
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [ toolz ];
-
-    # Disable failing test https://github.com/pytoolz/cytoolz/issues/97
-    checkPhase = ''
-      NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages}
-    '';
-
-    meta = {
-      homepage = "http://github.com/pytoolz/cytoolz/";
-      description = "Cython implementation of Toolz: High performance functional utilities";
-      license = "licenses.bsd3";
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  cytoolz = callPackage ../development/python-modules/cytoolz { };
 
   cryptacular = buildPythonPackage rec {
     name = "cryptacular-1.4.1";
-- 
GitLab


From 51ade421c4b9a703b8f66fd79fac9ef33e7241f6 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 29 Oct 2017 12:43:47 +0100
Subject: [PATCH 193/877] sqlite: 3.20.1 -> 3.21.0

---
 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 4a10f912883..0625183fb7d 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.20.1";
+  name = "sqlite-3.21.0";
 
   src = fetchurl {
-    url = "http://sqlite.org/2017/sqlite-autoconf-3200100.tar.gz";
-    sha256 = "0hh7jnxfwvs2qlvmjwrgkvxb8sk4x8hj04m54fq9h1xw55dmjrpc";
+    url = "http://sqlite.org/2017/sqlite-autoconf-3210000.tar.gz";
+    sha256 = "1qxvzdjwzw6k0kqjfabj86rnq87xdbwbca7laxxdhnh0fmkm3pfp";
   };
 
   outputs = [ "bin" "dev" "out" ];
-- 
GitLab


From 119a58abbe274750dd1ed088626a09e8aaf426a0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 12:48:07 +0100
Subject: [PATCH 194/877] python.pkgs.datashape: move expression

---
 .../python-modules/datashape/default.nix      | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +------------
 2 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/datashape/default.nix

diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix
new file mode 100644
index 00000000000..81ead843169
--- /dev/null
+++ b/pkgs/development/python-modules/datashape/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, mock
+, numpy
+, multipledispatch
+, dateutil
+}:
+
+buildPythonPackage rec {
+  pname = "datashape";
+  version = "0.5.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783";
+  };
+
+  checkInputs = [ pytest mock ];
+  propagatedBuildInputs = [ numpy multipledispatch dateutil ];
+
+  checkPhase = ''
+    py.test datashape/tests
+  '';
+
+  meta = {
+    homepage = https://github.com/ContinuumIO/datashape;
+    description = "A data description language";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 868f156ce82..89cb098e9a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4523,29 +4523,7 @@ in {
     };
   };
 
-  datashape = buildPythonPackage rec {
-    name = "datashape-${version}";
-    version = "0.5.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/D/DataShape/${name}.tar.gz";
-      sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783";
-    };
-
-    buildInputs = with self; [ pytest mock ];
-    propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
-
-    checkPhase = ''
-      py.test datashape/tests
-    '';
-
-    meta = {
-      homepage = https://github.com/ContinuumIO/datashape;
-      description = "A data description language";
-      license = licenses.bsd2;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  datashape = callPackage ../development/python-modules/datashape { };
 
   requests-cache = buildPythonPackage (rec {
     name = "requests-cache-${version}";
-- 
GitLab


From d4bf9684b78141f7310e22dafabbfdbb6fae4f81 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 13:20:02 +0100
Subject: [PATCH 195/877] python.pkgs.odo: move expression

---
 .../python-modules/odo/default.nix            | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +------------
 2 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/odo/default.nix

diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix
new file mode 100644
index 00000000000..73b3f0be150
--- /dev/null
+++ b/pkgs/development/python-modules/odo/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, datashape
+, numpy
+, pandas
+, toolz
+, multipledispatch
+, networkx
+}:
+
+buildPythonPackage rec {
+  pname = "odo";
+  version= "0.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ datashape numpy pandas toolz multipledispatch networkx ];
+
+  checkPhase = ''
+    py.test odo/tests
+  '';
+
+  meta = {
+    homepage = https://github.com/ContinuumIO/odo;
+    description = "Data migration utilities";
+    license = lib.licenses.bsdOriginal;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89cb098e9a5..39234f5b969 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13453,29 +13453,7 @@ in {
     };
   };
 
-  odo = buildPythonPackage rec {
-    name = "odo-${version}";
-    version= "0.5.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/odo/${name}.tar.gz";
-      sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ datashape numpy pandas toolz multipledispatch networkx ];
-
-    checkPhase = ''
-      py.test odo/tests
-    '';
-
-    meta = {
-      homepage = https://github.com/ContinuumIO/odo;
-      description = "Data migration utilities";
-      license = licenses.bsdOriginal;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  odo = callPackage ../development/python-modules/odo { };
 
   offtrac = buildPythonPackage rec {
     name = "offtrac-0.1.0";
-- 
GitLab


From 16d0a334c86cb580afcca2b13c0c7714c5158bbd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 13:23:55 +0100
Subject: [PATCH 196/877] python.pkgs.pysoundfile: move expression

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

diff --git a/pkgs/development/python-modules/pysoundfile/default.nix b/pkgs/development/python-modules/pysoundfile/default.nix
new file mode 100644
index 00000000000..fe24f0203f0
--- /dev/null
+++ b/pkgs/development/python-modules/pysoundfile/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, numpy
+, libsndfile
+, cffi
+, isPyPy
+, stdenv
+}:
+
+buildPythonPackage rec {
+  pname = "PySoundFile";
+  name = "PySoundFile-${version}";
+  version = "0.8.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df";
+  };
+
+    checkInputs = [ pytest ];
+    propagatedBuildInputs = [ numpy libsndfile cffi ];
+
+    meta = {
+      description = "An audio library based on libsndfile, CFFI and NumPy";
+      license = lib.licenses.bsd3;
+      homepage = https://github.com/bastibe/PySoundFile;
+      maintainers = with lib.maintainers; [ fridh ];
+    };
+
+    prePatch = ''
+      substituteInPlace soundfile.py --replace "'sndfile'" "'${libsndfile.out}/lib/libsndfile.so'"
+    '';
+
+    # https://github.com/bastibe/PySoundFile/issues/157
+    disabled = isPyPy ||  stdenv.isi686;
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39234f5b969..124dc0c3885 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15491,32 +15491,7 @@ in {
     };
   };
 
-  pysoundfile = buildPythonPackage rec {
-    name = "pysoundfile-${version}";
-    version = "0.8.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/P/PySoundFile/PySoundFile-${version}.tar.gz";
-      sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ numpy pkgs.libsndfile cffi ];
-
-    meta = {
-      description = "An audio library based on libsndfile, CFFI and NumPy";
-      license = licenses.bsd3;
-      homepage = https://github.com/bastibe/PySoundFile;
-      maintainers = with maintainers; [ fridh ];
-    };
-
-    prePatch = ''
-      substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile.out}/lib/libsndfile.so'"
-    '';
-
-    # https://github.com/bastibe/PySoundFile/issues/157
-    disabled = isPyPy ||  stdenv.isi686;
-  };
+  pysoundfile = callPackage ../development/python-modules/pysoundfile { };
 
   python3pika = buildPythonPackage {
     name = "python3-pika-0.9.14";
-- 
GitLab


From 7c4c7cde6ef692bce10f1bc11e3ce75efe1076c0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 13:30:54 +0100
Subject: [PATCH 197/877] python.pkgs.seaborn: move expression

---
 .../python-modules/seaborn/default.nix        | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +-------------
 2 files changed, 35 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/seaborn/default.nix

diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix
new file mode 100644
index 00000000000..1647e6cfc14
--- /dev/null
+++ b/pkgs/development/python-modules/seaborn/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, pandas
+, matplotlib
+}:
+
+buildPythonPackage rec {
+  pname = "seaborn";
+  version = "0.7.1";
+  name = "${pname}-${version}";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs";
+  };
+
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ pandas matplotlib ];
+
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  # Computationally very demanding tests
+  doCheck = false;
+
+  meta = {
+    description = "Statisitical data visualization";
+    homepage = "http://stanford.edu/~mwaskom/software/seaborn/";
+    license = with lib.licenses; [ bsd3 ];
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 124dc0c3885..0be000b4a8d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19133,30 +19133,7 @@ in {
     };
   };
 
-  seaborn = buildPythonPackage rec {
-    name = "seaborn-0.7.1";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/seaborn/${name}.tar.gz";
-      sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs";
-    };
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [ pandas matplotlib ];
-
-    checkPhase = ''
-      nosetests -v
-    '';
-
-    # Computationally very demanding tests
-    doCheck = false;
-
-    meta = {
-      description = "Statisitical data visualization";
-      homepage = "http://stanford.edu/~mwaskom/software/seaborn/";
-      license     = "BSD";
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  seaborn = callPackage ../development/python-modules/seaborn { };
 
   selenium = buildPythonPackage rec {
     name = "selenium-2.52.0";
-- 
GitLab


From bd941043b8656001e927861648639d2caebcd44b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 13:31:17 +0100
Subject: [PATCH 198/877] python.pkgs.traitlets: move expression

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

diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix
new file mode 100644
index 00000000000..c34bb09b794
--- /dev/null
+++ b/pkgs/development/python-modules/traitlets/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, glibcLocales
+, pytest
+, mock
+, ipython_genutils
+, decorator
+, enum34
+}:
+
+buildPythonPackage rec {
+  pname = "traitlets";
+  version = "4.3.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835";
+  };
+
+  checkInputs = [ glibcLocales pytest mock ];
+  propagatedBuildInputs = [ ipython_genutils decorator enum34 ];
+
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" py.test $out
+  '';
+
+  meta = {
+    description = "Traitlets Python config system";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0be000b4a8d..de491248c45 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21026,32 +21026,7 @@ in {
 
   testtools = callPackage ../development/python-modules/testtools { };
 
-  traitlets = buildPythonPackage rec {
-    pname = "traitlets";
-    version = "4.3.2";
-    name = "${pname}-${version}";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835";
-    };
-
-    LC_ALL = "en_US.UTF-8";
-
-    buildInputs = with self; [ pkgs.glibcLocales pytest mock ];
-    propagatedBuildInputs = with self; [ipython_genutils decorator enum34];
-
-    checkPhase = ''
-      py.test $out
-    '';
-
-    meta = {
-      description = "Traitlets Python config system";
-      homepage = http://ipython.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  traitlets = callPackage ../development/python-modules/traitlets { };
 
   python_mimeparse = buildPythonPackage rec {
     name = "python-mimeparse-${version}";
-- 
GitLab


From b35a257dfd0118d9e018c14cea074c4a04da6497 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 13:33:54 +0100
Subject: [PATCH 199/877] python.pkgs.zipfile36: move expression

---
 .../python-modules/zipfile36/default.nix      | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +--------------
 2 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/zipfile36/default.nix

diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix
new file mode 100644
index 00000000000..0915eb002b7
--- /dev/null
+++ b/pkgs/development/python-modules/zipfile36/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, isPy3k
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "zipfile36";
+  version = "0.1.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest test_zipfile.py
+  '';
+
+  # Only works with Python 3.x.
+  # Not supposed to be used with 3.6 and up.
+  disabled = !(isPy3k && (pythonOlder "3.6"));
+
+  meta = {
+    description = "Read and write ZIP files - backport of the zipfile module from Python 3.6";
+    homepage = https://gitlab.com/takluyver/zipfile36;
+    license = lib.licenses.psfl;
+    maintainer = lib.maintainers.fridh;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de491248c45..6ac34955c2f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26190,31 +26190,7 @@ EOF
 
   zeroconf = callPackage ../development/python-modules/zeroconf { };
 
-  zipfile36 = buildPythonPackage rec {
-    pname = "zipfile36";
-    version = "0.1.3";
-    name = "${pname}-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-      sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead";
-    };
-
-    checkPhase = ''
-      ${python.interpreter} -m unittest test_zipfile.py
-    '';
-
-    # Only works with Python 3.x.
-    # Not supposed to be used with 3.6 and up.
-    disabled = !(isPy3k && (pythonOlder "3.6"));
-
-    meta = {
-      description = "Read and write ZIP files - backport of the zipfile module from Python 3.6";
-      homepage = https://gitlab.com/takluyver/zipfile36;
-      license = licenses.psfl;
-      maintainer = maintainers.fridh;
-    };
-  };
+  zipfile36 = callPackage ../development/python-modules/zipfile36 { };
 
   todoist = callPackage ../development/python-modules/todoist { };
 
-- 
GitLab


From 4ad0e0da320d1281d1a7e2c98ecc139d08396471 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 13:38:37 +0100
Subject: [PATCH 200/877] python.pkgs.nose-exclude: move expression

---
 .../python-modules/nose-exclude/default.nix   | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +--------------
 2 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/nose-exclude/default.nix

diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/pkgs/development/python-modules/nose-exclude/default.nix
new file mode 100644
index 00000000000..d9ec2f85fa2
--- /dev/null
+++ b/pkgs/development/python-modules/nose-exclude/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "nose-exclude";
+  version = "0.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304";
+  };
+
+  propagatedBuildInputs = [ nose ];
+
+  meta = {
+    license = lib.licenses.lgpl21;
+    description = "Exclude specific directories from nosetests runs";
+    homepage = https://github.com/kgrandis/nose-exclude;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ac34955c2f..9d27d091e93 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12862,25 +12862,7 @@ in {
     };
   };
 
-  nose-exclude = buildPythonPackage rec {
-    name = "nose-exclude-${version}";
-    version = "0.5.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/nose-exclude/${name}.tar.gz";
-      sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304";
-    };
-
-    propagatedBuildInputs = with self; [ nose ];
-
-    meta = {
-      license = licenses.lgpl21;
-      description = "Exclude specific directories from nosetests runs";
-      homepage = https://github.com/kgrandis/nose-exclude;
-      maintainers = with maintainers; [ fridh ];
-    };
-
-  };
+  nose-exclude = callPackage ../development/python-modules/nose-exclude { };
 
   nose-selecttests = buildPythonPackage rec {
     version = "0.4";
-- 
GitLab


From 5c2d2cbff321387bbada44ba86f7d422f53b88b7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 13:41:46 +0100
Subject: [PATCH 201/877] python.pkgs.numtraits: move expression

---
 .../python-modules/numtraits/default.nix      | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +-------------
 2 files changed, 34 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/numtraits/default.nix

diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix
new file mode 100644
index 00000000000..858b5ae594a
--- /dev/null
+++ b/pkgs/development/python-modules/numtraits/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, six
+, numpy
+, traitlets
+}:
+
+buildPythonPackage rec {
+  pname = "numtraits";
+  version = "0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ six numpy traitlets];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "Numerical traits for Python objects";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fridh ];
+    homepage = https://github.com/astrofrog/numtraits;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9d27d091e93..a80df277045 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13168,30 +13168,7 @@ in {
 
   numpy-stl = callPackage ../development/python-modules/numpy-stl { };
 
-  numtraits = buildPythonPackage rec {
-    pname = "numtraits";
-    version = "0.2";
-    name = "${pname}-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-      sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ six numpy traitlets];
-
-    checkPhase = ''
-      py.test
-    '';
-
-    meta = {
-      description = "Numerical traits for Python objects";
-      license = licenses.bsd2;
-      maintainers = with maintainers; [ fridh ];
-      homepage = https://github.com/astrofrog/numtraits;
-    };
-  };
+  numtraits = callPackage ../development/python-modules/numtraits { };
 
   nwdiag = buildPythonPackage rec {
     name = "nwdiag-1.0.3";
-- 
GitLab


From 416a975f74b965425831e829047f45f7e1502a11 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 13:44:43 +0100
Subject: [PATCH 202/877] python.pkgs.tabulate: move expression

---
 .../python-modules/tabulate/default.nix       | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +---------------
 2 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/tabulate/default.nix

diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix
new file mode 100644
index 00000000000..9ddc2a0e08b
--- /dev/null
+++ b/pkgs/development/python-modules/tabulate/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec {
+  version = "0.7.7";
+  pname = "tabulate";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6";
+  };
+
+  checkInputs = [ nose ];
+
+  # Tests: cannot import common (relative import).
+  doCheck = false;
+
+  meta = {
+    description = "Pretty-print tabular data";
+    homepage = https://bitbucket.org/astanin/python-tabulate;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a80df277045..3377c8c4fbb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20714,29 +20714,7 @@ in {
     inherit (pkgs) pkgconfig systemd;
   };
 
-  tabulate = buildPythonPackage rec {
-    version = "0.7.7";
-    pname = "tabulate";
-    name = "${pname}-${version}";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6";
-    };
-
-    buildInputs = with self; [ nose ];
-
-    # Tests: cannot import common (relative import).
-    doCheck = false;
-
-    meta = {
-      description = "Pretty-print tabular data";
-      homepage = https://bitbucket.org/astanin/python-tabulate;
-      license = licenses.mit;
-      maintainers = with maintainers; [ fridh ];
-    };
-
-  };
+  tabulate = callPackage ../development/python-modules/tabulate { };
 
   targetcli_fb = buildPythonPackage rec {
     version = "2.1.fb33";
-- 
GitLab


From a3b1f775332a1fd91b58bd5149409f3da7142dd2 Mon Sep 17 00:00:00 2001
From: Evan Wallace <mankarse.git@alethrea.net>
Date: Sun, 29 Oct 2017 12:54:26 +0000
Subject: [PATCH 203/877] lua5_3: 5.3.0 -> 5.3.4 Updated to latest upstream
 version

---
 pkgs/development/interpreters/lua-5/5.3.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix
index c1d313a3656..a512a251313 100644
--- a/pkgs/development/interpreters/lua-5/5.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.3.nix
@@ -5,11 +5,11 @@
 stdenv.mkDerivation rec {
   name = "lua-${version}";
   luaversion = "5.3";
-  version = "${luaversion}.0";
+  version = "${luaversion}.4";
 
   src = fetchurl {
-    url = "http://www.lua.org/ftp/${name}.tar.gz";
-    sha256 = "00fv1p6dv4701pyjrlvkrr6ykzxqy9hy1qxzj6qmwlb0ssr5wjmf";
+    url = "https://www.lua.org/ftp/${name}.tar.gz";
+    sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn";
   };
 
   nativeBuildInputs = [ readline ];
-- 
GitLab


From 67bee16731a5d26fa7d1edf3b922a554b30bbea1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 13:54:56 +0100
Subject: [PATCH 204/877] python.pkgs.recommonmark: move expression

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

diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix
new file mode 100644
index 00000000000..e03bd353627
--- /dev/null
+++ b/pkgs/development/python-modules/recommonmark/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, sphinx
+, CommonMark_54
+, docutils
+}:
+
+buildPythonPackage rec {
+  pname = "recommonmark";
+  name = "${pname}-${version}";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d";
+  };
+
+  checkInputs = [ pytest sphinx ];
+  propagatedBuildInputs = [ CommonMark_54 docutils ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "A docutils-compatibility bridge to CommonMark";
+    homepage = https://github.com/rtfd/recommonmark;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3377c8c4fbb..a6c3e163f83 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18049,27 +18049,7 @@ in {
   # use requests, not requests_2
   requests = callPackage ../development/python-modules/requests { };
 
-  requests_download = buildPythonPackage rec {
-    pname = "requests_download";
-    version = "0.1.1";
-    name = "${pname}-${version}";
-
-    format = "wheel";
-
-    src = pkgs.fetchurl {
-      url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl;
-      sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7";
-    };
-
-    propagatedBuildInputs = with self; [ requests ];
-
-    meta = {
-      description = "Download files using requests and save them to a target path";
-      homepage = https://www.github.com/takluyver/requests_download;
-      license = licenses.mit;
-      maintainer = maintainers.fridh;
-    };
-  };
+  requests_download = callPackage ../development/python-modules/requests_download { };
 
   requestsexceptions = callPackage ../development/python-modules/requestsexceptions {};
 
@@ -18194,26 +18174,7 @@ in {
 
   rcssmin = callPackage ../development/python-modules/rcssmin { };
 
-  recommonmark = buildPythonPackage rec {
-    name = "recommonmark-${version}";
-    version = "0.4.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/recommonmark/${name}.tar.gz";
-      sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d";
-    };
-
-    buildInputs = with self; [ pytest sphinx ];
-    propagatedBuildInputs = with self; [ CommonMark_54 docutils ];
-
-    meta = {
-      description = "A docutils-compatibility bridge to CommonMark";
-      homepage = https://github.com/rtfd/recommonmark;
-      license = licenses.mit;
-      maintainers = with maintainers; [ fridh ];
-    };
-
-  };
+  recommonmark = callPackage ../development/python-modules/recommonmark { };
 
   redis = callPackage ../development/python-modules/redis { };
 
-- 
GitLab


From 8a77a30bc18761de935bcb58fe1074a048741725 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Sun, 29 Oct 2017 00:20:52 +0200
Subject: [PATCH 205/877] install documentation: document
 boot.loader.grub.useOSProber

---
 nixos/doc/manual/installation/installing.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 94d8e9d2e1a..b0674307a56 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -140,6 +140,11 @@
     the GRUB boot loader is to be installed.  Without it, NixOS cannot
     boot.</para>
 
+    <para>If there are other operating systems running on the machine before
+    installing NixOS, the
+    <option>boot.loader.grub.useOSProber</option> option can be set to
+    <literal>true</literal> to automatically add them to the grub menu.</para>
+
     <para>Another critical option is <option>fileSystems</option>,
     specifying the file systems that need to be mounted by NixOS.
     However, you typically don’t need to set it yourself, because
-- 
GitLab


From 1450f6cdb3010c407c6ca0e3aa9dae64edae842a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Oct 2017 15:13:57 +0100
Subject: [PATCH 206/877] python.pkgs.requests_download: add missing file,
 fixes eval

---
 .../requests_download/default.nix             | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/requests_download/default.nix

diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix
new file mode 100644
index 00000000000..4e2646eb6ab
--- /dev/null
+++ b/pkgs/development/python-modules/requests_download/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "requests_download";
+  version = "0.1.1";
+  name = "${pname}-${version}";
+
+  format = "wheel";
+
+  #src = pkgs.fetchurl {
+  #  url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl;
+  #  sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7";
+  #};
+
+  src = fetchPypi {
+    inherit pname version format;
+    sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = {
+    description = "Download files using requests and save them to a target path";
+    homepage = https://www.github.com/takluyver/requests_download;
+    license = lib.licenses.mit;
+    maintainer = lib.maintainers.fridh;
+  };
+}
\ No newline at end of file
-- 
GitLab


From afc66e121d124a2229b56aa37102034136c70f7e Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Sun, 29 Oct 2017 12:27:58 +0100
Subject: [PATCH 207/877] vulnix: 1.2.2 -> 1.3.4

The build needs the ZODB fix in PR #30925 to succeed.
---
 lib/maintainers.nix                    |  1 +
 pkgs/tools/security/vulnix/default.nix | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 29b7b589fef..7c3a845c00c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -116,6 +116,7 @@
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
   ciil = "Simon Lackerbauer <simon@lackerbauer.com>";
   ckampka = "Christian Kampka <christian@kampka.net>";
+  ckauhaus = "Christian Kauhaus <christian@kauhaus.de>";
   cko = "Christine Koppelt <christine.koppelt@gmail.com>";
   cleverca22 = "Michael Bishop <cleverca22@gmail.com>";
   cmcdragonkai = "Roger Qiu <roger.qiu@matrix.ai>";
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index 1beb2268fc6..c86891d8ccd 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -3,19 +3,15 @@
 pythonPackages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "vulnix";
-  version = "1.2.2";
+  version = "1.3.4";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "1ia9plziwach0bxnlcd33q30kcsf8sv0nf2jc78gsmrqnxjabr12";
+    sha256 = "1js1i86pgkkqc9yzp1rck7rmaz79klv4048r9z7v56fam0a6sg05";
   };
 
   buildInputs = with pythonPackages; [ flake8 pytest pytestcov ];
 
-  postPatch = ''
-    sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py
-  '';
-
   propagatedBuildInputs = [
     nix
   ] ++ (with pythonPackages; [
@@ -27,12 +23,16 @@ pythonPackages.buildPythonApplication rec {
     zodb
   ]);
 
+  postPatch = ''
+    sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py
+  '';
+
   checkPhase = "py.test";
 
   meta = with stdenv.lib; {
     description = "NixOS vulnerability scanner";
     homepage = https://github.com/flyingcircusio/vulnix;
     license = licenses.bsd2;
-    maintainers = with maintainers; [ plumps ];
+    maintainers = with maintainers; [ ckauhaus plumps ];
   };
 }
-- 
GitLab


From 3afcba3e0a92522e42d3243df9235c30de4889e6 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@web.de>
Date: Sun, 29 Oct 2017 17:19:18 +0100
Subject: [PATCH 208/877] mupdf: correct license meta information

The website of MuPDF says that MuPDF is licensed under the terms of the GNU
Affero General Public License. However, I didn't see which version of that
license they mean.

A clear statement that MuPDF is licensed under the terms of AGPL >= 3 is
included in the README file of their Git repository:

    git://git.ghostscript.com/mupdf.git
---
 pkgs/applications/misc/mupdf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index a111e76df0c..b50d99466f8 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
     homepage = http://mupdf.com;
     repositories.git = git://git.ghostscript.com/mupdf.git;
     description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
-    license = licenses.gpl3Plus;
+    license = licenses.agpl3Plus;
     maintainers = with maintainers; [ viric vrthra fpletz ];
     platforms = platforms.linux;
   };
-- 
GitLab


From defebc885019e0219f93ded13d7dc9528fbe77e6 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Sun, 29 Oct 2017 14:10:13 -0400
Subject: [PATCH 209/877] corebird: 1.6 -> 1.7.1

Update corebird to the latest release.
---
 pkgs/applications/networking/corebird/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 412335094ff..54fc72fbfae 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -3,14 +3,14 @@
 , glib_networking }:
 
 stdenv.mkDerivation rec {
-  version = "1.6";
+  version = "1.7.1";
   name = "corebird-${version}";
 
   src = fetchFromGitHub {
     owner = "baedert";
     repo = "corebird";
     rev = version;
-    sha256 = "1bxjlamdy5d2j3xdahmxf6lwc7f6xdfxbzi712ppvh1dwggw654v";
+    sha256 = "1g6wkzrl6j0mmgafpv0jpqa906s1x7p5hmiqdgs9qwm7q2wlwrqd";
   };
 
   preConfigure = ''
-- 
GitLab


From 9e37df185c75a2ba7724ae4ce5ce3c356c1ce225 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 29 Oct 2017 14:42:55 -0400
Subject: [PATCH 210/877] fwupd: Remove manual rpath settings now that meson is
 fixed.

Thanks @yegortimoshenko!
---
 .../tools/build-managers/meson/default.nix    |  2 +-
 .../linux/firmware/fwupd/default.nix          | 31 ++-----------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 1c2e726cdc5..8e4c5d4801a 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
     sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py
   '';
 
-  setupHook = ./setup-hook.sh;    
+  setupHook = ./setup-hook.sh;
 
   meta = with lib; {
     homepage = http://mesonbuild.com;
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 455defa5823..09ca05484f7 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -1,30 +1,10 @@
 { stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool
 , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive
 , libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar
-, fwupdate, libgpgerror, libyaml, valgrind, meson, libuuid, pygobject3
-, pillow, ninja, gcab, makeWrapper, glib, gdk_pixbuf
+, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3
+, pillow, ninja, gcab
 }:
 let version = "0.9.6";
-    rpath = stdenv.lib.makeLibraryPath
-      [ libuuid.out
-        appstream-glib
-        glib
-        libsoup
-        gdk_pixbuf
-        libarchive.lib
-        gcab
-        sqlite.out
-        gusb
-        polkit.out
-        gpgme
-        libgpgerror
-        libelf
-        efivar
-        libsmbios
-        fwupdate
-        libgudev
-        "$out"
-      ];
 in
   stdenv.mkDerivation
     { name = "fwupd-${version}";
@@ -36,18 +16,13 @@ in
         [ gtk_doc pkgconfig gobjectIntrospection intltool libgudev
           polkit appstream-glib gusb sqlite libarchive libsoup
           docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind
-          meson gpgme libuuid pygobject3 pillow ninja gcab makeWrapper
+          meson gpgme libuuid pygobject3 pillow ninja gcab
         ];
       patches = [ ./fix-missing-deps.patch ];
       preConfigure = ''
         export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${efivar}/include/efivar"
       '';
       mesonFlags = [ "-Denable-colorhug=false" "-Denable-man=false" "-Denable-tests=false" "--localstatedir=/var" "-Denable-doc=false" "-Dwith-bootdir=/boot" ];
-      postFixup = ''
-        for prog in $out/bin/* $out/libexec/fwupd/*; do
-          wrapProgram "$prog" --prefix LD_LIBRARY_PATH : ${rpath}
-        done
-      '';
       enableParallelBuilding = true;
       meta =
         { license = [ stdenv.lib.licenses.gpl2 ];
-- 
GitLab


From a626aa17b00cd62e31a704daf6acc989629fe74e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 29 Oct 2017 15:42:21 -0400
Subject: [PATCH 211/877] lame: 3.99.5 -> 3.100

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

diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index b324494faff..cc077a78a65 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -23,15 +23,13 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "lame-${version}";
-  version = "3.99.5";
+  version = "3.100";
 
   src = fetchurl {
     url = "mirror://sourceforge/lame/${name}.tar.gz";
-    sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14";
+    sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx";
   };
 
-  patches = [ ./gcc-4.9.patch ];
-
   outputs = [ "out" "lib" "doc" ]; # a small single header
   outputMan = "out";
 
-- 
GitLab


From e270f158ac2319dddc9a44ae2512c4aba1855a60 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 29 Oct 2017 15:54:18 -0400
Subject: [PATCH 212/877] lightdm: 1.22.0 -> 1.24.0

---
 pkgs/applications/display-managers/lightdm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 452cb38f126..e82d4c69def 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -7,15 +7,15 @@
 with stdenv.lib;
 
 let
-  ver_branch = "1.22";
-  version = "1.22.0";
+  ver_branch = "1.24";
+  version = "1.24.0";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
-    sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4";
+    sha256 = "18j33bm54i8k7ncxcs69zqi4105s62n58jrydqn3ikrb71s9nl6d";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
-- 
GitLab


From cbe326feb88c380dbee2a9b500fd32a307f71cf6 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Sun, 29 Oct 2017 21:32:40 +0100
Subject: [PATCH 213/877] rustup: Patch rustup to patchelf binaries

---
 .../0001-dynamically-patchelf-binaries.patch  | 54 +++++++++++++
 .../0001-use-hardcoded-dynamic-linker.patch   | 75 -------------------
 .../development/tools/rust/rustup/default.nix |  8 +-
 3 files changed, 59 insertions(+), 78 deletions(-)
 create mode 100644 pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
 delete mode 100644 pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch

diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
new file mode 100644
index 00000000000..4d77cf45d41
--- /dev/null
+++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
@@ -0,0 +1,54 @@
+From c21cc756b69a5f33c8a7758b746a816f40f55932 Mon Sep 17 00:00:00 2001
+From: Leon Isenberg <ljli@users.noreply.github.com>
+Date: Sat, 28 Oct 2017 17:58:17 +0200
+Subject: [PATCH] nix customization: patchelf installed binaries
+
+---
+ src/rustup-dist/src/component/package.rs | 24 +++++++++++++++++++++++-
+ 1 file changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs
+index 8aa63db9..4d219826 100644
+--- a/src/rustup-dist/src/component/package.rs
++++ b/src/rustup-dist/src/component/package.rs
+@@ -99,7 +99,13 @@ impl Package for DirectoryPackage {
+             let src_path = root.join(&path);
+ 
+             match &*part.0 {
+-                "file" => try!(builder.copy_file(path.clone(), &src_path)),
++                "file" => {
++                    try!(builder.copy_file(path.clone(), &src_path));
++                    nix_patchelf_if_needed(
++                        &target.prefix().path().join(path.clone()),
++                        &src_path,
++                    )
++                }
+                 "dir" => try!(builder.copy_dir(path.clone(), &src_path)),
+                 _ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()),
+             }
+@@ -117,6 +123,22 @@ impl Package for DirectoryPackage {
+     }
+ }
+ 
++fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) {
++    let is_bin = if let Some(p) = src_path.parent() {
++        p.ends_with("bin")
++    } else {
++        false
++    };
++
++    if is_bin {
++        let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
++            .arg("--set-interpreter")
++            .arg("@dynamicLinker@")
++            .arg(dest_path)
++            .output();
++    }
++}
++
+ // On Unix we need to set up the file permissions correctly so
+ // binaries are executable and directories readable. This shouldn't be
+ // necessary: the source files *should* have the right permissions,
+-- 
+2.14.1
+
diff --git a/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch b/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch
deleted file mode 100644
index 3b429c1745e..00000000000
--- a/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 36c053f37670c6003f9e8dc001741f7c49e9526a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
-Date: Sat, 15 Apr 2017 20:42:10 +0200
-Subject: [PATCH] use hardcoded dynamic-linker
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
----
- src/rustup-cli/common.rs |  3 ++-
- src/rustup/toolchain.rs  | 22 ++++++++++++++++++++--
- 2 files changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs
-index 1abf345..21096e7 100644
---- a/src/rustup-cli/common.rs
-+++ b/src/rustup-cli/common.rs
-@@ -220,7 +220,8 @@ pub fn rustc_version(toolchain: &Toolchain) -> String {
-     if toolchain.exists() {
-         let rustc_path = toolchain.binary_file("rustc");
-         if utils::is_file(&rustc_path) {
--            let mut cmd = Command::new(&rustc_path);
-+            let mut cmd = Command::new("@dynamicLinker@");
-+            cmd.arg(&rustc_path);
-             cmd.arg("--version");
-             toolchain.set_ldpath(&mut cmd);
- 
-diff --git a/src/rustup/toolchain.rs b/src/rustup/toolchain.rs
-index dc29c32..212a4ab 100644
---- a/src/rustup/toolchain.rs
-+++ b/src/rustup/toolchain.rs
-@@ -315,7 +315,7 @@ impl<'a> Toolchain<'a> {
-             }
-             Path::new(&binary)
-         };
--        let mut cmd = Command::new(&path);
-+        let mut cmd = wrap_elf_interpreter(&path);
-         self.set_env(&mut cmd);
-         Ok(cmd)
-     }
-@@ -363,7 +363,7 @@ impl<'a> Toolchain<'a> {
-         } else {
-             src_file
-         };
--        let mut cmd = Command::new(exe_path);
-+        let mut cmd = wrap_elf_interpreter(exe_path);
-         self.set_env(&mut cmd);
-         cmd.env("RUSTUP_TOOLCHAIN", &primary_toolchain.name);
-         Ok(cmd)
-@@ -648,3 +648,21 @@ impl<'a> Toolchain<'a> {
-         path
-     }
- }
-+
-+fn wrap_elf_interpreter<S: AsRef<OsStr>>(p: S) -> Command {
-+    use std::fs::File;
-+    use std::io::Read;
-+    let path = Path::new(&p);
-+    let is_elf = File::open(path).map(|mut f| {
-+        let mut buf = [0; 4];
-+        let _ = f.read(&mut buf);
-+        buf == b"\x7fELF"[..]
-+    }).unwrap_or(false);
-+    if is_elf {
-+        let mut cmd = Command::new("@dynamicLinker@");
-+        cmd.arg(&path);
-+        cmd
-+    } else {
-+        Command::new(&path)
-+    }
-+}
--- 
-2.12.2
-
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 65599ad8d18..3106048e674 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, runCommand
+{ stdenv, lib, runCommand, patchelf
 , fetchFromGitHub, rustPlatform
 , pkgconfig, curl, Security }:
 
@@ -24,9 +24,11 @@ rustPlatform.buildRustPackage rec {
   cargoBuildFlags = [ "--features no-self-update" ];
 
   patches = lib.optionals stdenv.isLinux [
-    (runCommand "0001-use-hardcoded-dynamic-linker.patch" { CC=stdenv.cc; } ''
+    (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; } ''
        export dynamicLinker=$(cat $CC/nix-support/dynamic-linker)
-       substituteAll ${./0001-use-hardcoded-dynamic-linker.patch} $out
+       substitute ${./0001-dynamically-patchelf-binaries.patch} $out \
+         --subst-var patchelf \
+         --subst-var dynamicLinker
     '')
   ];
 
-- 
GitLab


From 9e5ba4eb8b5253c24b56a42fa7606d8c3c7e0678 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Sun, 29 Oct 2017 21:34:15 +0100
Subject: [PATCH 214/877] rustup: 1.3.0 -> 2017-10-29

---
 pkgs/development/tools/rust/rustup/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 3106048e674..b7065cc5d7d 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -4,15 +4,15 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rustup-${version}";
-  version = "1.3.0";
+  version = "2017-10-29";
 
-  cargoSha256 = "1yd7k0jpx78p5bp6iyzgbyj7pjz8vyjg9g7fmf1bl60jsbdpgv3g";
+  cargoSha256 = "1xwxv8y9xjgdmm92ldrn9m9fml2zb5h7qqm7dhw63j6psb3ajqrw";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rustup.rs";
-    rev = version;
-    sha256 = "199jlqqidzak7nxmv2nzjzv7zfzy9z7hw6h8d8wf1rbfdwd9l6hs";
+    rev = "13c8092507bf646f3ef6a621fe2c5a68212e800f";
+    sha256 = "1qd01rjk9qpfzgqs35f5nxrcf00kmf76zwmgj3yzdig9zymjwndg";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 36ff83402aa8d5a06d06140d1a6216e9f5bb6382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 14:13:52 +0100
Subject: [PATCH 215/877] pythonPackages.autopep8: move to python-modules/

---
 .../python-modules/autopep8/default.nix       | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +-----------------
 2 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/autopep8/default.nix

diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
new file mode 100644
index 00000000000..6dc091624c5
--- /dev/null
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, buildPythonPackage, pep8 }:
+
+buildPythonPackage rec {
+  name = "autopep8-1.0.4";
+
+  src = fetchurl {
+    url = "mirror://pypi/a/autopep8/${name}.tar.gz";
+    sha256 = "17lydqm8y9a5qadp6iifxrb5mb0g9fr1vxn5qy1fjpyhazxaw8n1";
+  };
+
+  propagatedBuildInputs = [ pep8 ];
+
+  # One test fails:
+  # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A tool that automatically formats Python code to conform to the PEP 8 style guide";
+    homepage = https://pypi.python.org/pypi/autopep8/;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7da6d973a81..75ed9bf9cc0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -674,28 +674,7 @@ in {
     };
   };
 
-  autopep8 = buildPythonPackage (rec {
-    name = "autopep8-1.0.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/autopep8/${name}.tar.gz";
-      sha256 = "17lydqm8y9a5qadp6iifxrb5mb0g9fr1vxn5qy1fjpyhazxaw8n1";
-    };
-
-    propagatedBuildInputs = with self; [ pep8 ];
-
-    # One test fails:
-    # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests)
-    doCheck = false;
-
-    meta = {
-      description = "A tool that automatically formats Python code to conform to the PEP 8 style guide";
-      homepage = https://pypi.python.org/pypi/autopep8/;
-      license = licenses.mit;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  });
+  autopep8 = callPackage ../development/python-modules/autopep8 { };
 
   av = buildPythonPackage rec {
     name = "av-${version}";
-- 
GitLab


From 4c0582d47dbed105ca9c7507a4f365a7ae0e8b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 14:26:15 +0100
Subject: [PATCH 216/877] pythonPackages.blockdiag: move to python-modules/

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

diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix
new file mode 100644
index 00000000000..fed6f6e9219
--- /dev/null
+++ b/pkgs/development/python-modules/blockdiag/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
+, pillow, webcolors, funcparserlib
+}:
+
+buildPythonPackage rec {
+  name = "blockdiag-${version}";
+  version = "1.5.3";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
+    sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f";
+  };
+
+  buildInputs = [ pep8 nose unittest2 docutils ];
+
+  propagatedBuildInputs = [ pillow webcolors funcparserlib ];
+
+  # One test fails:
+  #   ...
+  #   FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Generate block-diagram image from spec-text file (similar to Graphviz)";
+    homepage = http://blockdiag.com/;
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 75ed9bf9cc0..67ea140586d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2012,33 +2012,7 @@ in {
     };
   };
 
-
-  blockdiag = buildPythonPackage rec {
-    name = "blockdiag-${version}";
-    version = "1.5.3";
-
-    src = pkgs.fetchurl {
-      url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
-      sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f";
-    };
-
-    buildInputs = with self; [ pep8 nose unittest2 docutils ];
-
-    propagatedBuildInputs = with self; [ pillow webcolors funcparserlib ];
-
-    # One test fails:
-    #   ...
-    #   FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams)
-    doCheck = false;
-
-    meta = {
-      description = "Generate block-diagram image from spec-text file (similar to Graphviz)";
-      homepage = http://blockdiag.com/;
-      license = licenses.asl20;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  blockdiag = callPackage ../development/python-modules/blockdiag { };
 
   bpython = callPackage ../development/python-modules/bpython {};
 
-- 
GitLab


From 0bc9f75dc16442abab86abcbab67dfe885378f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 14:32:12 +0100
Subject: [PATCH 217/877] pythonPackages.construct: move to python-modules/

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

diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
new file mode 100644
index 00000000000..1845d7ec94f
--- /dev/null
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, six, pythonOlder }:
+
+buildPythonPackage rec {
+  name = "construct-${version}";
+  version = "2.8.10";
+
+  src = fetchFromGitHub {
+    owner = "construct";
+    repo = "construct";
+    rev = "v${version}";
+    sha256 = "1xfmmc5pihn3ql9f7blrciy06y2bwczqvkbcpvh96dmgqwc3wys3";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  # Tests fail with the following error on Python 3.5+
+  # TypeError: not all arguments converted during string formatting
+  doCheck = pythonOlder "3.5";
+
+  meta = with stdenv.lib; {
+    description = "Powerful declarative parser (and builder) for binary data";
+    homepage = http://construct.readthedocs.org/;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67ea140586d..472f84c274d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3044,33 +3044,7 @@ in {
 
   confluent-kafka = callPackage ../development/python-modules/confluent-kafka {};
 
-
-  construct = buildPythonPackage rec {
-    name = "construct-${version}";
-    version = "2.8.10";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "construct";
-      repo = "construct";
-      rev = "v${version}";
-      sha256 = "1xfmmc5pihn3ql9f7blrciy06y2bwczqvkbcpvh96dmgqwc3wys3";
-    };
-
-    propagatedBuildInputs = with self; [ six ];
-
-    # Tests fail with the following error on Python 3.5+
-    # TypeError: not all arguments converted during string formatting
-    doCheck = pythonOlder "3.5";
-
-    meta = {
-      description = "Powerful declarative parser (and builder) for binary data";
-      homepage = http://construct.readthedocs.org/;
-      license = licenses.mit;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
-
+  construct = callPackage ../development/python-modules/construct {};
 
   consul = buildPythonPackage (rec {
     name = "python-consul-0.7.0";
-- 
GitLab


From 95f29282fb57060adc8f7083ad0b4e3348ddf643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 14:37:00 +0100
Subject: [PATCH 218/877] pythonPackages.pycollada: move to python-modules/

---
 .../python-modules/pycollada/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +-----------------
 2 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/pycollada/default.nix

diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix
new file mode 100644
index 00000000000..fec32b86aaf
--- /dev/null
+++ b/pkgs/development/python-modules/pycollada/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, buildPythonPackage, numpy, isPy3k, dateutil, dateutil_1_5 }:
+
+buildPythonPackage rec {
+  name = "pycollada-0.4.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pycollada/${name}.tar.gz";
+    sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv";
+  };
+
+  buildInputs = [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]);
+
+  # Some tests fail because they refer to test data files that don't exist
+  # (upstream packaging issue)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python library for reading and writing collada documents";
+    homepage = http://pycollada.github.io/;
+    license = "BSD"; # they don't specify which BSD variant
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 472f84c274d..bfaae8485a3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3643,28 +3643,7 @@ in {
 
   cffi = callPackage ../development/python-modules/cffi { };
 
-  pycollada = buildPythonPackage rec {
-    name = "pycollada-0.4.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pycollada/${name}.tar.gz";
-      sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv";
-    };
-
-    buildInputs = with self; [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]);
-
-    # Some tests fail because they refer to test data files that don't exist
-    # (upstream packaging issue)
-    doCheck = false;
-
-    meta = {
-      description = "Python library for reading and writing collada documents";
-      homepage = http://pycollada.github.io/;
-      license = "BSD"; # they don't specify which BSD variant
-      platforms = with platforms; linux ++ darwin;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  pycollada = callPackage ../development/python-modules/pycollada { };
 
   pycontracts = buildPythonPackage rec {
     version = "1.7.9";
-- 
GitLab


From 34dbc6c01cc0adb64f2e825032ba63e8670c113b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 14:42:50 +0100
Subject: [PATCH 219/877] pythonPackages.dpkt: move to python-modules/

---
 .../python-modules/dpkt/default.nix           | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +-----------------
 2 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/dpkt/default.nix

diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix
new file mode 100644
index 00000000000..87b5bd6b812
--- /dev/null
+++ b/pkgs/development/python-modules/dpkt/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
+
+buildPythonPackage rec {
+  name = "dpkt-1.8";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "https://dpkt.googlecode.com/files/${name}.tar.gz";
+    sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols";
+    homepage = https://code.google.com/p/dpkt/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ bjornfor ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bfaae8485a3..02b4239349c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4906,26 +4906,7 @@ in {
     };
   };
 
-  dpkt = buildPythonPackage rec {
-    name = "dpkt-1.8";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "https://dpkt.googlecode.com/files/${name}.tar.gz";
-      sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols";
-      homepage = https://code.google.com/p/dpkt/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ bjornfor ];
-      platforms = platforms.all;
-    };
-  };
+  dpkt = callPackage ../development/python-modules/dpkt {};
 
   urllib3 = callPackage ../development/python-modules/urllib3 {};
 
-- 
GitLab


From 9e76c950a70f0482abe10b9a34ce43edfae5031a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 14:51:29 +0100
Subject: [PATCH 220/877] pythonPackages.gevent: move to python-modules/

---
 .../python-modules/gevent/default.nix         | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 35 +-----------------
 2 files changed, 37 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/development/python-modules/gevent/default.nix

diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
new file mode 100644
index 00000000000..8a3d3b3d09b
--- /dev/null
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, buildPythonPackage, isPyPy, python, libev, greenlet }:
+
+buildPythonPackage rec {
+  name = "gevent-1.1.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/g/gevent/${name}.tar.gz";
+    sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c";
+  };
+
+  # Why do we have this patch?
+  postPatch = ''
+    substituteInPlace libev/ev.c --replace \
+      "ecb_inline void ecb_unreachable (void) ecb_noreturn" \
+      "ecb_inline ecb_noreturn void ecb_unreachable (void)"
+  '';
+
+  buildInputs = [ libev ];
+  propagatedBuildInputs = stdenv.lib.optionals (!isPyPy) [ greenlet ];
+
+  checkPhase = ''
+    cd greentest
+    ${python.interpreter} testrunner.py
+  '';
+
+  # Bunch of failures.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Coroutine-based networking library";
+    homepage = http://www.gevent.org/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 02b4239349c..625dfba69aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9445,40 +9445,7 @@ in {
     };
   };
 
-  gevent = buildPythonPackage rec {
-    name = "gevent-1.1.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/gevent/${name}.tar.gz";
-      sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c";
-    };
-
-    # Why do we have this patch?
-    postPatch = ''
-      substituteInPlace libev/ev.c --replace \
-        "ecb_inline void ecb_unreachable (void) ecb_noreturn" \
-        "ecb_inline ecb_noreturn void ecb_unreachable (void)"
-    '';
-
-    buildInputs = with self; [ pkgs.libev ];
-    propagatedBuildInputs = with self; optionals (!isPyPy) [ greenlet ];
-
-    checkPhase = ''
-      cd greentest
-      ${python.interpreter} testrunner.py
-    '';
-
-    # Bunch of failures.
-    doCheck = false;
-
-    meta = {
-      description = "Coroutine-based networking library";
-      homepage = http://www.gevent.org/;
-      license = licenses.mit;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  gevent = callPackage ../development/python-modules/gevent { };
 
   geventhttpclient = buildPythonPackage rec {
     name = "geventhttpclient-${version}";
-- 
GitLab


From afd4a17ee5abada65616b0f3566813c08b7c4376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 15:22:33 +0100
Subject: [PATCH 221/877] pythonPackages.nwdiag: move to python-modules/

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 625dfba69aa..9b14717bd00 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13012,29 +13012,7 @@ in {
 
   numtraits = callPackage ../development/python-modules/numtraits { };
 
-  nwdiag = buildPythonPackage rec {
-    name = "nwdiag-1.0.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/nwdiag/${name}.tar.gz";
-      sha256 = "0n7ary1fngxk8bk15vabc8fhnmxlh098piciwaviwn7l4a5q1zys";
-    };
-
-    buildInputs = with self; [ pep8 nose unittest2 docutils ];
-
-    propagatedBuildInputs = with self; [ blockdiag ];
-
-    # tests fail
-    doCheck = false;
-
-    meta = {
-      description = "Generate network-diagram image from spec-text file (similar to Graphviz)";
-      homepage = http://blockdiag.com/;
-      license = licenses.asl20;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  nwdiag = callPackage ../development/python-modules/nwdiag { };
 
   dynd = buildPythonPackage rec {
     version = "0.7.2";
-- 
GitLab


From 6de28d760acec6f664ad5f20d508594cd62a894c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 15:25:44 +0100
Subject: [PATCH 222/877] pythonPackages.Pyro: move to python-modules/

---
 .../python-modules/pyro/default.nix           | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +-----------------
 2 files changed, 20 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyro/default.nix

diff --git a/pkgs/development/python-modules/pyro/default.nix b/pkgs/development/python-modules/pyro/default.nix
new file mode 100644
index 00000000000..dbad83bef7e
--- /dev/null
+++ b/pkgs/development/python-modules/pyro/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
+
+buildPythonPackage rec {
+  name = "Pyro-3.16";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "mirror://pypi/P/Pyro/${name}.tar.gz";
+    sha256 = "1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Distributed object middleware for Python (IPC/RPC)";
+    homepage = http://pythonhosted.org/Pyro/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9b14717bd00..6359f3e16d8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16818,23 +16818,7 @@ in {
     };
   });
 
-  Pyro = buildPythonPackage (rec {
-    name = "Pyro-3.16";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/P/Pyro/${name}.tar.gz";
-      sha256 = "1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578";
-    };
-
-    meta = {
-      description = "Distributed object middleware for Python (IPC/RPC)";
-      homepage = http://pythonhosted.org/Pyro/;
-      license = licenses.mit;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  });
+  Pyro = callPackage ../development/python-modules/pyro { };
 
   pyrsistent = buildPythonPackage (rec {
     name = "pyrsistent-0.11.12";
-- 
GitLab


From 3ab65ef6bf0206a4d9f85ef283dcd90e9d4d2a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 15:28:59 +0100
Subject: [PATCH 223/877] pythonPackages.robomachine: move to python-modules/

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

diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix
new file mode 100644
index 00000000000..1e7b020cd51
--- /dev/null
+++ b/pkgs/development/python-modules/robomachine/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, buildPythonPackage, pyparsing, argparse, robotframework }:
+
+buildPythonPackage rec {
+  name = "robomachine-0.6";
+
+  src = fetchurl {
+    url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz";
+    sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54";
+  };
+
+  propagatedBuildInputs = [ pyparsing argparse robotframework ];
+
+  # Remove Windows .bat files
+  postInstall = ''
+    rm "$out/bin/"*.bat
+  '';
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "argparse" ""
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Test data generator for Robot Framework";
+    homepage = https://github.com/mkorpela/RoboMachine;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6359f3e16d8..c110ce8a3a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18246,32 +18246,7 @@ in {
 
   restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { };
 
-  robomachine = buildPythonPackage rec {
-    name = "robomachine-0.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz";
-      sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54";
-    };
-
-    propagatedBuildInputs = with self; [ pyparsing argparse robotframework ];
-
-    # Remove Windows .bat files
-    postInstall = ''
-      rm "$out/bin/"*.bat
-    '';
-
-    postPatch = ''
-      substituteInPlace setup.py --replace "argparse" ""
-    '';
-
-    meta = {
-      description = "Test data generator for Robot Framework";
-      homepage = https://github.com/mkorpela/RoboMachine;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  robomachine = callPackage ../development/python-modules/robomachine { };
 
   robotframework = buildPythonPackage rec {
     version = "3.0.2";
-- 
GitLab


From b6d345c4b0791408ae69d7e34e9f3f4bf5fe5c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 15:40:13 +0100
Subject: [PATCH 224/877] pythonPackages.robotframework: move to
 python-modules/

---
 .../python-modules/robotframework/default.nix | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +------------------
 2 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/robotframework/default.nix

diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix
new file mode 100644
index 00000000000..e0a05eb2e25
--- /dev/null
+++ b/pkgs/development/python-modules/robotframework/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
+
+buildPythonPackage rec {
+  version = "3.0.2";
+  name = "robotframework-${version}";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "mirror://pypi/r/robotframework/${name}.tar.gz";
+    sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Generic test automation framework";
+    homepage = http://robotframework.org/;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c110ce8a3a5..dc8559acd48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18248,25 +18248,7 @@ in {
 
   robomachine = callPackage ../development/python-modules/robomachine { };
 
-  robotframework = buildPythonPackage rec {
-    version = "3.0.2";
-    name = "robotframework-${version}";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/robotframework/${name}.tar.gz";
-      sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610";
-    };
-
-    meta = {
-      description = "Generic test automation framework";
-      homepage = http://robotframework.org/;
-      license = licenses.asl20;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
-
+  robotframework = callPackage ../development/python-modules/robotframework { };
 
   robotframework-selenium2library = buildPythonPackage rec {
     version = "1.6.0";
-- 
GitLab


From fb3973a43e5475c63463fc30fbdbf3e3cecf7c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 15:43:01 +0100
Subject: [PATCH 225/877] pythonPackages.robotframework-ride: move to
 python-modules/

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

diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix
new file mode 100644
index 00000000000..a9b536fc76e
--- /dev/null
+++ b/pkgs/development/python-modules/robotframework-ride/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }:
+
+buildPythonPackage rec {
+  version = "1.2.3";
+  name = "robotframework-ride-${version}";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz";
+    sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j";
+  };
+
+  propagatedBuildInputs = [ pygments wxPython ];
+
+  # ride_postinstall.py checks that needed deps are installed and creates a
+  # desktop shortcut. We don't really need it and it clutters up bin/ so
+  # remove it.
+  postInstall = ''
+    rm -f "$out/bin/ride_postinstall.py"
+  '';
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Light-weight and intuitive editor for Robot Framework test case files";
+    homepage = https://code.google.com/p/robotframework-ride/;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dc8559acd48..d20c8fdd3ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18293,36 +18293,7 @@ in {
 
   robotsuite = callPackage ../development/python-modules/robotsuite { };
 
-  robotframework-ride = buildPythonPackage rec {
-    version = "1.2.3";
-    name = "robotframework-ride-${version}";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz";
-      sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j";
-    };
-
-    propagatedBuildInputs = with self; [ pygments wxPython ];
-
-    # ride_postinstall.py checks that needed deps are installed and creates a
-    # desktop shortcut. We don't really need it and it clutters up bin/ so
-    # remove it.
-    postInstall = ''
-      rm -f "$out/bin/ride_postinstall.py"
-    '';
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      description = "Light-weight and intuitive editor for Robot Framework test case files";
-      homepage = https://code.google.com/p/robotframework-ride/;
-      license = licenses.asl20;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  robotframework-ride = callPackage ../development/python-modules/robotframework-ride { };
 
   robotframework-requests = buildPythonPackage rec {
     version = "0.4.6";
-- 
GitLab


From 628e1b9b4ee59ba992af37c8d8786e1957d07849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 15:45:15 +0100
Subject: [PATCH 226/877] pythonPackages.seqdiag: move to python-modules/

---
 .../python-modules/seqdiag/default.nix        | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +----------------
 2 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/seqdiag/default.nix

diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix
new file mode 100644
index 00000000000..98a81873a71
--- /dev/null
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
+, blockdiag
+}:
+
+buildPythonPackage rec {
+  name = "seqdiag-0.9.4";
+
+  src = fetchurl {
+    url = "mirror://pypi/s/seqdiag/${name}.tar.gz";
+    sha256 = "1qa7d0m1wahvmrj95rxkb6128cbwd4w3gy8gbzncls66h46bifiz";
+  };
+
+  buildInputs = [ pep8 nose unittest2 docutils ];
+
+  propagatedBuildInputs = [ blockdiag ];
+
+  # Tests fail:
+  #   ...
+  #   ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/')
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)";
+    homepage = http://blockdiag.com/;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d20c8fdd3ce..0be1c2e484b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18636,31 +18636,7 @@ in {
     };
   };
 
-  seqdiag = buildPythonPackage rec {
-    name = "seqdiag-0.9.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/seqdiag/${name}.tar.gz";
-      sha256 = "1qa7d0m1wahvmrj95rxkb6128cbwd4w3gy8gbzncls66h46bifiz";
-    };
-
-    buildInputs = with self; [ pep8 nose unittest2 docutils ];
-
-    propagatedBuildInputs = with self; [ blockdiag ];
-
-    # Tests fail:
-    #   ...
-    #   ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/')
-    doCheck = false;
-
-    meta = {
-      description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)";
-      homepage = http://blockdiag.com/;
-      license = licenses.asl20;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  seqdiag = callPackage ../development/python-modules/seqdiag { };
 
   pysendfile = buildPythonPackage rec {
     name = "pysendfile-${version}";
-- 
GitLab


From 086ad07ed675475916f100e76107d7399f71f78b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 15:47:17 +0100
Subject: [PATCH 227/877] pythonPackages.scapy: move to python-modules/

---
 .../python-modules/scapy/default.nix          | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +-----------------
 2 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/scapy/default.nix

diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix
new file mode 100644
index 00000000000..5241b632f12
--- /dev/null
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, buildPythonPackage, isPy3k, isPyPy }:
+
+buildPythonPackage rec {
+  name = "scapy-2.2.0";
+
+  disabled = isPy3k || isPyPy;
+
+  src = fetchurl {
+    url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz";
+    sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Powerful interactive network packet manipulation program";
+    homepage = http://www.secdev.org/projects/scapy/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0be1c2e484b..452357334cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18693,24 +18693,7 @@ in {
 
   sampledata = callPackage ../development/python-modules/sampledata { };
 
-  scapy = buildPythonPackage rec {
-    name = "scapy-2.2.0";
-
-    disabled = isPy3k || isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz";
-      sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5";
-    };
-
-    meta = {
-      description = "Powerful interactive network packet manipulation program";
-      homepage = http://www.secdev.org/projects/scapy/;
-      license = licenses.gpl2;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  scapy = callPackage ../development/python-modules/scapy { };
 
   scipy = callPackage ../development/python-modules/scipy { };
 
-- 
GitLab


From aaa3608b4b2dd1a799bdbc01af993057308edd5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 15:49:20 +0100
Subject: [PATCH 228/877] pythonPackages.pyusb: move to python-modules/

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

diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix
new file mode 100644
index 00000000000..0651192344a
--- /dev/null
+++ b/pkgs/development/python-modules/pyusb/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, buildPythonPackage, libusb, libusb1 }:
+
+buildPythonPackage rec {
+  name = "pyusb-1.0.0";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d/PyUSB-1.0.0.tar.gz";
+    sha256 = "0s2k4z06fapd5vp1gnrlf8a9sjpc03p9974lzw5k6ky39akzyd2v";
+  };
+
+  # Fix the USB backend library lookup
+  postPatch =
+    ''
+      libusb=${libusb1.out}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}
+      test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
+      sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py
+    '';
+
+  propagatedBuildInputs = [ libusb ];
+
+  # No tests included
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python USB access module (wraps libusb 1.0)";  # can use other backends
+    homepage = http://pyusb.sourceforge.net/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 452357334cd..2f7e51ee117 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22812,35 +22812,7 @@ EOF
 
   unidecode = callPackage ../development/python-modules/unidecode {};
 
-  pyusb = buildPythonPackage rec {
-    name = "pyusb-1.0.0";
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d/PyUSB-1.0.0.tar.gz";
-      sha256 = "0s2k4z06fapd5vp1gnrlf8a9sjpc03p9974lzw5k6ky39akzyd2v";
-    };
-
-    # Fix the USB backend library lookup
-    postPatch =
-      ''
-        libusb=${pkgs.libusb1.out}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}
-        test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
-        sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py
-      '';
-
-    propagatedBuildInputs = [ pkgs.libusb ];
-
-    # No tests included
-    doCheck = false;
-
-    meta = {
-      description = "Python USB access module (wraps libusb 1.0)";  # can use other backends
-      homepage = http://pyusb.sourceforge.net/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
-
+  pyusb = callPackage ../development/python-modules/pyusb {};
 
   BlinkStick = buildPythonPackage rec {
     name = "BlinkStick-${version}";
-- 
GitLab


From 05bf2bdba12c7d0870706e1424ffd6a36b26bd84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 15:51:20 +0100
Subject: [PATCH 229/877] pythonPackages.usbtmc: move to python-modules/

---
 .../python-modules/usbtmc/default.nix         | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +------------------
 2 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/usbtmc/default.nix

diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix
new file mode 100644
index 00000000000..3d1fa3be41f
--- /dev/null
+++ b/pkgs/development/python-modules/usbtmc/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, buildPythonPackage, pyusb }:
+
+buildPythonPackage rec {
+  name = "usbtmc-${version}";
+  version = "0.6";
+
+  src = fetchurl {
+    url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz";
+    sha256 = "1wnw6ndc3s1i8zpbikz5zc40ijvpraqdb0xn8zmqlyn95xxfizw2";
+  };
+
+  propagatedBuildInputs = [ pyusb ];
+
+  meta = with stdenv.lib; {
+    description = "Python implementation of the USBTMC instrument control protocol";
+    homepage = http://alexforencich.com/wiki/en/python-usbtmc/start;
+    license = licenses.mit;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f7e51ee117..5b5071cab2d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22839,25 +22839,7 @@ EOF
     };
   };
 
-
-  usbtmc = buildPythonPackage rec {
-    name = "usbtmc-${version}";
-    version = "0.6";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz";
-      sha256 = "1wnw6ndc3s1i8zpbikz5zc40ijvpraqdb0xn8zmqlyn95xxfizw2";
-    };
-
-    propagatedBuildInputs = with self; [ pyusb ];
-
-    meta = {
-      description = "Python implementation of the USBTMC instrument control protocol";
-      homepage = http://alexforencich.com/wiki/en/python-usbtmc/start;
-      license = licenses.mit;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  usbtmc = callPackage ../development/python-modules/usbtmc {};
 
   txgithub = buildPythonPackage rec {
     name = "${pname}-${version}";
-- 
GitLab


From 140243639529209db37f7c79c8c44dea1db90542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 15:53:44 +0100
Subject: [PATCH 230/877] pythonPackages.pyev: move to python-modules/

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

diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix
new file mode 100644
index 00000000000..db06fedd68c
--- /dev/null
+++ b/pkgs/development/python-modules/pyev/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, buildPythonPackage, libev }:
+
+buildPythonPackage rec {
+  name = "pyev-0.9.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pyev/${name}.tar.gz";
+    sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx";
+  };
+
+  buildInputs = [ libev ];
+
+  libEvSharedLibrary =
+    if !stdenv.isDarwin
+    then "${libev}/lib/libev.so.4"
+    else "${libev}/lib/libev.4.dylib";
+
+  postPatch = ''
+    test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; }
+    sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python bindings for libev";
+    homepage = https://code.google.com/p/pyev/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5b5071cab2d..cb03a13f6e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16274,34 +16274,7 @@ in {
     };
   };
 
-
-  pyev = buildPythonPackage rec {
-    name = "pyev-0.9.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyev/${name}.tar.gz";
-      sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx";
-    };
-
-    buildInputs = [ pkgs.libev ];
-
-    libEvSharedLibrary =
-      if !stdenv.isDarwin
-      then "${pkgs.libev}/lib/libev.so.4"
-      else "${pkgs.libev}/lib/libev.4.dylib";
-
-    postPatch = ''
-      test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; }
-      sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py
-    '';
-
-    meta = {
-      description = "Python bindings for libev";
-      homepage = https://code.google.com/p/pyev/;
-      license = licenses.gpl3;
-      maintainers = [ maintainers.bjornfor ];
-    };
-  };
+  pyev = callPackage ../development/python-modules/pyev { };
 
   pyexcelerator = buildPythonPackage rec {
     name = "pyexcelerator-${version}";
-- 
GitLab


From adac3e43fd271dbb9c50cd2f9d42588b5b93e9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 15:57:39 +0100
Subject: [PATCH 231/877] pythonPackages.llfuse: move to python-modules/

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

diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
new file mode 100644
index 00000000000..7c907d1e5ef
--- /dev/null
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, buildPythonPackage, pkgconfig, pytest, fuse, attr, which
+, contextlib2
+}:
+
+buildPythonPackage rec {
+  name = "llfuse-1.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
+    sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ pytest fuse attr which ];
+
+  propagatedBuildInputs = [ contextlib2 ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python bindings for the low-level FUSE API";
+    homepage = https://code.google.com/p/python-llfuse/;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb03a13f6e0..d83ac0df11b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10938,33 +10938,8 @@ in {
 
   livereload = callPackage ../development/python-modules/livereload { };
 
-  llfuse = buildPythonPackage rec {
-    name = "llfuse-1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
-      sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps";
-    };
-
-    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = with self; [ pytest pkgs.fuse pkgs.attr pkgs.which ];
-
-    propagatedBuildInputs = with self; [ contextlib2 ];
-
-    checkPhase = ''
-      py.test
-    '';
-
-    # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin'
-    doCheck = false;
-
-    meta = {
-      description = "Python bindings for the low-level FUSE API";
-      homepage = https://code.google.com/p/python-llfuse/;
-      license = licenses.lgpl2Plus;
-      platforms = platforms.unix;
-      maintainers = with maintainers; [ bjornfor ];
-    };
+  llfuse = callPackage ../development/python-modules/llfuse {
+    fuse = pkgs.fuse;  # use "real" fuse, not the python module
   };
 
   locustio = buildPythonPackage rec {
-- 
GitLab


From 41b89d15779c74e9a705841c0bb54f375575ca27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 14:18:17 +0100
Subject: [PATCH 232/877] pythonPackages.autopep8: 1.0.4 -> 1.3.3

The pep8 package is renamed to pycodestyle and autopep8 references the
new name.

(Also, fetchurl -> fetchPypi.)
---
 .../python-modules/autopep8/default.nix            | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
index 6dc091624c5..06ad939cfa8 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, buildPythonPackage, pep8 }:
+{ stdenv, fetchPypi, buildPythonPackage, pycodestyle }:
 
 buildPythonPackage rec {
-  name = "autopep8-1.0.4";
+  pname = "autopep8";
+  version = "1.3.3";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/a/autopep8/${name}.tar.gz";
-    sha256 = "17lydqm8y9a5qadp6iifxrb5mb0g9fr1vxn5qy1fjpyhazxaw8n1";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0c1gl648g2xnz3j0rsp71ld4i32zlglmqjvqf4q8r08jp3zpny7z";
   };
 
-  propagatedBuildInputs = [ pep8 ];
+  propagatedBuildInputs = [ pycodestyle ];
 
   # One test fails:
   # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests)
-- 
GitLab


From 454ad93a358a99e2c1c9dd7c45fd0568f93fad85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 14:33:18 +0100
Subject: [PATCH 233/877] pythonPackages.construct: 2.8.10 -> 2.8.16

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

diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index 1845d7ec94f..9d8e61d1f45 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   name = "construct-${version}";
-  version = "2.8.10";
+  version = "2.8.16";
 
   src = fetchFromGitHub {
     owner = "construct";
     repo = "construct";
     rev = "v${version}";
-    sha256 = "1xfmmc5pihn3ql9f7blrciy06y2bwczqvkbcpvh96dmgqwc3wys3";
+    sha256 = "0lzz1dy419n254qccch7yx4nkpwd0fsyjhnsnaf6ysgwzqxxv63j";
   };
 
   propagatedBuildInputs = [ six ];
-- 
GitLab


From 5065f0f258b4d91a2a05bfbb7695f499e5f76de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 14:40:37 +0100
Subject: [PATCH 234/877] pythonPackages.pycollada: 0.4.1 -> 0.5

* fetchurl -> fetchPypi
---
 .../development/python-modules/pycollada/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix
index fec32b86aaf..948d9741bd8 100644
--- a/pkgs/development/python-modules/pycollada/default.nix
+++ b/pkgs/development/python-modules/pycollada/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, buildPythonPackage, numpy, isPy3k, dateutil, dateutil_1_5 }:
+{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil, dateutil_1_5 }:
 
 buildPythonPackage rec {
-  name = "pycollada-0.4.1";
+  pname = "pycollada";
+  version = "0.5";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pycollada/${name}.tar.gz";
-    sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1g96maw2c25l4i3ks51784h33zf7s18vrn6iyz4ca34iy4sl7yq9";
   };
 
   buildInputs = [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]);
-- 
GitLab


From 4b3f72917269173b8b22e783b2a043496d3ccd6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 14:44:50 +0100
Subject: [PATCH 235/877] pythonPackages.dpkt: 1.8 -> 1.9.1

* fetchurl -> fetchPypi
* Tests work now.
* Package is py3k compatible now.
---
 pkgs/development/python-modules/dpkt/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix
index 87b5bd6b812..43c318fc7c3 100644
--- a/pkgs/development/python-modules/dpkt/default.nix
+++ b/pkgs/development/python-modules/dpkt/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
+{ stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "dpkt-1.8";
-  disabled = isPy3k;
+  pname = "dpkt";
+  version = "1.9.1";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "https://dpkt.googlecode.com/files/${name}.tar.gz";
-    sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0rr9ygczhxkfb61778jx0cxs0sq46zwlcj5l3wn6xmd3iy3yx9y6";
   };
 
-  # error: invalid command 'test'
-  doCheck = false;
-
   meta = with stdenv.lib; {
     description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols";
     homepage = https://code.google.com/p/dpkt/;
-- 
GitLab


From 82ababbd833651d319e604091edc4d585f9035e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 16:08:28 +0100
Subject: [PATCH 236/877] pythonPackages.pyusb: 1.0.0 -> 1.0.2

Also, fetchurl -> fetchPypi.
---
 pkgs/development/python-modules/pyusb/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix
index 0651192344a..6ba6794bfd1 100644
--- a/pkgs/development/python-modules/pyusb/default.nix
+++ b/pkgs/development/python-modules/pyusb/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, buildPythonPackage, libusb, libusb1 }:
+{ stdenv, fetchPypi, buildPythonPackage, libusb, libusb1 }:
 
 buildPythonPackage rec {
-  name = "pyusb-1.0.0";
+  pname = "pyusb";
+  version = "1.0.2";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d/PyUSB-1.0.0.tar.gz";
-    sha256 = "0s2k4z06fapd5vp1gnrlf8a9sjpc03p9974lzw5k6ky39akzyd2v";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qkk2jn270jwwl1x26hmdhb14m9kkbrzzwzizdjcl1a29b6756sf";
   };
 
   # Fix the USB backend library lookup
-- 
GitLab


From ccc1f9a5406688e00100f9594e49a01c10a8dde1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 16:04:38 +0100
Subject: [PATCH 237/877] pythonPackages.usbtmc: 0.6 -> 0.8

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

diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix
index 3d1fa3be41f..0c684274907 100644
--- a/pkgs/development/python-modules/usbtmc/default.nix
+++ b/pkgs/development/python-modules/usbtmc/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   name = "usbtmc-${version}";
-  version = "0.6";
+  version = "0.8";
 
   src = fetchurl {
     url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz";
-    sha256 = "1wnw6ndc3s1i8zpbikz5zc40ijvpraqdb0xn8zmqlyn95xxfizw2";
+    sha256 = "14f4j77ljr45crnjwlp1dqbxwa45s20y2fpq5rg59r60w15al4yw";
   };
 
   propagatedBuildInputs = [ pyusb ];
-- 
GitLab


From aa12eddb6c9683145160c4b75604a259478fef54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 29 Oct 2017 22:53:27 +0100
Subject: [PATCH 238/877] pythonPackages.nwdiag: unbreak eval

Oops, this should have been part of commit afd4a17ee5abada65616b0f3566813c08b7c4376
("pythonPackages.nwdiag: move to python-modules/"). I noticed 2 seconds
to late!
---
 .../python-modules/nwdiag/default.nix         | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/nwdiag/default.nix

diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix
new file mode 100644
index 00000000000..ebf7ce944c1
--- /dev/null
+++ b/pkgs/development/python-modules/nwdiag/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
+, blockdiag
+}:
+
+buildPythonPackage rec {
+  name = "nwdiag-1.0.3";
+
+  src = fetchurl {
+    url = "mirror://pypi/n/nwdiag/${name}.tar.gz";
+    sha256 = "0n7ary1fngxk8bk15vabc8fhnmxlh098piciwaviwn7l4a5q1zys";
+  };
+
+  buildInputs = [ pep8 nose unittest2 docutils ];
+
+  propagatedBuildInputs = [ blockdiag ];
+
+  # tests fail
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Generate network-diagram image from spec-text file (similar to Graphviz)";
+    homepage = http://blockdiag.com/;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
-- 
GitLab


From e697f10fc4e5343c9fc3c253efb910fecb6f84da Mon Sep 17 00:00:00 2001
From: Christopher Singley <csingley@gmail.com>
Date: Sun, 29 Oct 2017 19:28:16 -0500
Subject: [PATCH 239/877] PlexPy: init at 1.4.25

---
 lib/maintainers.nix             |  1 +
 pkgs/servers/plexpy/default.nix | 41 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/servers/plexpy/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7c3a845c00c..dc2281401e0 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -136,6 +136,7 @@
   cryptix = "Henry Bubert <cryptix@riseup.net>";
   CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>";
   cstrahan = "Charles Strahan <charles@cstrahan.com>";
+  csingley = "Christopher Singley <csingley@gmail.com>";
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
   DamienCassou = "Damien Cassou <damien@cassou.me>";
   danbst = "Danylo Hlynskyi <abcz2.uprola@gmail.com>";
diff --git a/pkgs/servers/plexpy/default.nix b/pkgs/servers/plexpy/default.nix
new file mode 100644
index 00000000000..2875ecc5240
--- /dev/null
+++ b/pkgs/servers/plexpy/default.nix
@@ -0,0 +1,41 @@
+{stdenv, fetchFromGitHub, python}:
+
+stdenv.mkDerivation rec {
+  version = "1.4.25";
+  pname = "plexpy";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "JonnyWong16";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0a4ynrfamlwkgqil4n61v47p21czxpjdzg0mias4kdjam2nnwnjx";
+  };
+
+  buildPhase = ":";
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R * $out/
+
+    # Remove superfluous Python checks from main script;
+    # prepend shebang
+    echo "#!${python.interpreter}" > $out/PlexPy.py
+    tail -n +7 PlexPy.py >> $out/PlexPy.py
+
+    mkdir $out/bin
+    # Can't just symlink to the main script, since it uses __file__ to
+    # import bundled packages and manage the service
+    echo "#!/bin/bash" > $out/bin/plexpy
+    echo "$out/PlexPy.py \$*" >> $out/bin/plexpy
+    chmod +x $out/bin/plexpy
+  '';
+
+  meta  = with stdenv.lib; {
+    description = "A Python based monitoring and tracking tool for Plex Media Server.";
+    homepage = http://jonnywong16.github.io/plexpy/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ csingley ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 596051f4ea7..762f217fcbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3966,6 +3966,8 @@ with pkgs;
 
   plex = callPackage ../servers/plex { enablePlexPass = config.plex.enablePlexPass or false; };
 
+  plexpy = callPackage ../servers/plexpy { python = python2; };
+
   ploticus = callPackage ../tools/graphics/ploticus {
     libpng = libpng12;
   };
-- 
GitLab


From 95dc36235ce21ab8563f1ba61a5d80e6c2ea9e3b Mon Sep 17 00:00:00 2001
From: Christopher Singley <csingley@gmail.com>
Date: Sun, 29 Oct 2017 19:29:25 -0500
Subject: [PATCH 240/877] PlexPy service

---
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/services/misc/plexpy.nix | 81 ++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 nixos/modules/services/misc/plexpy.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6f00a97dd3f..44bcec5aec2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -328,6 +328,7 @@
   ./services/misc/parsoid.nix
   ./services/misc/phd.nix
   ./services/misc/plex.nix
+  ./services/misc/plexpy.nix
   ./services/misc/pykms.nix
   ./services/misc/radarr.nix
   ./services/misc/redmine.nix
diff --git a/nixos/modules/services/misc/plexpy.nix b/nixos/modules/services/misc/plexpy.nix
new file mode 100644
index 00000000000..df9f1258124
--- /dev/null
+++ b/nixos/modules/services/misc/plexpy.nix
@@ -0,0 +1,81 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.plexpy;
+in
+{
+  options = {
+    services.plexpy = {
+      enable = mkEnableOption "PlexPy Plex Monitor";
+
+      dataDir = mkOption {
+        type = types.str;
+        default = "/var/lib/plexpy";
+        description = "The directory where PlexPy stores its data files.";
+      };
+
+      configFile = mkOption {
+        type = types.str;
+        default = "/var/lib/plexpy/config.ini";
+        description = "The location of PlexPy's config file.";
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 8181;
+        description = "TCP port where PlexPy listens.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "plexpy";
+        description = "User account under which PlexPy runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "nogroup";
+        description = "Group under which PlexPy runs.";
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.plexpy;
+        defaultText = "pkgs.plexpy";
+        description = ''
+          The PlexPy package to use.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.plexpy = {
+      description = "PlexPy Plex Monitor";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        test -d "${cfg.dataDir}" || {
+          echo "Creating initial PlexPy data directory in \"${cfg.dataDir}\"."
+          mkdir -p "${cfg.dataDir}"
+          chown ${cfg.user}:${cfg.group} "${cfg.dataDir}"
+        }
+     '';
+      serviceConfig = {
+        Type = "simple";
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly = "true";
+        GuessMainPID = "false";
+        ExecStart = "${cfg.package}/bin/plexpy --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port} --pidfile ${cfg.dataDir}/plexpy.pid --nolaunch";
+        Restart = "on-failure";
+      };
+    };
+
+    users.extraUsers = mkIf (cfg.user == "plexpy") {
+      plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; };
+    };
+  };
+}
-- 
GitLab


From 51e68732f95049a04789a7a021533765d39ce110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Sun, 22 Oct 2017 22:45:03 +0200
Subject: [PATCH 241/877] coqPackages.dpdgraph: remove support for coq 8.7

coqPackages_8_7.dpdgraph won't build since Coq 8.7.0 is not yet supported
upstream.
---
 pkgs/development/coq-modules/dpdgraph/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index aec3828f323..65be1f4e066 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -1,11 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
 
 let param = {
-  "8.7" = {
-    version = "0.6.1";
-    rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663";
-    sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9";
-  };
   "8.6" = {
     version = "0.6.1";
     rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663";
-- 
GitLab


From b831d3845f885ebb102ec0d63d4b664fbdfd10f8 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 14:59:04 +0800
Subject: [PATCH 242/877] pythonPackages.clientform: Remove package

From upstream:
This functionality provided by this module is now part of mechanize. I don't intend to make further standalone releases of ClientForm.
---
 pkgs/top-level/python-packages.nix | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d83ac0df11b..4f7db48b7d9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2752,24 +2752,6 @@ in {
 
   cligj = callPackage ../development/python-modules/cligj { };
 
-  clientform = buildPythonPackage (rec {
-    name = "clientform-0.2.10";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/C/ClientForm/ClientForm-0.2.10.tar.gz";
-      sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm";
-    };
-
-    meta = {
-      homepage = http://wwwsearch.sourceforge.net/ClientForm/;
-
-      license = "bsd";
-
-      description = "Python module for handling HTML forms on the client side";
-    };
-  });
-
   /* There is a project called "closure-linter" on PyPI that is the
      same as this, but it does not appear to be owned by Google.
      So we're pulling from Google's GitHub repo instead. */
@@ -11299,7 +11281,7 @@ in {
       sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl";
     };
 
-    propagatedBuildInputs = with self; [ clientform html5lib ];
+    propagatedBuildInputs = with self; [ html5lib ];
 
     doCheck = false;
 
-- 
GitLab


From e78864e3b7db45d4b803fb816781ec7ce904aedc Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 15:21:17 +0800
Subject: [PATCH 243/877] pythonPackages.skype4py: Remove package, not updated
 in years and no dependent packages

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f7db48b7d9..93363593188 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19613,39 +19613,6 @@ in {
     };
   };
 
-
-  skype4py = buildPythonPackage (rec {
-    name = "Skype4Py-1.0.32.0";
-    disabled = isPy3k || isPyPy;
-
-    src = pkgs.fetchurl {
-      url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz;
-      sha256 = "0cmkrv450wa8v50bng5dflpwkl5c1p9pzysjkb2956w5kvwh6f5b";
-    };
-
-    unpackPhase = ''
-      tar xf $src
-      find . -type d -exec chmod +rx {} \;
-      sourceRoot=`pwd`/`ls -d S*`
-    '';
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ pkgs.xorg.libX11 dbus-python pygobject2 ];
-
-    meta = {
-      description = "High-level, platform independent Skype API wrapper for Python";
-
-      # The advertisement says https://developer.skype.com/wiki/Skype4Py
-      # but that url does not work. This following web page points to the
-      # download link and has some information about the package.
-      homepage = http://pypi.python.org/pypi/Skype4Py/1.0.32.0;
-      broken = true;
-      license = "BSD";
-    };
-  });
-
   smartdc = buildPythonPackage rec {
     name = "smartdc-0.1.12";
 
-- 
GitLab


From 892a0005ff299e2dc561376f74af9e56476b71e5 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 15:29:10 +0800
Subject: [PATCH 244/877] pythonPackages.pyxattr: 0.5.1 -> 0.6.0

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

diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix
new file mode 100644
index 00000000000..558dc37a394
--- /dev/null
+++ b/pkgs/development/python-modules/pyxattr/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, pkgs
+, fetchPypi
+, buildPythonPackage
+}:
+
+buildPythonPackage rec {
+    pname = "pyxattr";
+    version = "0.6.0";
+    name = pname + "-" + version;
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1a3fqjlgbzq5hmc3yrnxxxl8nyn3rz2kfn17svbsahaq4gj0xl09";
+    };
+
+    # IOError: [Errno 95] Operation not supported (expected)
+    doCheck = false;
+
+    buildInputs = with pkgs; [ attr ];
+
+    meta = with lib; {
+      description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems";
+      license = licenses.lgpl21Plus;
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93363593188..1e90fb1ae72 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17612,25 +17612,7 @@ in {
 
   pywinrm = callPackage ../development/python-modules/pywinrm { };
 
-  pyxattr = buildPythonPackage (rec {
-    name = "pyxattr-0.5.1";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/downloads/iustin/pyxattr/${name}.tar.gz";
-      sha256 = "0jmkffik6hdzs7ng8c65bggss2ai40nm59jykswdf5lpd36cxddq";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    buildInputs = with self; [ pkgs.attr ];
-
-    meta = {
-      description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems";
-      license = licenses.lgpl21Plus;
-    };
-  });
-
+  pyxattr = callPackage ../development/python-modules/pyxattr { };
 
   pyaml = buildPythonPackage (rec {
     name = "pyaml-15.02.1";
-- 
GitLab


From 286ca78bf77dec222137d83f900a67759b04d1f2 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 15:43:04 +0800
Subject: [PATCH 245/877] pythonPackages.fuse: Move to python-modules

---
 .../python-modules/python-fuse/default.nix    | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-------------
 2 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/python-fuse/default.nix

diff --git a/pkgs/development/python-modules/python-fuse/default.nix b/pkgs/development/python-modules/python-fuse/default.nix
new file mode 100644
index 00000000000..d9debce6aec
--- /dev/null
+++ b/pkgs/development/python-modules/python-fuse/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, pkgconfig
+, fetchurl
+, fuse
+, buildPythonPackage
+, isPy3k
+}:
+
+buildPythonPackage rec {
+    baseName = "fuse";
+    version = "0.2.1";
+    name = "${baseName}-${version}";
+    disabled = isPy3k;
+
+    src = fetchurl {
+      url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";
+      sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";
+    };
+
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ fuse ];
+
+    meta = {
+      description = "Python bindings for FUSE";
+      license = lib.licenses.lgpl21;
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1e90fb1ae72..2d4604e1a74 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9253,25 +9253,7 @@ in {
     };
   };
 
-  fuse = buildPythonPackage (rec {
-    baseName = "fuse";
-    version = "0.2.1";
-    name = "${baseName}-${version}";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";
-      sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";
-    };
-
-    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = with self; [ pkgs.fuse ];
-
-    meta = {
-      description = "Python bindings for FUSE";
-      license = licenses.lgpl21;
-    };
-  });
+  fuse = callPackage ../development/python-modules/python-fuse { };
 
   fusepy = buildPythonPackage rec {
     name = "fusepy-2.0.4";
-- 
GitLab


From 552922cf538f2ab77c5c950b8abb3bda6a4a8bb2 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 15:49:35 +0800
Subject: [PATCH 246/877] pythonPackages.pylibacl: 0.5.1 -> 0.5.3

---
 .../python-modules/pylibacl/default.nix       | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-------------
 2 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/pylibacl/default.nix

diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix
new file mode 100644
index 00000000000..97fbe28e50d
--- /dev/null
+++ b/pkgs/development/python-modules/pylibacl/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pkgs
+}:
+
+buildPythonPackage rec {
+  pname = "pylibacl";
+  version = "0.5.3";
+  name = pname + "-" + version;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0c3xw1s5bh6jnsc0wwyxnn6kn6x6rpbmmi05ap1f81fyqlgrzgj0";
+  };
+
+  # ERROR: testExtended (tests.test_acls.AclExtensions)
+  # IOError: [Errno 0] Error
+  doCheck = false;
+
+  buildInputs = with pkgs; [ acl ];
+
+  meta = {
+    description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them";
+    license = lib.licenses.lgpl21Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2d4604e1a74..a8e0e704ef5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16986,25 +16986,7 @@ in {
     };
   };
 
-  pylibacl = buildPythonPackage (rec {
-    name = "pylibacl-0.5.1";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/downloads/iustin/pylibacl/${name}.tar.gz";
-      sha256 = "1idks7j9bn62xzsaxkvhl7bdq6ws8kv8aa0wahfh7724qlbbcf1k";
-    };
-
-    # ERROR: testExtended (tests.test_acls.AclExtensions)
-    # IOError: [Errno 0] Error
-    doCheck = false;
-
-    buildInputs = with self; [ pkgs.acl ];
-
-    meta = {
-      description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them";
-      license = licenses.lgpl21Plus;
-    };
-  });
+  pylibacl = callPackage ../development/python-modules/pylibacl { };
 
   pyliblo = buildPythonPackage rec {
     name = "pyliblo-${version}";
-- 
GitLab


From 49a1221562f84ec6e1aa2b41eedeac376defb558 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 19:21:26 +0800
Subject: [PATCH 247/877] salut-a-toi: Move pythonPackages dependencies not
 required by other packages into salut-a-toi derivation

---
 .../salut-a-toi/default.nix                   | 20 ++++--
 .../salut-a-toi/requirements.nix              | 67 +++++++++++++++++++
 .../python-modules/pyfeed/default.nix         | 23 -------
 pkgs/top-level/python-packages.nix            | 39 -----------
 4 files changed, 81 insertions(+), 68 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
 delete mode 100644 pkgs/development/python-modules/pyfeed/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
index 4f360c831a2..9ff1799ddd2 100644
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
@@ -1,7 +1,12 @@
-{stdenv, fetchurl, python27Packages, file }:
+{ stdenv, fetchurl, python27Packages, file }:
 
 let
   inherit (python27Packages) python;
+  requirements = (import ./requirements.nix {
+    inherit stdenv fetchurl;
+    pythonPackages = python27Packages;
+  });
+
 in
   stdenv.mkDerivation rec {
     name = "salut-a-toi";
@@ -13,12 +18,15 @@ in
       sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
     };
 
-    buildInputs = with python27Packages; 
+    buildInputs = with python27Packages;
     [
       python twisted urwid wxPython pygobject2
-      wokkel dbus-python pyfeed wrapPython setuptools file 
+      dbus-python wrapPython setuptools file
       pycrypto pyxdg
-    ];
+    ] ++  (with requirements; [
+      pyfeed
+      wokkel
+    ]);
 
     configurePhase = ''
       sed -i "/use_setuptools/d" setup.py
@@ -26,7 +34,7 @@ in
       sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh
       sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
 
-      echo 'import wokkel.muc' | python 
+      echo 'import wokkel.muc' | python
     '';
 
     buildPhase = ''
@@ -39,7 +47,7 @@ in
       for i in "$out/bin"/*; do
       head -n 1 "$i" | grep -E '[/ ]python( |$)' && {
         wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}"
-      } || true 
+      } || true
       done
     '';
 
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
new file mode 100644
index 00000000000..1a681118245
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
@@ -0,0 +1,67 @@
+{ fetchurl
+, stdenv
+, pythonPackages
+}:
+
+let
+  buildPythonPackage = pythonPackages.buildPythonPackage;
+
+  xe = buildPythonPackage rec {
+    url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz";
+    name = stdenv.lib.nameFromURL url ".tar";
+    src = fetchurl {
+      inherit url;
+      sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = {
+      homepage = "http://home.blarg.net/~steveha/xe.html";
+      description = "XML elements";
+    };
+  };
+
+in {
+
+  pyfeed = (buildPythonPackage rec {
+    url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz";
+
+    name = stdenv.lib.nameFromURL url ".tar";
+
+    src = fetchurl {
+      inherit url;
+      sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1";
+    };
+
+    propagatedBuildInputs = [ xe ];
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      homepage = "http://home.blarg.net/~steveha/pyfeed.html";
+      description = "Tools for syndication feeds";
+    };
+
+  });
+
+  wokkel = buildPythonPackage (rec {
+    url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz";
+    name = stdenv.lib.nameFromURL url ".tar";
+    src = fetchurl {
+      inherit url;
+      sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [twisted dateutil];
+
+    meta = with stdenv.lib; {
+      description = "Some (mainly XMPP-related) additions to twisted";
+      homepage = "http://wokkel.ik.nu/";
+      license = licenses.mit;
+    };
+  });
+
+}
diff --git a/pkgs/development/python-modules/pyfeed/default.nix b/pkgs/development/python-modules/pyfeed/default.nix
deleted file mode 100644
index a1591037fb5..00000000000
--- a/pkgs/development/python-modules/pyfeed/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, buildPythonPackage, fetchurl
-, xe }:
-
-buildPythonPackage rec {
-  url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz";
-
-  name = stdenv.lib.nameFromURL url ".tar";
-
-  src = fetchurl {
-    inherit url;
-    sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1";
-  };
-
-  propagatedBuildInputs = [ xe ];
-
-  # error: invalid command 'test'
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    homepage = "http://home.blarg.net/~steveha/pyfeed.html";
-    description = "Tools for syndication feeds";
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a8e0e704ef5..1311e0491cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16258,8 +16258,6 @@ in {
      };
    };
 
-  pyfeed = callPackage ../development/python-modules/pyfeed { };
-
   pyfftw = callPackage ../development/python-modules/pyfftw { };
 
   pyfiglet = callPackage ../development/python-modules/pyfiglet { };
@@ -21547,26 +21545,6 @@ EOF
 
   widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };
 
-
-  wokkel = buildPythonPackage (rec {
-    url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz";
-    name = nameFromURL url ".tar";
-    src = pkgs.fetchurl {
-      inherit url;
-      sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml";
-    };
-
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [twisted dateutil];
-
-    meta = {
-      description = "Some (mainly XMPP-related) additions to twisted";
-      homepage = "http://wokkel.ik.nu/";
-      license = licenses.mit;
-    };
-  });
-
   magic-wormhole = callPackage ../development/python-modules/magic-wormhole { };
 
   wsgiproxy2 = buildPythonPackage rec {
@@ -21607,23 +21585,6 @@ EOF
     propagatedBuildInputs = with self; [ eventlib application ];
   };
 
-  xe = buildPythonPackage rec {
-    url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz";
-    name = stdenv.lib.nameFromURL url ".tar";
-    src = pkgs.fetchurl {
-      inherit url;
-      sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = "http://home.blarg.net/~steveha/xe.html";
-      description = "XML elements";
-    };
-  };
-
   xlib = buildPythonPackage (rec {
     name = "xlib-${version}";
     version = "0.17";
-- 
GitLab


From 88683da1157ea23835a83bd4ee864aa882177c72 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 21:27:15 +0800
Subject: [PATCH 248/877] pythonpackages.pymacs: Remove package, does not seem
 to be maintained upstream

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1311e0491cd..05374eb8c54 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17006,29 +17006,6 @@ in {
     };
   };
 
-  pymacs = buildPythonPackage rec {
-    version = "0.25";
-    name = "pymacs-${version}";
-    disabled = isPy3k || isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/pinard/Pymacs/tarball/v${version}";
-      name = "${name}.tar.gz";
-      sha256 = "1hmy76c5igm95rqbld7gvk0az24smvc8hplfwx2f5rhn6frj3p2i";
-    };
-
-    configurePhase = "make";
-
-    doCheck = false;
-
-    meta = {
-      description = "Emacs Lisp to Python interface";
-      homepage = http://pymacs.progiciels-bpi.ca;
-      license = licenses.gpl2;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
   pypcap = callPackage ../development/python-modules/pypcap {};
 
   pyplatec = buildPythonPackage rec {
-- 
GitLab


From d1144c05ec0e965915cbf18196342d3dc2de9084 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 21:30:42 +0800
Subject: [PATCH 249/877] pythonpackages.ropemode: Remove outdated package, far
 behind upstream

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 05374eb8c54..068b85668a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18206,25 +18206,6 @@ in {
      };
   };
 
-  ropemode = buildPythonPackage rec {
-    version = "0.2";
-    name = "ropemode-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/ropemode/${name}.tar.gz";
-      sha256 = "0jw6h1wvk6wk0wknqdf7s9pw76m8472jv546lqdd88jbl2scgcjl";
-    };
-
-    propagatedBuildInputs = with self; [ rope ];
-
-     meta = {
-       description = "A plugin for performing python refactorings in emacs";
-       homepage = http://rope.sf.net;
-       maintainers = with maintainers; [ goibhniu ];
-       license = licenses.gpl2;
-     };
-  };
-
   ropper = callPackage ../development/python-modules/ropper { };
 
   routes = buildPythonPackage rec {
-- 
GitLab


From b9b8efc8123645d21b253fb7210f63ab5dbe9da2 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 21:31:30 +0800
Subject: [PATCH 250/877] pythonpackages.ropemacs: Remove outdated package, far
 behind upstream

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 068b85668a4..86db6ec7a28 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18187,25 +18187,6 @@ in {
     };
   };
 
-  ropemacs = buildPythonPackage rec {
-    version = "0.7";
-    name = "ropemacs-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/ropemacs/${name}.tar.gz";
-      sha256 = "1x5qf1drcdz9jfiiakc60kzqkb3ahsg9j902c5byf3gjfacdrmqj";
-    };
-
-    propagatedBuildInputs = with self; [ ropemode ];
-
-     meta = {
-       description = "A plugin for performing python refactorings in emacs";
-       homepage = http://rope.sf.net/ropemacs.html;
-       maintainers = with maintainers; [ goibhniu ];
-       license = licenses.gpl2;
-     };
-  };
-
   ropper = callPackage ../development/python-modules/ropper { };
 
   routes = buildPythonPackage rec {
-- 
GitLab


From 8b8dd0926fe3f5ea8605813056264d4dea32ae06 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 21:33:24 +0800
Subject: [PATCH 251/877] pythonpackages.taskcoach: Remove outdated package,
 far behind upstream

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86db6ec7a28..c3e982e173c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20169,36 +20169,6 @@ in {
     };
   };
 
-  taskcoach = buildPythonPackage rec {
-    name = "TaskCoach-1.3.22";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://sourceforge/taskcoach/${name}.tar.gz";
-      sha256 = "1ddx56bqmh347synhgjq625ijv5hqflr0apxg0nl4jqdsqk1zmxh";
-    };
-
-    propagatedBuildInputs = with self; [ wxPython ];
-
-    # I don't know why I need to add these libraries. Shouldn't they
-    # be part of wxPython?
-    postInstall = ''
-      libspaths=${with pkgs.xorg; pkgs.lib.makeLibraryPath [ libSM libXScrnSaver ]}
-      wrapProgram $out/bin/taskcoach.py \
-        --prefix LD_LIBRARY_PATH : $libspaths
-    '';
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = http://taskcoach.org/;
-      description = "Todo manager to keep track of personal tasks and todo lists";
-      license = licenses.gpl3Plus;
-      broken = stdenv.isDarwin;
-    };
-  };
-
   taskw = buildPythonPackage rec {
     version = "1.0.3";
     name = "taskw-${version}";
-- 
GitLab


From e86b3a07d188950f2c46af7c09df9ab16c6f4aed Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 21:43:54 +0800
Subject: [PATCH 252/877] pythonpackages.ledger-autosync: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c3e982e173c..de172153208 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6186,35 +6186,6 @@ in {
     };
   };
 
-  ledger-autosync = buildPythonPackage rec {
-    name = "ledger-autosync-${version}";
-    version = "0.2.3";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/ledger-autosync/ledger-autosync-${version}.tar.gz";
-      sha256 = "f19fa66e656309825887171d84a462e64676b1cc36b62e4dd8679ff63926a469";
-    };
-
-    propagatedBuildInputs = with self; [ ofxclient ];
-
-    buildInputs = with self; [
-      mock
-      nose
-      # Used at runtime to translate ofx entries to the ledger
-      # format. In fact, user could use either ledger or hledger.
-      pkgs.which
-      pkgs.ledger ];
-
-    # Tests are disable since they require hledger and python-ledger
-    doCheck = false;
-
-    meta = {
-      homepage = https://gitlab.com/egh/ledger-autosync;
-      description = "ledger-autosync is a program to pull down transactions from your bank and create ledger transactions for them";
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ lewo ];
-    };
-  };
-
   libsexy = callPackage ../development/python-modules/libsexy {
     libsexy = pkgs.libsexy;
   };
-- 
GitLab


From e87ffaefc6207ffec6ec4a6b1aeb5e9d255d4fb6 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 21:52:26 +0800
Subject: [PATCH 253/877] anki: Depend on pythonPackages.beautifulsoup4 instead
 of pythonPackages.beautifulsoup

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

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index c5bac4db8e5..4a531c07efd 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -7,8 +7,8 @@
 }:
 
 let
-    version = "2.0.46";
-    inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4;
+    version = "2.0.47";
+    inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup4 httplib2 matplotlib pyqt4;
     qt4 = pyqt4.qt;
 in
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       sha256 = "01h51rbnj0r6lmjnn2vzxzaf7mxkc0azmg1v4mvf4pkpsp50a7hr";
     };
 
-    pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ]
+    pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup4 httplib2 ]
               ++ lib.optional plotsSupport matplotlib;
 
     buildInputs = [ python wrapPython lame mplayer libpulseaudio ];
-- 
GitLab


From 12d8140a5197e855cc042db4d12010e0cb53d87b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 21:54:48 +0800
Subject: [PATCH 254/877] pythonpackages.python_tvrage: Remove dead package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de172153208..7cd5731cdca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8993,27 +8993,6 @@ in {
 
   pytorch = callPackage ../development/python-modules/pytorch { };
 
-  python_tvrage = buildPythonPackage (rec {
-    version = "0.4.1";
-    name = "tvrage-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-tvrage/python-tvrage-${version}.tar.gz";
-      sha256 = "f8a530376c5cf1bc573d1945a8504c3394b228c731a3eff5100c705997a72063";
-    };
-
-    # has mostly networking dependent tests
-    doCheck = false;
-    propagatedBuildInputs = with self; [ beautifulsoup ];
-
-    meta = {
-      homepage = https://github.com/ckreutzer/python-tvrage;
-      description = "Client interface for tvrage.com's XML-based api feeds";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  });
-
   python2-pythondialog = buildPythonPackage rec {
     name = "python2-pythondialog-${version}";
     version = "3.3.0";
-- 
GitLab


From bb50ae9807be1ca06e801502c3449864ff6bf82a Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 22:03:17 +0800
Subject: [PATCH 255/877] pythonPackages.beautifulsoup: Move into pyload, no
 longer depended upon by any packages

---
 .../networking/pyload/beautifulsoup.nix       | 20 +++++++++++++++++++
 .../networking/pyload/default.nix             | 11 ++++++++--
 pkgs/top-level/python-packages.nix            | 19 ------------------
 3 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/applications/networking/pyload/beautifulsoup.nix

diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix
new file mode 100644
index 00000000000..571df924e1f
--- /dev/null
+++ b/pkgs/applications/networking/pyload/beautifulsoup.nix
@@ -0,0 +1,20 @@
+{ pythonPackages, isPy3k, pkgs }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "beautifulsoup-3.2.1";
+  disabled = isPy3k;
+
+  src = pkgs.fetchurl {
+    url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
+    sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = {
+    homepage = http://www.crummy.com/software/BeautifulSoup/;
+    license = "bsd";
+    description = "Undemanding HTML/XML parser";
+  };
+}
diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix
index f8cd1ab1d00..c331c4f287e 100644
--- a/pkgs/applications/networking/pyload/default.nix
+++ b/pkgs/applications/networking/pyload/default.nix
@@ -1,5 +1,12 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }:
-pythonPackages.buildPythonApplication rec {
+{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey
+, pkgs }:
+
+let
+  beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix {
+    inherit pythonPackages;
+  };
+
+in pythonPackages.buildPythonApplication rec {
   version = "0.4.9-next";
   name = "pyLoad-" + version;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7cd5731cdca..1bc50dc0e21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1253,25 +1253,6 @@ in {
     };
   };
 
-  beautifulsoup = buildPythonPackage (rec {
-    name = "beautifulsoup-3.2.1";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
-      sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = http://www.crummy.com/software/BeautifulSoup/;
-      license = "bsd";
-      description = "Undemanding HTML/XML parser";
-    };
-  });
-
   beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { };
 
   beaker = buildPythonPackage rec {
-- 
GitLab


From ab66d6ea229cb4796628de824d22f342efe51590 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 22:11:23 +0800
Subject: [PATCH 256/877] pythonpackages.rtmidi: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1bc50dc0e21..c8f33b87715 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7716,30 +7716,6 @@ in {
   };
 
 
-  rtmidi = buildPythonPackage rec {
-    version = "0.3a";
-    name = "rtmidi-${version}";
-
-    src = pkgs.fetchurl {
-      url = "http://chrisarndt.de/projects/python-rtmidi/download/python-${name}.tar.bz2";
-      sha256 = "0d2if633m3kbiricd5hgn1csccd8xab6lnab1bq9prdr9ks9i8h6";
-    };
-
-    preConfigure = ''
-      sed -i "/use_setuptools/d" setup.py
-    '';
-
-    buildInputs = with self; [ pkgs.alsaLib pkgs.libjack2 ];
-
-    meta = {
-      description = "A Python wrapper for the RtMidi C++ library written with Cython";
-      homepage = http://trac.chrisarndt.de/code/wiki/python-rtmidi;
-      license = licenses.mit;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
-
   setuptools-git = buildPythonPackage rec {
     name = "setuptools-git-${version}";
     version = "1.1";
-- 
GitLab


From 1b55fc59228f23ac5aa3d50021332a93ac8c1ad7 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 22:13:15 +0800
Subject: [PATCH 257/877] pythonpackages.doxypy: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c8f33b87715..c256c1d23c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8371,22 +8371,6 @@ in {
     };
   };
 
-  doxypy = buildPythonPackage rec {
-    name = "doxypy-0.4.2";
-
-    src = pkgs.fetchurl {
-      url = "http://code.foosel.org/files/${name}.tar.gz";
-      sha256 = "1afmb30zmy7942b53qa5vd3js883wwqqls35n8xfb3rnj0qnll8g";
-    };
-
-    meta = {
-      homepage = http://code.foosel.org/doxypy;
-      description = "An input filter for Doxygen";
-    };
-
-    doCheck = false;
-  };
-
 
   dtopt = buildPythonPackage rec {
     name = "dtopt-0.1";
-- 
GitLab


From 495b099818a88f35f5df9248b34dc72a4793ffa4 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 22:31:44 +0800
Subject: [PATCH 258/877] pythonpackages.requests_oauth2: Remove dead package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c256c1d23c3..b5034a80739 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17762,27 +17762,6 @@ in {
     };
   };
 
-  requests_oauth2 = buildPythonPackage rec {
-    name = "requests-oauth2-0.1.1";
-    # python3 does not support relative imports
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz;
-      sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg";
-    };
-
-    propagatedBuildInputs = with self; [ requests ];
-    # no tests in tarball
-    doCheck = false;
-
-    meta = {
-      description = "Python's Requests OAuth2 (Open Authentication) plugin";
-      homepage = https://github.com/maraujop/requests-oauth2;
-    };
-  };
-
-
   restview = callPackage ../development/python-modules/restview { };
 
   readme = buildPythonPackage rec {
-- 
GitLab


From 3fcf9bc9b18e0012d9b668913ca5e8b90c6ea9c2 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 22:47:06 +0800
Subject: [PATCH 259/877] pythonpackages.googlecl: Remove outdated package
 (source url dead)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5034a80739..a8c9f58545d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5635,27 +5635,6 @@ in {
 
   google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };
 
-  googlecl = buildPythonPackage rec {
-    version = "0.9.14";
-    name    = "googlecl-${version}";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url    = "https://googlecl.googlecode.com/files/${name}.tar.gz";
-      sha256 = "0nnf7xkr780wivr5xnchfcrahlzy9bi2dxcs1w1bh1014jql0iha";
-    };
-
-    meta = {
-      description = "Brings Google services to the command line";
-      homepage    = https://code.google.com/p/googlecl/;
-      license     = licenses.asl20;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-    };
-
-    propagatedBuildInputs = with self; [ gdata ];
-  };
-
   gplaycli = buildPythonPackage rec {
     version = "0.1.2";
     name = "gplaycli-${version}";
-- 
GitLab


From 2ca086da827f66980e1cc31f88862918b011a599 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 22:52:43 +0800
Subject: [PATCH 260/877] pythonpackages.deform_bootstrap: Remove seemingly
 dead package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a8c9f58545d..d382e0d5b4b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4617,30 +4617,6 @@ in {
     };
   };
 
-  deform_bootstrap = buildPythonPackage rec {
-    name = "deform_bootstrap-0.2.9";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/deform_bootstrap/${name}.tar.gz";
-      sha256 = "1hgq3vqsfqdmlyahnlc40w13viawhpzqf4jzigsggdb41x545fda";
-    };
-
-    buildInputs = [ self.mock ];
-    propagatedBuildInputs = with self; [ deform pyramid ];
-
-    # demo is removed as it depends on deformdemo
-    patchPhase = ''
-      rm -rf deform_bootstrap/demo
-    '';
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-      platforms = platforms.all;
-    };
-  };
-
-  demjson = callPackage ../development/python-modules/demjson { };
-
   derpconf = self.buildPythonPackage rec {
     name = "derpconf-0.4.9";
 
-- 
GitLab


From 938369861a7fcf9bee1820753a9f8aadf4a52fec Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 22:54:38 +0800
Subject: [PATCH 261/877] pythonpackages.trac: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d382e0d5b4b..36e7c72b213 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20355,29 +20355,6 @@ in {
     };
   };
 
-  trac = buildPythonPackage {
-    name = "trac-1.0.1";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = http://ftp.edgewall.com/pub/trac/Trac-1.0.1.tar.gz;
-      sha256 = "1nqa95fcnkpyq4jk6az7l7sqgm3b3pjq3bx1n7y4v3bad5jr1m4x";
-    };
-
-    # couple of failing tests
-    doCheck = false;
-
-    PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
-
-    propagatedBuildInputs = with self; [ genshi ];
-
-    meta = {
-      description = "Enhanced wiki and issue tracking system for software development projects";
-
-      license = "BSD";
-    };
-  };
-
   traits = buildPythonPackage rec {
     name = "traits-${version}";
     version = "4.5.0";
-- 
GitLab


From 33a56ef0a68cc06298556d866b24f1f2a8286639 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 22:57:36 +0800
Subject: [PATCH 262/877] pythonpackages.redNotebook: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 36e7c72b213..5e839de2398 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22963,29 +22963,6 @@ EOF
     };
   };
 
-
-  redNotebook = buildPythonPackage rec {
-    name = "rednotebook-1.8.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://sourceforge/rednotebook/${name}.tar.gz";
-      sha256 = "00b7s4xpqpxsbzjvjx9qsx5d84m9pvn383c5di1nsfh35pig0rzn";
-    };
-
-    # no tests available
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ pygtk pywebkitgtk pyyaml chardet ];
-
-    meta = {
-      homepage = http://rednotebook.sourceforge.net/index.html;
-      description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
-      license = licenses.gpl2;
-      maintainers = with maintainers; [ tstrobel ];
-    };
-  };
-
-
   uncertainties = callPackage ../development/python-modules/uncertainties { };
 
   funcy = buildPythonPackage rec {
-- 
GitLab


From 2170a73d5c3a666790a0cb3bc128801b24c0f4a7 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 23:05:21 +0800
Subject: [PATCH 263/877] pythonpackages.rtslib_fb: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e839de2398..9c0d4d4de31 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18225,22 +18225,6 @@ in {
     };
   };
 
-  rtslib_fb = buildPythonPackage rec {
-    version = "2.1.fb43";
-    name = "rtslib-fb-${version}";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/agrover/rtslib-fb/archive/v${version}.tar.gz";
-      sha256 = "1b59vyy12g6rix9l2fxx0hjiq33shkb79v57gwffs57vh74wc53v";
-    };
-
-    meta = {
-      description = "A Python object API for managing the Linux LIO kernel target";
-      homepage = "https://github.com/agrover/rtslib-fb";
-      platforms = platforms.linux;
-    };
-  };
-
   s3transfer = buildPythonPackage rec {
     version = "0.1.10";
     name = "s3transfer-${version}";
-- 
GitLab


From cb7caad4e96550f5ea88a412c6e9d4f848ae5413 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 23:06:52 +0800
Subject: [PATCH 264/877] pythonpackages.targetcli_fb: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9c0d4d4de31..e4ebf181353 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19957,27 +19957,6 @@ in {
 
   tabulate = callPackage ../development/python-modules/tabulate { };
 
-  targetcli_fb = buildPythonPackage rec {
-    version = "2.1.fb33";
-    name = "targetcli-fb-${version}";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/agrover/targetcli-fb/archive/v${version}.tar.gz";
-      sha256 = "1zcm0agdpf866020b43fl8zyyyzz6r74mn1sz4xpaa0pinpwjk42";
-    };
-
-    propagatedBuildInputs = with self; [
-      configshell_fb
-      rtslib_fb
-    ];
-
-    meta = {
-      description = "A command shell for managing the Linux LIO kernel target";
-      homepage = "https://github.com/agrover/targetcli-fb";
-      platforms = platforms.linux;
-    };
-  };
-
   taskw = buildPythonPackage rec {
     version = "1.0.3";
     name = "taskw-${version}";
-- 
GitLab


From 7d6a912bfeeb37f62735c579cc1c8935dee14f3b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 23:08:09 +0800
Subject: [PATCH 265/877] pythonpackages.configshell_fb: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4ebf181353..72cc1b282d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2981,30 +2981,6 @@ in {
   });
 
 
-  configshell_fb = buildPythonPackage rec {
-    version = "1.1.fb10";
-    name = "configshell-fb-${version}";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/agrover/configshell-fb/archive/v${version}.tar.gz";
-      sha256 = "1dd87xvm98nk3jzybb041gjdahi2z9b53pwqhyxcfj4a91y82ndy";
-    };
-
-    propagatedBuildInputs = with self; [
-      pyparsing
-      urwid
-    ];
-
-    # Fails on python 3 due to a None value where a string is expected
-    doCheck = !isPy3k;
-
-    meta = {
-      description = "A Python library for building configuration shells";
-      homepage = "https://github.com/agrover/configshell-fb";
-      platforms = platforms.linux;
-    };
-  };
-
   confluent-kafka = callPackage ../development/python-modules/confluent-kafka {};
 
   construct = callPackage ../development/python-modules/construct {};
-- 
GitLab


From b2de5a9373d890622eb44849626299ca29dd1370 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 23:12:47 +0800
Subject: [PATCH 266/877] pythonpackages.nose-selecttests: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 72cc1b282d1..a637ef4e218 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12467,23 +12467,6 @@ in {
 
   nose-exclude = callPackage ../development/python-modules/nose-exclude { };
 
-  nose-selecttests = buildPythonPackage rec {
-    version = "0.4";
-    name = "nose-selecttests-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/nose-selecttests/${name}.zip";
-      sha256 = "0lgrfgp3sq8xi8d9grrg0z8jsyk0wl8a3rxw31hb7vdncin5b7n5";
-    };
-
-    propagatedBuildInputs = with self; [ nose ];
-
-    meta = {
-      description = "Simple nose plugin that enables developers to run subset of collected tests to spare some waiting time for better things";
-    };
-  };
-
-
   nose2 = if isPy26 then null else (buildPythonPackage rec {
     name = "nose2-0.5.0";
     src = pkgs.fetchurl {
-- 
GitLab


From 98024e2d85ba94eab44db8ee326aa7631ab93861 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 28 Oct 2017 23:14:24 +0800
Subject: [PATCH 267/877] pythonpackages.pyramid_debugtoolbar: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a637ef4e218..9e467410396 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7080,19 +7080,6 @@ in {
   };
 
 
-  pyramid_debugtoolbar = buildPythonPackage rec {
-    name = "pyramid_debugtoolbar-1.0.9";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyramid_debugtoolbar/${name}.tar.gz";
-      sha256 = "1vnzg1qnnyisv7znxg7pasayfyr3nz7rrs5nqr4fmdgwj9q2pyv0";
-    };
-
-    buildInputs = with self; [ ];
-    propagatedBuildInputs = with self; [ pyramid pyramid_mako ];
-  };
-
-
   pyramid_mako = buildPythonPackage rec {
     name = "pyramid_mako-0.3.1";
 
-- 
GitLab


From 8af79c8adc53909923164cf315913facfe5499ba Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 30 Oct 2017 12:06:07 +0800
Subject: [PATCH 268/877] pythonPackages.ofxclient: Depend on beautifulsoup4
 instead of beautifulsoup3

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

diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix
index c7877675530..3b5fa1f531a 100644
--- a/pkgs/development/python-modules/ofxclient/default.nix
+++ b/pkgs/development/python-modules/ofxclient/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi,
- ofxhome, ofxparse, beautifulsoup, lxml, keyring
+ ofxhome, ofxparse, beautifulsoup4, lxml, keyring
 }:
 
 buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # ImportError: No module named tests
   doCheck = false;
 
-  propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup lxml keyring ];
+  propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup4 lxml keyring ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/captin411/ofxclient;
-- 
GitLab


From cdbcb19e83fee42d6cceba0fb477dd37e25f63ed Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 31 Oct 2017 01:16:43 +0900
Subject: [PATCH 269/877] sxiv: installs .desktop file

sxiv won't appear in meus as it has NoDisplay but it can be used to
generate the mimetypes.
---
 pkgs/applications/graphics/sxiv/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 93bb5f151d9..68597a23ca6 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libX11 imlib2 giflib libexif ];
 
+  postInstall = ''
+    mkdir -p $out/share/applications/
+    cp -v sxiv.desktop $out/share/applications/
+  '';
+
   meta = {
     description = "Simple X Image Viewer";
     homepage = https://github.com/muennich/sxiv;
-- 
GitLab


From b8a7c455f6e5eef0fe6d9d65701816cbf3662f57 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 25 Oct 2017 21:59:52 +0100
Subject: [PATCH 270/877] Fix idrisPackages.with-packages

1. The ln step was failing due to a file already existing
2. gcc was invoked directly which caused failure on OS X.
---
 pkgs/development/idris-modules/with-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix
index edcd20c1097..d2b09808ec1 100644
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/pkgs/development/idris-modules/with-packages.nix
@@ -10,7 +10,7 @@
 
     installIdrisLib () {
       if [ -d $1/lib/${idris.name} ]; then
-        ln -sv $1/lib/${idris.name}/* $out/lib/${idris.name}
+        ln -fsv $1/lib/${idris.name}/* $out/lib/${idris.name}
       fi
     }
 
@@ -34,7 +34,7 @@
   '';
 
   buildPhase = ''
-    gcc -O3 -o idris idris.c
+    $CC -O3 -o idris idris.c
   '';
 
   installPhase = ''
-- 
GitLab


From 29e80bde404b5ed126fdc2f32e794556506a9cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Mon, 23 Oct 2017 23:27:24 +0200
Subject: [PATCH 271/877] nixos/gitlab: fix hard-coded database name

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

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 740cbc141b5..0dde9ff3c5a 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -619,7 +619,7 @@ in {
         fi
 
         # enable required pg_trgm extension for gitlab
-        ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql gitlab -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
+        ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
         # Always do the db migrations just to be sure the database is up-to-date
         ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production
 
-- 
GitLab


From 00c03e90038a4935da17fa0d5f5ca9d08fc19676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Mon, 23 Oct 2017 23:48:26 +0200
Subject: [PATCH 272/877] nixos/gitlab: fix preStart script

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

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 0dde9ff3c5a..e0fae335d03 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -634,7 +634,7 @@ in {
 
         # The gitlab:shell:create_hooks task seems broken for fixing links
         # so we instead delete all the hooks and create them anew
-        rm ${cfg.statePath}/repositories/**/*.git/hooks
+        rm -f ${cfg.statePath}/repositories/**/*.git/hooks
         ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production
 
         # Change permissions in the last step because some of the
-- 
GitLab


From c556c72a2efda33c6ef00ff376bd5596f6eca817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Tue, 24 Oct 2017 00:07:51 +0200
Subject: [PATCH 273/877] nixos/gitlab: fix secret generation This line
 previously produced an error and an empty secret file.

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

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index e0fae335d03..7b2b40e5923 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -572,7 +572,7 @@ in {
         rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
         mkdir -p ${cfg.statePath}/config
 
-        tr -dc A-Za-z0-9 < /dev/urandom | head -c 32 > ${cfg.statePath}/config/gitlab_shell_secret
+        ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
 
         # The uploads directory is hardcoded somewhere deep in rails. It is
         # symlinked in the gitlab package to /run/gitlab/uploads to make it
-- 
GitLab


From dd0cdc2fb4dcc195bb00c5602f0c1da28dbd5282 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 30 Oct 2017 01:08:20 +0000
Subject: [PATCH 274/877] ocamlPackages.camlp5: 7.02 -> 7.03

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

diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index e5c79f534b0..0acd70b424a 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation {
 
-  name = "camlp5${if transitional then "_transitional" else ""}-7.02";
+  name = "camlp5${if transitional then "_transitional" else ""}-7.03";
 
   src = fetchzip {
-    url = https://github.com/camlp5/camlp5/archive/rel702.tar.gz;
-    sha256 = "1m2d55zrgllidhgslvzgmr27f56qzdahz2sv56bvjs3bg7grmhnc";
+    url = https://github.com/camlp5/camlp5/archive/rel703.tar.gz;
+    sha256 = "0bwzhp4qjypfa0x8drp8w434dfixm1nzrm6pcy9s5akpmqvb50a8";
   };
 
   buildInputs = [ ocaml ];
-- 
GitLab


From d8987135c264cec552ebca51348a16c63a833fbb Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Mon, 30 Oct 2017 11:17:06 +0000
Subject: [PATCH 275/877] types.submodule: Replace a friendly comment by a more
 gentle one.

---
 lib/types.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index c48e3b3000c..dd0f31e9d14 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -288,8 +288,17 @@ rec {
           }).config;
         getSubOptions = prefix: (evalModules
           { modules = opts'; inherit prefix;
-            # FIXME: hack to get shit to evaluate.
-            args = { name = ""; }; }).options;
+            # This is a work-around due to the fact that some sub-modules,
+            # such as the one included in an attribute set, expects a "args"
+            # attribute to be given to the sub-module. As the option
+            # evaluation does not have any specific attribute name, we
+            # provide a default one for the documentation.
+            #
+            # This is mandatory as some option declaration might use the
+            # "name" attribute given as argument of the submodule and use it
+            # as the default of option declarations.
+            args.name = "<name>";
+          }).options;
         getSubModules = opts';
         substSubModules = m: submodule m;
         functor = (defaultFunctor name) // {
-- 
GitLab


From 70f35a99a4f7d17f8b82105e648efb3de681ab8e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 30 Oct 2017 08:30:29 -0400
Subject: [PATCH 276/877] linux: 4.14-rc6 -> 4.14-rc7

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 3a8d82cdb26..8c8fd3c9733 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.14-rc6";
-  modDirVersion = "4.14.0-rc6";
+  version = "4.14-rc7";
+  modDirVersion = "4.14.0-rc7";
   extraMeta.branch = "4.14";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0gmxrf4jmw8xl5gx487chyx94yas7rva5jbkczm9iw9sw0c8gwcb";
+    sha256 = "1w7b1sc5dsxcqywsdbwgs92i8jpj7hsnss67yzb58z3bz3hb73m3";
   };
 
   # Should the testing kernels ever be built on Hydra?
-- 
GitLab


From d266a456ab34b680261fa04bfb78b11a0bfb605f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 30 Oct 2017 08:54:14 -0400
Subject: [PATCH 277/877] perl: 5.24.2 -> 5.24.3

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

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 5246c5b0e59..97e395d2a6d 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -116,9 +116,7 @@ let
       platforms = platforms.all;
     };
   };
-
 in rec {
-
   perl = perl524;
 
   perl522 = common {
@@ -127,8 +125,7 @@ in rec {
   };
 
   perl524 = common {
-    version = "5.24.2";
-    sha256 = "1x4yj814a79lcarwb3ab6bbcb36hvb5n4ph4zg3yb0nabsjfi6v0";
+    version = "5.24.3";
+    sha256 = "1m2px85kq2fyp2d4rx3bw9kg3car67qfqwrs5vlv96dx0x8rl06b";
   };
-
 }
-- 
GitLab


From 7fd58b57b14529f4a0d156360c20895d61becfcc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 30 Oct 2017 09:04:23 -0400
Subject: [PATCH 278/877] git: 2.14.3 -> 2.15.0

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index b3c642de9b2..6358a340bb6 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "2.14.3";
+  version = "2.15.0";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "078m0za5gyzcah5iaxdwx663yvdp8byvjc8rpzjzcrr4sl6rcc2k";
+    sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h";
   };
 
   hardeningDisable = [ "format" ];
-- 
GitLab


From 933060fe19741f3a832e9c2ce4c8404422b8676c Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 30 Oct 2017 13:34:58 +0000
Subject: [PATCH 279/877] mikutter: mark as broken

The package doesn't build anymore

/cc @midchildan
---
 .../networking/instant-messengers/mikutter/default.nix           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index 1fa7a2fe7e9..e00468d9a4c 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    broken = true;
     description = "An extensible Twitter client";
     homepage = https://mikutter.hachune.net;
     maintainers = with maintainers; [ midchildan ];
-- 
GitLab


From 119ebee6a4f66d4e623e058e897bdd5928ba478b Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Mon, 30 Oct 2017 13:25:31 +0100
Subject: [PATCH 280/877] pcre: 8.40 -> 8.41 (fixes multiple CVEs)

---
 .../libraries/pcre/CVE-2017-7186.patch        | 52 -------------------
 pkgs/development/libraries/pcre/default.nix   |  6 +--
 2 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/development/libraries/pcre/CVE-2017-7186.patch

diff --git a/pkgs/development/libraries/pcre/CVE-2017-7186.patch b/pkgs/development/libraries/pcre/CVE-2017-7186.patch
deleted file mode 100644
index e9e1997e47c..00000000000
--- a/pkgs/development/libraries/pcre/CVE-2017-7186.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/pcre_internal.h	2016/05/21 13:34:44	1649
-+++ b/pcre_internal.h	2017/02/24 17:30:30	1688
-@@ -2772,6 +2772,9 @@
- extern const pcre_uint16 PRIV(ucd_stage2)[];
- extern const pcre_uint32 PRIV(ucp_gentype)[];
- extern const pcre_uint32 PRIV(ucp_gbtable)[];
-+#ifdef COMPILE_PCRE32
-+extern const ucd_record  PRIV(dummy_ucd_record)[];
-+#endif
- #ifdef SUPPORT_JIT
- extern const int         PRIV(ucp_typerange)[];
- #endif
-@@ -2780,9 +2783,15 @@
- /* UCD access macros */
- 
- #define UCD_BLOCK_SIZE 128
--#define GET_UCD(ch) (PRIV(ucd_records) + \
-+#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \
-         PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \
-         UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
-+        
-+#ifdef COMPILE_PCRE32
-+#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch))
-+#else
-+#define GET_UCD(ch) REAL_GET_UCD(ch)
-+#endif 
- 
- #define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype
- #define UCD_SCRIPT(ch)      GET_UCD(ch)->script
---- a/pcre_ucd.c	2014/06/19 07:51:39	1490
-+++ b/pcre_ucd.c	2017/02/24 17:30:30	1688
-@@ -38,6 +38,20 @@
- const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0};
- #else
- 
-+/* If the 32-bit library is run in non-32-bit mode, character values
-+greater than 0x10ffff may be encountered. For these we set up a
-+special record. */
-+
-+#ifdef COMPILE_PCRE32
-+const ucd_record PRIV(dummy_ucd_record)[] = {{
-+  ucp_Common,    /* script */
-+  ucp_Cn,        /* type unassigned */
-+  ucp_gbOther,   /* grapheme break property */
-+  0,             /* case set */
-+  0,             /* other case */
-+  }};
-+#endif
-+
- /* When recompiling tables with a new Unicode version, please check the
- types in this structure definition from pcre_internal.h (the actual
- field names will be different):
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index d19410f735f..e6055151301 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -9,7 +9,7 @@ with stdenv.lib;
 assert elem variant [ null "cpp" "pcre16" "pcre32" ];
 
 let
-  version = "8.40";
+  version = "8.41";
   pname = if (variant == null) then "pcre"
     else  if (variant == "cpp") then "pcre-cpp"
     else  variant;
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2";
-    sha256 = "1x7lpjn7jhk0n3sdvggxrlrhab8kkfjwl7qix0ypw9nlx8lpmqh0";
+    sha256 = "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76";
   };
 
   outputs = [ "bin" "dev" "out" "doc" "man" ];
@@ -31,8 +31,6 @@ in stdenv.mkDerivation rec {
   ]
     ++ optional (variant != null) "--enable-${variant}";
 
-  patches = [ ./CVE-2017-7186.patch ];
-
   buildInputs = optional (hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads;
 
   doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform;
-- 
GitLab


From 367a3e45fd9a7c820871ae82b185f63208e1ccf0 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 30 Oct 2017 14:19:24 +0100
Subject: [PATCH 281/877] highlight: 3.39 -> 3.40, fetch src from Github

---
 pkgs/tools/text/highlight/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 71c5e352b94..275d65e7c37 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, getopt, lua, boost, pkgconfig, gcc }:
+{ stdenv, fetchFromGitHub, getopt, lua, boost, pkgconfig, gcc }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "highlight-${version}";
-  version = "3.39";
+  version = "3.40";
 
-  src = fetchurl {
-    url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
-    sha256 = "0z8gs69sqlyis4kvl8wwdgzywi199k73kkvn1mf9pf60npvcxwj4";
+  src = fetchFromGitHub {
+    owner = "andre-simon";
+    repo = "highlight";
+    rev = "${version}";
+    sha256 = "0bkywhz4y10qcajimdha1ck5mvn7fsrv3yn8nd6rqbva39gbfmfd";
   };
 
   nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin  gcc ;
@@ -28,6 +30,6 @@ stdenv.mkDerivation rec {
     description = "Source code highlighting tool";
     homepage = http://www.andre-simon.de/doku/highlight/en/highlight.php;
     platforms = platforms.unix;
-    maintainers = [ maintainers.ndowens ];
+    maintainers = with maintainers; [ ndowens willibutz ];
   };
 }
-- 
GitLab


From d22a1f6abcc2753f34a75d93bd52bbe2b387fcba Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 31 Oct 2017 03:08:36 +0900
Subject: [PATCH 282/877] pandas: 0.20.3 -> 0.21.0

Now needs 'moto' to complete tests.
---
 pkgs/development/python-modules/pandas/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 7bab184bb2a..2cbb67545a0 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -8,6 +8,7 @@
 , cython
 , dateutil
 , scipy
+, moto
 , numexpr
 , pytz
 , xlrd
@@ -27,12 +28,12 @@ let
   inherit (stdenv) isDarwin;
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.20.3";
+  version = "0.21.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a777e07633d83d546c55706420179551c8e01075b53c497dcf8ae4036766bc66";
+    sha256 = "0nf50ls2cnlsd2635nyji7l70xc91dw81qg5y01g5sifwwqcpmaw";
   };
 
   LC_ALL = "en_US.UTF-8";
@@ -64,6 +65,7 @@ in buildPythonPackage rec {
                 "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
   '';
 
+  checkInputs = [ moto ];
   checkPhase = ''
     runHook preCheck
   ''
-- 
GitLab


From da866a6f2969418cb542120372eda5103516b9b3 Mon Sep 17 00:00:00 2001
From: James Earl Douglas <james@earldouglas.com>
Date: Mon, 30 Oct 2017 08:57:54 -0600
Subject: [PATCH 283/877] jenkins: 2.86 -> 2.87

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index de0321109d7..e6f01ba5c93 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.86";
+  version = "2.87";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "198fcj2wkz8qxawk3mq29kwl51pxlbd7ivndcpvdvg42g0caqyi0";
+    sha256 = "1nzs9nn1nr2jav59v1xj39rzmrh1zmwaqnpaiqsll8kixkr9rb8f";
   };
 
   buildCommand = ''
-- 
GitLab


From abbea503b9e23eae7fa711799e0c63f9080a8ef2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 30 Oct 2017 15:13:09 +0000
Subject: [PATCH 284/877] CODEOWNERS: add zimbatm to ruby modules

---
 .github/CODEOWNERS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 124a1d19ecb..00e058eb84b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -34,6 +34,10 @@ pkgs/development/haskell-modules/hoogle.nix          @peti
 pkgs/applications/science/math/R @peti
 pkgs/development/r-modules       @peti
 
+# Ruby
+pkgs/development/interpreters/ruby @zimbatm
+pkgs/development/ruby-modules      @zimbatm
+
 # Darwin-related
 /pkgs/stdenv/darwin/             @org/darwin-maintainers
 /pkgs/os-specific/darwin/        @org/darwin-maintainers
-- 
GitLab


From 0a46a71a6ec41764b118a24e4cbf1b4bc4be906e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 30 Oct 2017 15:14:24 +0000
Subject: [PATCH 285/877] gitAndTools.git-codeowners: init at 0.1.1

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-codeowners/default.nix  | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 82846a564cd..58a9e808923 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -58,6 +58,8 @@ rec {
   # support for bugzilla
   git-bz = callPackage ./git-bz { };
 
+  git-codeowners = callPackage ./git-codeowners { };
+
   git-cola = callPackage ./git-cola { };
 
   git-crypt = callPackage ./git-crypt { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
new file mode 100644
index 00000000000..07e0ce80c5d
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
@@ -0,0 +1,21 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+rustPlatform.buildRustPackage rec {
+  name = "git-codeowners-${version}";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "softprops";
+    repo = "git-codeowners";
+    rev = "v${version}";
+    sha256 = "0imxbi6y1165bi2rik0n98v79fkgp8alb615qh41idg1p2krzyy5";
+  };
+
+  cargoSha256 = "0h831rf5vlvpzfm4sr3fvwlc0ys776fqis90y414mczphkxvz437";
+
+  meta = with lib; {
+    homepage = "https://github.com/softprops/git-codeowners";
+    description = "a git extension to work with CODEOWNERS files";
+    license = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
-- 
GitLab


From 029522249bce9a5e217247a9a961f9931f4a79f1 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 16 Oct 2017 15:09:23 +0200
Subject: [PATCH 286/877] gnumake: fix occasional hangs in parallel builds

https://savannah.gnu.org/bugs/?49014
https://savannah.gnu.org/bugs/?51159
---
 .../build-managers/gnumake/4.2/default.nix    |   1 +
 .../build-managers/gnumake/4.2/pselect.patch  | 170 ++++++++++++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch

diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index 253aadb86d7..7914d8ebb4f 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation {
     # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for
     # included Makefiles, don't look in /usr/include and friends.
     ./impure-dirs.patch
+    ./pselect.patch
   ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch
new file mode 100644
index 00000000000..5a03acb2f7c
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch
@@ -0,0 +1,170 @@
+From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith@gnu.org>
+Date: Sat, 3 Jun 2017 16:20:51 -0400
+Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs.
+
+* posixos.c (set_blocking): Set blocking on a file descriptor.
+(jobserver_setup): Set non-blocking on the jobserver read side.
+(jobserver_parse_auth): Ditto.
+(jobserver_acquire_all): Set blocking to avoid a busy-wait loop.
+(jobserver_acquire): If the non-blocking read() returns without
+taking a token then try again.
+---
+ posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 71 insertions(+), 26 deletions(-)
+
+diff --git posixos.c posixos.c
+index e642d7f..dbafa51 100644
+--- posixos.c
++++ posixos.c
+@@ -62,6 +62,24 @@ make_job_rfd (void)
+ #endif
+ }
+ 
++static void
++set_blocking (int fd, int blocking)
++{
++  // If we're not using pselect() don't change the blocking
++#ifdef HAVE_PSELECT
++  int flags;
++  EINTRLOOP (flags, fcntl (fd, F_GETFL));
++  if (flags >= 0)
++    {
++      int r;
++      flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK);
++      EINTRLOOP (r, fcntl (fd, F_SETFL, flags));
++      if (r < 0)
++        pfatal_with_name ("fcntl(O_NONBLOCK)");
++    }
++#endif
++}
++
+ unsigned int
+ jobserver_setup (int slots)
+ {
+@@ -86,6 +104,9 @@ jobserver_setup (int slots)
+         pfatal_with_name (_("init jobserver pipe"));
+     }
+ 
++  /* When using pselect() we want the read to be non-blocking.  */
++  set_blocking (job_fds[0], 0);
++
+   return 1;
+ }
+ 
+@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth)
+       return 0;
+     }
+ 
++  /* When using pselect() we want the read to be non-blocking.  */
++  set_blocking (job_fds[0], 0);
++
+   return 1;
+ }
+ 
+@@ -169,7 +193,10 @@ jobserver_acquire_all (void)
+ {
+   unsigned int tokens = 0;
+ 
+-  /* Close the write side, so the read() won't hang.  */
++  /* Use blocking reads to wait for all outstanding jobs.  */
++  set_blocking (job_fds[0], 1);
++
++  /* Close the write side, so the read() won't hang forever.  */
+   close (job_fds[1]);
+   job_fds[1] = -1;
+ 
+@@ -236,18 +263,12 @@ jobserver_pre_acquire (void)
+ unsigned int
+ jobserver_acquire (int timeout)
+ {
+-  sigset_t empty;
+-  fd_set readfds;
+   struct timespec spec;
+   struct timespec *specp = NULL;
+-  int r;
+-  char intake;
++  sigset_t empty;
+ 
+   sigemptyset (&empty);
+ 
+-  FD_ZERO (&readfds);
+-  FD_SET (job_fds[0], &readfds);
+-
+   if (timeout)
+     {
+       /* Alarm after one second (is this too granular?)  */
+@@ -256,28 +277,52 @@ jobserver_acquire (int timeout)
+       specp = &spec;
+     }
+ 
+-  r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty);
+-
+-  if (r == -1)
++  while (1)
+     {
+-      /* Better be SIGCHLD.  */
+-      if (errno != EINTR)
+-        pfatal_with_name (_("pselect jobs pipe"));
+-      return 0;
+-    }
++      fd_set readfds;
++      int r;
++      char intake;
+ 
+-  if (r == 0)
+-    /* Timeout.  */
+-    return 0;
++      FD_ZERO (&readfds);
++      FD_SET (job_fds[0], &readfds);
+ 
+-  /* The read FD is ready: read it!  */
+-  EINTRLOOP (r, read (job_fds[0], &intake, 1));
+-  if (r < 0)
+-    pfatal_with_name (_("read jobs pipe"));
++      r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty);
++      if (r < 0)
++        switch (errno)
++          {
++          case EINTR:
++            /* SIGCHLD will show up as an EINTR.  */
++            return 0;
++
++          case EBADF:
++            /* Someone closed the jobs pipe.
++               That shouldn't happen but if it does we're done.  */
++              O (fatal, NILF, _("job server shut down"));
+ 
+-  /* What does it mean if read() returns 0?  It shouldn't happen because only
+-     the master make can reap all the tokens and close the write side...??  */
+-  return r > 0;
++          default:
++            pfatal_with_name (_("pselect jobs pipe"));
++          }
++
++      if (r == 0)
++        /* Timeout.  */
++        return 0;
++
++      /* The read FD is ready: read it!  This is non-blocking.  */
++      EINTRLOOP (r, read (job_fds[0], &intake, 1));
++
++      if (r < 0)
++        {
++          /* Someone sniped our token!  Try again.  */
++          if (errno == EAGAIN)
++            continue;
++
++          pfatal_with_name (_("read jobs pipe"));
++        }
++
++      /* read() should never return 0: only the master make can reap all the
++         tokens and close the write side...??  */
++      return r > 0;
++    }
+ }
+ 
+ #else
+-- 
+cgit v1.0-41-gc330
+
-- 
GitLab


From 4a4f6ba41878d514d7c2616c85242ff31a13a06b Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 30 Oct 2017 15:20:54 +0000
Subject: [PATCH 287/877] CODEOWNERS: fix path matching

---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 00e058eb84b..bd24a2e0cab 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -35,8 +35,8 @@ pkgs/applications/science/math/R @peti
 pkgs/development/r-modules       @peti
 
 # Ruby
-pkgs/development/interpreters/ruby @zimbatm
-pkgs/development/ruby-modules      @zimbatm
+pkgs/development/interpreters/ruby/* @zimbatm
+pkgs/development/ruby-modules/*      @zimbatm
 
 # Darwin-related
 /pkgs/stdenv/darwin/             @org/darwin-maintainers
-- 
GitLab


From febe376f13b7b57de26af5af271ddcb565a25d74 Mon Sep 17 00:00:00 2001
From: Falco Peijnenburg <falco@lumiguide.nl>
Date: Mon, 30 Oct 2017 16:48:26 +0100
Subject: [PATCH 288/877] fetchadc: removed

It's not being used
---
 pkgs/build-support/fetchadc/builder.sh  |  7 -----
 pkgs/build-support/fetchadc/default.nix | 36 -------------------------
 pkgs/top-level/all-packages.nix         |  9 -------
 3 files changed, 52 deletions(-)
 delete mode 100644 pkgs/build-support/fetchadc/builder.sh
 delete mode 100644 pkgs/build-support/fetchadc/default.nix

diff --git a/pkgs/build-support/fetchadc/builder.sh b/pkgs/build-support/fetchadc/builder.sh
deleted file mode 100644
index ceeaa9213d6..00000000000
--- a/pkgs/build-support/fetchadc/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-loginpage=`curl --insecure -s -L -b cookies.txt "$url"`
-
-[[ $loginpage =~ form[^\>]+action=\"([^\"]+)\" ]] && loginurl=${BASH_REMATCH[1]}
-
-curl  --insecure -s --output "$out" -L -b cookies.txt --data "appleId=${adc_user}&accountPassword=${adc_pass}" "https://idmsa.apple.com/IDMSWebAuth/${loginurl}"
diff --git a/pkgs/build-support/fetchadc/default.nix b/pkgs/build-support/fetchadc/default.nix
deleted file mode 100644
index 4d759e6f7f1..00000000000
--- a/pkgs/build-support/fetchadc/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, curl, adc_user, adc_pass }:
-
-{ # Path to fetch.
-  path
-
-  # Hash of the downloaded file
-, sha256
-
-, # Additional curl options needed for the download to succeed.
-  curlOpts ? ""
-
-, # Name of the file.  If empty, use the basename of `path'.
-  name ? ""
-}:
-
-stdenv.mkDerivation {
-  url = "https://developer.apple.com/downloads/download.action?path=${path}";
-
-  name    = if name != "" then name else baseNameOf path;
-  builder = ./builder.sh;
-
-  buildInputs = [ curl ];
-
-  meta = {
-    # Password-guarded files from ADC are certainly unfree, as far as we're concerned!
-    license = stdenv.lib.licenses.unfree;
-  };
-
-  outputHashAlgo = "sha256";
-  outputHash     =  sha256;
-  outputHashMode = "flat";
-
-  inherit curlOpts adc_user adc_pass;
-
-  preferLocalBuild = true;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 762f217fcbe..e833d3dec09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -126,15 +126,6 @@ with pkgs;
     vs = vs90wrapper;
   };
 
-  fetchadc = callPackage ../build-support/fetchadc {
-    adc_user = if config ? adc_user
-      then config.adc_user
-      else throw "You need an adc_user attribute in your config to download files from Apple Developer Connection";
-    adc_pass = if config ? adc_pass
-      then config.adc_pass
-      else throw "You need an adc_pass attribute in your config to download files from Apple Developer Connection";
-  };
-
   fetchbower = callPackage ../build-support/fetchbower {
     inherit (nodePackages) bower2nix;
   };
-- 
GitLab


From a2fe432e2c9262b62d0f853b9965ef08de3408bc Mon Sep 17 00:00:00 2001
From: Kai Harries <kai.harries@gmail.com>
Date: Sun, 29 Oct 2017 21:15:10 +0100
Subject: [PATCH 289/877] gmailieer: init at 0.3

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

diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix
new file mode 100644
index 00000000000..b3a9634c8a1
--- /dev/null
+++ b/pkgs/applications/networking/gmailieer/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  name = "gmailieer";
+  version = "0.3";
+
+  src = fetchFromGitHub {
+    owner = "gauteh";
+    repo = "gmailieer";
+    rev = "v${version}";
+    sha256 = "1app783gf0p9p196nqsgbyl6s1bp304dfav86fqiq86h1scld787";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    notmuch
+    oauth2client
+    google_api_python_client
+    tqdm
+  ];
+
+  meta = with stdenv.lib; {
+    description      = "Fast email-fetching and two-way tag synchronization between notmuch and GMail";
+    longDescription  = ''
+      This program can pull email and labels (and changes to labels)
+      from your GMail account and store them locally in a maildir with
+      the labels synchronized with a notmuch database. The changes to
+      tags in the notmuch database may be pushed back remotely to your
+      GMail account.
+    '';
+    homepage         = https://github.com/gauteh/gmailieer;
+    repositories.git = https://github.com/gauteh/gmailieer.git;
+    license          = licenses.gpl3Plus;
+    maintainers      = with maintainers; [ kaiha ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b89e59463bd..f644ee5a527 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12270,6 +12270,8 @@ with pkgs;
 
   gfxtablet = callPackage ../os-specific/linux/gfxtablet {};
 
+  gmailieer = callPackage ../applications/networking/gmailieer {};
+
   gpm = callPackage ../servers/gpm {
     ncurses = null;  # Keep curses disabled for lack of value
   };
-- 
GitLab


From 821a7a38ea293d4711c20f95cdfb368acc632f9d Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Mon, 30 Oct 2017 16:42:58 +0100
Subject: [PATCH 290/877] prometheus-alertmanager: 0.8.0 -> 0.9.1

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

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 3ae2a45ca6d..444aa92ec2e 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "alertmanager-${version}";
-  version = "0.8.0";
+  version = "0.9.1";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "alertmanager";
-    sha256 = "0bqc58j0nrq7y8nbd927z7x74m8mcd2782cxkqwscpq6d9983qql";
+    sha256 = "1lkfj63pp4jf58xmn015r7s42p1wyj6fryihpmdn0k76b0ccwqzj";
   };
 
   # Tests exist, but seem to clash with the firewall.
-- 
GitLab


From c3255fe8ec326d2c8fe9462d49ed83aa64d3e68f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 30 Oct 2017 17:17:07 +0100
Subject: [PATCH 291/877] fetchzip and friends: Set "name" to "source" by
 default

This makes them produce the same store paths as builtins.fetchgit,
builtins.fetchTarball etc. See
https://github.com/NixOS/nix/commit/65b5f177b5fbb1b0778ede047a13a3cee9c59cfe.
---
 pkgs/build-support/fetchgit/gitrepotoname.nix | 19 -------------------
 pkgs/build-support/fetchzip/default.nix       |  3 ++-
 pkgs/top-level/all-packages.nix               | 12 +++++-------
 3 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/build-support/fetchgit/gitrepotoname.nix

diff --git a/pkgs/build-support/fetchgit/gitrepotoname.nix b/pkgs/build-support/fetchgit/gitrepotoname.nix
deleted file mode 100644
index 90005b54569..00000000000
--- a/pkgs/build-support/fetchgit/gitrepotoname.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ lib }:
-
-let
-  inherit (lib) removeSuffix hasPrefix removePrefix splitString stringToCharacters concatMapStrings last elem;
-
-  allowedChars = stringToCharacters "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-._?=";
-  sanitizeStoreName = s:
-    let
-      s' = concatMapStrings (c: if elem c allowedChars then c else "") (stringToCharacters s);
-      s'' = if hasPrefix "." s' then "_${removePrefix "." s'}" else s';
-    in
-      s'';
-in
-  urlOrRepo: rev:
-    let
-      repo' = last (splitString ":" (baseNameOf (removeSuffix ".git" (removeSuffix "/" urlOrRepo))));
-      rev' = baseNameOf rev;
-    in
-     "${sanitizeStoreName repo'}-${sanitizeStoreName rev'}-src"
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index 751dba56930..4a5381d71f2 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -11,10 +11,11 @@
   stripRoot ? true
 , url
 , extraPostFetch ? ""
+, name ? "source"
 , ... } @ args:
 
 lib.overrideDerivation (fetchurl ({
-  name = args.name or (baseNameOf url);
+  inherit name;
 
   recursiveHash = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69f1dfc88a4..7295ce09c23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -195,10 +195,8 @@ with pkgs;
 
   fetchzip = callPackage ../build-support/fetchzip { };
 
-  gitRepoToName = callPackage ../build-support/fetchgit/gitrepotoname.nix { };
-
   fetchFromGitHub = {
-    owner, repo, rev, name ? gitRepoToName repo rev,
+    owner, repo, rev, name ? "source",
     fetchSubmodules ? false, private ? false,
     githubBase ? "github.com", varPrefix ? null,
     ... # For hash agility
@@ -231,7 +229,7 @@ with pkgs;
   in fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; };
 
   fetchFromBitbucket = {
-    owner, repo, rev, name ? gitRepoToName repo rev,
+    owner, repo, rev, name ? "source",
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
@@ -242,7 +240,7 @@ with pkgs;
 
   # cgit example, snapshot support is optional in cgit
   fetchFromSavannah = {
-    repo, rev, name ? gitRepoToName repo rev,
+    repo, rev, name ? "source",
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
@@ -252,7 +250,7 @@ with pkgs;
 
   # gitlab example
   fetchFromGitLab = {
-    owner, repo, rev, name ? gitRepoToName repo rev,
+    owner, repo, rev, name ? "source",
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
@@ -262,7 +260,7 @@ with pkgs;
 
   # gitweb example, snapshot support is optional in gitweb
   fetchFromRepoOrCz = {
-    repo, rev, name ? gitRepoToName repo rev,
+    repo, rev, name ? "source",
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
-- 
GitLab


From ecdf4f1c51c0b1093b06c17fce29f6778ee6934f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Oct 2017 12:16:49 +0100
Subject: [PATCH 292/877] php56: 5.6.31 -> 5.6.32

---
 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 57383fa3412..578b4d41901 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -326,8 +326,8 @@ let
 
 in {
   php56 = generic {
-    version = "5.6.31";
-    sha256 = "03xixkvfp64bqp97p8vlj3hp63bpjw7hc16b7fgm7w35rdlp2fcg";
+    version = "5.6.32";
+    sha256 = "0lfbmdkvijkm6xc4p9sykv66y8xwhws0vsmka8v5cax4bxx4xr1y";
   };
 
   php70 = generic {
-- 
GitLab


From 3975f267abc305d4a197fe96c0cf5f49cbfc6d7d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Oct 2017 12:17:06 +0100
Subject: [PATCH 293/877] php70: 7.0.24 -> 7.0.25

---
 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 578b4d41901..b72a6886178 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -331,8 +331,8 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.24";
-    sha256 = "06fgpljz6xpxxkpf4cv9rqz8g504l9ikbw5aq0hqh5sgd611kycv";
+    version = "7.0.25";
+    sha256 = "09fc2lj447phprvilvq2sb6n0r1snj142f8faphrd896s6b4v8lm";
   };
 
   php71 = generic {
-- 
GitLab


From f41f5a8f77a09f9629b86d88f6a6b514e416d155 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Oct 2017 12:17:30 +0100
Subject: [PATCH 294/877] php71: 7.1.9 -> 7.1.11

---
 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 b72a6886178..be9aab50cb9 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -336,7 +336,7 @@ in {
   };
 
   php71 = generic {
-    version = "7.1.9";
-    sha256 = "1blvzm2js8mrdbmwks0v6nlb5wj4789ixzmlxm1l8z6xvw8cqk9i";
+    version = "7.1.11";
+    sha256 = "0ww5493w8w3jlks0xqlfm3v6mm53vpnv5vjy63inkj8zf3gdfikn";
   };
 }
-- 
GitLab


From 517606d1d4872c3b8b1a42796d572a7420fe1489 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Oct 2017 13:55:46 +0100
Subject: [PATCH 295/877] Revert "linux_4_4: remove"

This reverts commit 9f3f575ab3eb4cd6b5f8de20e6f1a5374fedef2c.

Support from upstream has been extended to Feb 2022.
---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 14 ++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-4.4.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
new file mode 100644
index 00000000000..16699dcdf43
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -0,0 +1,18 @@
+{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.4.80";
+  extraMeta.branch = "4.4";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "1hs07k49sbpi8yw2mdwn1967i82x4wn6kg0lbjvv5l1pv3alky1l";
+  };
+
+  kernelPatches = args.kernelPatches;
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e833d3dec09..6c0f6726450 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12435,6 +12435,19 @@ with pkgs;
     ];
   };
 
+  linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
+        kernelPatches.p9_fixes
+        kernelPatches.cpu-cgroup-v2."4.4"
+      ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -12657,6 +12670,7 @@ with pkgs;
   linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead;
   linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
   linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
+  linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_13);
   # Don't forget to update linuxPackages_latest!
-- 
GitLab


From 36be7d3e85fedcac31964e311de9d2d1b087767a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Oct 2017 14:00:14 +0100
Subject: [PATCH 296/877] Revert parts of "linux: remove unused kernel patches"

This reverts commit 05b8cae9ec88156f46d9b98424643b6208664222 that
removed the cgroup v2 patch for the 4.4 kernel.
---
 .../kernel/cpu-cgroup-v2-patches/4.4.patch    | 407 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 2 files changed, 408 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch

diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch
new file mode 100644
index 00000000000..8f2418c9efc
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch
@@ -0,0 +1,407 @@
+commit e7cae741f6d645ac68fe8823ca6ef45dbbf6891b
+Author: Tejun Heo <tj@kernel.org>
+Date:   Fri Mar 11 07:31:23 2016 -0500
+
+    sched: Misc preps for cgroup unified hierarchy interface
+    
+    Make the following changes in preparation for the cpu controller
+    interface implementation for the unified hierarchy.  This patch
+    doesn't cause any functional differences.
+    
+    * s/cpu_stats_show()/cpu_cfs_stats_show()/
+    
+    * s/cpu_files/cpu_legacy_files/
+    
+    * Separate out cpuacct_stats_read() from cpuacct_stats_show().  While
+      at it, remove pointless cpuacct_stat_desc[] array.
+    
+    Signed-off-by: Tejun Heo <tj@kernel.org>
+    Cc: Ingo Molnar <mingo@redhat.com>
+    Cc: Peter Zijlstra <peterz@infradead.org>
+    Cc: Li Zefan <lizefan@huawei.com>
+    Cc: Johannes Weiner <hannes@cmpxchg.org>
+
+diff --git a/kernel/sched/core.c b/kernel/sched/core.c
+index 732e993..77f3ddd 100644
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -8512,7 +8512,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota)
+ 	return ret;
+ }
+ 
+-static int cpu_stats_show(struct seq_file *sf, void *v)
++static int cpu_cfs_stats_show(struct seq_file *sf, void *v)
+ {
+ 	struct task_group *tg = css_tg(seq_css(sf));
+ 	struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
+@@ -8552,7 +8552,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css,
+ }
+ #endif /* CONFIG_RT_GROUP_SCHED */
+ 
+-static struct cftype cpu_files[] = {
++static struct cftype cpu_legacy_files[] = {
+ #ifdef CONFIG_FAIR_GROUP_SCHED
+ 	{
+ 		.name = "shares",
+@@ -8573,7 +8573,7 @@ static struct cftype cpu_files[] = {
+ 	},
+ 	{
+ 		.name = "stat",
+-		.seq_show = cpu_stats_show,
++		.seq_show = cpu_cfs_stats_show,
+ 	},
+ #endif
+ #ifdef CONFIG_RT_GROUP_SCHED
+@@ -8599,7 +8599,7 @@ struct cgroup_subsys cpu_cgrp_subsys = {
+ 	.fork		= cpu_cgroup_fork,
+ 	.can_attach	= cpu_cgroup_can_attach,
+ 	.attach		= cpu_cgroup_attach,
+-	.legacy_cftypes	= cpu_files,
++	.legacy_cftypes	= cpu_legacy_files,
+ 	.early_init	= 1,
+ };
+ 
+diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
+index dd7cbb5..42b2dd5 100644
+--- a/kernel/sched/cpuacct.c
++++ b/kernel/sched/cpuacct.c
+@@ -177,36 +177,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V)
+ 	return 0;
+ }
+ 
+-static const char * const cpuacct_stat_desc[] = {
+-	[CPUACCT_STAT_USER] = "user",
+-	[CPUACCT_STAT_SYSTEM] = "system",
+-};
+-
+-static int cpuacct_stats_show(struct seq_file *sf, void *v)
++static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp)
+ {
+-	struct cpuacct *ca = css_ca(seq_css(sf));
+ 	int cpu;
+-	s64 val = 0;
+ 
++	*userp = 0;
+ 	for_each_online_cpu(cpu) {
+ 		struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu);
+-		val += kcpustat->cpustat[CPUTIME_USER];
+-		val += kcpustat->cpustat[CPUTIME_NICE];
++		*userp += kcpustat->cpustat[CPUTIME_USER];
++		*userp += kcpustat->cpustat[CPUTIME_NICE];
+ 	}
+-	val = cputime64_to_clock_t(val);
+-	seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val);
+ 
+-	val = 0;
++	*sysp = 0;
+ 	for_each_online_cpu(cpu) {
+ 		struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu);
+-		val += kcpustat->cpustat[CPUTIME_SYSTEM];
+-		val += kcpustat->cpustat[CPUTIME_IRQ];
+-		val += kcpustat->cpustat[CPUTIME_SOFTIRQ];
++		*sysp += kcpustat->cpustat[CPUTIME_SYSTEM];
++		*sysp += kcpustat->cpustat[CPUTIME_IRQ];
++		*sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ];
+ 	}
++}
+ 
+-	val = cputime64_to_clock_t(val);
+-	seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val);
++static int cpuacct_stats_show(struct seq_file *sf, void *v)
++{
++	cputime64_t user, sys;
+ 
++	cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys);
++	seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user));
++	seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys));
+ 	return 0;
+ }
+ 
+
+commit 1bb33e8a69f089f2d3f58a0e681d4ff352e11c97
+Author: Tejun Heo <tj@kernel.org>
+Date:   Fri Mar 11 07:31:23 2016 -0500
+
+    sched: Implement interface for cgroup unified hierarchy
+    
+    While the cpu controller doesn't have any functional problems, there
+    are a couple interface issues which can be addressed in the v2
+    interface.
+    
+    * cpuacct being a separate controller.  This separation is artificial
+      and rather pointless as demonstrated by most use cases co-mounting
+      the two controllers.  It also forces certain information to be
+      accounted twice.
+    
+    * Use of different time units.  Writable control knobs use
+      microseconds, some stat fields use nanoseconds while other cpuacct
+      stat fields use centiseconds.
+    
+    * Control knobs which can't be used in the root cgroup still show up
+      in the root.
+    
+    * Control knob names and semantics aren't consistent with other
+      controllers.
+    
+    This patchset implements cpu controller's interface on the unified
+    hierarchy which adheres to the controller file conventions described
+    in Documentation/cgroups/unified-hierarchy.txt.  Overall, the
+    following changes are made.
+    
+    * cpuacct is implictly enabled and disabled by cpu and its information
+      is reported through "cpu.stat" which now uses microseconds for all
+      time durations.  All time duration fields now have "_usec" appended
+      to them for clarity.  While this doesn't solve the double accounting
+      immediately, once majority of users switch to v2, cpu can directly
+      account and report the relevant stats and cpuacct can be disabled on
+      the unified hierarchy.
+    
+      Note that cpuacct.usage_percpu is currently not included in
+      "cpu.stat".  If this information is actually called for, it can be
+      added later.
+    
+    * "cpu.shares" is replaced with "cpu.weight" and operates on the
+      standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000).
+      The weight is scaled to scheduler weight so that 100 maps to 1024
+      and the ratio relationship is preserved - if weight is W and its
+      scaled value is S, W / 100 == S / 1024.  While the mapped range is a
+      bit smaller than the orignal scheduler weight range, the dead zones
+      on both sides are relatively small and covers wider range than the
+      nice value mappings.  This file doesn't make sense in the root
+      cgroup and isn't create on root.
+    
+    * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max"
+      which contains both quota and period.
+    
+    * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by
+      "cpu.rt.max" which contains both runtime and period.
+    
+    v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for
+        CFS bandwidth stats and also using raw division for u64.  Use
+        CONFIG_CFS_BANDWITH and do_div() instead.
+    
+        The semantics of "cpu.rt.max" is not fully decided yet.  Dropped
+        for now.
+    
+    Signed-off-by: Tejun Heo <tj@kernel.org>
+    Cc: Ingo Molnar <mingo@redhat.com>
+    Cc: Peter Zijlstra <peterz@infradead.org>
+    Cc: Li Zefan <lizefan@huawei.com>
+    Cc: Johannes Weiner <hannes@cmpxchg.org>
+
+diff --git a/kernel/sched/core.c b/kernel/sched/core.c
+index 77f3ddd..7aafe63 100644
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -8591,6 +8591,139 @@ static struct cftype cpu_legacy_files[] = {
+ 	{ }	/* terminate */
+ };
+ 
++static int cpu_stats_show(struct seq_file *sf, void *v)
++{
++	cpuacct_cpu_stats_show(sf);
++
++#ifdef CONFIG_CFS_BANDWIDTH
++	{
++		struct task_group *tg = css_tg(seq_css(sf));
++		struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
++		u64 throttled_usec;
++
++		throttled_usec = cfs_b->throttled_time;
++		do_div(throttled_usec, NSEC_PER_USEC);
++
++		seq_printf(sf, "nr_periods %d\n"
++			   "nr_throttled %d\n"
++			   "throttled_usec %llu\n",
++			   cfs_b->nr_periods, cfs_b->nr_throttled,
++			   throttled_usec);
++	}
++#endif
++	return 0;
++}
++
++#ifdef CONFIG_FAIR_GROUP_SCHED
++static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css,
++			       struct cftype *cft)
++{
++	struct task_group *tg = css_tg(css);
++	u64 weight = scale_load_down(tg->shares);
++
++	return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024);
++}
++
++static int cpu_weight_write_u64(struct cgroup_subsys_state *css,
++				struct cftype *cftype, u64 weight)
++{
++	/*
++	 * cgroup weight knobs should use the common MIN, DFL and MAX
++	 * values which are 1, 100 and 10000 respectively.  While it loses
++	 * a bit of range on both ends, it maps pretty well onto the shares
++	 * value used by scheduler and the round-trip conversions preserve
++	 * the original value over the entire range.
++	 */
++	if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX)
++		return -ERANGE;
++
++	weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL);
++
++	return sched_group_set_shares(css_tg(css), scale_load(weight));
++}
++#endif
++
++static void __maybe_unused cpu_period_quota_print(struct seq_file *sf,
++						  long period, long quota)
++{
++	if (quota < 0)
++		seq_puts(sf, "max");
++	else
++		seq_printf(sf, "%ld", quota);
++
++	seq_printf(sf, " %ld\n", period);
++}
++
++/* caller should put the current value in *@periodp before calling */
++static int __maybe_unused cpu_period_quota_parse(char *buf,
++						 u64 *periodp, u64 *quotap)
++{
++	char tok[21];	/* U64_MAX */
++
++	if (!sscanf(buf, "%s %llu", tok, periodp))
++		return -EINVAL;
++
++	*periodp *= NSEC_PER_USEC;
++
++	if (sscanf(tok, "%llu", quotap))
++		*quotap *= NSEC_PER_USEC;
++	else if (!strcmp(tok, "max"))
++		*quotap = RUNTIME_INF;
++	else
++		return -EINVAL;
++
++	return 0;
++}
++
++#ifdef CONFIG_CFS_BANDWIDTH
++static int cpu_max_show(struct seq_file *sf, void *v)
++{
++	struct task_group *tg = css_tg(seq_css(sf));
++
++	cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg));
++	return 0;
++}
++
++static ssize_t cpu_max_write(struct kernfs_open_file *of,
++			     char *buf, size_t nbytes, loff_t off)
++{
++	struct task_group *tg = css_tg(of_css(of));
++	u64 period = tg_get_cfs_period(tg);
++	u64 quota;
++	int ret;
++
++	ret = cpu_period_quota_parse(buf, &period, &quota);
++	if (!ret)
++		ret = tg_set_cfs_bandwidth(tg, period, quota);
++	return ret ?: nbytes;
++}
++#endif
++
++static struct cftype cpu_files[] = {
++	{
++		.name = "stat",
++		.flags = CFTYPE_NOT_ON_ROOT,
++		.seq_show = cpu_stats_show,
++	},
++#ifdef CONFIG_FAIR_GROUP_SCHED
++	{
++		.name = "weight",
++		.flags = CFTYPE_NOT_ON_ROOT,
++		.read_u64 = cpu_weight_read_u64,
++		.write_u64 = cpu_weight_write_u64,
++	},
++#endif
++#ifdef CONFIG_CFS_BANDWIDTH
++	{
++		.name = "max",
++		.flags = CFTYPE_NOT_ON_ROOT,
++		.seq_show = cpu_max_show,
++		.write = cpu_max_write,
++	},
++#endif
++	{ }	/* terminate */
++};
++
+ struct cgroup_subsys cpu_cgrp_subsys = {
+ 	.css_alloc	= cpu_cgroup_css_alloc,
+ 	.css_free	= cpu_cgroup_css_free,
+@@ -8600,7 +8733,15 @@ struct cgroup_subsys cpu_cgrp_subsys = {
+ 	.can_attach	= cpu_cgroup_can_attach,
+ 	.attach		= cpu_cgroup_attach,
+ 	.legacy_cftypes	= cpu_legacy_files,
++	.dfl_cftypes	= cpu_files,
+ 	.early_init	= 1,
++#ifdef CONFIG_CGROUP_CPUACCT
++	/*
++	 * cpuacct is enabled together with cpu on the unified hierarchy
++	 * and its stats are reported through "cpu.stat".
++	 */
++	.depends_on	= 1 << cpuacct_cgrp_id,
++#endif
+ };
+ 
+ #endif	/* CONFIG_CGROUP_SCHED */
+diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
+index 42b2dd5..b4d32a6 100644
+--- a/kernel/sched/cpuacct.c
++++ b/kernel/sched/cpuacct.c
+@@ -224,6 +224,30 @@ static struct cftype files[] = {
+ 	{ }	/* terminate */
+ };
+ 
++/* used to print cpuacct stats in cpu.stat on the unified hierarchy */
++void cpuacct_cpu_stats_show(struct seq_file *sf)
++{
++	struct cgroup_subsys_state *css;
++	u64 usage, user, sys;
++
++	css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys);
++
++	usage = cpuusage_read(css, seq_cft(sf));
++	cpuacct_stats_read(css_ca(css), &user, &sys);
++
++	user *= TICK_NSEC;
++	sys *= TICK_NSEC;
++	do_div(usage, NSEC_PER_USEC);
++	do_div(user, NSEC_PER_USEC);
++	do_div(sys, NSEC_PER_USEC);
++
++	seq_printf(sf, "usage_usec %llu\n"
++		   "user_usec %llu\n"
++		   "system_usec %llu\n", usage, user, sys);
++
++	css_put(css);
++}
++
+ /*
+  * charge this task's execution time to its accounting group.
+  *
+diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h
+index ed60562..44eace9 100644
+--- a/kernel/sched/cpuacct.h
++++ b/kernel/sched/cpuacct.h
+@@ -2,6 +2,7 @@
+ 
+ extern void cpuacct_charge(struct task_struct *tsk, u64 cputime);
+ extern void cpuacct_account_field(struct task_struct *p, int index, u64 val);
++extern void cpuacct_cpu_stats_show(struct seq_file *sf);
+ 
+ #else
+ 
+@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *p, int index, u64 val)
+ {
+ }
+ 
++static inline void cpuacct_cpu_stats_show(struct seq_file *sf)
++{
++}
++
+ #endif
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c0f6726450..04e35a02d81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12440,6 +12440,7 @@ with pkgs;
       [ kernelPatches.bridge_stp_helper
         kernelPatches.p9_fixes
         kernelPatches.cpu-cgroup-v2."4.4"
+        kernelPatches.modinst_arg_list_too_long
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
-- 
GitLab


From 0a5ecde8085122835a9c8ffa2025e8ccb49ddb14 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Oct 2017 14:03:10 +0100
Subject: [PATCH 297/877] linux: 4.4.80 -> 4.4.95

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 16699dcdf43..a695fe34cd6 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,18 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.80";
+  version = "4.4.95";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1hs07k49sbpi8yw2mdwn1967i82x4wn6kg0lbjvv5l1pv3alky1l";
+    sha256 = "07vkxhh435gilxsh9ag6zvf2r9k5l9ffqp72900c50nsfjrdgdrx";
   };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
 } // (args.argsOverride or {}))
-- 
GitLab


From bfbe560411271e52fb1e0231a6d569bc3b5620b5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 14 Sep 2017 13:11:16 +0200
Subject: [PATCH 298/877] ibus: fix emoji hashes

---
 pkgs/tools/inputmethods/ibus/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 69ac0ad3ef6..3fd29d65f36 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -10,11 +10,11 @@ let
     srcs = {
       data = fetchurl {
         url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt";
-        sha256 = "0zfn3z61xy76yah3d24dd745qjssrib009m4nvqpnx4sf1r13i2x";
+        sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf";
       };
       sequences = fetchurl {
         url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt";
-        sha256 = "0xzk7hi2a8macx9s5gj2pb36d38y8fa9001sj71g6kw25c2h94cn";
+        sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1";
       };
       variation-sequences = fetchurl {
         url = "http://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt";
@@ -22,11 +22,11 @@ let
       };
       zwj-sequences = fetchurl {
         url = "http://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt";
-        sha256 = "0rrnk94mhm3k9vs74pvyvs4ir7f31f1libx7c196fmdqvp1qfafw";
+        sha256 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q";
       };
       test = fetchurl {
         url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt";
-        sha256 = "1dvxw5xp1xiy13c1p1c7l2xc9q8f8znk47kb7q8g7bbgbi21cq5m";
+        sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw";
       };
     };
   in stdenv.mkDerivation {
-- 
GitLab


From 5d41dda02db3f538fb253056575c151192d4ce41 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 30 Oct 2017 08:40:48 -0400
Subject: [PATCH 299/877] cyrus_sasl: Fix CVE-2013-4122

---
 pkgs/development/libraries/cyrus-sasl/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 5dbf134cf45..68398e93764 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false }:
+{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext,
+  pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -21,6 +22,10 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
+    (fetchpatch { # CVE-2013-4122
+      url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff";
+      sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2";
+    })
   ] ++ lib.optional stdenv.isFreeBSD (
       fetchurl {
         url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";
-- 
GitLab


From 9b0d50e3d0ff4a0ab783159c0efe6de9472fe7ed Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sun, 29 Oct 2017 22:07:48 +0000
Subject: [PATCH 300/877] fetchbower: clean common uri characters from version
 string

Some bower.json files have URL dependencies missing a version.

Fixes rvl/bower2nix#18
---
 pkgs/build-support/fetchbower/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix
index dd0bac49cb6..3e1f0eff84a 100644
--- a/pkgs/build-support/fetchbower/default.nix
+++ b/pkgs/build-support/fetchbower/default.nix
@@ -4,13 +4,13 @@ let
     let
       components = lib.splitString "#" version;
       hash = lib.last components;
-      ver = if builtins.length components == 1 then version else hash;
+      ver = if builtins.length components == 1 then (cleanName version) else hash;
     in ver;
 
-  bowerName = name: lib.replaceStrings ["/"] ["-"] name;
+  cleanName = name: lib.replaceStrings ["/" ":"] ["-" "-"] name;
 
   fetchbower = name: version: target: outputHash: stdenv.mkDerivation {
-    name = "${bowerName name}-${bowerVersion version}";
+    name = "${cleanName name}-${bowerVersion version}";
     SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
     buildCommand = ''
       fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}"
-- 
GitLab


From 9ec640ec70e9ecd1601d4b530db0ce34e9ac84f3 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Mon, 30 Oct 2017 12:16:48 +0000
Subject: [PATCH 301/877] bower2nix: fix execution under nix-shell --pure

bower2nix needs nix to compute store hashes.

Fixes rvl/bower2nix#16
---
 pkgs/development/node-packages/default-v4.nix | 4 ++--
 pkgs/development/node-packages/default-v6.nix | 4 ++--
 pkgs/top-level/node-packages.nix              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix
index 99cb7ca4044..c058154a996 100644
--- a/pkgs/development/node-packages/default-v4.nix
+++ b/pkgs/development/node-packages/default-v4.nix
@@ -1,4 +1,4 @@
-{pkgs, system, nodejs}:
+{pkgs, system, nodejs, stdenv}:
 
 let
   nodePackages = import ./composition-v4.nix {
@@ -43,7 +43,7 @@ nodePackages // {
     buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
     postInstall = ''
       for prog in bower2nix fetch-bower; do
-        wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
+        wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
       done
     '';
   });
diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
index 334c79a8267..3deee40812a 100644
--- a/pkgs/development/node-packages/default-v6.nix
+++ b/pkgs/development/node-packages/default-v6.nix
@@ -1,4 +1,4 @@
-{pkgs, system, nodejs}:
+{pkgs, system, nodejs, stdenv}:
 
 let
   nodePackages = import ./composition-v6.nix {
@@ -41,7 +41,7 @@ nodePackages // {
     buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
     postInstall = ''
       for prog in bower2nix fetch-bower; do
-        wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
+        wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
       done
     '';
   });
diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index d8eb668107b..4f72b420699 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -66,7 +66,7 @@ in rec {
     bower2nix.buildInputs = [ pkgs.makeWrapper ];
     bower2nix.postInstall = ''
       for prog in bower2nix fetch-bower; do
-        wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
+        wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
       done
     '';
   } // args.overrides or {};
-- 
GitLab


From b93df240781617e0008e41dd8f7f735f6d7f5344 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 30 Oct 2017 09:52:29 +0100
Subject: [PATCH 302/877] pari: enable darwin build

---
 .../science/math/pari/default.nix             | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 64784facfb9..86d4d289c2a 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -14,12 +14,21 @@ stdenv.mkDerivation rec {
   buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ];
 
   configureScript = "./Configure";
-  configureFlags =
-    "--mt=pthread" +
-    "--with-gmp=${gmp.dev} " +
-    "--with-readline=${readline.dev}";
+  configureFlags = [
+    "--mt=pthread"
+    "--with-gmp=${gmp.dev}"
+    "--with-readline=${readline.dev}"
+  ] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin";
 
-  makeFlags = "all";
+  preConfigure = ''
+    export LD=$CC
+  '';
+
+  postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    echo 'echo x86_64-darwin' > config/arch-osname
+  '';
+
+  makeFlags = [ "all" ];
 
   meta = with stdenv.lib; {
     description = "Computer algebra system for high-performance number theory computations";
@@ -36,12 +45,12 @@ stdenv.mkDerivation rec {
        Bordeaux I, France), PARI is now under the GPL and maintained by Karim
        Belabas with the help of many volunteer contributors.
 
-       - PARI is a C library, allowing fast computations.  
+       - PARI is a C library, allowing fast computations.
        - gp is an easy-to-use interactive shell giving access to the
           PARI functions.
        - GP is the name of gp's scripting language.
-       - gp2c, the GP-to-C compiler, combines the best of both worlds 
-          by compiling GP scripts to the C language and transparently loading 
+       - gp2c, the GP-to-C compiler, combines the best of both worlds
+          by compiling GP scripts to the C language and transparently loading
           the resulting functions into gp. (gp2c-compiled scripts will typically
           run 3 or 4 times faster.) gp2c currently only understands a subset
            of the GP language.
@@ -50,7 +59,7 @@ stdenv.mkDerivation rec {
     downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ ertes raskin AndersonTorres ];
-    platforms   = platforms.linux;
+    platforms   = platforms.linux ++ platforms.darwin;
     updateWalker = true;
   };
 }
-- 
GitLab


From 25c8014a4bd3db23b603f557d0a12b5fc905919a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 30 Oct 2017 13:34:53 -0400
Subject: [PATCH 303/877] gradle: 4.2.1 -> 4.3

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

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index a5ea6df3c8d..bbfcc851307 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,12 +52,12 @@ rec {
   };
 
   gradle_latest = gradleGen rec {
-    name = "gradle-4.2.1";
+    name = "gradle-4.3";
     nativeVersion = "0.14";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "1h7v133rm81jf0bgv9mgvydl7rgh4430dnsfs66wflfay82cqldm";
+      sha256 = "0k358y18pp2809kn5il4kv3qvlqrbwmy276bbm3mnmwjxx7g9jwd";
     };
   };
 
-- 
GitLab


From 3004b6f150b01af1e4f856097a67ade76c7c949f Mon Sep 17 00:00:00 2001
From: Falco Peijnenburg <falco@lumiguide.nl>
Date: Mon, 30 Oct 2017 18:37:20 +0100
Subject: [PATCH 304/877] fetchgitrevision: removed

It doesn't work and was last referred to in 5553546c212152a9cea72e1398b088cda78c7b8b
---
 pkgs/build-support/fetchgitrevision/default.nix | 10 ----------
 pkgs/top-level/all-packages.nix                 |  2 --
 2 files changed, 12 deletions(-)
 delete mode 100644 pkgs/build-support/fetchgitrevision/default.nix

diff --git a/pkgs/build-support/fetchgitrevision/default.nix b/pkgs/build-support/fetchgitrevision/default.nix
deleted file mode 100644
index e877648978d..00000000000
--- a/pkgs/build-support/fetchgitrevision/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-runCommand: git: repository: branch:
-  import (runCommand "head-revision"
-    { buildInputs = [ git ];
-      dummy = builtins.currentTime;
-    }
-    ''
-      rev=$(git ls-remote ${repository} | grep "refs/${branch}$" | awk '{ print $1 }')
-      echo "[ \"$rev\" ]" > $out
-      echo Latest revision in ${branch} is $rev
-    '')
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04e35a02d81..2a96fbe6622 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -144,8 +144,6 @@ with pkgs;
 
   fetchgitPrivate = callPackage ../build-support/fetchgit/private.nix { };
 
-  fetchgitrevision = import ../build-support/fetchgitrevision runCommand git;
-
   fetchgitLocal = callPackage ../build-support/fetchgitlocal { };
 
   fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {});
-- 
GitLab


From f7616c4f5e2c869192f353843a31eff7dab68d7f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 16 Feb 2017 22:06:57 +0100
Subject: [PATCH 305/877] openntpd: fix constraints feature on NixOS

The OpenNTPD constraints feature requires a valid chain of SSL
certificates, but the default path in openntpd didn't match the one in
NixOS.

Unfortunately the configured certificate path becomes hardcoded into the
binary, so this feature will likely still fail on other
distributions/operating systems, unless the path coincides with the
NixOS path or the user sets up a symlink.
---
 pkgs/tools/networking/openntpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix
index 2b2b441f2f9..7e1c257ec4b 100644
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     "--with-privsep-user=${privsepUser}"
     "--sysconfdir=/etc"
     "--localstatedir=/var"
+    "--with-cacert=/etc/ssl/certs/ca-certificates.crt"
   ];
 
   buildInputs = [ libressl ];
-- 
GitLab


From 0581038e8e757f05dc1f75df52e7d0c79acea3fc Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Mon, 30 Oct 2017 13:49:05 -0400
Subject: [PATCH 306/877] nixos/acme: remove doc note about restarting nginx

Discussion from #30945 indicates that it is no longer true that you have
to restart nginx.
---
 nixos/modules/security/acme.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index 823806f4641..6130ed82ed3 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -89,8 +89,5 @@ services.nginx = {
   };
 }
 </programlisting>
-
-<para>At the moment you still have to restart Nginx after the ACME
-certs arrive.</para>
 </section>
 </chapter>
-- 
GitLab


From 1d56d0c8a79334cd7149fd580512046558eaac78 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Mon, 30 Oct 2017 17:51:30 +0000
Subject: [PATCH 307/877] types.submodule: Fix the NixOS Manual, by escaping
 the <> symbols.

---
 lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index dd0f31e9d14..db3bd381523 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -297,7 +297,7 @@ rec {
             # This is mandatory as some option declaration might use the
             # "name" attribute given as argument of the submodule and use it
             # as the default of option declarations.
-            args.name = "<name>";
+            args.name = "&lt;name&gt;";
           }).options;
         getSubModules = opts';
         substSubModules = m: submodule m;
-- 
GitLab


From 7bd64e3dee5c687030213c79601ea7da06528765 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 14 Sep 2017 11:16:22 +0200
Subject: [PATCH 308/877] cjdns: fix hash

.. and switch to fetchFromGitHub to avoid future hash changes.
---
 pkgs/tools/networking/cjdns/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 11f65ea82b0..d5819639fa2 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }:
+{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }:
 
 let version = "20"; in
 stdenv.mkDerivation {
   name = "cjdns-"+version;
 
-  src = fetchurl {
-    url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz";
-    sha256 = "1dyqxi9l2pmrgm16a161909rg3vfzvib40frr7p6ddpk8yfh5888";
+  src = fetchFromGitHub {
+    owner = "cjdelisle";
+    repo = "cjdns";
+    rev = "cjdns-v${version}";
+    sha256 = "0gqcspiz1n0j711vwq807cy456dkcf03r376l04qc92173g2fzrx";
   };
 
   buildInputs = [ which python27 nodejs ] ++
-- 
GitLab


From d76572fa89094119ce284d698957680b461a887b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 31 Oct 2017 02:17:02 +0800
Subject: [PATCH 309/877] libarchive: Fixes for CVE-2017-14166 and
 CVE-2017-14502

---
 .../libraries/libarchive/CVE-2017-14166.patch | 36 +++++++++++++++++++
 .../libraries/libarchive/CVE-2017-14502.patch | 28 +++++++++++++++
 .../libraries/libarchive/default.nix          |  5 +++
 3 files changed, 69 insertions(+)
 create mode 100644 pkgs/development/libraries/libarchive/CVE-2017-14166.patch
 create mode 100644 pkgs/development/libraries/libarchive/CVE-2017-14502.patch

diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14166.patch b/pkgs/development/libraries/libarchive/CVE-2017-14166.patch
new file mode 100644
index 00000000000..b729ae41e0a
--- /dev/null
+++ b/pkgs/development/libraries/libarchive/CVE-2017-14166.patch
@@ -0,0 +1,36 @@
+From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001
+From: Joerg Sonnenberger <joerg@bec.de>
+Date: Tue, 5 Sep 2017 18:12:19 +0200
+Subject: [PATCH] Do something sensible for empty strings to make fuzzers
+ happy.
+
+---
+ libarchive/archive_read_support_format_xar.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
+index 7a22beb9d..93eeacc5e 100644
+--- a/libarchive/archive_read_support_format_xar.c
++++ b/libarchive/archive_read_support_format_xar.c
+@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt)
+ 	uint64_t l;
+ 	int digit;
+ 
++	if (char_cnt == 0)
++		return (0);
++
+ 	l = 0;
+ 	digit = *p - '0';
+ 	while (digit >= 0 && digit < 10  && char_cnt-- > 0) {
+@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt)
+ {
+ 	int64_t l;
+ 	int digit;
+-        
++
++	if (char_cnt == 0)
++		return (0);
++
+ 	l = 0;
+ 	while (char_cnt-- > 0) {
+ 		if (*p >= '0' && *p <= '7')
diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14502.patch b/pkgs/development/libraries/libarchive/CVE-2017-14502.patch
new file mode 100644
index 00000000000..dad8a93a8a8
--- /dev/null
+++ b/pkgs/development/libraries/libarchive/CVE-2017-14502.patch
@@ -0,0 +1,28 @@
+From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001
+From: Joerg Sonnenberger <joerg@bec.de>
+Date: Sat, 9 Sep 2017 17:47:32 +0200
+Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR
+ archives.
+
+Reported-By: OSS-Fuzz issue 573
+---
+ libarchive/archive_read_support_format_rar.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
+index cbb14c32d..751de6979 100644
+--- a/libarchive/archive_read_support_format_rar.c
++++ b/libarchive/archive_read_support_format_rar.c
+@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry,
+         return (ARCHIVE_FATAL);
+       }
+       filename[filename_size++] = '\0';
+-      filename[filename_size++] = '\0';
++      /*
++       * Do not increment filename_size here as the computations below
++       * add the space for the terminating NUL explicitly.
++       */
++      filename[filename_size] = '\0';
+ 
+       /* Decoded unicode form is UTF-16BE, so we have to update a string
+        * conversion object for it. */
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index fb1faf8d1b1..e0242802fd3 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
     sha256 = "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd";
   };
 
+  patches = [
+    ./CVE-2017-14166.patch
+    ./CVE-2017-14502.patch
+  ];
+
   outputs = [ "out" "lib" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 517a0723e48cd25c4771affd118e7500af9fb2bb Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 14 Sep 2017 17:58:43 +0200
Subject: [PATCH 310/877] pythonPackages.netaddr: fix patch hash

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d83ac0df11b..9ce0e45284b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12469,7 +12469,7 @@ in {
     patches = [
       (pkgs.fetchpatch {
         url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch;
-        sha256 = "08rn1s3w9424jhandy4j9sksy852ny00088zh15nirw5ajqg1dn7";
+        sha256 = "0s1cdn9v5alpviabhcjmzc0m2pnpq9dh2fnnk2x96dnry1pshg39";
       })
     ];
 
-- 
GitLab


From 07e0c0e0a2f237639600f2a0d62f6eac748b1e6e Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 30 Oct 2017 17:35:14 +0100
Subject: [PATCH 311/877] network-interfaces-scripted: fix NixOS/nixops#640

Reverse the PartOf dependency between network-setup and network-addresses-*

This was joint work of: @nh2, @domenkozar, @fpletz, @aszlig and @basvandijk
at the NixCon 2017 hackathon.
---
 nixos/modules/tasks/network-interfaces-scripted.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index e92c9bc27de..1f424f84c6e 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -93,6 +93,7 @@ let
             after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ];
             before = [ "network.target" "shutdown.target" ];
             wants = [ "network.target" ];
+            partOf = map (i: "network-addresses-${i.name}.service") interfaces;
             conflicts = [ "shutdown.target" ];
             wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target";
 
@@ -171,8 +172,6 @@ let
               "network-link-${i.name}.service"
               "network.target"
             ];
-            # propagate stop and reload from network-setup
-            partOf = [ "network-setup.service" ];
             # order before network-setup because the routes that are configured
             # there may need ip addresses configured
             before = [ "network-setup.service" ];
-- 
GitLab


From 94b7368eefcb833b96859ccc9e25facffdd4901a Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Mon, 30 Oct 2017 20:20:01 +0000
Subject: [PATCH 312/877] bchunk: fix recent CVEs, simplify installPhase

For details, see:

https://bugs.gentoo.org/635898

https://nvd.nist.gov/vuln/detail/CVE-2017-15953
https://nvd.nist.gov/vuln/detail/CVE-2017-15954
https://nvd.nist.gov/vuln/detail/CVE-2017-15955

https://github.com/extramaster/bchunk/issues/2
https://github.com/extramaster/bchunk/issues/3
https://github.com/extramaster/bchunk/issues/4
---
 pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch | 25 ++++++++++++++
 pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch | 33 +++++++++++++++++++
 pkgs/tools/cd-dvd/bchunk/default.nix          | 20 +++++------
 3 files changed, 66 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch
 create mode 100644 pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch

diff --git a/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch
new file mode 100644
index 00000000000..f78bb7178af
--- /dev/null
+++ b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch
@@ -0,0 +1,25 @@
+--- a/bchunk.c	2017-10-30 18:03:58.658741629 +0000
++++ b/bchunk.c	2017-10-30 19:40:25.558131619 +0000
+@@ -18,6 +18,7 @@
+   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   */
+
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -271,11 +272,10 @@
+ 	int16_t i;
+ 	float fl;
+ 	
+-	if (!(fname = malloc(strlen(bname) + 8))) {
+-		fprintf(stderr, "main(): malloc() failed, out of memory\n");
++	if (asprintf(&fname, "%s%2.2d.%s", bname, track->num, track->extension) == -1) {
++		fprintf(stderr, "writetrack(): asprintf() failed, out of memory\n");
+ 		exit(4);
+ 	}
+-	sprintf(fname, "%s%2.2d.%s", bname, track->num, track->extension);
+ 	
+ 	printf("%2d: %s ", track->num, fname);
+ 	
+
diff --git a/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch
new file mode 100644
index 00000000000..80930ac69bc
--- /dev/null
+++ b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch
@@ -0,0 +1,33 @@
+diff -urNZ bchunk-1.2.0.orig/bchunk.c bchunk-1.2.0/bchunk.c
+--- a/bchunk.c	2017-10-30 18:03:58.658741629 +0000
++++ b/bchunk.c	2017-10-30 19:17:36.732855884 +0000
+@@ -426,11 +426,11 @@
+ 			printf("\nTrack ");
+ 			if (!(p = strchr(p, ' '))) {
+ 				fprintf(stderr, "... ouch, no space after TRACK.\n");
+-				continue;
++				exit(3);
+ 			}
+ 			p++;
+ 			if (!(t = strchr(p, ' '))) {
+ 				fprintf(stderr, "... ouch, no space after track number.\n");
+-				continue;
++				exit(3);
+ 			}
+ 			*t = '\0';
+
+@@ -460,12 +460,12 @@
+ 		} else if ((p = strstr(s, "INDEX"))) {
+ 			if (!(p = strchr(p, ' '))) {
+ 				printf("... ouch, no space after INDEX.\n");
+-				continue;
++				exit(3);
+ 			}
+ 			p++;
+ 			if (!(t = strchr(p, ' '))) {
+ 				printf("... ouch, no space after index number.\n");
+-				continue;
++				exit(3);
+ 			}
+ 			*t = '\0';
+ 			t++;
\ No newline at end of file
diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix
index 4b8510773a3..ea4046f31f8 100644
--- a/pkgs/tools/cd-dvd/bchunk/default.nix
+++ b/pkgs/tools/cd-dvd/bchunk/default.nix
@@ -8,20 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0pcbyx3689cbl23dcij497hb3q5f1wmki7cxic5nzldx71g9vp5g";
   };
 
-  preConfigure =
-    ''
-      substituteInPlace Makefile \
-        --replace "-o root -g root" "" \
-        --replace "-o bin -g bin" ""
-    '';
+  patches = [ ./CVE-2017-15953.patch ./CVE-2017-15955.patch ];
 
-  makeFlags = "PREFIX=$(out) MAN_DIR=$(out)/share/man";
+  installPhase = ''
+    install -Dt $out/bin bchunk
+    install -Dt $out/share/man/man1 bchunk.1    
+  '';
 
-  preInstall = "mkdir -p $out/bin $out/share/man/man1";
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://he.fi/bchunk/;
-    description = "A program that converts CD-ROM images in BIN/CUE format into a set of ISO and CDR tracks";
-    platforms = stdenv.lib.platforms.linux;
+    description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks";
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From 440178d729efbc279a70c93495b6212db029f180 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 30 Oct 2017 21:43:10 +0100
Subject: [PATCH 313/877] gdm: don't start getty@tty1 if enabled

---
 nixos/modules/services/x11/display-managers/gdm.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 45a67ac040b..e83f26516f5 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -125,6 +125,8 @@ in
       "getty@tty1.service"
     ];
 
+    systemd.services."getty@tty1".enable = false;
+    systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
     systemd.services.display-manager.serviceConfig = {
       # Restart = "always"; - already defined in xserver.nix
       KillMode = "mixed";
-- 
GitLab


From 61aeeb50ab22e08ec920418107f10ad126f52189 Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <thilo.uttendorfer@allianz.de>
Date: Mon, 30 Oct 2017 22:19:11 +0100
Subject: [PATCH 314/877] pwgen: 2.07 -> 2.08

---
 pkgs/tools/security/pwgen/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix
index b793219f649..79e8fb071b3 100644
--- a/pkgs/tools/security/pwgen/default.nix
+++ b/pkgs/tools/security/pwgen/default.nix
@@ -1,11 +1,14 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, autoreconfHook}:
 stdenv.mkDerivation {
-  name = "pwgen-2.07";
+  name = "pwgen-2.08";
 
   src = fetchurl {
-    url = mirror://sourceforge/pwgen/pwgen-2.07.tar.gz;
-    sha256 = "0mhmw700kkh238fzivcwnwi94bj9f3h36yfh3k3j2v19b0zmjx7b";
+    url = https://github.com/tytso/pwgen/archive/v2.08.tar.gz;
+    sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f";
   };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
   meta = {
     description = "Password generator which creates passwords which can be easily memorized by a human";
     platforms = stdenv.lib.platforms.all;
-- 
GitLab


From 41267f612f2930ef989a28c2bfa9f882d9ec56c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Oct 2017 22:35:54 +0100
Subject: [PATCH 315/877] mesa: maintenance 17.2.2 -> 17.2.4

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 0fde0192726..fe34a8bb88f 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -66,7 +66,7 @@ let
 in
 
 let
-  version = "17.2.2";
+  version = "17.2.4";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
-    sha256 = "10jplvxg7rlbp7569w08z0igwlsjjfb7q3n07zgfr8d5sr224lng";
+    sha256 = "0l75q9l4g15y66rqk2swqvj18qj60hpimv0f97jk44bfrpz0i92v";
   };
 
   prePatch = "patchShebangs .";
-- 
GitLab


From cdf059f79702135ac5b10d3c8c54ca511b385260 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Mon, 30 Oct 2017 21:48:00 +0000
Subject: [PATCH 316/877] fetchbzr: do not write logs to non-existing home

---
 pkgs/build-support/fetchbzr/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh
index af1257d3688..e424fd92d51 100644
--- a/pkgs/build-support/fetchbzr/builder.sh
+++ b/pkgs/build-support/fetchbzr/builder.sh
@@ -4,6 +4,6 @@ header "exporting \`$url' (revision $rev) into \`$out'"
 
 # Perform a lightweight checkout so that we don't end up importing
 # all the repository's history.
-bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url"
+BZR_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url"
 
 stopNest
-- 
GitLab


From f2621d4ba86d7f78911c7a2e28d8883b57d1c65a Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Mon, 30 Oct 2017 21:58:37 +0000
Subject: [PATCH 317/877] nixos-generate-config: enforce umask 0022, fixes
 #30954

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index c0df2977856..7c737e84de0 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -8,6 +8,7 @@ use File::Basename;
 use File::Slurp;
 use File::stat;
 
+umask(0022);
 
 sub uniq {
     my %seen;
-- 
GitLab


From d424bfe236ed257960de00618750cf76ca77a7c7 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Mon, 30 Oct 2017 23:21:22 +0100
Subject: [PATCH 318/877] beamPackages.hex: 0.14.0 => 0.17.1

---
 pkgs/development/beam-modules/hex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index 7f933f9a78a..d0af0b59c9f 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -8,13 +8,13 @@ let
 
   pkg = self: stdenv.mkDerivation rec {
     name = "hex";
-    version = "v0.14.0";
+    version = "v0.17.1";
 
     src = fetchFromGitHub {
         owner = "hexpm";
         repo = "hex";
         rev = "${version}";
-        sha256 = "042rcwznb6cf9khn4l969axf7vhk53gy3rp23y6c8fhfp1472pai";
+        sha256 = "1s4asar1mcavzj3w37jcz243ka0z5jm0r42yws3h4aagawxxg02z";
     };
 
     setupHook = writeText "setupHook.sh" ''
-- 
GitLab


From 16e9541169fd05c850fa2c5571c9679002b74515 Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Mon, 30 Oct 2017 16:09:40 -0700
Subject: [PATCH 319/877] ansible: 2.4.0.0 -> 2.4.1.0

---
 pkgs/tools/admin/ansible/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix
index dd9c12c831c..80bd33bc776 100644
--- a/pkgs/tools/admin/ansible/2.4.nix
+++ b/pkgs/tools/admin/ansible/2.4.nix
@@ -6,12 +6,12 @@
 
 pythonPackages.buildPythonPackage rec {
   pname = "ansible";
-  version = "2.4.0.0";
+  version = "2.4.1.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "0xkwnx817rygb1922gncv9ivgvb7hjg8g53r39hfdm3jgzp6y9qs";
+    sha256 = "0spv0kjaicwss4q52s727b6grdizcxpa0bbsfg26pgf5kjrayqfs";
   };
 
   prePatch = ''
-- 
GitLab


From 25515ce9280dcb90cffc3fbd15e4ab2ac8ec0e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 31 Oct 2017 00:12:08 +0100
Subject: [PATCH 320/877] libav_11: security 11.10 -> 11.11

Fixes CVE-2017-7862.
---
 pkgs/development/libraries/libav/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 90d7583673a..e348fe0fae2 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -27,8 +27,9 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in
 
 let
   result = {
+    # e.g. https://libav.org/releases/libav-11.11.tar.xz.sha1
     libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f";
-    libav_11  = libavFun "11.10"  "38db6721ca8423682e4d614c170eccc33ba32e00";
+    libav_11  = libavFun "11.11"  "d7444fa4f135bdd7347cc962ab4b5228796b0f23";
     libav_12  = libavFun "12.2"   "3784b15f88076ca0ab8fb6b0377e975b83a5c9f5";
   };
 
-- 
GitLab


From 54d1e1412b67a813a65b36bbe832bd97e9c4dbfc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 31 Oct 2017 00:18:41 +0000
Subject: [PATCH 321/877] ocamlPackages.lablgtk: 2.18.5 -> 2.18.6

---
 .../ocaml-modules/lablgtk/default.nix         | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index 9d01b73479a..ff42af0c0e4 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -1,18 +1,24 @@
 { stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }:
 
-let
-  pname = "lablgtk";
+let param =
+  let check = stdenv.lib.versionAtLeast ocaml.version; in
+  if check "4.06" then {
+    version = "2.18.6";
+    url = https://forge.ocamlcore.org/frs/download.php/1726/lablgtk-2.18.6.tar.gz;
+    sha256 = "1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d";
+  } else if check "3.12" then {
+    version = "2.18.5";
+    url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz;
+    sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib";
+  } else throw "lablgtk is not available for OCaml ${ocaml.version}";
 in
 
-assert stdenv.lib.versionAtLeast ocaml.version "3.12";
-
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  version = "2.18.5";
+  name = "lablgtk-${version}";
+  inherit (param) version;
 
   src = fetchurl {
-    url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz;
-    sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib";
+    inherit (param) url sha256;
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 33c0dcacd0d61a41e6fdfb3244dd1fd442cf0738 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 31 Oct 2017 01:06:17 +0000
Subject: [PATCH 322/877] ocamlPackages.alcotest: 0.7.2 -> 0.8.1

---
 .../ocaml-modules/alcotest/default.nix        | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix
index bf0ae24ff03..90ee8d905a6 100644
--- a/pkgs/development/ocaml-modules/alcotest/default.nix
+++ b/pkgs/development/ocaml-modules/alcotest/default.nix
@@ -1,20 +1,35 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner, astring, fmt, result }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, jbuilder
+, cmdliner, astring, fmt, result
+}:
+
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
+    version = "0.8.1";
+    sha256 = "1bjhgwmshlaz9xncrrkknys7prigf8vlg1kqvfx9l8kn92mlf10b";
+    buildInputs = [ jbuilder ];
+    buildPhase = "jbuilder build -p alcotest";
+    inherit (jbuilder) installPhase;
+  } else {
+    version = "0.7.2";
+    sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md";
+    buildInputs = [ ocamlbuild opam topkg ];
+    inherit (topkg) buildPhase installPhase;
+  };
+in
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-alcotest-${version}";
-  version = "0.7.2";
+  inherit (param) version buildPhase installPhase;
 
   src = fetchzip {
     url = "https://github.com/mirage/alcotest/archive/${version}.tar.gz";
-    sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md";
+    inherit (param) sha256;
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+  buildInputs = [ ocaml findlib ] ++ param.buildInputs;
 
   propagatedBuildInputs = [ cmdliner astring fmt result ];
 
-  inherit (topkg) buildPhase installPhase;
-
   createFindlibDestdir = true;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 1b918d1ad23160ea06dc5dec9c23149d5da9fb4b Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Tue, 31 Oct 2017 02:09:33 +0100
Subject: [PATCH 323/877] racket: 6.10.1 -> 6.11

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

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 1a9475df284..19517e2216b 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -33,11 +33,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "6.10.1";
+  version = "6.11";
 
   src = fetchurl {
-    url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
-    sha256 = "0v3z6x277lq1y7wkqdf6mj3826z5vq0yadygspx9h4r0f1dnmafc";
+    url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
+    sha256 = "1nk7705x24jjlbqqhj8yvbgqkfscxx3m81bry1g56kjxysjmf3sw";
   };
 
   FONTCONFIG_FILE = fontsConf;
-- 
GitLab


From 37f548e83630785d0839f1c2e553b4c615a59573 Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Wed, 4 Oct 2017 00:02:43 -0700
Subject: [PATCH 324/877] hugin: 2016.2.0 -> 2017.0.0

---
 pkgs/applications/graphics/hugin/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 29e43a93c98..9acd8357cb7 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "hugin-2016.2.0";
+  name = "hugin-2017.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/hugin/${name}.tar.bz2";
-    sha256 = "058zd63vx29yrx2pphbbll7kzcxkai22q26lpw13rn4lvp41pasl";
+    sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a96fbe6622..43d2df104a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15046,7 +15046,9 @@ with pkgs;
 
   hue-cli = callPackage ../tools/networking/hue-cli { };
 
-  hugin = callPackage ../applications/graphics/hugin { };
+  hugin = callPackage ../applications/graphics/hugin {
+    wxGTK = wxGTK30;
+  };
 
   hugo = callPackage ../applications/misc/hugo { };
 
-- 
GitLab


From d061c5c4ff8f41788735d735299e4e9c6995fe19 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 31 Oct 2017 08:16:32 +0100
Subject: [PATCH 325/877] quagga: 1.2.1 -> 1.2.2

fixes CVE-2017-16227 & several other issues see [1] for details

[1] https://download-mirror.savannah.gnu.org/releases/quagga/quagga-1.2.2.changelog.txt
---
 pkgs/servers/quagga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index ba3cc6dae76..68c9b7a5936 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/pkgs/servers/quagga/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "quagga-${version}";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchurl {
     url = "mirror://savannah/quagga/${name}.tar.gz";
-    sha256 = "1kgvcr9cfgys5asvb5lh5h95silkr624apqm5x68xva19xfvmpda";
+    sha256 = "0c99rjjc62xl5kwvx2pwyvs0709vbwax1qydqbqf6r7fpvr24bjj";
   };
 
   buildInputs =
-- 
GitLab


From ea6a4068cf89444accdd079accfd7c26eff63e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 30 Oct 2017 23:33:20 +0000
Subject: [PATCH 326/877] darwin: build apple stuff in parallel

---
 pkgs/os-specific/darwin/apple-source-releases/default.nix   | 6 +++++-
 .../darwin/apple-source-releases/xnu/default.nix            | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 0e838994887..965632b5788 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -144,6 +144,10 @@ let
   appleDerivation_ = name: version: sha256: attrs: stdenv.mkDerivation ({
     inherit version;
     name = "${name}-${version}";
+    enableParallelBuilding = true;
+    meta = {
+      platforms = stdenv.lib.platforms.darwin;
+    };
   } // (if attrs ? srcs then {} else {
     src  = fetchApple version sha256 name;
   }) // attrs);
@@ -153,7 +157,7 @@ let
       name = builtins.elemAt (stdenv.lib.splitString "/" namePath) 0;
       appleDerivation = appleDerivation_ name version sha256;
       callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation name version; });
-    in callPackage (./. + builtins.toPath "/${namePath}");
+    in callPackage (./. + "/${namePath}");
 
   libsecPackage = pkgs.callPackage ./libsecurity_generic {
     inherit applePackage appleDerivation_;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
index fd0d00d81cf..0ce9c54e48c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
@@ -127,8 +127,4 @@ appleDerivation {
     mkdir $out/Library/PrivateFrameworks
     mv $out/Library/Frameworks/IOKit.framework $out/Library/PrivateFrameworks
   '';
-
-  meta = {
-    platforms = stdenv.lib.platforms.darwin;
-  };
 }
-- 
GitLab


From 0744e0d82909f7522f5d76fde7f31a7110405b61 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Mon, 30 Oct 2017 20:33:14 -0400
Subject: [PATCH 327/877] ffmpeg-full: fix on darwin

---
 pkgs/development/libraries/ffmpeg-full/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 11d365159f8..b50025aa108 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -411,7 +411,8 @@ stdenv.mkDerivation rec {
     ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
     ++ optionals nvenc [ nvidia-video-sdk ]
     ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
-                                   MediaToolbox VideoDecodeAcceleration ];
+                                   MediaToolbox VideoDecodeAcceleration
+                                   libiconv ];
 
   # Build qt-faststart executable
   buildPhase = optional qtFaststartProgram ''make tools/qt-faststart'';
-- 
GitLab


From 375cad399723b346f2444f66117806fb9da37985 Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Tue, 31 Oct 2017 16:01:59 +0700
Subject: [PATCH 328/877] skypeforlinux: 5.4.0.1 -> 5.5.0.1

5.4.0.1 is no longer available (HTTP 404)
---
 .../networking/instant-messengers/skypeforlinux/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 37bbfef65bb..bfccc4bfcb6 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -4,7 +4,7 @@
 
 let
 
-  version = "5.4.0.1";
+  version = "5.5.0.1";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -54,7 +54,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
-        sha256 = "1idjgmn0kym7jml30xq6zrcp8qinx64kgnxlw8m0ys4z6zlw0c8z";
+        sha256 = "1r65qlsjwp0n0fmlhvbp71h03b3x73r26jk9f4q687sjqnzmkvcr";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.system}";
-- 
GitLab


From fe9cefa7e4ed4da1a0d1d9777bf0f7145fff22e3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 31 Oct 2017 11:23:04 +0100
Subject: [PATCH 329/877] nodePackages: add more details about the packages to
 include and the Node.js versions to support

---
 pkgs/development/node-packages/README.md | 25 ++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md
index dea7cd9b38b..79f180759b0 100644
--- a/pkgs/development/node-packages/README.md
+++ b/pkgs/development/node-packages/README.md
@@ -1,13 +1,34 @@
 Node.js packages
 ================
-To add a package from [NPM](https://www.npmjs.com/) to nixpkgs:
+The `pkgs/development/node-packages` folder contains a generated collection of
+[NPM packages](https://npmjs.com/) that can be installed with the Nix package
+manager.
+
+As a rule of thumb, the package set should only provide *end user* software
+packages, such as command-line utilities. Libraries should only be added to the
+package set if there is a non-NPM package that requires it.
+
+When it is desired to use NPM libraries in a development project, use the
+`node2nix` generator directly on the `package.json` configuration file of the
+project.
+
+The package set also provides support for multiple Node.js versions. The policy
+is that a new package should be added to the collection for the latest stable LTS
+release (which is currently 6.x), unless there is an explicit reason to support
+a different release.
+
+To add a package from NPM to nixpkgs:
 
  1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
     or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
-    for packagages depending on Node.js 4.x)
+    for packages depending on Node.js 4.x)
  2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
  3. Build your new package to test your changes:
     `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
     To build against a specific Node.js version (e.g. 4.x):
     `nix-build -A nodePackages_4_x.<new-or-updated-package>`
  4. Add and commit all modified and generated files.
+
+For more information about the generation process, consult the
+[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
+tool.
-- 
GitLab


From 5618691751b6a0151d22a436622616545981472b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 31 Oct 2017 11:25:56 +0100
Subject: [PATCH 330/877] perl-DBD-SQLite: 1.50 -> 1.54

- This fixes tests after sqlite update, also tested via nixStable
  and via building some other perl reverse dependencies.
- The patch was conflicting due to upstream changes,
  but those changes allowed us to minimize the patch.
- meta from nix-generate-from-cpan
/cc #30927.
---
 .../perl-modules/DBD-SQLite/default.nix       | 19 +++++-----
 .../DBD-SQLite/external-sqlite.patch          | 36 ++++---------------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix
index bf3089ebfb9..a2a439b295b 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@@ -1,25 +1,24 @@
 { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }:
 
 buildPerlPackage rec {
-  name = "DBD-SQLite-1.50";
+  name = "DBD-SQLite-${version}";
+  version = "1.54";
 
   src = fetchurl {
     url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz";
-    sha256 = "1qcw2nzla03ywrl6mx1qklvbc8n5bn4gxqbjnvadfkwlffmi7i9s";
+    sha256 = "3929a6dbd8d71630f0cb57f85dcef9588cd7ac4c9fa12db79df77b9d3a4d7269";
   };
 
   propagatedBuildInputs = [ DBI ];
-
-  makeMakerFlags = "SQLITE_LOCATION=${sqlite.dev}";
+  buildInputs = [ sqlite ];
 
   patches = [
     # Support building against our own sqlite.
     ./external-sqlite.patch
   ];
 
-  sqlite_dev = sqlite.dev;
-  sqlite_out = sqlite.out;
-  postPatch = "substituteAllInPlace Makefile.PL; cat Makefile.PL";
+  SQLITE_INC = sqlite.dev + "/include";
+  SQLITE_LIB = sqlite.out + "/lib";
 
   preBuild =
     ''
@@ -39,5 +38,9 @@ buildPerlPackage rec {
   # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t").
   #doCheck = false;
 
-  meta.platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Self Contained SQLite RDBMS in a DBI Driver";
+    license = with licenses; [ artistic1 gpl1Plus ];
+    platforms = platforms.unix;
+  };
 }
diff --git a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch b/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
index 1f90546b252..5aafa461d94 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
+++ b/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
@@ -1,33 +1,11 @@
-diff --git a/Makefile.PL b/Makefile.PL
-index 606b28d..0cea060 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -128,24 +128,10 @@ SCOPE: {
- # the system SQLite. We expect that anyone sophisticated enough to use
+--- a/Makefile.PL	2016-04-21 15:44:34.000000000 +0200
++++ b/Makefile.PL	2017-10-31 11:04:28.389959946 +0100
+@@ -129,7 +129,7 @@
  # a system sqlite is also sophisticated enough to have a patching system
  # that can change the if ( 0 ) to if ( 1 )
--my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
+ my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
 -if ( 0 ) {
--	require File::Spec;
--	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
--		$sqlite_base =~ /=(.*)/;
--		$sqlite_base = $1;
--		$sqlite_lib = File::Spec->catdir( $sqlite_base, 'lib'     );
--		$sqlite_inc = File::Spec->catdir( $sqlite_base, 'include' );
--	}
--	if ( $sqlite_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) {
--		$sqlite_local =~ /=(.*)/;
--		$sqlite_local = "$1" ? 1 : 0;
--		if ( $sqlite_local ) {
--			# Keep these from making into CFLAGS/LDFLAGS
--			undef $sqlite_lib;
--			undef $sqlite_inc;
--		}
--	}
-+my ($sqlite_local, $sqlite_lib, $sqlite_inc);
 +if ( 1 ) {
-+		$sqlite_lib = '@sqlite_out@/lib';
-+		$sqlite_inc = '@sqlite_dev@/include';
- 
- 	# Now check for a compatible sqlite3
- 	unless ( $sqlite_local ) {
+ 	require File::Spec;
+ 	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
+ 		$sqlite_base =~ /=(.*)/;
-- 
GitLab


From 1fee6e149bb0cd4f1c7a751226c9c6090e392025 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 31 Oct 2017 10:38:12 +0000
Subject: [PATCH 331/877] luastdlib: 41.2.0 -> 41.2.1

---
 pkgs/top-level/lua-packages.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index c94a401db0f..7a0b0a56c9b 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -438,12 +438,15 @@ let
   };
 
 
-  luastdlib = buildLuaPackage {
-    name = "stdlib";
+  luastdlib = buildLuaPackage rec {
+    name = "stdlib-${version}";
+    version = "41.2.1";
 
-    src = fetchzip {
-      url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip";
-      sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms";
+    src = fetchFromGitHub {
+      owner = "lua-stdlib";
+      repo = "lua-stdlib";
+      rev = "release-v${version}";
+      sha256 = "03wd1qvkrj50fjszb2apzdkc8d5bpfbbi9pajl0vbrlzzmmi3jlq";
     };
 
     nativeBuildInputs = [ autoreconfHook unzip ];
-- 
GitLab


From 16bfe585528453c9b0e015d1f84d16a9bdb332f1 Mon Sep 17 00:00:00 2001
From: Falco Peijnenburg <falco@lumiguide.nl>
Date: Tue, 31 Oct 2017 12:13:39 +0100
Subject: [PATCH 332/877] clementine: Added gst-libav plugin

Fixes regression introduced in 0322f66307286f5377d4479938ed57fadaf8425a that made clementine unable
to play m4a files.
---
 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 28367446d40..60b6ad2dac6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1394,7 +1394,7 @@ with pkgs;
   clementine = callPackage ../applications/audio/clementine {
     boost = boost155;
     gst_plugins =
-      with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ];
+      with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ];
   };
 
   clementineFree = clementine.free;
-- 
GitLab


From 2a09272b5b7b649cd47b4f8f8b06a0170e12f420 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Tue, 31 Oct 2017 12:43:34 +0100
Subject: [PATCH 333/877] maven: 3.5.0 -> 3.5.2

---
 .../tools/build-managers/apache-maven/default.nix            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index 5490790fe38..79648c16f5e 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -2,7 +2,7 @@
 
 assert jdk != null;
 
-let version = "3.5.0"; in
+let version = "3.5.2"; in
 stdenv.mkDerivation rec {
   name = "apache-maven-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
-    sha256 = "0d7hjnj77hc7qqnnfmqlwij8n6pcldfavvd6lilvv5ak4hci9fdy";
+    sha256 = "1zza5kjf69hnx41gy3yhvsk1kz259nig5njcmzjbsr8a75p1yyvh";
   };
 
   buildInputs = [ makeWrapper ];
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://maven.apache.org/;
     license = licenses.asl20;
     platforms = platforms.unix;
+    maintainers = with maintainers; [ cko ];
   };
 }
-- 
GitLab


From 12da0b5f457fafd412609de1d1cca3aa068a03ba Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 30 Oct 2017 16:57:54 +0800
Subject: [PATCH 334/877] mht2htm: init at 1.8.1.35

---
 pkgs/tools/misc/mht2htm/default.nix | 43 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/tools/misc/mht2htm/default.nix

diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix
new file mode 100644
index 00000000000..930fd1e5d3e
--- /dev/null
+++ b/pkgs/tools/misc/mht2htm/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, unzip, fpc, lazarus }:
+
+let
+  date = "07.apr.2016";
+
+in stdenv.mkDerivation rec {
+  name = "mht2mht-${version}";
+  version = "1.8.1.35";
+
+  src = fetchurl {
+    # there is a disconnect between the directory name date and file name date
+    # you should verify if that is still then case when the next version is released
+    url    = "mirror://sourceforge/mht2htm/mht2htm/1.8.1%20%2805.apr.2016%29/mht2htmcl-${version}_${date}.source.zip";
+    sha256 = "16r6zkihp84yqllp2hyaf0nvymdn9ji3g30mc5scfwycdfanja6f";
+  };
+
+  sourceRoot = ".";
+
+  buildInputs = [ fpc lazarus ];
+
+  nativeBuildInputs = [ unzip ];
+
+  buildPhase = ''
+    runHook preBuild
+    lazbuild --lazarusdir=${lazarus}/share/lazarus mht2htmcl.lpi
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 -t $out/bin               mht2htmcl
+    install -Dm644 -t $out/share/doc/mht2htm CHANGELOG COPYING README
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Convert .mht files to .html";
+    homepage    = http://pgm.bpalanka.com/mht2htm.html;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b89e59463bd..03aaf29fc8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -163,6 +163,8 @@ with pkgs;
 
   packer = callPackage ../development/tools/packer { };
 
+  mht2htm = callPackage ../tools/misc/mht2htm { };
+
   fetchpatch = callPackage ../build-support/fetchpatch { };
 
   fetchs3 = callPackage ../build-support/fetchs3 { };
-- 
GitLab


From 2ad3933dcae98149361264e7aa5df6d9166a8c97 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 31 Oct 2017 14:35:59 +0000
Subject: [PATCH 335/877] autofs: do not strip needed symbols

Fixes #28282 after #27415
---
 pkgs/os-specific/linux/autofs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index 698c478aca0..8c207e4a47d 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -24,6 +24,8 @@ in stdenv.mkDerivation {
     export E2FSCK=${e2fsprogs}/bin/fsck.ext2
     export E3FSCK=${e2fsprogs}/bin/fsck.ext3
     export E4FSCK=${e2fsprogs}/bin/fsck.ext4
+
+    unset STRIP # Makefile.rules defines a usable STRIP only without the env var.
   '';
 
   installPhase = ''
-- 
GitLab


From 04b2460eb65c64705df0de0ce33dde6ba524a216 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 31 Oct 2017 15:49:59 +0100
Subject: [PATCH 336/877] graphite: fix the graphiteApi service

---
 nixos/modules/services/monitoring/graphite.nix |  4 ++--
 nixos/tests/graphite.nix                       | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 01b4aca9173..645dfeab019 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -22,8 +22,8 @@ let
   );
 
   graphiteApiConfig = pkgs.writeText "graphite-api.yaml" ''
-    time_zone: ${config.time.timeZone}
     search_index: ${dataDir}/index
+    ${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''}
     ${optionalString (cfg.api.finders != []) ''finders:''}
     ${concatMapStringsSep "\n" (f: "  - " + f.moduleName) cfg.api.finders}
     ${optionalString (cfg.api.functions != []) ''functions:''}
@@ -536,7 +536,7 @@ in {
         environment = {
           PYTHONPATH = let
               aenv = pkgs.python.buildEnv.override {
-                extraLibs = [ cfg.api.package pkgs.cairo ] ++ cfg.api.finders;
+                extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders;
               };
             in "${aenv}/${pkgs.python.sitePackages}";
           GRAPHITE_API_CONFIG = graphiteApiConfig;
diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix
index 4fd7de192d5..a22ef224580 100644
--- a/nixos/tests/graphite.nix
+++ b/nixos/tests/graphite.nix
@@ -4,22 +4,28 @@ import ./make-test.nix ({ pkgs, ...} :
   nodes = {
     one =
       { config, pkgs, ... }: {
+        time.timeZone = "UTC";
         services.graphite = {
-          web = {
+          web.enable = true;
+          api = {
             enable = true;
+            port = 8082;
           };
-          carbon = {
-            enableCache = true;
-          };
+          carbon.enableCache = true;
+          seyren.enable = true;
+          pager.enable = true;
         };
       };
-    };
+  };
 
   testScript = ''
     startAll;
     $one->waitForUnit("default.target");
     $one->requireActiveUnit("graphiteWeb.service");
+    $one->requireActiveUnit("graphiteApi.service");
+    $one->requireActiveUnit("graphitePager.service");
     $one->requireActiveUnit("carbonCache.service");
+    $one->requireActiveUnit("seyren.service");
     $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003");
     $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo")
   '';
-- 
GitLab


From 12c8a4497217cf8bb5dbd2b037c63f24d190d2d6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 31 Oct 2017 16:21:13 +0100
Subject: [PATCH 337/877] pythonPackages.multidict: Fix the build and tests

(Was broken since 7ce848309e6d64820af1e96045c5386992e90a4a)
---
 .../python-modules/multidict/default.nix            | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index cf05cbff631..8d9340625e1 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -1,9 +1,9 @@
 { lib
 , fetchurl
 , buildPythonPackage
-, pytest
+, cython
+, pytest, psutil, pytestrunner
 , isPy3k
-, psutil
 }:
 
 let
@@ -17,11 +17,8 @@ in buildPythonPackage rec {
     sha256 = "e76909da2fad6966281d4e0e4ccfd3c3025699ebcc30806afa09fa1384c3532b";
   };
 
-  checkInputs = [ pytest psutil ];
-
-  checkPhase = ''
-    py.test
-  '';
+  buildInputs = [ cython ];
+  checkInputs = [ pytest psutil pytestrunner ];
 
   disabled = !isPy3k;
 
@@ -30,4 +27,4 @@ in buildPythonPackage rec {
     homepage = https://github.com/aio-libs/multidict/;
     license = lib.licenses.asl20;
   };
-}
\ No newline at end of file
+}
-- 
GitLab


From 997e65e6aef3c194a6230cd54718aa7680657800 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 31 Oct 2017 15:57:02 +0100
Subject: [PATCH 338/877] beancount: 2.0b15 -> 2.0rc1

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

diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix
index 70d5180191e..efc61dba7a4 100644
--- a/pkgs/applications/office/beancount/default.nix
+++ b/pkgs/applications/office/beancount/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchhg, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "2.0b15";
+  version = "2.0rc1";
   name = "beancount-${version}";
   namePrefix = "";
 
   src = pkgs.fetchurl {
     url = "mirror://pypi/b/beancount/${name}.tar.gz";
-    sha256 = "1dvnpgja4v4k5zagfsmdjavlib0z3r9r4z197yvj86szhzs0z86k";
+    sha256 = "12vlkck4q3dax9866krp6963c6d845b7inkkwrlkk4njh84n71wf";
   };
 
   buildInputs = with pythonPackages; [ nose ];
-- 
GitLab


From b40215956f972f86beb074c5272c06bec755fcab Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 31 Oct 2017 15:58:30 +0100
Subject: [PATCH 339/877] bean-add: 2017-09-13 -> 2017-10-31

---
 pkgs/applications/office/beancount/bean-add.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index 0a93efd3990..9cee31b01eb 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "bean-add-2017-09-13";
+  name = "bean-add-2017-10-31";
 
   src = fetchFromGitHub {
     owner = "simon-v";
     repo = "bean-add";
-    rev = "035f07a9e48a9dd23b49a27ba9c070ee9ddc4cc7";
-    sha256 = "0lj8940bn2h8541am4x0sfqpfk5xfnyfdnf3jpajfgx6wyjm2frg";
+    rev = "9ac64272a17e76f8292bd94deb5aee45c14130d2";
+    sha256 = "1vcwbbi2jsf87yq8f2hyf7nz9br1973sb20qjnsx5fxlmcpn47jh";
   };
 
   propagatedBuildInputs = with python3Packages; [ python ];
-- 
GitLab


From ef50ac6fd21adc6d0a52205a48751973dd8610b7 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 31 Oct 2017 16:00:46 +0100
Subject: [PATCH 340/877] cli-visualizer: 1.5 -> 1.6

---
 pkgs/applications/misc/cli-visualizer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index fd88ea61ad8..8b24df1bee9 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "1.5";
+  version = "1.6";
   name = "cli-visualizer-${version}";
 
   src = fetchFromGitHub {
     owner = "dpayne";
     repo = "cli-visualizer";
     rev = version;
-    sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs";
+    sha256 = "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc";
   };
 
   postPatch = ''
-- 
GitLab


From 1d5e648eba0c0386d20a213dcbf2a6cd85740c61 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 31 Oct 2017 16:07:26 +0100
Subject: [PATCH 341/877] hstr: 1.22 -> 1.23

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

diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index ba04bd5c39d..3c4f409d18f 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline, ncurses }:
 
 let
-  version = "1.22";
+  version = "1.23";
 in
 stdenv.mkDerivation rec {
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
-    sha256 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp";
+    sha256 = "1hnira256p7sdilx34mnkji7gi2jcl98zz4izqxsqmnzj8ghhzkv";
   };
 
   buildInputs = [ readline ncurses ];
-- 
GitLab


From cc9431fee2352dbfad6d0dee89c5dedb0fa9a59d Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 31 Oct 2017 16:09:14 +0100
Subject: [PATCH 342/877] http-prompt: 0.10.2 -> 0.11.0

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

diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index 5f6f0466f63..83ad64a66a4 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pythonPackages, httpie }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.10.2";
+  version = "0.11.0";
   name = "http-prompt";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     repo = "http-prompt";
     owner = "eliangcs";
-    sha256 = "0c03n1ll61zd4f60kzih3skl0hspck5hhpcf74h5l6v5as7qdbi2";
+    sha256 = "0arl85880nnyfx8cvpzm6cr8nalhyrkz5zqfr628p487rwqv45ip";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-- 
GitLab


From 64cf206745f7cfefd8cc37e846e0b0a07f335543 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 31 Oct 2017 16:10:32 +0100
Subject: [PATCH 343/877] khal: 0.9.7 -> 0.9.8

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

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 1334f2317b9..91e583e2af4 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -5,11 +5,11 @@ with python3Packages;
 buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "khal";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0x1p62ff7ggb172rjr6sbdrjh1gl3ck3bwxsqlsix8i5wycwvnmv";
+    sha256 = "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y";
   };
 
   LC_ALL = "en_US.UTF-8";
-- 
GitLab


From 6123b53a863a3d8d5ba6146193a7dd41aaaca7f6 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 31 Oct 2017 16:13:31 +0100
Subject: [PATCH 344/877] loc: 2017-06-23 -> 0.4.1

---
 pkgs/development/misc/loc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index fd5796276f7..88d24fddf79 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -3,17 +3,17 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  version = "2017-06-23";
+  version = "0.4.1";
   name = "loc-${version}";
 
   src = fetchFromGitHub {
     owner = "cgag";
     repo = "loc";
-    rev = "bbea575f56879ef614d57a42a6b79fd45b9a8b38";
-    sha256 = "0agyhi55rh248fmlsip4fi1iw4xv3433q7bcb2lpjfnjpzxxlvfn";
+    rev = "v${version}";
+    sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg";
   };
 
-  cargoSha256 = "0f3i8av9g19r2nhr9m8ca8s23kq294c5kqyvx155l6p76r7a9kvb";
+  cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk";
 
   meta = {
     homepage = http://github.com/cgag/loc;
-- 
GitLab


From 12255a855f30639bfdbd2d180fcd0278a4266b32 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 31 Oct 2017 16:21:37 +0100
Subject: [PATCH 345/877] pythonPackages.click-log: 0.1.3 -> 0.2.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 9ce0e45284b..db60631dfa5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2703,12 +2703,12 @@ in {
   };
 
   click-log = buildPythonPackage rec {
-    version = "0.1.3";
+    version = "0.2.1";
     name = "click-log-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/click-log/${name}.tar.gz";
-      sha256 = "0kdd1vminxpcfczxl2kkf285n0dr1gxh2cdbx1p6vkj7b7bci3gx";
+      sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9";
     };
 
     propagatedBuildInputs = with self; [ click ];
-- 
GitLab


From 713a7b65e746a1ed268636aea6c85ce5fe2c6635 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 31 Oct 2017 16:22:38 +0100
Subject: [PATCH 346/877] vdirsyncer: 0.15.0 -> 0.16.3

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

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 17798057ec3..382b69722a4 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -6,12 +6,12 @@ let
   pythonPackages = python3Packages;
 in
 pythonPackages.buildPythonApplication rec {
-  version = "0.15.0";
+  version = "0.16.3";
   name = "vdirsyncer-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "08aa5yxcj7ziz2r0hz4p554q8hgpfl2bh8r6r85f4g24mg6arxsj";
+    sha256 = "0dpwbfi97ksijqng191659m8k0v215y8ld95w8gb126m4m96qpzw";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-- 
GitLab


From 8e93531157b19cbb04609b89aa54781565a1f100 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 31 Oct 2017 16:41:10 +0100
Subject: [PATCH 347/877] pythonPackages.raven: 6.2.1 -> 6.3.0

---
 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 9ce0e45284b..10cd211b5e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7368,11 +7368,11 @@ in {
   };
 
   raven = buildPythonPackage rec {
-    name = "raven-6.2.1";
+    name = "raven-6.3.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/r/raven/${name}.tar.gz";
-      sha256 = "1zkh8llsfng5viz8cpf9j74v30705hv80vb5g6gha1ij7v60p8y0";
+      sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k";
     };
 
     # way too many dependencies to run tests
-- 
GitLab


From 8e91f4ea91216d68186585d8ab863d4f6133688e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 31 Oct 2017 16:56:40 +0100
Subject: [PATCH 348/877] lf: 2017-09-06 -> 2017-10-30

---
 pkgs/tools/misc/lf/default.nix | 6 +++---
 pkgs/tools/misc/lf/deps.nix    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index b10b7891e5d..f8b687a5c8b 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "lf-unstable-${version}";
-  version = "2017-09-06";
+  version = "2017-10-30";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
-    rev = "ae4a29e5501f805fadb115658e83df6744a258b2"; # nightly
-    sha256 = "099ckbnyk08a716fc5qz7yldalb1p9gn2zn8kqp7bp4adi541hid";
+    rev = "3f7bd0a62d1a243562e182d9051ebb54f3414aaa"; # nightly
+    sha256 = "0g6wf4j3dfy3yfkby3wlqajryv4kffqvhljq2q0x482fsrl4vipz";
   };
 
   goPackagePath = "github.com/gokcehan/lf";
diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix
index 5b014d18dc1..91a0c368d5f 100644
--- a/pkgs/tools/misc/lf/deps.nix
+++ b/pkgs/tools/misc/lf/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nsf/termbox-go";
-      rev = "4ed959e0540971545eddb8c75514973d670cf739"; # master
-      sha256 = "1vx64i1mg660if3wwm81p4b7lzxfb3qbr39i7misdyld3fc486p9";
+      rev = "10cefba34bc5e7a6e5df0836a42513c28a10e074"; # master
+      sha256 = "05jy6dpva2a1xfsv3yajavbx41gx8hhh5k3k901dnk0118hnyd0w";
     };
   }
   {
-- 
GitLab


From bbb90b111301f51ba497629582241af15d14bb59 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 31 Oct 2017 15:59:06 +0000
Subject: [PATCH 349/877] wp-cli: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix
index 779aed7fea3..e0aac84abb7 100644
--- a/pkgs/development/tools/wp-cli/default.nix
+++ b/pkgs/development/tools/wp-cli/default.nix
@@ -2,11 +2,11 @@
 
 let
   name = "wp-cli-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchurl {
     url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
-    sha256 = "0q5d32jq7a6rba77sr1yyj6ib6x838hw14mm186ah1xxgnn7rnry";
+    sha256 = "0rav5a6znx81gwaxin1ib10sbfg16bgdnnyv1zn5sjify3f1wpqj";
   };
 
   completion = fetchurl {
-- 
GitLab


From e55d49bb1ab2e965f2e237511bb1e017ed776262 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 31 Oct 2017 15:57:33 +0100
Subject: [PATCH 350/877] wordpress: 4.7.4 -> 4.8.3

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

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 878e8480bb9..bb07c42b872 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,11 +2,12 @@
 { fetchFromGitHub, lib } : fetchFromGitHub {
   owner = "WordPress";
   repo = "WordPress";
-  rev = "4.7.4";
-  sha256 = "1ia9d3n085x2r6pvdrv4rk6gdp6xhjhpsq5g7a6448xzv9hf14ri";
+  rev = "4.8.3";
+  sha256 = "077bdx22sj29v8q493b49xfzxpc38q45pjhmn4znw2fmkjilih5p";
   meta = {
     homepage = https://wordpress.org;
     description = "WordPress is open source software you can use to create a beautiful website, blog, or app.";
     license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.basvandijk ];
   };
 }
-- 
GitLab


From 6df9c74238edc0d1a95569b1b6b9cc4c0a757e1b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 31 Oct 2017 17:28:59 +0100
Subject: [PATCH 351/877] pythonPackages: Move my libraries to python-modules

---
 .../python-modules/keyutils/default.nix       | 24 ++++++++
 .../python-modules/raven/default.nix          | 23 +++++++
 .../python-modules/zipstream/default.nix      | 22 +++++++
 pkgs/top-level/python-packages.nix            | 61 +------------------
 4 files changed, 72 insertions(+), 58 deletions(-)
 create mode 100644 pkgs/development/python-modules/keyutils/default.nix
 create mode 100644 pkgs/development/python-modules/raven/default.nix
 create mode 100644 pkgs/development/python-modules/zipstream/default.nix

diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix
new file mode 100644
index 00000000000..2746f161668
--- /dev/null
+++ b/pkgs/development/python-modules/keyutils/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }:
+
+let
+  pname = "keyutils";
+  version = "0.5";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/k/${pname}/${name}.tar.gz";
+    sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10";
+  };
+
+  buildInputs = [ pkgs.keyutils pytestrunner ];
+
+  doCheck = false;
+
+  meta = {
+    description = "A set of python bindings for keyutils";
+    homepage = https://github.com/sassoftware/python-keyutils;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix
new file mode 100644
index 00000000000..00bc54d844b
--- /dev/null
+++ b/pkgs/development/python-modules/raven/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchurl, isPy3k, contextlib2 }:
+
+buildPythonPackage rec {
+  name = "raven-6.3.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/r/raven/${name}.tar.gz";
+    sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k";
+  };
+
+  # way too many dependencies to run tests
+  # see https://github.com/getsentry/raven-python/blob/master/setup.py
+  doCheck = false;
+
+  propagatedBuildInputs = lib.optionals (!isPy3k) [ contextlib2 ];
+
+  meta = {
+    description = "A Python client for Sentry (getsentry.com)";
+    homepage = https://github.com/getsentry/raven-python;
+    license = [ lib.licenses.bsd3 ];
+    maintainers = with lib.maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix
new file mode 100644
index 00000000000..aac2bceeb15
--- /dev/null
+++ b/pkgs/development/python-modules/zipstream/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchurl, nose }:
+
+let
+  pname = "zipstream";
+  version = "1.1.4";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/z/${pname}/${name}.tar.gz";
+    sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif";
+  };
+
+  buildInputs = [ nose ];
+
+  meta = {
+    description = "A zip archive generator";
+    homepage = https://github.com/allanlei/python-zipstream;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 10cd211b5e1..de843c3dc50 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7367,24 +7367,7 @@ in {
     };
   };
 
-  raven = buildPythonPackage rec {
-    name = "raven-6.3.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/raven/${name}.tar.gz";
-      sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k";
-    };
-
-    # way too many dependencies to run tests
-    # see https://github.com/getsentry/raven-python/blob/master/setup.py
-    doCheck = false;
-
-    propagatedBuildInputs = optionals (!isPy3k) [ self.contextlib2 ];
-
-    meta = {
-      maintainers = with maintainers; [ primeos ];
-    };
-  };
+  raven = callPackage ../development/python-modules/raven { };
 
   rethinkdb = buildPythonPackage rec {
     name = "rethinkdb-${version}";
@@ -10574,27 +10557,7 @@ in {
 
   keyring = callPackage ../development/python-modules/keyring { };
 
-  keyutils = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "keyutils";
-    version = "0.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/${pname}/${name}.tar.gz";
-      sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10";
-    };
-
-    buildInputs = with self; [ pkgs.keyutils pytestrunner ];
-
-    doCheck = false;
-
-    meta = {
-      description = "A set of python bindings for keyutils";
-      homepage = https://github.com/sassoftware/python-keyutils;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ primeos ];
-    };
-  };
+  keyutils = callPackage ../development/python-modules/keyutils { };
 
   klaus = buildPythonPackage rec {
     version = "0.9.1";
@@ -21860,25 +21823,7 @@ EOF
     };
   });
 
-  zipstream = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "zipstream";
-    version = "1.1.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/${pname}/${name}.tar.gz";
-      sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif";
-    };
-
-    buildInputs = with self; [ nose ];
-
-    meta = {
-      description = "A zip archive generator";
-      homepage = "https://github.com/allanlei/python-zipstream";
-      license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ primeos ];
-    };
-  };
+  zipstream = callPackage ../development/python-modules/zipstream { };
 
   zodb = callPackage ../development/python-modules/zodb {};
 
-- 
GitLab


From 527781ebc4137d9e6cda6dd21ab0dd776f8582d5 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 31 Oct 2017 17:31:02 +0100
Subject: [PATCH 352/877] apache-httpd: fix nix evaluation error

This only sets the timezone when it's not null to prevent:

  error: cannot coerce null to a string, at
  nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix:676:7
---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 1c3c7835d96..f9f2511f45d 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -676,6 +676,7 @@ in
       ''
         ; Needed for PHP's mail() function.
         sendmail_path = sendmail -t -i
+      '' + optionalString (!isNull config.time.timeZone) ''
 
         ; Apparently PHP doesn't use $TZ.
         date.timezone = "${config.time.timeZone}"
-- 
GitLab


From 3165c56db9df4d2399e900a8d6eaffcd092359f7 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 31 Oct 2017 17:37:11 +0000
Subject: [PATCH 353/877] apache-httpd/wordpress: disable built-in WordPress
 autoupdater

---
 nixos/modules/services/web-servers/apache-httpd/wordpress.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index c6f4bcd0f66..1c654667dfc 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -13,6 +13,7 @@ let
     define('DB_HOST',     '${config.dbHost}');
     define('DB_CHARSET',  'utf8');
     $table_prefix  = '${config.tablePrefix}';
+    define('AUTOMATIC_UPDATER_DISABLED', true);
     ${config.extraConfig}
     if ( !defined('ABSPATH') )
     	define('ABSPATH', dirname(__FILE__) . '/');
-- 
GitLab


From 60321cb811940efea70c8c31b510958b0a4d9a83 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 31 Oct 2017 12:52:17 +0100
Subject: [PATCH 354/877] LTS Haskell 9.11

---
 .../configuration-hackage2nix.yaml            | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8de2749004e..0a89e738357 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 9.10
+  # LTS Haskell 9.11
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -323,7 +323,7 @@ default-package-overrides:
   - bytestring-strict-builder ==0.4.5
   - bytestring-tree-builder ==0.2.7.1
   - bytestring-trie ==0.2.4.1
-  - bzlib-conduit ==0.2.1.4
+  - bzlib-conduit ==0.2.1.5
   - c2hs ==0.28.2
   - Cabal ==1.24.2.0
   - cabal-dependency-licenses ==0.2.0.0
@@ -669,7 +669,7 @@ default-package-overrides:
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9
   - exp-pairs ==0.1.5.2
-  - extensible ==0.4.5
+  - extensible ==0.4.6
   - extensible-effects ==1.11.1.0
   - extensible-exceptions ==0.1.1.4
   - extra ==1.5.3
@@ -686,6 +686,7 @@ default-package-overrides:
   - fclabels ==2.0.3.2
   - fdo-notify ==0.3.1
   - feature-flags ==0.1.0.1
+  - fedora-haskell-tools ==0.3
   - feed ==0.3.12.0
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.6
@@ -790,7 +791,7 @@ default-package-overrides:
   - gi-soup ==2.4.14
   - git ==0.2.0
   - github ==0.16.0
-  - github-release ==1.0.6
+  - github-release ==1.0.7
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
   - github-webhook-handler-snap ==0.0.7
@@ -948,7 +949,7 @@ default-package-overrides:
   - haddock-api ==2.17.4
   - haddock-library ==1.4.3
   - haddock-test ==0.0.1
-  - hailgun ==0.4.1.5
+  - hailgun ==0.4.1.6
   - hailgun-simple ==0.1.0.0
   - hakyll ==4.9.8.0
   - hakyll-favicon ==0.1.0
@@ -1024,12 +1025,12 @@ default-package-overrides:
   - hebrew-time ==0.1.1
   - hedgehog ==0.5
   - hedgehog-quickcheck ==0.1
-  - hedis ==0.9.10
+  - hedis ==0.9.11
   - here ==1.2.11
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.5.0
   - hex ==0.1.2
-  - hexml ==0.3.2
+  - hexml ==0.3.3
   - hexpat ==0.20.13
   - hexstring ==0.11.1
   - hformat ==0.3.1.0
@@ -1090,8 +1091,8 @@ default-package-overrides:
   - hsebaysdk ==0.4.0.0
   - hse-cpp ==0.2
   - hsemail ==2
-  - hset ==2.2.0
   - HSet ==0.0.1
+  - hset ==2.2.0
   - hsexif ==0.6.1.4
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
@@ -1207,7 +1208,7 @@ default-package-overrides:
   - inline-c ==0.5.6.1
   - inline-c-cpp ==0.1.0.0
   - inline-java ==0.6.5
-  - inline-r ==0.9.0.1
+  - inline-r ==0.9.0.2
   - insert-ordered-containers ==0.2.1.0
   - instance-control ==0.1.2.0
   - integer-logarithms ==1.0.2
@@ -1232,10 +1233,10 @@ default-package-overrides:
   - ip6addr ==0.5.3
   - iproute ==1.7.1
   - IPv6Addr ==1.0.1
-  - IPv6DB ==0.2.2
+  - IPv6DB ==0.2.3
   - irc ==0.6.1.0
   - irc-client ==0.4.4.4
-  - irc-conduit ==0.2.2.3
+  - irc-conduit ==0.2.2.4
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.1
   - islink ==0.1.0.0
@@ -1283,7 +1284,7 @@ default-package-overrides:
   - kraken ==0.0.3
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==0.4.3
+  - lackey ==0.4.4
   - lame ==0.1.1
   - language-c ==0.6.1
   - language-c-quote ==0.12.1
@@ -1349,7 +1350,7 @@ default-package-overrides:
   - lmdb ==0.2.5
   - loch-th ==0.2.1
   - log ==0.9.0.1
-  - log-base ==0.7.3.0
+  - log-base ==0.7.4.0
   - log-domain ==0.11.2
   - log-elasticsearch ==0.9.1.0
   - logfloat ==0.13.3.3
@@ -1630,14 +1631,14 @@ default-package-overrides:
   - perf ==0.1.2
   - persistable-record ==0.5.1.1
   - persistable-types-HDBC-pg ==0.0.1.5
-  - persistent ==2.7.0
+  - persistent ==2.7.1
   - persistent-mongoDB ==2.6.0
-  - persistent-mysql ==2.6.1
+  - persistent-mysql ==2.6.2.1
   - persistent-mysql-haskell ==0.3.0.0
-  - persistent-postgresql ==2.6.1
+  - persistent-postgresql ==2.6.2
   - persistent-redis ==2.5.2
   - persistent-refs ==0.4
-  - persistent-sqlite ==2.6.2
+  - persistent-sqlite ==2.6.3
   - persistent-template ==2.5.3
   - pgp-wordlist ==0.1.0.2
   - pg-transact ==0.1.0.1
@@ -1646,7 +1647,7 @@ default-package-overrides:
   - picoparsec ==0.1.2.3
   - picosat ==0.1.4
   - pid1 ==0.1.2.0
-  - pinboard ==0.9.12.5
+  - pinboard ==0.9.12.6
   - pinch ==0.3.2.0
   - pinchot ==0.24.0.0
   - pipes ==4.3.6
@@ -1735,8 +1736,8 @@ default-package-overrides:
   - prompt ==0.1.1.2
   - protobuf ==0.2.1.1
   - protobuf-simple ==0.1.0.4
-  - protocol-buffers ==2.4.4
-  - protocol-buffers-descriptor ==2.4.4
+  - protocol-buffers ==2.4.5
+  - protocol-buffers-descriptor ==2.4.5
   - proto-lens ==0.2.1.0
   - proto-lens-arbitrary ==0.1.1.1
   - proto-lens-combinators ==0.1.0.7
@@ -1752,7 +1753,7 @@ default-package-overrides:
   - publicsuffix ==0.20170508
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
-  - purescript-bridge ==0.11.1.0
+  - purescript-bridge ==0.11.1.1
   - pusher-http-haskell ==1.2.0.1
   - pwstore-fast ==2.4.4
   - QuasiText ==0.1.2.6
@@ -1783,7 +1784,7 @@ default-package-overrides:
   - rank-product ==0.2.0.1
   - Rasterific ==0.7.2.1
   - rasterific-svg ==0.3.3
-  - ratel ==0.3.5
+  - ratel ==0.3.6
   - ratel-wai ==0.2.0
   - rattletrap ==2.5.0
   - rawfilepath ==0.2.4
@@ -1852,7 +1853,7 @@ default-package-overrides:
   - result ==0.2.6.0
   - rethinkdb ==2.2.0.10
   - rethinkdb-client-driver ==0.0.25
-  - retry ==0.7.4.2
+  - retry ==0.7.4.3
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
   - rng-utils ==0.2.1
@@ -1921,16 +1922,16 @@ default-package-overrides:
   - servant-mock ==0.8.2
   - servant-purescript ==0.8.0.1
   - servant-ruby ==0.2.1.0
-  - servant-server ==0.11
+  - servant-server ==0.11.0.1
   - servant-static-th ==0.1.0.6
   - servant-subscriber ==0.6.0.0
   - servant-swagger ==1.1.3.1
-  - servant-swagger-ui ==0.2.4.3.0.20
+  - servant-swagger-ui ==0.2.4.3.4.0
   - servant-yaml ==0.1.0.0
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
   - serversession-frontend-yesod ==1.0
-  - servius ==1.2.0.2
+  - servius ==1.2.0.3
   - set-cover ==0.0.8
   - setenv ==0.1.1.3
   - setlocale ==1.0.0.5
@@ -2251,7 +2252,7 @@ default-package-overrides:
   - typography-geometry ==1.0.0.1
   - tz ==0.1.3.0
   - tzdata ==0.1.20170320.0
-  - ua-parser ==0.7.4
+  - ua-parser ==0.7.4.1
   - uglymemo ==0.1.0.1
   - unbound ==0.5.1
   - unbounded-delays ==0.1.1.0
@@ -2357,7 +2358,7 @@ default-package-overrides:
   - wai-routes ==0.10.0
   - wai-routing ==0.13.0
   - wai-session ==0.3.2
-  - wai-session-postgresql ==0.2.1.0
+  - wai-session-postgresql ==0.2.1.1
   - wai-slack-middleware ==0.2.0
   - waitra ==0.0.4.0
   - wai-transformers ==0.0.7
-- 
GitLab


From 2177c9f036f1ab7ededcff4b753d4fda0eb63c9d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 31 Oct 2017 14:33:56 +0100
Subject: [PATCH 355/877] hackage2nix: disable failing builds

---
 .../configuration-hackage2nix.yaml            | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0a89e738357..93d8180bd0a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2803,6 +2803,7 @@ dont-distribute-packages:
   aeson-smart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-t:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-tiled:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-yak:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affection:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3259,6 +3260,7 @@ dont-distribute-packages:
   cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-sort:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-toolkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2doap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3410,6 +3412,7 @@ dont-distribute-packages:
   clafer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   claferIG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   claferwiki:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clang-compilation-database:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clang-pure:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clanki:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clarifai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3565,6 +3568,7 @@ dont-distribute-packages:
   Configurable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   congruence-relation:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   conjure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conkin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   conlogger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Conscript:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   consistent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4230,6 +4234,7 @@ dont-distribute-packages:
   filediff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filepath-crypto:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   filepath-io-access:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   filepather:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   FilePather:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4336,7 +4341,9 @@ dont-distribute-packages:
   free-theorems-seq:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems-webui:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-vector-spaces:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freelude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   freesect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   freesound:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   freetype-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4832,6 +4839,7 @@ dont-distribute-packages:
   haskell-brainfuck:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-cnc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-coffee:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-compression:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-course-preludes:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-eigen-util:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-formatter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5021,6 +5029,7 @@ dont-distribute-packages:
   Hermes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hermit-syb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hermit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  herms:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone-embed:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone-wai:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5753,6 +5762,7 @@ dont-distribute-packages:
   karakuri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   karps:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   katip-elasticsearch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  katip-syslog:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   katt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kawaii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kazura-queue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5944,6 +5954,7 @@ dont-distribute-packages:
   libsystemd-daemon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   libtagc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libvirt-hs:                                   [ "x86_64-darwin" ]
+  libvirt-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxls:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxml-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5965,6 +5976,7 @@ dont-distribute-packages:
   linear-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-vect:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linearmap-category:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   linearscan-hoopl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinearSplit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinkChecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5989,6 +6001,7 @@ dont-distribute-packages:
   liquid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal-demo:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  liquidhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-mux:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-attoparsec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-html-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6130,6 +6143,7 @@ dont-distribute-packages:
   mandulia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mangopay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifold-random:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manifolds-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifolds:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   marionetta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6253,6 +6267,7 @@ dont-distribute-packages:
   mmtl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   moan:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   modelicaparser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  modern-uri:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   modsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   modular-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   modular-prelude-classy:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6315,6 +6330,7 @@ dont-distribute-packages:
   mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monoid-statistics:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoidplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monte-carlo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6325,6 +6341,7 @@ dont-distribute-packages:
   morfeusz:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   morph:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mosaico-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  motor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mount:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   movie-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mp3decoder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6674,6 +6691,7 @@ dont-distribute-packages:
   paragon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Paraiso:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   parallel-tasks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parameterized:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   paranoia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   parco-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6878,6 +6896,7 @@ dont-distribute-packages:
   postgresql-typed-lifted:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgrest-ws:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgrest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmark-streams:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7048,6 +7067,7 @@ dont-distribute-packages:
   rail-compiler-editor:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rails-session:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rainbow-tests:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Raincat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   raketka:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rakhana:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rakuten:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7176,6 +7196,7 @@ dont-distribute-packages:
   reify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   relation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   relational-postgresql8:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  relational-record-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   relative-date:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reload:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   remark:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7237,6 +7258,7 @@ dont-distribute-packages:
   rewrite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rewriting:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rezoom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rhine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rhythm-game-tutorial:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   riak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   RichConditional:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7324,6 +7346,7 @@ dont-distribute-packages:
   safer-file-handles:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   saferoute:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sai-shape-syb:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sajson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Salsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   saltine-quickcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   saltine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7393,6 +7416,7 @@ dont-distribute-packages:
   sdl2-cairo-image:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-compositor:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-gfx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-mixer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seacat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   search:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7763,6 +7787,7 @@ dont-distribute-packages:
   step-function:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stepwise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stgi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  STLinkUSB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-chunked-queues:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-firehose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8355,6 +8380,7 @@ dont-distribute-packages:
   wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-make-assets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-brotli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8436,6 +8462,7 @@ dont-distribute-packages:
   WikimediaParser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wikipedia4epub:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   wild-bind-task-x11:                           [ "x86_64-darwin" ]
+  windns:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   windowslive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   winerror:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   winio:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8451,6 +8478,7 @@ dont-distribute-packages:
   woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wolf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordAlignment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wordchoice:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Wordlint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet-ghc74:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8510,6 +8538,7 @@ dont-distribute-packages:
   xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkbcommon:                                    [ "x86_64-darwin" ]
   xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xleb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xls:                                          [ "x86_64-darwin" ]
   xlsior:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-- 
GitLab


From 48adf76d5dc27071cd5b9c4be399d228e758fd6a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Oct 2017 03:00:41 +0200
Subject: [PATCH 356/877] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.6-13-gcf4b32a from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/476d2d9c505a27b5fdf591147cc05b41e6d4928c.
---
 .../haskell-modules/hackage-packages.nix      | 2083 +++++++++++------
 1 file changed, 1376 insertions(+), 707 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b9b9e75c859..cc0d8deb1f5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1835,8 +1835,8 @@ self: {
      }:
      mkDerivation {
        pname = "Blogdown";
-       version = "0.2.2";
-       sha256 = "18lxj5ka4jfaz1ig6x6qkdzlil99i3bcy4cqpbsccvyvhbax323c";
+       version = "0.2.3";
+       sha256 = "0xdlcx82nfm74n88fghbg5f6fnjvrajpsz52hrc4bl5afxx63bpx";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -2230,10 +2230,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "CSPM-CoreLanguage";
-       version = "0.3.0.3";
-       sha256 = "0vr6zpdz5lnpkyzwhig72pv8ncvqdjyp1nn76zpx3v6xlpzrs3q2";
+       version = "0.3.1.0";
+       sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255";
        libraryHaskellDepends = [ base ];
-       description = "Definition of a FDR-compatible CSP core-language";
+       description = "Definition of a CSP core-language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -2243,8 +2243,8 @@ self: {
      }:
      mkDerivation {
        pname = "CSPM-FiringRules";
-       version = "0.4.3.0";
-       sha256 = "0rdggf00zq51j4af6rhk4ix8rbpd82piy2al4m6ymziwflv3b70m";
+       version = "0.4.4.0";
+       sha256 = "11j4f9za74x9f0l8jbf7mvjnmd6gyx02zb31jjrhza3y4hpcj412";
        libraryHaskellDepends = [
          base containers CSPM-CoreLanguage mtl parallel-tree-search
          QuickCheck random tree-monad
@@ -2255,16 +2255,16 @@ self: {
      }) {};
 
   "CSPM-Frontend" = callPackage
-    ({ mkDerivation, alex, array, base, containers, dlist, either
-     , ghc-prim, mtl, parsec2, prettyclass, syb, transformers
+    ({ mkDerivation, alex, array, base, containers, dlist, either, mtl
+     , parsec, prettyclass, syb, transformers
      }:
      mkDerivation {
        pname = "CSPM-Frontend";
-       version = "0.10.0.0";
-       sha256 = "0wmfk9givv604ajzkg60586lz08xqcx60bnqgslpfzkh458mz9z3";
+       version = "0.12.1.0";
+       sha256 = "17i5app854vb4mghf9l0laldbgraqbq08w36hh61j5n161ypb1s5";
        libraryHaskellDepends = [
-         array base containers dlist either ghc-prim mtl parsec2 prettyclass
-         syb transformers
+         array base containers dlist either mtl parsec prettyclass syb
+         transformers
        ];
        libraryToolDepends = [ alex ];
        description = "A CSP-M parser compatible with FDR-2.91";
@@ -2278,8 +2278,8 @@ self: {
      }:
      mkDerivation {
        pname = "CSPM-Interpreter";
-       version = "0.7.0.0";
-       sha256 = "0shf0bb4zqnxvclsavvxnsy697xbl5q1xjqww8makps6dirwk0qn";
+       version = "0.7.1.0";
+       sha256 = "01byczl4109mwmxflmnflxxh4pnfj4anqsfgng5q664a8rjzqfwy";
        libraryHaskellDepends = [
          array base containers CSPM-CoreLanguage CSPM-Frontend mtl
          prettyclass syb
@@ -2290,15 +2290,13 @@ self: {
      }) {};
 
   "CSPM-ToProlog" = callPackage
-    ({ mkDerivation, array, base, containers, CSPM-Frontend, ghc-prim
-     , pretty
-     }:
+    ({ mkDerivation, array, base, containers, CSPM-Frontend, pretty }:
      mkDerivation {
        pname = "CSPM-ToProlog";
-       version = "0.5.2.0";
-       sha256 = "0qy2zdxgdm9vacm2ickf1lvyj6wrcnpifaxgh25apg9j9v6g0h12";
+       version = "0.5.5.0";
+       sha256 = "1jr4q8jyai53g4yps1377q7wv9c52mg50yikycyirrpz46giiy2r";
        libraryHaskellDepends = [
-         array base containers CSPM-Frontend ghc-prim pretty
+         array base containers CSPM-Frontend pretty
        ];
        description = "some modules specific for the ProB tool";
        license = stdenv.lib.licenses.bsd3;
@@ -2308,22 +2306,22 @@ self: {
   "CSPM-cspm" = callPackage
     ({ mkDerivation, base, cmdargs, containers, CSPM-CoreLanguage
      , CSPM-FiringRules, CSPM-Frontend, CSPM-Interpreter, CSPM-ToProlog
-     , hslua, parallel, pretty, prettyclass, syb, transformers, xml
+     , hslua, parallel, prettyclass, syb, transformers, xml
      }:
      mkDerivation {
        pname = "CSPM-cspm";
-       version = "0.8.0.0";
-       sha256 = "1lhfq8gjls2g3xwskwa7vx1kj6n83b4msx4fc6769li4r2xn1bc9";
+       version = "0.8.1.0";
+       sha256 = "0brgzzhkqk8pvdniqwzcfwwr9v7y3kw3zdhsw053lxs0dcb191n0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules
-         CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty
+         CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel
          prettyclass syb transformers xml
        ];
        executableHaskellDepends = [
          base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules
-         CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty
+         CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel
          prettyclass syb transformers xml
        ];
        description = "cspm command line tool for analyzing CSPM specifications";
@@ -6077,8 +6075,8 @@ self: {
      }:
      mkDerivation {
        pname = "GLUtil";
-       version = "0.9.1.1";
-       sha256 = "13536fari7askp70zp7arzbk16vwgz42lw7anwxnhi9gpq2hjy5y";
+       version = "0.9.2";
+       sha256 = "04k0i27igqzvxmyp2yy5gvd9agymmxwxnnkqxkiv0qjhk1kj8p8r";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath hpp JuicyPixels
          linear OpenGL OpenGLRaw transformers vector
@@ -9351,8 +9349,8 @@ self: {
      }:
      mkDerivation {
        pname = "Hastodon";
-       version = "0.1.0";
-       sha256 = "012b8f2jb297bnx7sgsvz0vw0ic0xmlrr0b7fs65y6ycll6ih2zw";
+       version = "0.2.0";
+       sha256 = "1ybchvkcv9n4wp8r4xassmgw1z0kdscmkccg3rbhz72lwp3m13zz";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types MissingH text
        ];
@@ -10251,36 +10249,6 @@ self: {
      }) {};
 
   "IPv6DB" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
-     , hedis, hspec, http-client, http-types, IPv6Addr, mtl
-     , optparse-applicative, text, unordered-containers, vector, wai
-     , wai-logger, warp
-     }:
-     mkDerivation {
-       pname = "IPv6DB";
-       version = "0.2.2";
-       sha256 = "117qn9h25wi0q8nnj10yj33spqizcsf0inb7n4xpbccg60x9i51k";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring fast-logger hedis http-types IPv6Addr mtl
-         optparse-applicative text unordered-containers vector wai
-         wai-logger warp
-       ];
-       testHaskellDepends = [
-         aeson base hspec http-client http-types vector
-       ];
-       homepage = "http://ipv6db.cybervisible.com";
-       description = "A RESTful Web Service for IPv6-related data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "IPv6DB_0_2_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
      , hedis, hspec, http-client, http-types, IPv6Addr, mtl
      , optparse-applicative, text, unordered-containers, vector, wai
@@ -12662,31 +12630,33 @@ self: {
      }) {};
 
   "MutationOrder" = callPackage
-    ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, base, bimaps
-     , BiobaseXNA, bytestring, cereal, cereal-vector, cmdargs
-     , containers, deepseq, directory, DPutils, file-embed, filepath
-     , FormalGrammars, log-domain, parallel, PrimitiveArray
+    ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, attoparsec, base
+     , bimaps, BiobaseXNA, bytestring, bytestring-trie, cereal
+     , cereal-vector, cmdargs, containers, deepseq, directory, DPutils
+     , errors, file-embed, filemanip, filepath, FormalGrammars, hashable
+     , lens, log-domain, mtl, OrderedBits, parallel, PrimitiveArray
      , PrimitiveArray-Pretty, QuickCheck, serialize-instances
-     , ShortestPathProblems, tasty, tasty-quickcheck, tasty-th, text
-     , unordered-containers, vector, vector-strategies
+     , ShortestPathProblems, split, tasty, tasty-quickcheck, tasty-th
+     , text, unordered-containers, vector, vector-strategies
      , ViennaRNA-bindings, zlib
      }:
      mkDerivation {
        pname = "MutationOrder";
-       version = "0.0.0.2";
-       sha256 = "0bzk2n84j2w1j11b8pi5505kdad3fzr4m86qwkwc9kmv2l25j680";
+       version = "0.0.1.0";
+       sha256 = "0zk0cwjapsinnadwk8ss5cv3g81c6cz1dcqq47g53bfi0m9aly9q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ADPfusion ADPfusionSet aeson base bimaps BiobaseXNA bytestring
-         cereal cereal-vector containers deepseq directory DPutils filepath
-         FormalGrammars log-domain parallel PrimitiveArray
-         PrimitiveArray-Pretty serialize-instances ShortestPathProblems text
-         unordered-containers vector vector-strategies ViennaRNA-bindings
-         zlib
+         ADPfusion ADPfusionSet aeson attoparsec base bimaps BiobaseXNA
+         bytestring bytestring-trie cereal cereal-vector containers deepseq
+         directory DPutils errors filemanip filepath FormalGrammars hashable
+         lens log-domain mtl OrderedBits parallel PrimitiveArray
+         PrimitiveArray-Pretty serialize-instances ShortestPathProblems
+         split text unordered-containers vector vector-strategies
+         ViennaRNA-bindings zlib
        ];
        executableHaskellDepends = [
-         base bytestring cmdargs file-embed filepath
+         base bytestring cmdargs directory errors file-embed filepath
        ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th vector
@@ -15171,7 +15141,7 @@ self: {
        homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Random123" = callPackage
@@ -15872,6 +15842,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "STLinkUSB" = callPackage
+    ({ mkDerivation, base, binary, bytestring, transformers, usb
+     , vector
+     }:
+     mkDerivation {
+       pname = "STLinkUSB";
+       version = "0.1.0";
+       sha256 = "17rqwr9f0g9p4i7qw4gih1g7wj2y7d7bdma55warp82v0v996ypr";
+       libraryHaskellDepends = [
+         base binary bytestring transformers usb vector
+       ];
+       description = "STLink USB interface in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "STMonadTrans" = callPackage
     ({ mkDerivation, array, base, Cabal, mtl }:
      mkDerivation {
@@ -17478,8 +17464,8 @@ self: {
      }:
      mkDerivation {
        pname = "TeX-my-math";
-       version = "0.201.0.0";
-       sha256 = "0lrv0wybagc1zka9nq78qrdaygl4wbhkllw3w79cnmk1bagslxs4";
+       version = "0.201.1.0";
+       sha256 = "13rf0q74kk8lmgwfxicgf2d83b1jnvyq623pykm5z4g3cnap4nn4";
        libraryHaskellDepends = [
          base decimal-literals dumb-cas hashable haskell-src-meta HaTeX
          template-haskell text unordered-containers vector-space void
@@ -18330,8 +18316,8 @@ self: {
      }:
      mkDerivation {
        pname = "Villefort";
-       version = "0.1.1.14";
-       sha256 = "020ialav8dxbzkyra8sjip397l50j7d3gy3m44jf4wgiyk3d9jpj";
+       version = "0.1.2.1";
+       sha256 = "1iabmpf31vb493xp8ypmai15ld4jbf0zchjnmf6hwfs58w92v27d";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -18674,14 +18660,14 @@ self: {
      }) {advapi32 = null; gdi32 = null; shell32 = null; 
          shfolder = null; user32 = null; winmm = null;};
 
-  "Win32_2_6_0_0" = callPackage
+  "Win32_2_6_1_0" = callPackage
     ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32
      , msimg32, shell32, shfolder, shlwapi, unbuildable, user32, winmm
      }:
      mkDerivation {
        pname = "Win32";
-       version = "2.6.0.0";
-       sha256 = "1swrahwg89c6001cprzfx9fi64kndzmfvwbr34k2f00izv39fn6l";
+       version = "2.6.1.0";
+       sha256 = "1qwwznnnqnr6zqvjzwr35bkvzrvjf7v90j4qkhinzs8p0yx4b97b";
        libraryHaskellDepends = [ base bytestring filepath unbuildable ];
        librarySystemDepends = [
          advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm
@@ -19856,6 +19842,8 @@ self: {
        pname = "accelerate-blas";
        version = "0.1.0.1";
        sha256 = "0rjcga34ipml402gikwvdxnpdjrmh9vnhd8wvcv109gs1ih6pafd";
+       revision = "2";
+       editedCabalFile = "1bxh38hyn7lq73z1dqg8rsbdblvy3551lp08jlm2h8p9b8bsriia";
        libraryHaskellDepends = [
          accelerate accelerate-llvm accelerate-llvm-native
          accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda
@@ -21980,6 +21968,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-tiled" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "aeson-tiled";
+       version = "0.0.0.1";
+       sha256 = "147rm19czz8bvzmjj4mmcvjyz02mr3cisyprzdfpx1q5msi7aghk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers text vector
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ aeson base hspec ];
+       homepage = "https://github.com/schell/aeson-tiled#readme";
+       description = "Aeson instances for the Tiled map editor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-toolkit" = callPackage
     ({ mkDerivation, aeson, base, bytestring, failure, hspec, text }:
      mkDerivation {
@@ -22426,8 +22435,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika";
-       version = "5.3";
-       sha256 = "0apx1i3v5p416wa9d0s8qacras3p137f9djbyv5miz5n7yhmlfi3";
+       version = "5.3.1";
+       sha256 = "1qgccxz77fa3j6vakg14z81wqw3259zrgg3xvfmrizshxnp1vh54";
        libraryHaskellDepends = [
          array base binary containers deepseq mtl mwc-random random vector
        ];
@@ -22459,8 +22468,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "0.7.4.2";
-       sha256 = "12igx82kzbsg9zick5r9nai2zdds33pkfgp0zm9kdr4a04qz58z1";
+       version = "0.8";
+       sha256 = "1ggr95d6na41sllnz6a8lnscb63v04b8x466hw6658r8vxai0560";
        libraryHaskellDepends = [
          aivika aivika-transformers base binary containers
          distributed-process exceptions mtl mwc-random random stm time
@@ -22558,15 +22567,16 @@ self: {
      }) {};
 
   "aivika-lattice" = callPackage
-    ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl
-     , mwc-random, random
+    ({ mkDerivation, aivika, aivika-transformers, array, base
+     , containers, mtl, mwc-random, random
      }:
      mkDerivation {
        pname = "aivika-lattice";
-       version = "0.3";
-       sha256 = "1770w2jbfyvcrdsvlh00l7861ckxk37yk4qc27fmigd060gbz552";
+       version = "0.4";
+       sha256 = "0fczcyg9bmijjwzh4x2kgs5q0x5swz17b51cv298ka4cmbqbhmgv";
        libraryHaskellDepends = [
-         aivika aivika-transformers base containers mtl mwc-random random
+         aivika aivika-transformers array base containers mtl mwc-random
+         random
        ];
        homepage = "http://www.aivikasoft.com";
        description = "Nested discrete event simulation module for the Aivika library using lattice";
@@ -25249,7 +25259,6 @@ self: {
        ];
        description = "Generic Haskell AMQP Consumer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp-worker" = callPackage
@@ -26130,25 +26139,25 @@ self: {
 
   "apiary" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, bytestring-read, case-insensitive
-     , data-default-class, directory, exceptions, hashable, http-date
-     , http-types, HUnit, mime-types, monad-control, mtl, process
-     , resourcet, stringsearch, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, time, transformers, transformers-base
-     , types-compat, unix-compat, unordered-containers, vault, wai
-     , wai-extra, web-routing
+     , blaze-markup, bytestring, bytestring-lexing, case-insensitive
+     , data-default-class, directory, exceptions, ghc-prim, hashable
+     , hetero-dict, http-date, http-types, HUnit, mime-types
+     , monad-control, mtl, primitive, process, resourcet, stringsearch
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+     , time, transformers, transformers-base, unix-compat
+     , unordered-containers, vault, wai, wai-extra
      }:
      mkDerivation {
        pname = "apiary";
-       version = "2.0.2";
-       sha256 = "155mkd7fdy32vhpl3njwa4v5r720w1y436i3laz9nysxnjaqk85r";
+       version = "2.1.2";
+       sha256 = "03b3rhjpjfinj1xnkngipz09d1j1dijy25s0z0a5mvygahlf9kvc";
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html blaze-markup bytestring
-         bytestring-read case-insensitive data-default-class exceptions
-         hashable http-date http-types mime-types monad-control mtl process
-         resourcet stringsearch template-haskell text time transformers
-         transformers-base types-compat unix-compat unordered-containers
-         vault wai wai-extra web-routing
+         bytestring-lexing case-insensitive data-default-class exceptions
+         ghc-prim hashable hetero-dict http-date http-types mime-types
+         monad-control mtl primitive process resourcet stringsearch
+         template-haskell text time transformers transformers-base
+         unix-compat unordered-containers vault wai wai-extra
        ];
        testHaskellDepends = [
          aeson base bytestring directory http-types HUnit mtl tasty
@@ -26164,18 +26173,16 @@ self: {
     ({ mkDerivation, apiary, apiary-session, authenticate, base
      , blaze-builder, bytestring, cereal, data-default-class
      , http-client, http-client-tls, http-types, monad-control
-     , resourcet, text, types-compat, wai, web-routing
+     , resourcet, text, wai
      }:
      mkDerivation {
        pname = "apiary-authenticate";
-       version = "1.4.0";
-       sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0";
-       revision = "5";
-       editedCabalFile = "0jndacr6vcnh14d7bd10v9jl2qcpzfwr223j7x1f6zza70r2p5rl";
+       version = "1.5.1";
+       sha256 = "0j28iv0am45a104cpc6jd1gv1j7nqwbjji892d0q9g90wlf2r5p8";
        libraryHaskellDepends = [
          apiary apiary-session authenticate base blaze-builder bytestring
          cereal data-default-class http-client http-client-tls http-types
-         monad-control resourcet text types-compat wai web-routing
+         monad-control resourcet text wai
        ];
        homepage = "https://github.com/philopon/apiary";
        description = "authenticate support for apiary web framework";
@@ -26190,10 +26197,8 @@ self: {
      }:
      mkDerivation {
        pname = "apiary-clientsession";
-       version = "1.4.0";
-       sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6";
-       revision = "3";
-       editedCabalFile = "06kcmwm1mrvqmbl510ni2j1rdsrzhs81xsjia5wlyhn4jr4192ag";
+       version = "1.5.1";
+       sha256 = "1cxxc3nn05k2v0mr2lnhhjwigykx5jws23mik3znq259r18wjjk7";
        libraryHaskellDepends = [
          apiary apiary-cookie apiary-session base bytestring cereal
          clientsession data-default-class time unix-compat vault
@@ -26206,17 +26211,14 @@ self: {
 
   "apiary-cookie" = callPackage
     ({ mkDerivation, apiary, base, blaze-builder, blaze-html
-     , bytestring, cookie, time, types-compat, wai, web-routing
+     , bytestring, cookie, time, wai
      }:
      mkDerivation {
        pname = "apiary-cookie";
-       version = "1.4.0";
-       sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx";
-       revision = "4";
-       editedCabalFile = "0qc5nzjak8zb5i3kavz7hi1qy6ywalsrgj2wrxdb53jwac76gigc";
+       version = "1.5.1";
+       sha256 = "1lci1vim94nk3ah72wa9iy1vza3gnf3c05jp10bnv0khy131mghy";
        libraryHaskellDepends = [
-         apiary base blaze-builder blaze-html bytestring cookie time
-         types-compat wai web-routing
+         apiary base blaze-builder blaze-html bytestring cookie time wai
        ];
        homepage = "https://github.com/philopon/apiary";
        description = "Cookie support for apiary web framework";
@@ -26228,10 +26230,8 @@ self: {
     ({ mkDerivation, apiary, base, blaze-builder, wai-extra }:
      mkDerivation {
        pname = "apiary-eventsource";
-       version = "1.4.0";
-       sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7";
-       revision = "2";
-       editedCabalFile = "15fc0hdrcic1nk62znn3dcq6dp00d0msl38kb7pdapvkpnyh1z0g";
+       version = "1.5.1";
+       sha256 = "0dkvj03ay44m49pmm96y9nvyqlrw91kyw0pzm6wraspagbvs57nm";
        libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
        homepage = "https://github.com/philopon/apiary";
        description = "eventsource support for apiary web framework";
@@ -26281,18 +26281,15 @@ self: {
   "apiary-logger" = callPackage
     ({ mkDerivation, apiary, base, data-default-class, fast-logger
      , lifted-base, monad-control, monad-logger, transformers
-     , transformers-base, types-compat
+     , transformers-base
      }:
      mkDerivation {
        pname = "apiary-logger";
-       version = "1.4.0";
-       sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48";
-       revision = "4";
-       editedCabalFile = "1qs3fxaiybyb4g9d4w393yxwsxr4b6wzg5va7qmlqpcavr9l1224";
+       version = "1.5.1";
+       sha256 = "19a8qiv0dygxmznjpr46s3wihryi83qj6d12nzr7d0n7j36ja2d8";
        libraryHaskellDepends = [
          apiary base data-default-class fast-logger lifted-base
          monad-control monad-logger transformers transformers-base
-         types-compat
        ];
        homepage = "https://github.com/philopon/apiary";
        description = "fast-logger support for apiary web framework";
@@ -26323,17 +26320,15 @@ self: {
   "apiary-mongoDB" = callPackage
     ({ mkDerivation, apiary, base, bson, data-default-class
      , lifted-base, monad-control, mongoDB, resource-pool, text, time
-     , transformers, types-compat
+     , transformers
      }:
      mkDerivation {
        pname = "apiary-mongoDB";
-       version = "1.4.0";
-       sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd";
-       revision = "2";
-       editedCabalFile = "1pk0axkr5zrlbyqskznh050ahvpnccdpa0ixfn3i5sw26nnva4ny";
+       version = "1.5.1";
+       sha256 = "1liiyk2w2v18455ydbxz7k5d58f29sgmlagxikkgsplbdm3m5mz0";
        libraryHaskellDepends = [
          apiary base bson data-default-class lifted-base monad-control
-         mongoDB resource-pool text time transformers types-compat
+         mongoDB resource-pool text time transformers
        ];
        homepage = "https://github.com/philopon/apiary";
        description = "mongoDB support for apiary web framework";
@@ -26344,18 +26339,15 @@ self: {
   "apiary-persistent" = callPackage
     ({ mkDerivation, apiary, apiary-logger, base, monad-control
      , monad-logger, persistent, resource-pool, resourcet, transformers
-     , transformers-base, types-compat, web-routing
+     , transformers-base
      }:
      mkDerivation {
        pname = "apiary-persistent";
-       version = "1.4.0";
-       sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9";
-       revision = "3";
-       editedCabalFile = "17i3l8aj2k1hzlmyf2h4jl5savbrdvnvz2i8riwcmwfqgnmcfdc2";
+       version = "1.5.1";
+       sha256 = "03vd0vjz72dd8ngi5n9dziplpxdysql5gxgiqfn825fzc75c9pn4";
        libraryHaskellDepends = [
          apiary apiary-logger base monad-control monad-logger persistent
-         resource-pool resourcet transformers transformers-base types-compat
-         web-routing
+         resource-pool resourcet transformers transformers-base
        ];
        homepage = "https://github.com/philopon/apiary";
        description = "persistent support for apiary web framework";
@@ -26385,16 +26377,12 @@ self: {
      }) {};
 
   "apiary-session" = callPackage
-    ({ mkDerivation, apiary, base, types-compat, wai, web-routing }:
+    ({ mkDerivation, apiary, base, wai }:
      mkDerivation {
        pname = "apiary-session";
-       version = "1.4.0";
-       sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23";
-       revision = "3";
-       editedCabalFile = "04yrlp26dbhhybqvviajmd85vrcdbscmbw4nmag32wfnz5xdb0qr";
-       libraryHaskellDepends = [
-         apiary base types-compat wai web-routing
-       ];
+       version = "1.5.0";
+       sha256 = "01z4r0sfm562wssfpqs3yzgwrprh8jzp0xsck4z099pwjknfi4i4";
+       libraryHaskellDepends = [ apiary base wai ];
        homepage = "https://github.com/philopon/apiary";
        description = "session support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -26402,18 +26390,12 @@ self: {
      }) {};
 
   "apiary-websockets" = callPackage
-    ({ mkDerivation, apiary, base, wai-websockets, web-routing
-     , websockets
-     }:
+    ({ mkDerivation, apiary, base, wai-websockets, websockets }:
      mkDerivation {
        pname = "apiary-websockets";
-       version = "1.4.0";
-       sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1";
-       revision = "2";
-       editedCabalFile = "1s8mpk1h6a6yxmwivclawwn20s2zs094cvbphl8ymil8mm505n3j";
-       libraryHaskellDepends = [
-         apiary base wai-websockets web-routing websockets
-       ];
+       version = "1.5.0";
+       sha256 = "0z43lqjz51r3mw92drjkrl3m8na7ldick76vqas0dr17v1d4qdsw";
+       libraryHaskellDepends = [ apiary base wai-websockets websockets ];
        homepage = "https://github.com/philopon/apiary";
        description = "websockets support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -28914,8 +28896,8 @@ self: {
     ({ mkDerivation, attoparsec, base, ip }:
      mkDerivation {
        pname = "attoparsec-ip";
-       version = "0.0.0";
-       sha256 = "08hgjmi9nlgg9qavsh5sl0s52yzh7vk6c933dgx9k16vk456r2y4";
+       version = "0.0.1";
+       sha256 = "0aananvfa7h9d73yf1c69zw5b3s3m67qhfmfrzdbifw3wj5cm9cd";
        libraryHaskellDepends = [ attoparsec base ip ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/athanclark/attoparsec-ip#readme";
@@ -29074,8 +29056,8 @@ self: {
      }:
      mkDerivation {
        pname = "attoparsec-uri";
-       version = "0.0.2";
-       sha256 = "096w3zb9a0fcqcnzl7lb9n27hgbaj6f5n93vll7rih972657h0my";
+       version = "0.0.3";
+       sha256 = "1n89gkgnd8zp7ggklv98y58hk3f45l20wr3m1avcpk9a42ig186n";
        libraryHaskellDepends = [
          attoparsec attoparsec-ip base bytedump ip strict text vector
        ];
@@ -34841,6 +34823,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bizzlelude-js" = callPackage
+    ({ mkDerivation, base, containers, text }:
+     mkDerivation {
+       pname = "bizzlelude-js";
+       version = "1.0.4";
+       sha256 = "1wp1542cjcypz339f9b5qxcgf1ppilbxgi8861s5d9p89zrgimij";
+       libraryHaskellDepends = [ base containers text ];
+       homepage = "http://github.com/TheBizzle";
+       description = "A lousy Prelude replacement by a lousy dude";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bk-tree" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -35993,8 +35987,8 @@ self: {
      }:
      mkDerivation {
        pname = "bond";
-       version = "0.10.0.0";
-       sha256 = "1f7vfh9pcg6za8rcdpq1lbvyn2z7plcb70d5r1xj330akvl626jw";
+       version = "0.10.1.0";
+       sha256 = "024qd9dmgqsa3q5xykc0bbvgay9hp9qwl9xixkgjpa5li68rd54c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36184,8 +36178,8 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit }:
      mkDerivation {
        pname = "boolean-list";
-       version = "0.1.0.1";
-       sha256 = "0xz0p3simx0vzvpjcmlqw7hnx0v3fiz25q8d9n7iw6z72c1920mc";
+       version = "0.1.0.2";
+       sha256 = "1vqn1igmsgq6nry9bpz5vhggbm3j8kc3p6d6wy16nf94z10nq3qs";
        libraryHaskellDepends = [ base bytestring HUnit ];
        homepage = "http://xy30.com";
        description = "convert numbers to binary coded lists";
@@ -37140,6 +37134,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "buffer" = callPackage
+    ({ mkDerivation, base, base-prelude, bug, bytestring, criterion
+     , quickcheck-instances, rerebase, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "buffer";
+       version = "0.5.0.1";
+       sha256 = "09dwscqkdppmiprz8k0rfxkwf7qd8b6md8iviqmxw3wamm9qx7dl";
+       libraryHaskellDepends = [ base base-prelude bug bytestring ];
+       testHaskellDepends = [
+         bug quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ bug criterion rerebase ];
+       homepage = "https://github.com/nikita-volkov/buffer";
+       description = "Simple mutable low-level buffer for IO";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "buffer-builder" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances
@@ -37494,8 +37508,8 @@ self: {
      }:
      mkDerivation {
        pname = "bustle";
-       version = "0.6.1";
-       sha256 = "18qg8fwmdq0lrfz7gyyzv6f4ch24sm925ykxb68rr996wxnmlbm2";
+       version = "0.6.2";
+       sha256 = "099awz60hp9bpc8d27zkb3vm8r5bqp2y358drj6bzas5gqlg67bf";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -38132,8 +38146,8 @@ self: {
      }:
      mkDerivation {
        pname = "bzlib-conduit";
-       version = "0.2.1.4";
-       sha256 = "07gxnbr65pl70lssgcxbajc0id9x4p3p8mc0hfi9lgf8rh270w1d";
+       version = "0.2.1.5";
+       sha256 = "1bv78qr6fbf6lg1dx06g3r2904fjnpvb87mlqv6np2kpyzjc11an";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bindings-DSL bytestring conduit conduit-extra data-default mtl
@@ -39107,6 +39121,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cabal-toolkit" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, containers
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "cabal-toolkit";
+       version = "0.0.1";
+       sha256 = "0rlr2zcm4pmiknw7z4jgn1n1wd9wr056g5hbv7jcr3l709b1753j";
+       libraryHaskellDepends = [
+         base binary bytestring Cabal containers template-haskell
+       ];
+       homepage = "https://github.com/TerrorJack/cabal-toolkit#readme";
+       description = "Helper functions for writing custom Setup.hs scripts.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-uninstall" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, process }:
      mkDerivation {
@@ -42191,8 +42222,8 @@ self: {
      }:
      mkDerivation {
        pname = "chatwork";
-       version = "0.1.1.2";
-       sha256 = "050a0vhv59svdgja4lc8jxcyxqbrd9zr14hwbrnk7hzk9dxvd0wz";
+       version = "0.1.1.3";
+       sha256 = "0g7995g5i49mxd0qhdb2l1l1yz047yqwnmzk9f6xvqv5fqy5c6p5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42378,6 +42409,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "checkers_0_4_9" = callPackage
+    ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
+     mkDerivation {
+       pname = "checkers";
+       version = "0.4.9";
+       sha256 = "1vpyyhvq1xkq8pxz2xpmw14yldn8ks95zaijpqxdzsmq4v3sy83a";
+       libraryHaskellDepends = [
+         array base QuickCheck random semigroupoids
+       ];
+       description = "Check properties on standard classes and data structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "checkmate" = callPackage
     ({ mkDerivation, base, bytestring, containers, diff-parse
      , directory, file-embed, filepath, github, hlint, hspec
@@ -42676,13 +42721,14 @@ self: {
      }) {};
 
   "chronologique" = callPackage
-    ({ mkDerivation, base, hourglass, hspec, QuickCheck, time }:
+    ({ mkDerivation, base, hourglass, hspec, QuickCheck, time, vector
+     }:
      mkDerivation {
        pname = "chronologique";
-       version = "0.2.1.0";
-       sha256 = "13lrngxfbsfsmqph8slh8zn7hvvihbwzc6cna315kjzhi3a3mwbm";
-       libraryHaskellDepends = [ base hourglass time ];
-       testHaskellDepends = [ base hourglass hspec QuickCheck ];
+       version = "0.3.0.0";
+       sha256 = "1pgggmsmb3ah15iqkib9d9ms0vs4j3945a7mbih0zra4xha39dg9";
+       libraryHaskellDepends = [ base hourglass time vector ];
+       testHaskellDepends = [ base hourglass hspec QuickCheck vector ];
        description = "Time to manipulate time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42690,16 +42736,16 @@ self: {
   "chronos" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable
      , HUnit, primitive, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, vector
+     , test-framework-hunit, test-framework-quickcheck2, text, torsor
+     , vector
      }:
      mkDerivation {
        pname = "chronos";
-       version = "0.4";
-       sha256 = "0lc7qb1ky15sxmvndfjcmmy6j913ncnzq0hjx9mbqljvg7di0yal";
-       revision = "1";
-       editedCabalFile = "1mk6kn0gs7azv7c9bcal8k6zzlpska0x9akk91la2xvg298sy6a5";
+       version = "1.0";
+       sha256 = "135fb54lac1rqb7ql0810f22a41whmswckhjbmb1xysryv0gv05k";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring hashable primitive text vector
+         aeson attoparsec base bytestring hashable primitive text torsor
+         vector
        ];
        testHaskellDepends = [
          attoparsec base bytestring HUnit QuickCheck test-framework
@@ -43390,6 +43436,7 @@ self: {
        homepage = "https://github.com/lambdageek/clang-compilation-database";
        description = "JSON Compilation Database Format encoding and decoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clang-pure" = callPackage
@@ -45306,8 +45353,8 @@ self: {
     ({ mkDerivation, array, base, bytestring, text }:
      mkDerivation {
        pname = "cndict";
-       version = "0.8.2";
-       sha256 = "0pc6rph99mxy5cbrxrysxq5q01vn2k2ax3c00pv9sw7inn4inh0p";
+       version = "0.8.3";
+       sha256 = "1vci3z74jsxfhbbz122mcbcdh6n2371i0l803vgd8ndzawhs13m4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base bytestring text ];
        homepage = "https://github.com/Lemmih/cndict";
@@ -46019,8 +46066,8 @@ self: {
      }:
      mkDerivation {
        pname = "colour-space";
-       version = "0.1.3.0";
-       sha256 = "06ainna4nrqd9an0s0hvcrqw18g55v0fqw4a6p00g5kw53729qyq";
+       version = "0.1.4.0";
+       sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq";
        libraryHaskellDepends = [
          base colour constrained-categories JuicyPixels linear
          linearmap-category manifolds semigroups vector-space
@@ -47471,6 +47518,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "concurrent-buffer" = callPackage
+    ({ mkDerivation, base, base-prelude, bug, bytestring, criterion
+     , quickcheck-instances, rerebase, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "concurrent-buffer";
+       version = "0.1";
+       sha256 = "0qrnsp98x42blvngixm9wzk9cnwk335s5axslwrl6hq8pawx2ycd";
+       libraryHaskellDepends = [ base base-prelude bug bytestring ];
+       testHaskellDepends = [
+         bug quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ bug criterion rerebase ];
+       homepage = "https://github.com/nikita-volkov/concurrent-buffer";
+       description = "Concurrent expanding buffer";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "concurrent-dns-cache" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers, dns
      , hspec, iproute, lifted-base, monad-control, network, psqueues
@@ -48565,6 +48632,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "conkin" = callPackage
+    ({ mkDerivation, base, data-default, doctest, markdown-unlit
+     , pretty-show
+     }:
+     mkDerivation {
+       pname = "conkin";
+       version = "1.0.2";
+       sha256 = "1843mlmf09jgdj6hd7jzn81pwd4biimrc4rxaki9s2df2qd2zr6r";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base data-default doctest markdown-unlit pretty-show
+       ];
+       homepage = "http://github.com/rampion/conkin";
+       description = "Tools for functors from Hask^k to Hask";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conlogger" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -50806,8 +50891,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.20";
-       sha256 = "08cvagp0v98s8x99cdq86yk1i33fcpgxq3zdm414lf6cpjq80qa1";
+       version = "5.9.23";
+       sha256 = "04f66vjl1bpfgsf0j5dpz7wjvkvw22ia0f1d375mzhp5xmv4qw46";
        libraryHaskellDepends = [
          array base binary bytestring cereal cond directory exceptions
          filepath gray-extended hdaemonize hsyslog MonadRandom mtl
@@ -51872,8 +51957,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptoids";
-       version = "0.3.0.0";
-       sha256 = "1n8mr80n1hmld02n1a97nsxh3x8fmnqmbpnnvjawkq1mj768nbc4";
+       version = "0.4.0.0";
+       sha256 = "1km63vgckjsxxrkd45w7c5gc3d5hk6dg6f0y4z4c8wajz4ddp1a3";
        libraryHaskellDepends = [
          base binary bytestring cryptoids-types cryptonite directory
          exceptions filepath memory
@@ -52565,8 +52650,8 @@ self: {
      }:
      mkDerivation {
        pname = "cuda";
-       version = "0.8.0.0";
-       sha256 = "0zlasd6c3da462qaffj9z44546551b2cvs0wv0f23739x4i929z9";
+       version = "0.8.0.1";
+       sha256 = "0raaydjcnicg38kxy1mjpxb0k57q5nnzb7p38i8x5ify30bzxw0w";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -54183,14 +54268,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse_1_2_0_2" = callPackage
+  "data-diverse_1_2_0_3" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
      , hspec, tagged
      }:
      mkDerivation {
        pname = "data-diverse";
-       version = "1.2.0.2";
-       sha256 = "0h0wifwckybn0py6xndaj1fp0sld28aca4qgclw07qsyfd9rnc9x";
+       version = "1.2.0.3";
+       sha256 = "0mc9xzh0hja8zvgwnfa65hdwirqzggbw1k07fspgzs699wj9dh6r";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim tagged
        ];
@@ -54215,13 +54300,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse-lens_0_5_0_0" = callPackage
-    ({ mkDerivation, base, data-diverse, hspec, lens, tagged }:
+  "data-diverse-lens_0_5_1_0" = callPackage
+    ({ mkDerivation, base, data-diverse, hspec, lens, profunctors
+     , tagged
+     }:
      mkDerivation {
        pname = "data-diverse-lens";
-       version = "0.5.0.0";
-       sha256 = "1can16ndkff8c3dfn585hdbg8zw805icax01hfm0ys3rvypwn4vq";
-       libraryHaskellDepends = [ base data-diverse lens tagged ];
+       version = "0.5.1.0";
+       sha256 = "0c1hrz9b8a01vphfqmlfgx3mh6ci8hd5wwr8iwpkv6z7ps7sp9kd";
+       libraryHaskellDepends = [
+         base data-diverse lens profunctors tagged
+       ];
        testHaskellDepends = [ base data-diverse hspec lens tagged ];
        homepage = "https://github.com/louispan/data-diverse-lens#readme";
        description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
@@ -56941,18 +57030,17 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
-  "dejafu_0_9_0_0" = callPackage
+  "dejafu_0_9_0_1" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
-     , leancheck, mtl, random, ref-fd, semigroups, transformers
-     , transformers-base
+     , leancheck, random, ref-fd, transformers, transformers-base
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.9.0.0";
-       sha256 = "0n2qj6kaldg006pjz5aj0wjigr3dd7vgbl35fgsz3fx9j64ydi72";
+       version = "0.9.0.1";
+       sha256 = "18i21basz8d50axa1ccgz9djghd95iazv4k7x499fff1nak39147";
        libraryHaskellDepends = [
-         base concurrency containers deepseq exceptions leancheck mtl random
-         ref-fd semigroups transformers transformers-base
+         base concurrency containers deepseq exceptions leancheck random
+         ref-fd transformers transformers-base
        ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Systematic testing for Haskell concurrency";
@@ -57448,16 +57536,20 @@ self: {
      }) {};
 
   "derive-topdown" = callPackage
-    ({ mkDerivation, base, mtl, primitive, syb, template-haskell
-     , th-expand-syns, transformers
+    ({ mkDerivation, base, binary, derive, haskell-src, mtl, primitive
+     , QuickCheck, syb, template-haskell, th-expand-syns, transformers
      }:
      mkDerivation {
        pname = "derive-topdown";
-       version = "0.0.0.7";
-       sha256 = "1r566bcp0qqwwbndwbbfnczxwmlyl9dfnsysnija7v8fn46z30ni";
+       version = "0.0.0.9";
+       sha256 = "0jvmdwd1dif8hxb45s2fw96pca1hm41p5cac68in1pkpsvq7z6cf";
        libraryHaskellDepends = [
          base mtl primitive syb template-haskell th-expand-syns transformers
        ];
+       testHaskellDepends = [
+         base binary derive haskell-src mtl primitive QuickCheck syb
+         template-haskell th-expand-syns transformers
+       ];
        homepage = "https://github.com/HaskellZhangSong/derive-topdown";
        description = "Help Haskellers derive class instances for composited data types";
        license = stdenv.lib.licenses.bsd3;
@@ -59671,8 +59763,8 @@ self: {
      }:
      mkDerivation {
        pname = "diskhash";
-       version = "0.0.2.1";
-       sha256 = "1kgjwcggi33jw1k1s462cya6hydcz7ka9pkqk2lgdcxwlw9fy9kb";
+       version = "0.0.2.3";
+       sha256 = "08g484knhw96mlk5qa6cx1cm9kblxrz8979c9xcvmidgj44phb8z";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring directory HUnit QuickCheck test-framework
@@ -61379,15 +61471,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dotenv_0_5_1_0" = callPackage
+  "dotenv_0_5_1_1" = callPackage
     ({ mkDerivation, base, base-compat, exceptions, hspec
      , hspec-megaparsec, megaparsec, optparse-applicative, process, text
      , transformers
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.5.1.0";
-       sha256 = "1cgx9q8gdfvkv3vr10yafa0vls2iil5kr5nqdbn4n9xf8m5p3dn1";
+       version = "0.5.1.1";
+       sha256 = "1i4892xc2d05qnswcyf40ww5idjd1m3wwqz9wxwhph1jqzvsgc9b";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -62332,15 +62424,14 @@ self: {
      }:
      mkDerivation {
        pname = "dumb-cas";
-       version = "0.1.0.0";
-       sha256 = "0jrxphgxm6f7wzrn8vzfz0i6scz2xz72yja5i2bmkf185gqvhpjz";
-       revision = "1";
-       editedCabalFile = "0wzq73i209fa8apj34lc851cgg6047kimxkl9ykv8l9nspg22faq";
+       version = "0.1.1.0";
+       sha256 = "1crzw0axgamjhxrm2ggdqw45jw80avp227bwc1v0c7lmb4cmkr3p";
        libraryHaskellDepends = [
          base containers decimal-literals hashable template-haskell
          unordered-containers
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "https://github.com/leftaroundabout/dumb-cas";
        description = "A computer “algebra” system that knows nothing about algebra, at the core";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62388,8 +62479,8 @@ self: {
     ({ mkDerivation, base, transformers, transformers-base }:
      mkDerivation {
        pname = "dunai";
-       version = "0.1.1.0";
-       sha256 = "1smzf6m5l2ma500r9d51iia994lq8wvq2ryf3gijz3fyll6f5ibn";
+       version = "0.2.0.0";
+       sha256 = "1h6rw4h300hbmv05immhzxzf5yb9kc5zsykifdysi40l4fbx7rkc";
        libraryHaskellDepends = [ base transformers transformers-base ];
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
        license = stdenv.lib.licenses.bsd3;
@@ -62951,12 +63042,16 @@ self: {
      }) {};
 
   "eap" = callPackage
-    ({ mkDerivation, base, binary, bytestring }:
+    ({ mkDerivation, base, binary, bytestring, cryptonite, memory, mtl
+     , pretty-hex
+     }:
      mkDerivation {
        pname = "eap";
-       version = "0.1.0.0";
-       sha256 = "118nayxnc8xwyhx622wvgr3l35v90481j50m43x2zfkwish23dir";
-       libraryHaskellDepends = [ base binary bytestring ];
+       version = "0.9.0.1";
+       sha256 = "0z7ab3i16424gpxwjhc4x7c55yhvzx5qjm80f2klpf94zz4w37ab";
+       libraryHaskellDepends = [
+         base binary bytestring cryptonite memory mtl pretty-hex
+       ];
        homepage = "https://github.com/erickg/eap#readme";
        description = "Extensible Authentication Protocol (EAP)";
        license = stdenv.lib.licenses.bsd3;
@@ -67868,8 +67963,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions";
-       version = "0.1.3";
-       sha256 = "0b3f9h0s7ayijkpqk929pgw6lxszbq94c9y69wsfcs7h7awd792h";
+       version = "0.1.4";
+       sha256 = "1dxkg5yc2njq7dpv7vgkmrs73x5np5w1ahi79my6ysamnc2w8a04";
        libraryHaskellDepends = [
          attoparsec base containers lattices singletons text transformers
        ];
@@ -67887,8 +67982,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions-z3";
-       version = "0.1.0";
-       sha256 = "1ma1g8b25466cpk8fyaf6fajp330wvnd44h2ddjvm9hkgaa8s82x";
+       version = "0.1.1";
+       sha256 = "0hk8qhkvlh4v210k7d845krg31px72ma44fmwahbycn6pgy32659";
        libraryHaskellDepends = [
          base containers expressions singletons transformers z3
        ];
@@ -67976,17 +68071,18 @@ self: {
 
   "extensible" = callPackage
     ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim
-     , lens, monad-skeleton, mtl, primitive, profunctors, QuickCheck
-     , semigroups, StateVar, tagged, template-haskell, transformers
+     , hashable, lens, monad-skeleton, mtl, primitive, profunctors
+     , QuickCheck, semigroups, StateVar, tagged, template-haskell
+     , transformers, vector
      }:
      mkDerivation {
        pname = "extensible";
-       version = "0.4.5";
-       sha256 = "10cs47fdl79dasq5afbj5b47ybmvfsx589bwy6y3qcmlwybjnmlj";
+       version = "0.4.6";
+       sha256 = "0khi212qc834qnrssbn4xcfiypi2m7x8gwpwvpd6sbi6hi6c052v";
        libraryHaskellDepends = [
-         base comonad constraints deepseq ghc-prim monad-skeleton mtl
-         primitive profunctors QuickCheck semigroups StateVar tagged
-         template-haskell transformers
+         base comonad constraints deepseq ghc-prim hashable monad-skeleton
+         mtl primitive profunctors QuickCheck semigroups StateVar tagged
+         template-haskell transformers vector
        ];
        testHaskellDepends = [ base lens QuickCheck template-haskell ];
        homepage = "https://github.com/fumieval/extensible";
@@ -68532,6 +68628,28 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "fast-builder_0_0_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, ghc-prim, process, QuickCheck, scientific, stm
+     , template-haskell, text, true-name, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "fast-builder";
+       version = "0.0.1.0";
+       sha256 = "09s0jyiv1ch8cbgwfaxn5mmn9w7ik661h2g6d5znxr0nsi0bp2n1";
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       testHaskellDepends = [ base bytestring process QuickCheck stm ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring containers criterion deepseq ghc-prim
+         scientific template-haskell text true-name unordered-containers
+         vector
+       ];
+       homepage = "http://github.com/takano-akio/fast-builder";
+       description = "Fast ByteString Builder";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fast-digits" = callPackage
     ({ mkDerivation, base, criterion, digits, integer-gmp, QuickCheck
      , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck
@@ -69264,6 +69382,22 @@ self: {
        license = "GPL";
      }) {};
 
+  "fedora-haskell-tools" = callPackage
+    ({ mkDerivation, base, directory, filepath, process, time, unix }:
+     mkDerivation {
+       pname = "fedora-haskell-tools";
+       version = "0.3";
+       sha256 = "0ml5laiwkpd68j87px57jdvjc90pw1ma41gsc06h1qjlhnvhhill";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory filepath process time unix
+       ];
+       homepage = "https://github.com/fedora-haskell/fedora-haskell-tools";
+       description = "Building and tracking tools for Fedora Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "fedora-packages" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hlint
      , HsOpenSSL, hspec, http-streams, io-streams, lens, text
@@ -69717,8 +69851,8 @@ self: {
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.12.0";
-       sha256 = "0cv8jq2if0pv40yp8inl3slsgs3z1rncffjgs2522qimq123rxcz";
+       version = "0.12.0.1";
+       sha256 = "1ikyhdkr3pvkpmqw7j4xgz07bnxnvckld8kd06191kgqlvr2k764";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70218,6 +70352,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "filepath-crypto" = callPackage
+    ({ mkDerivation, base, binary, bytestring, case-insensitive
+     , cryptoids, cryptoids-types, encoding, exceptions, filepath, sandi
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "filepath-crypto";
+       version = "0.0.0.2";
+       sha256 = "1i6y0bpyndghkfip2l0ijk9mnhia0fjmd6skzl1a3dbh5pibf7fd";
+       libraryHaskellDepends = [
+         base binary bytestring case-insensitive cryptoids cryptoids-types
+         encoding exceptions filepath sandi template-haskell
+       ];
+       description = "Reversable and secure encoding of object ids as filepaths";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "filepath-io-access" = callPackage
     ({ mkDerivation, base, base-io-access, filepath }:
      mkDerivation {
@@ -72808,6 +72960,24 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "fortytwo" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, doctest, hspec
+     , process, text
+     }:
+     mkDerivation {
+       pname = "fortytwo";
+       version = "1.0.2";
+       sha256 = "15imj5ps040iz5abfnzjpgfq726j9c28bwwg06zbf07ji74dz190";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ ansi-terminal base text ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ async base doctest hspec process ];
+       homepage = "https://github.com/gianlucaguarini/fortytwo#readme";
+       description = "Interactive terminal prompt";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "forward-chan" = callPackage
     ({ mkDerivation, base, SafeSemaphore, stm, unagi-chan }:
      mkDerivation {
@@ -73424,14 +73594,15 @@ self: {
      }:
      mkDerivation {
        pname = "free-vector-spaces";
-       version = "0.1.2.0";
-       sha256 = "1km43gdngrjbyd6z8v6nfj25aybb4xdkxdnfizkd9sbkdqyxkbk8";
+       version = "0.1.4.0";
+       sha256 = "057l1fnkqyqnjbhzjz2jjlcrsmkcv2gd16gb5n3j99crw97s62xj";
        libraryHaskellDepends = [
          base lens linear MemoTrie vector vector-space
        ];
        homepage = "https://github.com/leftaroundabout/free-vector-spaces";
        description = "Instantiate the classes from the vector-space package with types from linear";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-vl" = callPackage
@@ -73492,6 +73663,7 @@ self: {
        homepage = "https://github.com/clintonmead/freelude#readme";
        description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freenect" = callPackage
@@ -74758,6 +74930,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fuzzyset" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, data-default, hspec
+     , ieee754, lens, text, text-metrics, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "fuzzyset";
+       version = "0.1.0.2";
+       sha256 = "1gpx8qw9vxlardjxncgkbbk3zvq8zjrc6nhjk80va7d7ix5zpdhz";
+       libraryHaskellDepends = [
+         base base-unicode-symbols data-default lens text text-metrics
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base base-unicode-symbols hspec ieee754 lens text
+         unordered-containers
+       ];
+       homepage = "https://github.com/laserpants/fuzzyset-haskell";
+       description = "Fuzzy set for approximate string matching";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fuzzytime" = callPackage
     ({ mkDerivation, base, cmdargs, directory, old-time, process }:
      mkDerivation {
@@ -75051,23 +75244,22 @@ self: {
      }) {};
 
   "gauge" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, basement, bytestring
-     , code-page, containers, deepseq, directory, foundation, HUnit
-     , math-functions, mwc-random, optparse-applicative, QuickCheck
-     , statistics, tasty, tasty-hunit, tasty-quickcheck, vector
+    ({ mkDerivation, base, basement, bytestring, code-page, containers
+     , deepseq, directory, HUnit, math-functions, mwc-random, tasty
+     , tasty-hunit, vector
      }:
      mkDerivation {
        pname = "gauge";
-       version = "0.1.0";
-       sha256 = "10hxx7n8hpcivi0g34w85dsvfx4l926rv1b6s88hyhpwj4qyvxb5";
+       version = "0.1.3";
+       sha256 = "1i97f00haj4832s2arbnqq19dpna54ygmchvnqkq00hsxk38cyc0";
        libraryHaskellDepends = [
-         ansi-wl-pprint base basement code-page containers deepseq
-         foundation math-functions mwc-random optparse-applicative vector
+         base basement code-page containers deepseq math-functions
+         mwc-random vector
        ];
        testHaskellDepends = [
-         base bytestring deepseq directory foundation HUnit QuickCheck
-         statistics tasty tasty-hunit tasty-quickcheck vector
+         base bytestring deepseq directory HUnit tasty tasty-hunit
        ];
+       benchmarkHaskellDepends = [ base ];
        homepage = "https://github.com/vincenthz/hs-gauge";
        description = "small framework for performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
@@ -75393,29 +75585,108 @@ self: {
      }) {inherit (pkgs) gegl;};
 
   "gelatin" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, directory
-     , file-embed, FontyFruity, gl, GLFW-b, JuicyPixels, lens, linear
-     , time, vector
+    ({ mkDerivation, base, bytestring, containers, lens, linear, mtl
+     , transformers, vector
      }:
      mkDerivation {
        pname = "gelatin";
-       version = "0.0.0.3";
-       sha256 = "07ixnrhgqfqgb8cfm5qik17vx893jrjk7lq6342lpczpks22a58q";
+       version = "0.1.0.0";
+       sha256 = "08y9wsym19rgwr6k44n8pxffwi1fna3nmg4bq5cc7in5zj1ihfbv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async base bytestring containers directory file-embed FontyFruity
-         gl GLFW-b JuicyPixels lens linear time vector
-       ];
-       executableHaskellDepends = [
-         async base bytestring containers directory file-embed FontyFruity
-         gl GLFW-b JuicyPixels lens linear time vector
+         base bytestring containers lens linear mtl transformers vector
        ];
-       description = "An experimental real time renderer";
+       executableHaskellDepends = [ base linear mtl vector ];
+       homepage = "https://github.com/schell/gelatin";
+       description = "A graphics description language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gelatin-freetype2" = callPackage
+    ({ mkDerivation, base, containers, either, freetype2, gelatin
+     , gelatin-gl, mtl, transformers
+     }:
+     mkDerivation {
+       pname = "gelatin-freetype2";
+       version = "0.1.0.0";
+       sha256 = "0nr5xsxwg73liyr572jv1vzj5bjk3qhkkk7j6g0kqf2h31yxgqhr";
+       libraryHaskellDepends = [
+         base containers either freetype2 gelatin gelatin-gl mtl
+         transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/schell/gelatin/gelatin-freetype2#readme";
+       description = "FreeType2 based text rendering for the gelatin realtime rendering system";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "gelatin-fruity" = callPackage
+    ({ mkDerivation, base, FontyFruity, gelatin, linear, vector }:
+     mkDerivation {
+       pname = "gelatin-fruity";
+       version = "0.1.0.0";
+       sha256 = "0yp3z4sz52f21zvdy1xmd0bvpicbnv4wa53937rq1vw2jv60xx2r";
+       libraryHaskellDepends = [ base FontyFruity gelatin linear vector ];
+       homepage = "https://github.com/schell/gelatin-fruity#readme";
+       description = "Gelatin's support for rendering TTF outlines, using FontyFruity";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "gelatin-gl" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, either
+     , filepath, gelatin, gelatin-shaders, gl, JuicyPixels, lens, linear
+     , mtl, template-haskell, transformers, vector
+     }:
+     mkDerivation {
+       pname = "gelatin-gl";
+       version = "0.1.0.0";
+       sha256 = "1x9a3wb878d1nrlxj2rciw4xz93gn3m326zciqnn5dg31fwqs396";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory either filepath gelatin
+         gelatin-shaders gl JuicyPixels lens linear mtl template-haskell
+         transformers vector
+       ];
+       executableHaskellDepends = [ base gelatin lens linear mtl vector ];
+       homepage = "https://github.com/schell/gelatin/gelatin-gl";
+       description = "OpenGL rendering routines for the gelatin-picture graphics EDSL";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "gelatin-sdl2" = callPackage
+    ({ mkDerivation, base, either, filepath, gelatin-gl, mtl, sdl2
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gelatin-sdl2";
+       version = "0.1.1.0";
+       sha256 = "0gnn5b06q6fsbblrjghyzn46dby2skm5r9ys6pl6fhp7pa3c924n";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base gelatin-gl mtl sdl2 transformers ];
+       executableHaskellDepends = [ base either filepath sdl2 ];
+       homepage = "https://github.com/schell/gelatin";
+       description = "An SDL2 backend for the gelatin renderer";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "gelatin-shaders" = callPackage
+    ({ mkDerivation, base, bytestring, filepath, gelatin }:
+     mkDerivation {
+       pname = "gelatin-shaders";
+       version = "0.1.0.0";
+       sha256 = "001ifyyv85b9gb5l4hf21b5dqakg4f7n3bil5a1abb4vcj2zmpfr";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base bytestring filepath gelatin ];
+       homepage = "https://github.com/schell/gelatin-shaders#readme";
+       description = "Gelatin's OpenGL shaders";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gemstone" = callPackage
     ({ mkDerivation, array, base, bitmap, bitmap-opengl, containers
      , FTGL, lens, linear, OpenGL, random, SDL, SDL-image, stb-image
@@ -77644,14 +77915,14 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "ghc-typelits-natnormalise_0_5_5" = callPackage
+  "ghc-typelits-natnormalise_0_5_6" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell
      }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.5.5";
-       sha256 = "1dr0568hfxrjhvpgl624zghnvinfg7wwn9x36lrnxr4cl7najqk5";
+       version = "0.5.6";
+       sha256 = "07rrc3aw00i36z6xgp2jik9wqi0d8byzy48dy8jj089vp7s6birb";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra integer-gmp
        ];
@@ -79185,7 +79456,7 @@ self: {
 
   "git-annex" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
-     , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
+     , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, concurrent-output, conduit, conduit-extra
      , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus
      , directory, disk-free-space, dlist, dns, edit-distance, esqueleto
@@ -79204,8 +79475,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20171018";
-       sha256 = "17armwygz44wphv6hqpyjggh4ybarhy3a2ypnsrc1ifhpq3rf15d";
+       version = "6.20171026";
+       sha256 = "0i44cfxp5wy6y527l9jbj83ilkxilp4jm7106q70czls0hnx6yij";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -79214,10 +79485,6 @@ self: {
        ];
        isLibrary = false;
        isExecutable = true;
-       setupHaskellDepends = [
-         base bytestring Cabal data-default directory exceptions filepath
-         hslogger IfElse process split unix unix-compat
-       ];
        executableHaskellDepends = [
          aeson async aws base blaze-builder bloomfilter byteable bytestring
          case-insensitive clientsession concurrent-output conduit
@@ -79711,27 +79978,6 @@ self: {
      }) {};
 
   "github-release" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers, uri-templater
-     }:
-     mkDerivation {
-       pname = "github-release";
-       version = "1.0.6";
-       sha256 = "1ixs76y5cb1dkrvl8i13a7s9xgs3170w3sjx6bhj05fi6wvz3n8z";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/github-release#readme";
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-release_1_0_7" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, mime-types, optparse-generic, text
      , unordered-containers, uri-templater
@@ -79750,7 +79996,6 @@ self: {
        homepage = "https://github.com/tfausak/github-release#readme";
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -85459,13 +85704,13 @@ self: {
     ({ mkDerivation, base, cairo, containers, filepath, gtk }:
      mkDerivation {
        pname = "gulcii";
-       version = "0.2.0.3";
-       sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29";
+       version = "0.3";
+       sha256 = "1crx9kz4s8by509x1k60m89jmmn7gfhi46d05q44ikhk5zkxycws";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cairo containers filepath gtk ];
-       homepage = "http://code.mathr.co.uk/gulcii";
+       homepage = "https://code.mathr.co.uk/gulcii";
        description = "graphical untyped lambda calculus interactive interpreter";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87495,25 +87740,6 @@ self: {
      }) {};
 
   "hailgun" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, email-validate
-     , exceptions, filepath, http-client, http-client-tls, http-types
-     , tagsoup, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "hailgun";
-       version = "0.4.1.5";
-       sha256 = "0hi9a8aa10n14ipk4g8ksrf175z92kkwk0d9n3qzn835fkj5kkyr";
-       libraryHaskellDepends = [
-         aeson base bytestring email-validate exceptions filepath
-         http-client http-client-tls http-types tagsoup text time
-         transformers
-       ];
-       homepage = "https://bitbucket.org/robertmassaioli/hailgun";
-       description = "Mailgun REST api interface for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hailgun_0_4_1_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, email-validate
      , exceptions, filepath, http-client, http-client-tls, http-types
      , tagsoup, text, time, transformers
@@ -87530,7 +87756,6 @@ self: {
        homepage = "https://bitbucket.org/robertmassaioli/hailgun";
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hailgun-send" = callPackage
@@ -90687,23 +90912,25 @@ self: {
      }) {};
 
   "haskell-compression" = callPackage
-    ({ mkDerivation, base, bimap, booleanlist, bytestring, containers
+    ({ mkDerivation, base, bimap, boolean-list, bytestring, containers
      }:
      mkDerivation {
        pname = "haskell-compression";
-       version = "0.2";
-       sha256 = "0z0jhz5m70qrs2w3q58xghgv279yjvhfdspy5pqpss87jm1fm3ab";
+       version = "0.3";
+       sha256 = "1yksgwhxpfl47d6zrqdx5bdxyya9vd3kr1g33pz19qfqsvfcqlhp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bimap booleanlist bytestring containers
+         base bimap boolean-list bytestring containers
+       ];
+       executableHaskellDepends = [
+         base bimap boolean-list bytestring containers
        ];
-       executableHaskellDepends = [ base bimap bytestring containers ];
        homepage = "http://xy30.com";
        description = "compress files";
        license = stdenv.lib.licenses.gpl3;
-       broken = true;
-     }) {booleanlist = null;};
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
 
   "haskell-conll" = callPackage
     ({ mkDerivation, base, containers, lens, pretty-show, protolude
@@ -93337,8 +93564,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasktags";
-       version = "0.69.3";
-       sha256 = "1yjsdvb3y6ly29anvh14bvfan1fplc9brb6i68ipcz9a7jk9l1jf";
+       version = "0.69.4";
+       sha256 = "1s7phsg20h15p2dnri6viy5k6c4n42gchy684dv3r30qrwwvv0ni";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95446,23 +95673,42 @@ self: {
      }) {};
 
   "heavy-logger" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, fast-logger, hsyslog
-     , monad-control, monad-logger, mtl, template-haskell, text
-     , text-format-heavy, transformers-base
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , data-default, fast-logger, hsyslog, lifted-base, monad-control
+     , monad-logger, mtl, stm, template-haskell, text, text-format-heavy
+     , th-lift, th-lift-instances, thread-local-storage
+     , transformers-base
      }:
      mkDerivation {
        pname = "heavy-logger";
-       version = "0.1.0.0";
-       sha256 = "0wnvgjbhwscmq0wm7arlwpqj5dsrshaqhnx5nvlcvjkzrhcpxlpp";
+       version = "0.3.1.0";
+       sha256 = "0cmanxnahxgk52ffpni0zx4z22vdrh6r5my4llvsdd94bpfmxpi4";
        libraryHaskellDepends = [
-         attoparsec base bytestring fast-logger hsyslog monad-control
-         monad-logger mtl template-haskell text text-format-heavy
-         transformers-base
+         attoparsec base bytestring containers data-default fast-logger
+         hsyslog lifted-base monad-control monad-logger mtl stm
+         template-haskell text text-format-heavy th-lift th-lift-instances
+         thread-local-storage transformers-base
        ];
        description = "Full-weight logging based on fast-logger";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "heavy-logger-amazon" = callPackage
+    ({ mkDerivation, amazonka-core, base, binary, heavy-logger
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "heavy-logger-amazon";
+       version = "0.1.0.0";
+       sha256 = "18wcnpnjmv841ac3kvnyk0s9rrgfwvlgv950s1znnjdmi3qc0bjk";
+       libraryHaskellDepends = [
+         amazonka-core base binary heavy-logger template-haskell text
+       ];
+       homepage = "https://github.com/portnov/heavy-logger-amazon#readme";
+       description = "heavy-logger compatibility with amazonka-core logging";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hebrew-time" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, time
@@ -95555,30 +95801,6 @@ self: {
      }) {};
 
   "hedis" = callPackage
-    ({ mkDerivation, async, base, bytestring, bytestring-lexing
-     , deepseq, HUnit, mtl, network, resource-pool, scanner
-     , slave-thread, stm, test-framework, test-framework-hunit, text
-     , time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hedis";
-       version = "0.9.10";
-       sha256 = "1z8vl3ql5nyl4jg3pzghsbi1ld9a047zbwz6fgzgk1lvspa0pcd3";
-       libraryHaskellDepends = [
-         async base bytestring bytestring-lexing deepseq mtl network
-         resource-pool scanner stm text time unordered-containers vector
-       ];
-       testHaskellDepends = [
-         async base bytestring HUnit mtl slave-thread stm test-framework
-         test-framework-hunit text time
-       ];
-       benchmarkHaskellDepends = [ base mtl time ];
-       homepage = "https://github.com/informatikr/hedis";
-       description = "Client library for the Redis datastore: supports full command set, pipelining";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedis_0_9_11" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, HUnit, mtl, network, resource-pool, scanner
      , slave-thread, stm, test-framework, test-framework-hunit, text
@@ -95600,7 +95822,6 @@ self: {
        homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis-config" = callPackage
@@ -96374,6 +96595,7 @@ self: {
        homepage = "https://github.com/JackKiefer/herms";
        description = "A command-line manager for delicious kitchen recipes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hero-club-five-tenets" = callPackage
@@ -96699,8 +96921,8 @@ self: {
     ({ mkDerivation, base, bytestring, extra }:
      mkDerivation {
        pname = "hexml";
-       version = "0.3.2";
-       sha256 = "0vyv45s6nqhbgkzxcgx1ihmif0d7sxmfafqc2xcmcm2vg4jb7ls4";
+       version = "0.3.3";
+       sha256 = "1lhwhv75s71bqdclvfawhg9ss9z5icg9rpihkjfss4yzhxhcrvf4";
        libraryHaskellDepends = [ base bytestring extra ];
        testHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/ndmitchell/hexml#readme";
@@ -101147,20 +101369,20 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {inherit (pkgs) openssl;};
 
-  "hoopl_3_10_2_1" = callPackage
+  "hoopl_3_10_2_2" = callPackage
     ({ mkDerivation, base, containers, filepath, mtl, parsec
      , test-framework, test-framework-hunit
      }:
      mkDerivation {
        pname = "hoopl";
-       version = "3.10.2.1";
-       sha256 = "1c20ahr12dlapajzgb7mhxb1m8q1485amwmvzmsgy7l7x2ls41kw";
+       version = "3.10.2.2";
+       sha256 = "15rbb9a8mza3zv8h3p237zhmy29bxc4k48ik27kzzj7islb16yq9";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base containers filepath mtl parsec test-framework
          test-framework-hunit
        ];
-       homepage = "http://ghc.cs.tufts.edu/hoopl/";
+       homepage = "https://github.com/haskell/hoopl";
        description = "A library to support dataflow analysis and optimization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102350,8 +102572,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.4.4";
-       sha256 = "0vijl65rxir61nwx7sdgy6lcwgskyks3cdgcqd814smnavh6nhdn";
+       version = "2.4.5";
+       sha256 = "0f4h9b5c6s523967hkqg6wz57g350awa26r2y2wlfr4f39qgjwx3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102731,6 +102953,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libb2;};
 
+  "hs-brotli" = callPackage
+    ({ mkDerivation, base, brotli, brotlidec, brotlienc, bytestring
+     , ghc-prim, libbrotlidec, libbrotlienc, QuickCheck
+     , quickcheck-instances, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "hs-brotli";
+       version = "0.1.0.0";
+       sha256 = "083l7bbjlxh629a9m88mfp087f09gwsmzs9vmpxrqffw23zrnclf";
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       librarySystemDepends = [ brotlidec brotlienc ];
+       libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ];
+       testHaskellDepends = [
+         base brotli bytestring QuickCheck quickcheck-instances
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/iand675/brotli#readme";
+       description = "Compression and decompression in the brotli format";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {brotli = null; brotlidec = null; brotlienc = null; 
+         libbrotlidec = null; libbrotlienc = null;};
+
   "hs-captcha" = callPackage
     ({ mkDerivation, base, bytestring, gd, random }:
      mkDerivation {
@@ -103382,8 +103627,8 @@ self: {
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
        pname = "hsI2C";
-       version = "0.1.2";
-       sha256 = "0ma8klvyv4rnfxkag99vm4nvw77yppcv63p6829b4ynsa9vyv9rn";
+       version = "0.1.3";
+       sha256 = "0p77xndqpqfyjw9y7q791pysrpz3zkimw8mcxyfl4yrh34sammx9";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "I2C access for Haskell and Linux";
        license = stdenv.lib.licenses.bsd3;
@@ -108910,15 +109155,15 @@ self: {
      }) {};
 
   "hw-conduit" = callPackage
-    ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
-     , mmap, time, vector, word8
+    ({ mkDerivation, array, base, bytestring, conduit
+     , conduit-combinators, criterion, hspec, mmap, time, vector, word8
      }:
      mkDerivation {
        pname = "hw-conduit";
-       version = "0.2.0.2";
-       sha256 = "052sgj1bny2d2j4gsmfj7mx9jcnkac7b0rsz7310nv2rc9h46sbl";
+       version = "0.2.0.3";
+       sha256 = "19fwlgnpc17h305nmaygd5w9p5yv9jm25jgc440r9frqzw7if83a";
        libraryHaskellDepends = [
-         array base bytestring conduit time word8
+         array base bytestring conduit conduit-combinators time word8
        ];
        testHaskellDepends = [ base bytestring conduit hspec ];
        benchmarkHaskellDepends = [
@@ -109115,20 +109360,20 @@ self: {
 
   "hw-kafka-avro" = callPackage
     ({ mkDerivation, aeson, avro, base, binary, bytestring, cache
-     , containers, errors, hashable, hspec, http-client, mtl, pure-zlib
-     , QuickCheck, semigroups, servant, servant-client, text
+     , containers, errors, hashable, hspec, http-client, http-types, mtl
+     , pure-zlib, QuickCheck, semigroups, servant, servant-client, text
      , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "hw-kafka-avro";
-       version = "1.2.0";
-       sha256 = "0v2l7g524wz45mnqdqrs33qbb1psm33jlfl1hlnd22dxfw7mhdhl";
+       version = "1.3.0";
+       sha256 = "0lryr18gcmgfxa10gmd5y43l62x684ahpzk53wx5z5qww0chy7fa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson avro base binary bytestring cache containers errors hashable
-         http-client mtl pure-zlib semigroups servant servant-client text
-         transformers unordered-containers
+         http-client http-types mtl pure-zlib semigroups servant
+         servant-client text transformers unordered-containers
        ];
        executableHaskellDepends = [
          aeson avro base binary bytestring cache containers errors hashable
@@ -109153,8 +109398,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "2.0.3";
-       sha256 = "0xdkkasjql0la376kmb8zljndfbcxyizf9rqj02nlb1np8gs6apq";
+       version = "2.0.4";
+       sha256 = "0mqrxczjr822hccmrdsmy98mw10jdmiiq94vdibkqrh618hs4fd5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111855,6 +112100,8 @@ self: {
        pname = "imagesize-conduit";
        version = "1.1";
        sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i";
+       revision = "1";
+       editedCabalFile = "1gq749v6558zkvvn8iqkd4iqv4giiysxjqb2kncarnhghkkbgbaf";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra exceptions
        ];
@@ -113111,8 +113358,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-r";
-       version = "0.9.0.1";
-       sha256 = "1by27qjsgwaws7nf3lslml7n58j2fk478pinflk10jji5zcs4nz9";
+       version = "0.9.0.2";
+       sha256 = "1swxdilr1l7h3pk313fyjgpg58g20v6560j9g4cxz0gakqqhb3jc";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default-class deepseq
          exceptions mtl pretty primitive process reflection setenv
@@ -114665,8 +114912,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-conduit";
-       version = "0.2.2.3";
-       sha256 = "06gklbipbjg0n2c3iqh753v9njd602r3lj4rmq1155kx0bxlwhmg";
+       version = "0.2.2.4";
+       sha256 = "118ksbf8kh0bmwk5m32qv609kggwssm3a56zc14f8bg67bkdkrc4";
        libraryHaskellDepends = [
          async base bytestring conduit conduit-extra connection irc irc-ctcp
          network-conduit-tls profunctors text time tls transformers
@@ -117857,8 +118104,8 @@ self: {
      }:
      mkDerivation {
        pname = "justified-containers";
-       version = "0.2.0.0";
-       sha256 = "0fsr9j4qnlffhkgbz50lwy3f18d619risxfl44wgfgr9b722xj8r";
+       version = "0.2.0.1";
+       sha256 = "0k2vw8d37hkjj786kx52hjs7qlmmv4hr8bp9dd2rskgsnwjizmw2";
        libraryHaskellDepends = [ base containers roles ];
        testHaskellDepends = [
          base containers ghc-prim hspec QuickCheck should-not-typecheck
@@ -118469,14 +118716,14 @@ self: {
     ({ mkDerivation, aeson, async, base, bloodhound, bytestring
      , containers, criterion, deepseq, enclosed-exceptions, exceptions
      , http-client, http-types, katip, lens, lens-aeson
-     , quickcheck-instances, retry, rng-utils, scientific, stm
-     , stm-chans, tagged, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, transformers, unordered-containers, uuid, vector
+     , quickcheck-instances, random, retry, scientific, stm, stm-chans
+     , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, unordered-containers, uuid, vector
      }:
      mkDerivation {
        pname = "katip-elasticsearch";
-       version = "0.4.0.1";
-       sha256 = "0w1iprf3lpnbgil3gzpka5akjc8kl3l6g2knizddjb6xvszy564q";
+       version = "0.4.0.3";
+       sha256 = "0aji0738dz7i0lry30y6rpfbhvcpc79mfqc77nlvaplb3plw0m51";
        libraryHaskellDepends = [
          aeson async base bloodhound bytestring enclosed-exceptions
          exceptions http-client http-types katip retry scientific stm
@@ -118489,9 +118736,10 @@ self: {
          unordered-containers vector
        ];
        benchmarkHaskellDepends = [
-         aeson base bloodhound criterion deepseq rng-utils text
+         aeson base bloodhound criterion deepseq random text
          unordered-containers uuid
        ];
+       homepage = "https://github.com/Soostone/katip";
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118512,6 +118760,7 @@ self: {
        homepage = "https://github.com/iconnect/katip-syslog#readme";
        description = "Syslog Katip Scribe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "katt" = callPackage
@@ -119986,8 +120235,8 @@ self: {
      }:
      mkDerivation {
        pname = "lackey";
-       version = "0.4.3";
-       sha256 = "07n5acnrwy991qsx0bg1hbpxky0nxwybnh1zs08n4jmbl10rvsrs";
+       version = "0.4.4";
+       sha256 = "0p689g86rim4hqw0chn6p22yr9vcb4xcl44aiv6lzqb8fnwzyadx";
        libraryHaskellDepends = [ base servant servant-foreign text ];
        testHaskellDepends = [ base servant tasty tasty-hspec text ];
        homepage = "https://github.com/tfausak/lackey#readme";
@@ -121872,8 +122121,8 @@ self: {
     ({ mkDerivation, base, HUnit, parsec, wl-pprint }:
      mkDerivation {
        pname = "language-webidl";
-       version = "0.1.4.0";
-       sha256 = "06px2m4zf1b14lx7nx0m21gmxqskfyk7a777j7sbqd3dwsrbl834";
+       version = "0.2.0.0";
+       sha256 = "1h93a19y8109mwxl795hi0xdb3jy1z9w2ks3sc6g673kv04pw0pf";
        libraryHaskellDepends = [ base parsec wl-pprint ];
        testHaskellDepends = [ base HUnit ];
        description = "Parser and Pretty Printer for WebIDL";
@@ -124160,24 +124409,26 @@ self: {
      }) {};
 
   "libssh2" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, libssh2, network, ssh2
+    ({ mkDerivation, base, bytestring, c2hs, libssh2, network, select
      , syb, time
      }:
      mkDerivation {
        pname = "libssh2";
-       version = "0.2.0.4";
-       sha256 = "1abdd5k4pnfxpg1kg1kvmwgwv946zlndhnydhhphad2ah3d2pkjf";
+       version = "0.2.0.5";
+       sha256 = "0l224pd8bb9d29043qdy40dbknnhmwnjc95r3yyc93lhwd5fsqma";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base bytestring network syb time ];
-       librarySystemDepends = [ ssh2 ];
+       libraryHaskellDepends = [
+         base bytestring network select syb time
+       ];
+       librarySystemDepends = [ libssh2 ];
        libraryPkgconfigDepends = [ libssh2 ];
        libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/portnov/libssh2-hs";
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) libssh2; ssh2 = null;};
+     }) {inherit (pkgs) libssh2;};
 
   "libssh2-conduit" = callPackage
     ({ mkDerivation, base, conduit, libssh2, monad-control, stm
@@ -124280,7 +124531,7 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/libvirt-hs";
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libvirt;};
 
   "libvorbis" = callPackage
@@ -125012,8 +125263,8 @@ self: {
     ({ mkDerivation, base, sbv }:
      mkDerivation {
        pname = "linearEqSolver";
-       version = "1.3";
-       sha256 = "0bszi1k27ag4yk31zxkn3jk3cqh1xzdcscm4nb6k4n0psf0qm2rp";
+       version = "2.0";
+       sha256 = "0dianwg8r4b6x6z17d994kmhjmqwdx083vlm9rzakfkn7p773l8w";
        libraryHaskellDepends = [ base sbv ];
        homepage = "http://github.com/LeventErkok/linearEqSolver";
        description = "Use SMT solvers to solve linear systems over integers and rationals";
@@ -125027,8 +125278,10 @@ self: {
      }:
      mkDerivation {
        pname = "linearmap-category";
-       version = "0.3.2.0";
-       sha256 = "0g93h1sl6djyf0r6295a7iayjnwjwmk8w7m06gi3vqr2srwjk4s5";
+       version = "0.3.4.0";
+       sha256 = "0idmaw25cz7lk3kr9n0jri776j0qajrlc9j1aki0brvx6p6yh2dp";
+       revision = "1";
+       editedCabalFile = "0vrx3ws23qg1ygh1ksvgrpz92nhnr1nmrwy8a3ax08n8jcx2nrrw";
        libraryHaskellDepends = [
          base constrained-categories containers free-vector-spaces ieee754
          lens linear manifolds-core semigroups tagged transformers vector
@@ -125037,6 +125290,7 @@ self: {
        homepage = "https://github.com/leftaroundabout/linearmap-family";
        description = "Native, complete, matrix-free linear algebra";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linearscan" = callPackage
@@ -125625,6 +125879,7 @@ self: {
        homepage = "https://github.com/ucsd-progsys/liquidhaskell";
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) z3;};
 
   "liquidhaskell-cabal" = callPackage
@@ -126968,8 +127223,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-base";
-       version = "0.7.3.0";
-       sha256 = "15bf0ly3fl2k7dqn5vskafsihil5lb7ij96vw0nsb3dil80f54qk";
+       version = "0.7.4.0";
+       sha256 = "06rzvh3g294hpwpxw2syvywrw3rms1chjxqhki8b97ml1nlfnrs0";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions mmorph
          monad-control monad-time mtl semigroups stm text time
@@ -129094,22 +129349,23 @@ self: {
   "madlang" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, Cabal, composition-prelude
      , containers, criterion, directory, file-embed, hspec
-     , hspec-megaparsec, http-client, megaparsec, MonadRandom, mtl
-     , optparse-applicative, process, random-shuffle, recursion-schemes
-     , tar, template-haskell, text, zip-archive, zlib
+     , hspec-megaparsec, http-client, http-client-tls, megaparsec
+     , MonadRandom, mtl, optparse-applicative, process, random-shuffle
+     , recursion-schemes, tar, template-haskell, text, th-lift-instances
+     , titlecase, zip-archive, zlib
      }:
      mkDerivation {
        pname = "madlang";
-       version = "3.0.0.1";
-       sha256 = "0zh935qpaq3w0qdijbmpyf71yvjigygks7ryxfcw9q9hivypvxgj";
+       version = "3.1.1.13";
+       sha256 = "0qmgd368brmmibqlimv254i20ayxw96ipnwcfid4q3pdml9javn4";
        isLibrary = true;
        isExecutable = true;
-       setupHaskellDepends = [ base Cabal directory file-embed process ];
+       setupHaskellDepends = [ base Cabal directory process ];
        libraryHaskellDepends = [
          ansi-wl-pprint base composition-prelude containers directory
-         file-embed http-client megaparsec MonadRandom mtl
+         file-embed http-client http-client-tls megaparsec MonadRandom mtl
          optparse-applicative random-shuffle recursion-schemes tar
-         template-haskell text zip-archive zlib
+         template-haskell text th-lift-instances titlecase zip-archive zlib
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec hspec-megaparsec text ];
@@ -129471,6 +129727,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "makefile_1_1_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "makefile";
+       version = "1.1.0.0";
+       sha256 = "01swnw8fp2cx5z5xim9apia3yw48six61mhf6p3g0gp99w4i4ypd";
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [
+         attoparsec base doctest Glob QuickCheck tasty tasty-hunit
+         tasty-quickcheck text
+       ];
+       homepage = "http://github.com/nmattia/mask";
+       description = "Simple Makefile parser and generator";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mallard" = callPackage
     ({ mkDerivation, base, byteable, bytestring, cryptohash, exceptions
      , fgl, file-embed, hashable, hasql, hasql-optparse-applicative
@@ -129982,8 +130257,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifold-random";
-       version = "0.4.1.0";
-       sha256 = "0493y21sq56hj99ny10nn9kbgq2525ij79rmq5x2p1dx30gk16m5";
+       version = "0.4.4.0";
+       sha256 = "1qihbyhmf9abyb7fh4gf6qxwbk2a1jwnxdpnjinfi3x87xasvajj";
        libraryHaskellDepends = [
          base constrained-categories linearmap-category manifolds random-fu
          semigroups vector-space
@@ -129995,20 +130270,26 @@ self: {
      }) {};
 
   "manifolds" = callPackage
-    ({ mkDerivation, base, comonad, constrained-categories, containers
-     , deepseq, free, free-vector-spaces, lens, linear
+    ({ mkDerivation, base, call-stack, comonad, constrained-categories
+     , containers, deepseq, free, free-vector-spaces, lens, linear
      , linearmap-category, manifolds-core, MemoTrie, number-show
-     , semigroups, tagged, transformers, vector, vector-space, void
+     , placeholders, pragmatic-show, semigroups, tagged, tasty
+     , tasty-hunit, tasty-quickcheck, transformers, vector, vector-space
+     , void
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.4.1.0";
-       sha256 = "1vmgcv0yy72a29w15sg0z3z885vjhfpapgabilqbvh7dpxfv43x1";
+       version = "0.4.4.0";
+       sha256 = "1wsqar82w0sqspihyvkd9jndw2q6818nci82clqgxb1dawyna5vx";
        libraryHaskellDepends = [
-         base comonad constrained-categories containers deepseq free
-         free-vector-spaces lens linear linearmap-category manifolds-core
-         MemoTrie number-show semigroups tagged transformers vector
-         vector-space void
+         base call-stack comonad constrained-categories containers deepseq
+         free free-vector-spaces lens linear linearmap-category
+         manifolds-core MemoTrie number-show placeholders pragmatic-show
+         semigroups tagged transformers vector vector-space void
+       ];
+       testHaskellDepends = [
+         base constrained-categories containers lens linearmap-category
+         pragmatic-show tasty tasty-hunit tasty-quickcheck vector-space
        ];
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Coordinate-free hypersurfaces";
@@ -130017,15 +130298,16 @@ self: {
      }) {};
 
   "manifolds-core" = callPackage
-    ({ mkDerivation, base, tagged, vector-space }:
+    ({ mkDerivation, base, call-stack, tagged, vector-space }:
      mkDerivation {
        pname = "manifolds-core";
-       version = "0.4.1.0";
-       sha256 = "041b4mjrl800vlyg1ibfmmyp87ad2mak6171s2mlc4mwsi4xrl4g";
-       libraryHaskellDepends = [ base tagged vector-space ];
+       version = "0.4.4.0";
+       sha256 = "00b24ry943f6m46wkbxh8452q9xswcn2ri9c511r9bsinhzg653q";
+       libraryHaskellDepends = [ base call-stack tagged vector-space ];
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "The basic classes for the manifolds hierarchy";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "map-exts" = callPackage
@@ -133119,8 +133401,8 @@ self: {
      }:
      mkDerivation {
        pname = "milena";
-       version = "0.5.1.0";
-       sha256 = "0vfypwp503ab91hca5mmclgxxy0ggzd9g90h7jaj5vxrij7ya5ly";
+       version = "0.5.2.0";
+       sha256 = "06gx1j9bxzxnagsymgr0nzhs1s6jsr14mhh2qx38h85n5g12zpvb";
        libraryHaskellDepends = [
          base bytestring cereal containers digest lens lifted-base
          monad-control mtl murmur-hash network random resource-pool
@@ -133130,6 +133412,7 @@ self: {
          base bytestring lens mtl network QuickCheck semigroups tasty
          tasty-hspec tasty-quickcheck
        ];
+       homepage = "https://github.com/adamflott/milena.git#readme";
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134077,6 +134360,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "modern-uri" = callPackage
+    ({ mkDerivation, base, bytestring, containers, contravariant
+     , criterion, deepseq, exceptions, hspec, hspec-megaparsec
+     , megaparsec, profunctors, QuickCheck, template-haskell, text
+     , weigh
+     }:
+     mkDerivation {
+       pname = "modern-uri";
+       version = "0.1.0.0";
+       sha256 = "04k6v2mdkwdwvphfhhm7dwgy12n3kwxi02azkpzng0qa24vb1w1r";
+       libraryHaskellDepends = [
+         base bytestring containers contravariant deepseq exceptions
+         megaparsec profunctors QuickCheck template-haskell text
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq megaparsec text weigh
+       ];
+       homepage = "https://github.com/mrkkrp/modern-uri";
+       description = "Modern library for working with URIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "modify-fasta" = callPackage
     ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
      , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
@@ -135973,15 +136282,23 @@ self: {
      }) {};
 
   "monoid-statistics" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, math-functions, QuickCheck, tasty
+     , tasty-quickcheck, vector, vector-th-unbox
+     }:
      mkDerivation {
        pname = "monoid-statistics";
-       version = "0.3.1";
-       sha256 = "0gfdjmx457r580lc40vpg8fkzd8n971b5vam96v6kzssg2cznqy3";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://bitbucket.org/Shimuuar/monoid-statistics";
+       version = "1.0.0";
+       sha256 = "0n3q8izk197lrkvm6hmdzg7dl1mzji2z09b1wkz02pm4y0gganv3";
+       libraryHaskellDepends = [
+         base math-functions vector vector-th-unbox
+       ];
+       testHaskellDepends = [
+         base math-functions QuickCheck tasty tasty-quickcheck
+       ];
+       homepage = "https://github.com/Shimuuar/monoid-statistics";
        description = "Monoids for calculation of statistics of sample";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-subclasses" = callPackage
@@ -136343,6 +136660,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "motor" = callPackage
+    ({ mkDerivation, base, CTRex, indexed, indexed-extras, reflection
+     }:
+     mkDerivation {
+       pname = "motor";
+       version = "0.1.0.0";
+       sha256 = "00jr7dlnm22cvjwprclizcbm4kw2i84zzzd7n6im9li00w1a2iwy";
+       libraryHaskellDepends = [
+         base CTRex indexed indexed-extras reflection
+       ];
+       testHaskellDepends = [ base CTRex indexed indexed-extras ];
+       description = "Type-safe effectful state machines in Haskell";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mount" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -141433,8 +141766,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.9.0.0";
-       sha256 = "099q24f9879sdwqa0jnlsamvpz1jbyryn90w7jp7np68avbhv9bf";
+       version = "0.9.1.2";
+       sha256 = "1428pkzj7kam7ya21fb3qchq95lvp6dp9dnh5qj41nkw9x5dz517";
        libraryHaskellDepends = [
          async base binary bytestring monad-loops template-haskell unix
        ];
@@ -141490,8 +141823,8 @@ self: {
      }:
      mkDerivation {
        pname = "nice-html";
-       version = "0.2.0";
-       sha256 = "0lkqqfp6x3w9lxh1jgm6c07pyfz1yr7drkr15s1m9vwvdh7mj24v";
+       version = "0.3.0";
+       sha256 = "1ns6qrzm9lwbgjcr7mw58g0qivbqac4yxisvbfy9j2cq3dqzm6d3";
        libraryHaskellDepends = [
          base bifunctors blaze-markup bytestring data-default-class deepseq
          free recursion-schemes template-haskell text transformers vector
@@ -142663,6 +142996,18 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "numbered-semigroups" = callPackage
+    ({ mkDerivation, base, call-stack, semigroups }:
+     mkDerivation {
+       pname = "numbered-semigroups";
+       version = "0.1.0.0";
+       sha256 = "100r6k3cwycl75mj9g1x4w4qv064v8bdaan5rsj2vnvx4w1jrhp2";
+       libraryHaskellDepends = [ base call-stack semigroups ];
+       homepage = "https://github.com/leftaroundabout/numbered-semigroups";
+       description = "A sequence of semigroups, for composing stuff in multiple spatial directions";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "numbering" = callPackage
     ({ mkDerivation, base, containers, vector }:
      mkDerivation {
@@ -143435,6 +143780,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "octane_0_20_3" = 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.20.3";
+       sha256 = "0rjvl7f3sa8i7a1svhh4phc2r2zjjwi1p3cajnwzms7kasmcqfjp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bimap binary bytestring containers data-default-class
+         file-embed overloaded-records rattletrap text
+       ];
+       executableHaskellDepends = [
+         aeson base bimap binary bytestring containers data-default-class
+         file-embed http-client http-client-tls overloaded-records
+         rattletrap text
+       ];
+       homepage = "https://github.com/tfausak/octane#readme";
+       description = "Parse Rocket League replays";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "octohat" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
@@ -146472,6 +146843,54 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "pandoc_2_0_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , binary, blaze-html, blaze-markup, bytestring, Cabal
+     , case-insensitive, cmark-gfm, containers, criterion, data-default
+     , deepseq, Diff, directory, doctemplates, executable-path, filepath
+     , Glob, haddock-library, hslua, HTTP, http-client, http-client-tls
+     , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types
+     , parsec, process, QuickCheck, random, safe, scientific, SHA
+     , skylighting, split, syb, tagsoup, tasty, tasty-golden
+     , tasty-hunit, tasty-quickcheck, temporary, texmath, text, time
+     , unix, unordered-containers, vector, xml, yaml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "2.0.0.1";
+       sha256 = "1wq21vsg9afv8lxk6rmmmb57437q7gv1qs4ymbzd1mvxkvzx0hwh";
+       configureFlags = [ "-fhttps" "-f-trypandoc" ];
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring binary blaze-html
+         blaze-markup bytestring case-insensitive cmark-gfm containers
+         data-default deepseq directory doctemplates filepath Glob
+         haddock-library hslua HTTP http-client http-client-tls http-types
+         JuicyPixels mtl network network-uri pandoc-types parsec process
+         random safe scientific SHA skylighting split syb tagsoup temporary
+         texmath text time unix unordered-containers vector xml yaml
+         zip-archive zlib
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base bytestring containers Diff directory executable-path filepath
+         hslua pandoc-types process QuickCheck tasty tasty-golden
+         tasty-hunit tasty-quickcheck temporary text zip-archive
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion text time
+       ];
+       doCheck = false;
+       homepage = "http://pandoc.org";
+       description = "Conversion between markup formats";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
@@ -146510,20 +146929,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-citeproc_0_11_1_1" = callPackage
+  "pandoc-citeproc_0_11_1_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , containers, data-default, directory, filepath, hs-bibutils, mtl
-     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , Cabal, 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.11.1.1";
-       sha256 = "00732amji7xlrkxzlwc5rzkq6saxjlvwlvinhkw4hyh1w0d74qwj";
+       version = "0.11.1.2";
+       sha256 = "0lv1j035f5c0dd0n772ivav6kwzfxvnk6zcxmmhmkc3s9r9716sd";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
          hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
@@ -146769,8 +147189,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-stylefrommeta";
-       version = "0.1.0.1";
-       sha256 = "1lzjia4fl2s6aak00cb79sq5n85wyfcdn5xjanl7x9xr07rv2641";
+       version = "0.1.1.0";
+       sha256 = "0blgccnzyignq14y94cnascjxlk6088wwpxifwm45rnn0hs786vf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -147543,6 +147963,20 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "parameterized" = callPackage
+    ({ mkDerivation, base, data-diverse, hspec, transformers }:
+     mkDerivation {
+       pname = "parameterized";
+       version = "0.2.0.0";
+       sha256 = "0z40b6cja2c4y177w6iwg8dijlpk5zwrf5yfwppc5y6n57g260z7";
+       libraryHaskellDepends = [ base data-diverse transformers ];
+       testHaskellDepends = [ base data-diverse hspec transformers ];
+       homepage = "https://github.com/louispan/parameterized#readme";
+       description = "Extensible records and polymorphic variants";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "parameterized-data" = callPackage
     ({ mkDerivation, base, template-haskell, type-level }:
      mkDerivation {
@@ -148212,13 +148646,13 @@ self: {
      }) {};
 
   "partial-semigroup" = callPackage
-    ({ mkDerivation, base, hedgehog }:
+    ({ mkDerivation, base, doctest, hedgehog }:
      mkDerivation {
        pname = "partial-semigroup";
-       version = "0.2.0.1";
-       sha256 = "0k3b66wlhi280wk3q5ilmcn93m4rch1ily8f3z79lpxjjlraz7lw";
+       version = "0.3.0.2";
+       sha256 = "0r2rhcq73lb18j03h5nk7j6vzv9qxjnw8zsir3zy6cynkv4w35zd";
        libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hedgehog ];
+       testHaskellDepends = [ base doctest hedgehog ];
        homepage = "https://github.com/chris-martin/partial-semigroup";
        description = "A partial binary associative operator";
        license = stdenv.lib.licenses.asl20;
@@ -148228,8 +148662,8 @@ self: {
     ({ mkDerivation, base, hedgehog, partial-semigroup }:
      mkDerivation {
        pname = "partial-semigroup-hedgehog";
-       version = "0.2.0.1";
-       sha256 = "1c4rbf1x6llgprx0rgil71z3306ky9x59sl8db1z6hg9ykriv4n2";
+       version = "0.3.0.1";
+       sha256 = "0i1p3277qv05jrshj3f61l9ag10dlh0hbwx550achlff3blfqhdr";
        libraryHaskellDepends = [ base hedgehog partial-semigroup ];
        homepage = "https://github.com/chris-martin/partial-semigroup";
        description = "Property testing for partial semigroups using Hedgehog";
@@ -148240,8 +148674,8 @@ self: {
     ({ mkDerivation, partial-semigroup-hedgehog }:
      mkDerivation {
        pname = "partial-semigroup-test";
-       version = "0.2.0.1";
-       sha256 = "1cdlwjq7bbbq7yz5flzjkj0kp5s991nwsjq52xiqhmlzbim598s4";
+       version = "0.3.0.1";
+       sha256 = "006dlck7dr1xs2wwd233bm87mf619dlwnb66xlcfp82ksdmnfl6n";
        libraryHaskellDepends = [ partial-semigroup-hedgehog ];
        doHaddock = false;
        homepage = "https://github.com/chris-martin/partial-semigroup";
@@ -149855,8 +150289,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.7.0";
-       sha256 = "1snywd1qaj572m0nqdadqm9i86n0mhz8gcwwnaf35kk2sd8lvg6f";
+       version = "2.7.1";
+       sha256 = "079r6b1rvvwgagznxwf4j5i29jpqrvnck545ig004v2853r6x2f2";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers exceptions fast-logger http-api-data
@@ -150042,8 +150476,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mysql";
-       version = "2.6.1";
-       sha256 = "0i1a7xmspgxzlwi1z9jyh5ckjx16yba1xs289vh2id9400yh8c57";
+       version = "2.6.2.1";
+       sha256 = "0rk3rplz8y0b9macvb19w7m7ljnkq4gkmrjrdqdqcpga6ih357ik";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger mysql mysql-simple persistent
@@ -150079,7 +150513,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "persistent-mysql-haskell_0_3_4_1" = callPackage
+  "persistent-mysql-haskell_0_3_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , io-streams, monad-control, monad-logger, mysql-haskell, network
      , persistent, persistent-template, resource-pool, resourcet, text
@@ -150087,8 +150521,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mysql-haskell";
-       version = "0.3.4.1";
-       sha256 = "0w80z2098rh3svxncyaa4jrqdcdgzrfrzq4p981g34cs7kysfmn2";
+       version = "0.3.5";
+       sha256 = "0sc6hw112d8jk1rflyrmcc8gkjddl41bbw6hksyv7a5w6sc7z33n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -150147,8 +150581,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.6.1";
-       sha256 = "0w7qssz4avq82vzs40kf82gkjdkcxqbkrfq6kz39x9m3za9b9pqc";
+       version = "2.6.2";
+       sha256 = "0140cki5c5aj21qg2cvqm5a511l6n4zbx3vb94hpfr1bs9nmfjam";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger persistent postgresql-libpq
@@ -150261,8 +150695,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-sqlite";
-       version = "2.6.2";
-       sha256 = "1gw5p531187dqchi7384q3irh9n8p7prs172zpq9r1l1ziqw8dk1";
+       version = "2.6.3";
+       sha256 = "0wgj8v6wkqvj60klmxlmhgmbl6yp3i425v95p8s45wm96phpzn9l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -151244,32 +151678,6 @@ self: {
      }) {};
 
   "pinboard" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hspec
-     , http-client, http-client-tls, http-types, monad-logger, mtl
-     , network, profunctors, QuickCheck, random, safe-exceptions
-     , semigroups, text, time, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "pinboard";
-       version = "0.9.12.5";
-       sha256 = "1gvq7slby26cm62203gh13s4blwphiy0chdhkp3vl4k3gjlbslam";
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-client http-client-tls
-         http-types monad-logger mtl network profunctors random
-         safe-exceptions text time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers hspec mtl QuickCheck
-         safe-exceptions semigroups text time transformers
-         unordered-containers
-       ];
-       homepage = "https://github.com/jonschoning/pinboard";
-       description = "Access to the Pinboard API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pinboard_0_9_12_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, safe-exceptions
@@ -151293,7 +151701,6 @@ self: {
        homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinch" = callPackage
@@ -154938,6 +155345,8 @@ self: {
        pname = "postgresql-typed";
        version = "0.5.1";
        sha256 = "0bvrbbzqjvzsm0bqinvbcz897fzf1isg76mk3hniyf8l9a19a3wv";
+       revision = "1";
+       editedCabalFile = "047bjdwgg94gbpzcapar46vw33n4g8gx639ns9i4d32105w32f0r";
        libraryHaskellDepends = [
          aeson array attoparsec base binary bytestring containers cryptonite
          haskell-src-meta HDBC memory network old-locale postgresql-binary
@@ -155053,6 +155462,7 @@ self: {
        homepage = "https://github.com/diogob/postgrest-ws#readme";
        description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postie" = callPackage
@@ -155084,8 +155494,8 @@ self: {
      }:
      mkDerivation {
        pname = "postmark";
-       version = "0.2.1";
-       sha256 = "1afy3yra89909vilwr36j8vrvkhsy1xcp1jcvrdj90bj93rq64v3";
+       version = "0.2.2";
+       sha256 = "043q69v629r6y8ljij8nmfjz4qs3181278wrnlfgagfahh98pg0b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156640,14 +157050,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_6_1_0" = callPackage
+  "process_1_6_2_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.6.1.0";
-       sha256 = "0lwaa9qfh1x8zgmq7panhsvrs1nwcc1fficcg391dxp995ga4pr4";
+       version = "1.6.2.0";
+       sha256 = "0gsyzwvid2w1z5m0w492sqb8q8c86q9wa7iqjadcdhbv8ag9z6xm";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -157529,8 +157939,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.8.1";
-       sha256 = "14q1zd6bvrfcs21pklxd6wgiqpb92v0464k4zhq9l31v4k2p5zpk";
+       version = "4.9.0";
+       sha256 = "1pciifl4hm5bmdx2li4hj3cm41ffj7s23r4ivkr8x3zghmik3n88";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -157953,8 +158363,8 @@ self: {
      }:
      mkDerivation {
        pname = "protocol-buffers";
-       version = "2.4.4";
-       sha256 = "1qlkilnxfx5grim0hxf7drg2m48z76f88d4r61sy71npybf3mqnv";
+       version = "2.4.5";
+       sha256 = "1dcyv89z3869zd43wkby7xrzb1gz1iy2jrdr7yk45q2d1i63ssh4";
        libraryHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
@@ -157968,8 +158378,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
-       version = "2.4.4";
-       sha256 = "0jr1clff6vn8lpx2rbc72angn0glc2v18ji5lqgzijri8zya9nqj";
+       version = "2.4.5";
+       sha256 = "0rz1v9iab012sc2m45yvmag94xg64gjrw0pqddp8gvw67i5lfan3";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
@@ -158298,6 +158708,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ptr" = callPackage
+    ({ mkDerivation, base, base-prelude, bug, bytestring, contravariant
+     , mtl, profunctors, quickcheck-instances, rerebase, semigroups
+     , tasty, tasty-hunit, tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "ptr";
+       version = "0.15.3";
+       sha256 = "1h66bk595nv0jmcxdzfzvpr7ymfm6hl3n4bnglwlwkp2y1ymm3i3";
+       libraryHaskellDepends = [
+         base base-prelude bug bytestring contravariant mtl profunctors
+         semigroups text transformers
+       ];
+       testHaskellDepends = [
+         bug quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/nikita-volkov/ptr";
+       description = "Abstractions for operations on pointers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pub" = callPackage
     ({ mkDerivation, base, bytestring, hedis, optparse-generic, pipes
      , pipes-bytestring, text
@@ -158846,8 +159278,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.11.1.0";
-       sha256 = "0syx11yzan1m86skjlxwv17ickplbiamkhbf2xsif0w0216whbvx";
+       version = "0.11.1.1";
+       sha256 = "023j88q724l38zqry6v916na1hlqhcinb5pw3cqssmql0cf32ajh";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving lens mtl text
          transformers
@@ -159060,7 +159492,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pusher-http-haskell_1_5_0_0" = callPackage
+  "pusher-http-haskell_1_5_0_1" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , containers, cryptonite, hashable, hspec, HTTP, http-client
      , http-types, memory, network-uri, QuickCheck, scientific, text
@@ -159068,8 +159500,8 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "1.5.0.0";
-       sha256 = "098vj92gwzspqp0xbd4dxxb3dggpdz5gpf616p2spkj9xvdqgy17";
+       version = "1.5.0.1";
+       sha256 = "08fgyvm1lp1yr9p9a6fr111x78rlzhr02gbsd6q6hjxnlffya4vf";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring containers cryptonite
          hashable HTTP http-client http-types memory text time transformers
@@ -160866,8 +161298,8 @@ self: {
      }:
      mkDerivation {
        pname = "radium";
-       version = "0.8.0";
-       sha256 = "04pc3zy09hg7p9w54ffwvfcby3341vbpzlv2d9ma2q9py0ymx6d5";
+       version = "0.9.0";
+       sha256 = "142c2qra8080yndj2y0m0bdrqmf8l6r0z43pj1icdvjqj9451j16";
        libraryHaskellDepends = [ base containers lens parsec ];
        testHaskellDepends = [
          base Cabal containers hspec lens parsec QuickCheck
@@ -160895,13 +161327,15 @@ self: {
      }) {};
 
   "radius" = callPackage
-    ({ mkDerivation, base, binary, bytestring, iproute, pretty-hex }:
+    ({ mkDerivation, base, binary, bytestring, cryptonite, iproute
+     , memory
+     }:
      mkDerivation {
        pname = "radius";
-       version = "0.2.0.0";
-       sha256 = "1arch1d93yijbm7r9a9ggjj7wzy7rk0immj5g8frczrbp0xpgmzy";
+       version = "0.4.0.0";
+       sha256 = "0bdixglg4yy5n6chw0n5mpk563dbkhh7iyzrmp9q2vpzxxvvdi06";
        libraryHaskellDepends = [
-         base binary bytestring iproute pretty-hex
+         base binary bytestring cryptonite iproute memory
        ];
        homepage = "https://github.com/erickg/radius#readme";
        description = "Remote Authentication Dial In User Service (RADIUS)";
@@ -161142,8 +161576,8 @@ self: {
      }:
      mkDerivation {
        pname = "rakuten";
-       version = "0.1.0.0";
-       sha256 = "18gasv78zq8l51kpwvx6gc089day6pmlz2f43vrfichqbivahmhf";
+       version = "0.1.0.1";
+       sha256 = "1y9kyipmhhy5f0f7v805a17x7g938vkvxnzj9n4h9rlprpdbdczc";
        libraryHaskellDepends = [
          aeson base bytestring connection constraints data-default-class
          extensible http-api-data http-client http-client-tls http-types
@@ -161988,25 +162422,6 @@ self: {
      }) {};
 
   "ratel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, filepath, http-client, http-client-tls, http-types
-     , tasty, tasty-hspec, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
-       version = "0.3.5";
-       sha256 = "0mw59q5wbj5mbhznqd4szc5ps7d1r7gf490vdjqfblb5sqncy510";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [ base filepath tasty tasty-hspec ];
-       homepage = "https://github.com/tfausak/ratel#readme";
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_0_3_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, filepath, http-client, http-client-tls, http-types
      , tasty, tasty-hspec, text, uuid
@@ -162023,7 +162438,6 @@ self: {
        homepage = "https://github.com/tfausak/ratel#readme";
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratel-wai" = callPackage
@@ -164068,15 +164482,18 @@ self: {
      }) {};
 
   "reflex-sdl2" = callPackage
-    ({ mkDerivation, base, dependent-sum, mtl, ref-tf, reflex, sdl2 }:
+    ({ mkDerivation, async, base, containers, dependent-sum
+     , exception-transformers, mtl, primitive, ref-tf, reflex, sdl2, stm
+     }:
      mkDerivation {
        pname = "reflex-sdl2";
-       version = "0.1.0.0";
-       sha256 = "1k18lb7aa440i76yd6x4bh3sz6wsqv1cq1l93wpac1673bvxicll";
+       version = "0.2.0.0";
+       sha256 = "1aqcmj9gv1dhm8vqykawphk41fi24k4k061ynvfnpdypakldlvvw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base dependent-sum mtl ref-tf reflex sdl2
+         async base containers dependent-sum exception-transformers mtl
+         primitive ref-tf reflex sdl2 stm
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/schell/reflex-sdl2#readme";
@@ -165271,13 +165688,13 @@ self: {
 
   "relational-record-examples" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3
-     , persistable-record, relational-query, relational-query-HDBC
-     , relational-schemas, template-haskell, time
+     , persistable-record, product-isomorphic, relational-query
+     , relational-query-HDBC, relational-schemas, template-haskell, time
      }:
      mkDerivation {
        pname = "relational-record-examples";
-       version = "0.3.2.1";
-       sha256 = "1y0bxg2sgrq72wpa1llymhn3kbks7krnsh0qzqd1cqni01g6q8hv";
+       version = "0.4.0.0";
+       sha256 = "0ch075l87sxxgmvis6hnrpc72lr0v21nx0xhw0ahpirqbw01ndqh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165286,10 +165703,11 @@ self: {
          template-haskell
        ];
        executableHaskellDepends = [
-         base relational-query template-haskell time
+         base product-isomorphic relational-query template-haskell time
        ];
        description = "Examples of Haskell Relationa Record";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-schemas" = callPackage
@@ -166260,8 +166678,8 @@ self: {
        pname = "req-conduit";
        version = "0.2.1";
        sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c";
-       revision = "1";
-       editedCabalFile = "0pz1pz7l06c6g0d6ripgb8yn5kz5zryzjhabnx93d89qix0dzkg3";
+       revision = "2";
+       editedCabalFile = "1r7qfg670gdncb9yszgg4dw5x8az17cfgbkpbnb7zjdy7rqrj442";
        libraryHaskellDepends = [
          base bytestring conduit http-client req resourcet transformers
        ];
@@ -166418,15 +166836,14 @@ self: {
      }:
      mkDerivation {
        pname = "resolv";
-       version = "0.1.1.0";
-       sha256 = "03k0r57q93y3iv3g62zpjhh5a647v3g9imn3z9jr1vnj5gracyh5";
+       version = "0.1.1.1";
+       sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring containers
        ];
        testHaskellDepends = [
          base bytestring directory filepath tasty tasty-hunit
        ];
-       homepage = "http://github.com/hvr/resolv";
        description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -167012,8 +167429,8 @@ self: {
      }:
      mkDerivation {
        pname = "retry";
-       version = "0.7.4.2";
-       sha256 = "0z5ls9z5zcqkk3vbpl4wdgspi98n19m5i8mfian1fyxkf0jkj6sj";
+       version = "0.7.4.3";
+       sha256 = "0i47gmlljz00fwf2qwkrh24hgsyw5sz2npaighx4wxvykf00d390";
        libraryHaskellDepends = [
          base data-default-class exceptions ghc-prim random transformers
        ];
@@ -167243,8 +167660,8 @@ self: {
      }:
      mkDerivation {
        pname = "rhine";
-       version = "0.1.0.0";
-       sha256 = "1gjz5i7a00kq48fkg7ms3qr04jzg8mw5vb3lgn1pflp45m4p95vi";
+       version = "0.1.1.0";
+       sha256 = "1vl7hnnb2bmrzaf4231pq9rvn8l7y2y3x5g6b1ry77rb45bzspkq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167253,6 +167670,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Functional Reactive Programming with type-level clocks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rhythm-game-tutorial" = callPackage
@@ -168179,6 +168597,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rose-trees_0_0_4_4" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, hashable
+     , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups
+     , sets, tasty, tasty-quickcheck, unordered-containers, witherable
+     }:
+     mkDerivation {
+       pname = "rose-trees";
+       version = "0.0.4.4";
+       sha256 = "1kbjkfknl2pyp30n5c6m6xavqlm8zg06w78b3x7iwvi854yi64r3";
+       libraryHaskellDepends = [
+         base containers deepseq hashable mtl QuickCheck
+         quickcheck-instances semigroupoids semigroups sets
+         unordered-containers witherable
+       ];
+       testHaskellDepends = [
+         base containers deepseq hashable QuickCheck quickcheck-instances
+         semigroupoids semigroups sets tasty tasty-quickcheck
+         unordered-containers witherable
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hashable mtl QuickCheck
+         quickcheck-instances semigroupoids semigroups sets
+         unordered-containers witherable
+       ];
+       description = "A collection of rose tree structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rose-trie" = callPackage
     ({ mkDerivation, base, containers, deepseq, minilens, mtl
      , transformers
@@ -169607,6 +170054,7 @@ self: {
        homepage = "https://github.com/kccqzy/haskell-sajson#readme";
        description = "Fast JSON parsing powered by Chad Austin's sajson library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "saltine" = callPackage
@@ -170186,13 +170634,13 @@ self: {
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
      , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell, text, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.2.12";
-       sha256 = "14c188bn883nd5nngvydx6aj8z7x1cgjgsl41l8a6hsiwjx721l0";
+       version = "2.2.15";
+       sha256 = "02y9mvy2ij1kdn06wgdpn5y5f4wa814lj4krvfsjyc2g9am06y83";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -170202,7 +170650,7 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base basic-prelude binary-conduit bytestring conduit
-         conduit-extra yaml
+         conduit-extra resourcet yaml
        ];
        testHaskellDepends = [
          aeson base base64-bytestring basic-prelude bytestring QuickCheck
@@ -171651,7 +172099,7 @@ self: {
        executableHaskellDepends = [ base data-default-class sdl2 vector ];
        description = "Bindings to SDL2_mixer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2_mixer;};
 
   "sdl2-ttf" = callPackage
@@ -172560,15 +173008,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sensu-run_0_4_0" = callPackage
+  "sensu-run_0_4_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, http-client
      , http-types, lens, network, optparse-applicative, process
      , temporary, text, time, unix, unix-compat, vector, wreq
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.4.0";
-       sha256 = "0wsrm7l12yfm89yfd5y1w8xypfg29d2s1afy7m8dpcdypmrxrghw";
+       version = "0.4.0.1";
+       sha256 = "05vmrbf3hk26ya5rvhadc8q1qb932x2n0x153bhafbf60yzc4bc5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -173211,6 +173659,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-auth-cookie_0_5_0_6" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
+     , cereal, cookie, criterion, cryptonite, data-default, deepseq
+     , exceptions, hspec, http-api-data, http-types, memory, mtl
+     , QuickCheck, servant, servant-server, tagged, time, transformers
+     , wai
+     }:
+     mkDerivation {
+       pname = "servant-auth-cookie";
+       version = "0.5.0.6";
+       sha256 = "1bxvgf71710jzs0k83bz4rdj7zsagmwpsqv96invw8d7shipg650";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-builder bytestring cereal cookie
+         cryptonite data-default exceptions http-api-data http-types memory
+         mtl servant servant-server tagged time transformers wai
+       ];
+       testHaskellDepends = [
+         base bytestring cereal cryptonite data-default deepseq hspec
+         QuickCheck servant-server time transformers
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion cryptonite servant-server
+       ];
+       description = "Authentication via encrypted cookies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-auth-docs" = callPackage
     ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck
      , servant, servant-auth, servant-docs, text, yaml
@@ -173505,6 +173983,8 @@ self: {
        pname = "servant-checked-exceptions";
        version = "0.4.1.0";
        sha256 = "19h0vywlh6b41mdjpka4b7rz4l6gxmjlvji8nzbgkllsjgr81g3g";
+       revision = "1";
+       editedCabalFile = "07srldxvgzgzxq5dik787ays7xylwsdmz8bv3ffvp435nvvpmrzr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173538,8 +174018,8 @@ self: {
        pname = "servant-client";
        version = "0.11";
        sha256 = "1yiar76gf1zg8jaymz0xq751xs51fp0ryra4x4hwg71s32l2nvga";
-       revision = "1";
-       editedCabalFile = "0ymiqsn6451znpn524w1wn129plnqbplbvwxwjpp1drz3ab6xk6b";
+       revision = "2";
+       editedCabalFile = "0w3b3036rv9vfya5ayn9z70rkwk7hd9zisl7klgxzk4fgfmc3sgd";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat base64-bytestring bytestring
          exceptions generics-sop http-api-data http-client http-client-tls
@@ -173915,6 +174395,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-kotlin" = callPackage
+    ({ mkDerivation, aeson, base, containers, directory, formatting
+     , hspec, http-api-data, lens, servant, servant-foreign, shelly
+     , text, time, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "servant-kotlin";
+       version = "0.1.0.0";
+       sha256 = "0rsy8bmycmgxpnimaly08shlaqmna084bdgcxxs3ad0kicc427r1";
+       libraryHaskellDepends = [
+         base containers directory formatting lens servant servant-foreign
+         text time wl-pprint-text
+       ];
+       testHaskellDepends = [
+         aeson base containers directory formatting hspec http-api-data lens
+         servant servant-foreign text time wl-pprint-text
+       ];
+       benchmarkHaskellDepends = [
+         aeson base containers directory formatting http-api-data lens
+         servant servant-foreign shelly text time wl-pprint-text
+       ];
+       homepage = "https://github.com/matsubara0507/servant-kotlin#readme";
+       description = "Automatically derive Kotlin class to query servant webservices";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "servant-lucid" = callPackage
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
@@ -173959,8 +174465,8 @@ self: {
        pname = "servant-mock";
        version = "0.8.2";
        sha256 = "146z4n7ayg0347kabwdz1crha7ilfdcdx3pazdgsmq2bl8mwad3w";
-       revision = "1";
-       editedCabalFile = "19vvzy09wj0yxjz4sv417c45h1n34nd7zc9n8agxavr3wyi9lihh";
+       revision = "2";
+       editedCabalFile = "16zbbjz7rj7fg6qs8zjy9arz7bwza9pq1gn15csnsvm5n6qnpgal";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -174347,10 +174853,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.11";
-       sha256 = "1c821ia2741v7nxbv651hcj21dmcqnqf4ix198is5b63sj4ff3ib";
-       revision = "1";
-       editedCabalFile = "04s8kzc1jzarxg68nqgdckv0ajw846a1byqjksgzlqlmfqm0l32l";
+       version = "0.11.0.1";
+       sha256 = "0yrcs1ixy7mzifdyssi58m34xn95mfy9zxbkm9k5z6svqnv1qp72";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -174557,10 +175061,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-swagger-ui";
-       version = "0.2.4.3.0.20";
-       sha256 = "18qp908s0kjcz6dlvj2031kr8qjnzrgh2v92mdg4lwa1j7ddf0xn";
-       revision = "1";
-       editedCabalFile = "1wsbb9zaq5qv39hrymy1cma581337rbvqlm7y24jwfvk4vafs3fp";
+       version = "0.2.4.3.4.0";
+       sha256 = "1vb1bp7hjjyhb1p6x0j7z2ky05n72qm7zcmwgnsmnqalaxdnsvri";
        libraryHaskellDepends = [
          base blaze-markup bytestring directory file-embed filepath
          http-media servant servant-blaze servant-server servant-swagger
@@ -174907,25 +175409,6 @@ self: {
      }) {};
 
   "servius" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
-     , http-types, markdown, shakespeare, text, wai, wai-app-static
-     }:
-     mkDerivation {
-       pname = "servius";
-       version = "1.2.0.2";
-       sha256 = "0asxkdg7csxmnpzw672jazynhnnc73ddpay65npql0jz93mq45n1";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base blaze-builder blaze-html bytestring http-types markdown
-         shakespeare text wai wai-app-static
-       ];
-       homepage = "http://github.com/snoyberg/servius#readme";
-       description = "Warp web server with template rendering";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servius_1_2_0_3" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
      , http-types, markdown, shakespeare, text, wai, wai-app-static
      }:
@@ -174942,7 +175425,6 @@ self: {
        homepage = "http://github.com/snoyberg/servius#readme";
        description = "Warp web server with template rendering";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ses-html" = callPackage
@@ -175334,8 +175816,8 @@ self: {
      }:
      mkDerivation {
        pname = "sext";
-       version = "0.1.3";
-       sha256 = "0z6a4ghv5knfcwv28bax4gny5za0k0y076d15bnk01qg293w273b";
+       version = "0.1.3.1";
+       sha256 = "0836faqrrb9wsw5hlm82587isw6rkn4v8i6dh9hzxsqif1izd363";
        libraryHaskellDepends = [
          base bytestring template-haskell text vector
        ];
@@ -177753,18 +178235,18 @@ self: {
      }) {};
 
   "simplessh" = callPackage
-    ({ mkDerivation, base, bytestring, mtl, ssh2 }:
+    ({ mkDerivation, base, bytestring, libssh2, mtl }:
      mkDerivation {
        pname = "simplessh";
        version = "0.2.0.5";
        sha256 = "1f0rck8shcm69bg2n2ijjad6dzrybfyrjqpsx5qh333mmz0q7bbq";
        libraryHaskellDepends = [ base bytestring mtl ];
-       librarySystemDepends = [ ssh2 ];
+       librarySystemDepends = [ libssh2 ];
        homepage = "http://hub.darcs.net/thoferon/simplessh";
        description = "Simple wrapper around libssh2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {ssh2 = null;};
+     }) {inherit (pkgs) libssh2;};
 
   "simplest-sqlite" = callPackage
     ({ mkDerivation, base, bytestring, exception-hierarchy, sqlite
@@ -178391,7 +178873,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "skylighting_0_4_1" = callPackage
+  "skylighting_0_4_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
      , blaze-html, bytestring, case-insensitive, containers, criterion
      , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random
@@ -178400,8 +178882,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.4.1";
-       sha256 = "0dsngs2nw2ijhxxwa8d7fb9rxgqz6kgimbsvxmhpd5s4y6a1ygf4";
+       version = "0.4.2";
+       sha256 = "0szhhmjz14wq1ica3gl6nj5fh85fwh55xyywlq8q3dq8isl1hcz3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -180202,17 +180684,26 @@ self: {
      }) {};
 
   "snaplet-redis" = callPackage
-    ({ mkDerivation, base, configurator, hedis, lens, mtl, network
-     , snap, text, transformers
+    ({ mkDerivation, aeson, base, bytestring, cereal, clientsession
+     , configurator, hedis, heist, lens, monad-control, mtl, network
+     , snap, snap-core, snap-server, text, time, transformers
+     , unordered-containers, xmlhtml
      }:
      mkDerivation {
        pname = "snaplet-redis";
-       version = "0.1.4.2";
-       sha256 = "0ri5cj3gjz5c1snh7kbncb08ijs1551ixr06v3nxjsb03hrl4hhh";
+       version = "0.1.5";
+       sha256 = "12c4pgh2axnvd7hnyf0xpnsidfss39siys3nzwafdmm0p5wf67bx";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base configurator hedis lens mtl network snap text transformers
+         base bytestring cereal clientsession configurator hedis lens mtl
+         network snap snap-core text time transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring hedis heist lens monad-control mtl snap
+         snap-core snap-server text time xmlhtml
        ];
-       homepage = "https://github.com/dzhus/snaplet-redis/";
+       homepage = "https://github.com/dzhus/snaplet-redis#readme";
        description = "Redis support for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187034,6 +187525,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "substring-parser" = callPackage
+    ({ mkDerivation, attoparsec, base, hspec, NoTrace, text }:
+     mkDerivation {
+       pname = "substring-parser";
+       version = "0.1.0.0";
+       sha256 = "0f4rbfpdhbnpk4gm4rsavblqdabxlqbf58xr9rvjcxq62hac6lvc";
+       libraryHaskellDepends = [ attoparsec base NoTrace text ];
+       testHaskellDepends = [ attoparsec base hspec NoTrace text ];
+       homepage = "https://gitlab.com/igrep/substring-parser";
+       description = "Match / replace substrings with a parser combinators";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "subtitleParser" = callPackage
     ({ mkDerivation, attoparsec, base, containers, text }:
      mkDerivation {
@@ -187736,8 +188240,8 @@ self: {
      }:
      mkDerivation {
        pname = "swagger-petstore";
-       version = "0.0.1.4";
-       sha256 = "177aipxcycs79kh5vdkgq5rj8n0mixy374mxaggfp959i28rx164";
+       version = "0.0.1.5";
+       sha256 = "0fpviny6yxrmdhraan3ffhgwynn1lj88xdj093jf4229ysj0cskk";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          deepseq exceptions http-api-data http-client http-client-tls
@@ -192212,6 +192716,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "test-fixture_0_5_1_0" = callPackage
+    ({ mkDerivation, base, data-default-class, exceptions
+     , haskell-src-exts, haskell-src-meta, hspec, hspec-discover, mtl
+     , template-haskell, th-orphans, transformers
+     }:
+     mkDerivation {
+       pname = "test-fixture";
+       version = "0.5.1.0";
+       sha256 = "1mjy7nx2w7gvsibvc5vl21hr8ypxd4qdiy46iagnfij1k3kdh6wv";
+       libraryHaskellDepends = [
+         base data-default-class exceptions haskell-src-exts
+         haskell-src-meta mtl template-haskell th-orphans
+       ];
+       testHaskellDepends = [
+         base hspec hspec-discover mtl template-haskell transformers
+       ];
+       homepage = "http://github.com/cjdev/test-fixture#readme";
+       description = "Test monadic side-effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "test-framework" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
      , hostname, old-locale, random, regex-posix, time, xml
@@ -192578,13 +193104,18 @@ self: {
      }) {};
 
   "testCom" = callPackage
-    ({ mkDerivation, base, haskell-src-meta, template-haskell }:
+    ({ mkDerivation, base, haskell-src-meta, random, template-haskell
+     }:
      mkDerivation {
        pname = "testCom";
-       version = "0.2.0";
-       sha256 = "1gp8ylpp6315srcr1pi78a9f6kr24kp5dyfml9yibj35qd6wdil2";
-       libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
-       testHaskellDepends = [ base haskell-src-meta template-haskell ];
+       version = "0.3.0";
+       sha256 = "0j9mh47jq6igh5xkalgbrvjrvjsnyl7ir6jq7kr9rhh7rab4m7h1";
+       libraryHaskellDepends = [
+         base haskell-src-meta random template-haskell
+       ];
+       testHaskellDepends = [
+         base haskell-src-meta random template-haskell
+       ];
        description = "Write your tests in comments";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192989,8 +193520,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-format-heavy";
-       version = "0.1.4.0";
-       sha256 = "1kmiksxzvd99d762n4vgrx90awsdy0s3gm1a5s73r9yd79pajq5n";
+       version = "0.1.5.0";
+       sha256 = "127h2pw3p9ixx34jiql9kgpjbjmkmwigm56iklaz6wxd69zr0sfx";
        libraryHaskellDepends = [
          base bytestring containers data-default parsec text time
        ];
@@ -194359,8 +194890,8 @@ self: {
      }:
      mkDerivation {
        pname = "thank-you-stars";
-       version = "0.1.0";
-       sha256 = "1qxi26g81ndrx8vxckb8hkpaqqpbd60r2ck705mhafrv0yd3kry7";
+       version = "0.2.0";
+       sha256 = "0a1mv7k7m4yaadfrmb45s09aa5zy0wd2jccjsyqhp63v89m58z8j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194368,7 +194899,9 @@ self: {
          hackage-db req split text
        ];
        executableHaskellDepends = [ base containers directory filepath ];
-       testHaskellDepends = [ base Cabal containers hackage-db hspec ];
+       testHaskellDepends = [
+         base Cabal containers directory filepath hspec
+       ];
        homepage = "https://github.com/y-taka-23/thank-you-stars#readme";
        description = "Give your dependencies stars on GitHub!";
        license = stdenv.lib.licenses.bsd3;
@@ -194620,8 +195153,8 @@ self: {
      }:
      mkDerivation {
        pname = "thread-hierarchy";
-       version = "0.1.0.2";
-       sha256 = "1fhbwzx8shf2ph9l5mkrlz40dxdzn02rvjgz9l2kvjmi8v5rclxk";
+       version = "0.1.0.3";
+       sha256 = "1j5caivjcvrmfqgl13lhlx9dq81kka64w96ykb0bfb089kwi0j9f";
        libraryHaskellDepends = [
          base containers lifted-base monad-control transformers-base
        ];
@@ -194808,22 +195341,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "threepenny-editors_0_5_5" = callPackage
+  "threepenny-editors_0_5_6" = callPackage
     ({ mkDerivation, base, bifunctors, casing, containers, generics-sop
-     , profunctors, threepenny-gui
+     , profunctors, text, threepenny-gui
      }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.5.5";
-       sha256 = "1gblkdkmkngry2fncjv4l7f3q614rw4p25cskf850kjgvcvm04fj";
+       version = "0.5.6";
+       sha256 = "0gnbzf3a3xykkf8xc5bnn1wznszyrnllf5s6cb4gqz6cbqnf2mnw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bifunctors casing containers generics-sop profunctors
+         base bifunctors casing containers generics-sop profunctors text
          threepenny-gui
        ];
        executableHaskellDepends = [
-         base bifunctors casing containers generics-sop profunctors
+         base bifunctors casing containers generics-sop profunctors text
          threepenny-gui
        ];
        homepage = "https://github.com/pepeiborra/threepenny-editors";
@@ -195350,8 +195883,8 @@ self: {
     ({ mkDerivation, base, HUnit }:
      mkDerivation {
        pname = "tile";
-       version = "0.1.0.0";
-       sha256 = "1j952m67spr4v7g3i8lpa9cn79rlmb8ybbg9hw2yswcijpq52fyb";
+       version = "0.3.0.0";
+       sha256 = "1w35rhrpjs39xbcg2i635jxdkbp4nhkzrrnl9p3bz85yc1iiiv8m";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/caneroj1/tile#readme";
@@ -196417,8 +196950,8 @@ self: {
     ({ mkDerivation, base, containers, HUnit, network-uri, text }:
      mkDerivation {
        pname = "tld";
-       version = "0.3.0.1";
-       sha256 = "0rfzcwaj9fyhrc8vswjjnqdj4bi7jln2lq38pcvnkl5zwx7kqhxa";
+       version = "0.3.0.2";
+       sha256 = "1snw5cdkyqyninqqqwa6qfndfmwfr4lkdg0v94267g7xbwcqjj8h";
        libraryHaskellDepends = [ base containers network-uri text ];
        testHaskellDepends = [ base HUnit network-uri text ];
        description = "This project separates subdomains, domains, and top-level-domains from URLs";
@@ -196969,8 +197502,8 @@ self: {
      }:
      mkDerivation {
        pname = "tomlcheck";
-       version = "0.1.0.14";
-       sha256 = "1zms4vigyy29c3wmjh6zmhjlmvj3x98dx99mdpxws6sxl0wibfcv";
+       version = "0.1.0.17";
+       sha256 = "0yfy0453j3s5sskz529rd50dbjxhr411a4g5803dsw06kibij05s";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -199153,25 +199686,24 @@ self: {
   "tweet-hs" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
      , bytestring, composition-prelude, containers, criterion
-     , data-default, directory, extra, hspec, htoml, http-client
-     , http-client-tls, http-types, lens, megaparsec
-     , optparse-applicative, QuickCheck, split, text
-     , unordered-containers
+     , data-default, directory, extra, hspec, htoml-megaparsec
+     , http-client, http-client-tls, http-types, lens, megaparsec
+     , optparse-applicative, split, text, unordered-containers
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.9";
-       sha256 = "1s9gg1247xa2rl30s9i4rza04107s7awrx7pbmd4vc436mv4624z";
+       version = "1.0.1.21";
+       sha256 = "0m35d2ym83d3c0k2imjr9ws2nai6yhm784is9k1g6xrbazd947gr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint authenticate-oauth base bytestring
-         composition-prelude containers data-default directory extra htoml
-         http-client http-client-tls http-types lens megaparsec
-         optparse-applicative split text unordered-containers
+         composition-prelude containers data-default directory extra
+         htoml-megaparsec http-client http-client-tls http-types lens
+         megaparsec optparse-applicative split text unordered-containers
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Command-line tool for twitter";
@@ -200199,17 +200731,19 @@ self: {
      }) {};
 
   "type-of-html" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, criterion, ghc-prim
-     , hspec, QuickCheck, text
+    ({ mkDerivation, base, blaze-html, bytestring, criterion
+     , double-conversion, ghc-prim, hspec, QuickCheck, text
      }:
      mkDerivation {
        pname = "type-of-html";
-       version = "1.0.0.0";
-       sha256 = "0yknmw9xfi0pdg0ps2wg966i5k9y3nrqr38srj4lifng9bcgahx0";
-       libraryHaskellDepends = [ base bytestring ghc-prim text ];
-       testHaskellDepends = [ base hspec QuickCheck text ];
+       version = "1.0.1.1";
+       sha256 = "1fc8pqkvmrcvh3wayykqbc0ha336x77xq0hbzym9bknzr1xpy56n";
+       libraryHaskellDepends = [
+         base bytestring double-conversion ghc-prim text
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [
-         base blaze-html bytestring criterion text
+         base blaze-html bytestring criterion QuickCheck text
        ];
        homepage = "https://github.com/knupfer/type-of-html";
        description = "High performance type driven html generation";
@@ -200525,6 +201059,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "typedflow" = callPackage
+    ({ mkDerivation, base, ghc-typelits-knownnat, mtl, pretty-compact
+     }:
+     mkDerivation {
+       pname = "typedflow";
+       version = "0.9";
+       sha256 = "0hanh2gww0i4a8dkq1kxizni8qgk5mzj6qkvz9k1yvprpx2kym8c";
+       libraryHaskellDepends = [
+         base ghc-typelits-knownnat mtl pretty-compact
+       ];
+       description = "Typed frontend to TensorFlow and higher-order deep learning";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "typedquery" = callPackage
     ({ mkDerivation, aeson, base, bytestring, haskell-src-meta, parsec
      , template-haskell, text, transformers
@@ -200848,8 +201396,8 @@ self: {
      }:
      mkDerivation {
        pname = "ua-parser";
-       version = "0.7.4";
-       sha256 = "1maph5na307ih1qx2ziww3mhc9c0a5rxqj2jfc4w404hisby947i";
+       version = "0.7.4.1";
+       sha256 = "1pwls2qbhd3ig2lm4ix3kh08yw20k0iajigbxqd0vmpkx459pmrf";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring data-default file-embed pcre-light text yaml
@@ -202193,21 +202741,26 @@ self: {
      }) {};
 
   "universum" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
-     , ghc-prim, hashable, microlens, microlens-mtl, mtl, safe
-     , safe-exceptions, stm, text, text-format, transformers
-     , type-operators, unordered-containers, utf8-string, vector
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl
+     , safe, safe-exceptions, semigroups, stm, text, text-format
+     , transformers, type-operators, unordered-containers, utf8-string
+     , vector
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.7.0";
-       sha256 = "1d2887l2g8f9scpwcrvlxk0dm8w9d7qnlpbfjswa08dnmy63kcrf";
+       version = "0.7.1";
+       sha256 = "1q7q1ynfm4m1zz2inyvvj7868p3yxjl7w512j5xiz4mzx3llb292";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions ghc-prim hashable
          microlens microlens-mtl mtl safe safe-exceptions stm text
          text-format transformers type-operators unordered-containers
          utf8-string vector
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hashable mtl semigroups text
+         unordered-containers
+       ];
        homepage = "https://github.com/serokell/universum";
        description = "Custom prelude used in Serokell";
        license = stdenv.lib.licenses.mit;
@@ -203860,8 +204413,8 @@ self: {
      }:
      mkDerivation {
        pname = "uuid-crypto";
-       version = "1.3.0.0";
-       sha256 = "02vzxxijz2pdwq4asgvsxvj6gcnjdzrfrhiavwbmc0vckw8s108s";
+       version = "1.3.1.0";
+       sha256 = "10r6phn23f3piqs4jhx764pcl6f3dbxq75pvwsnmwcszdi970a3l";
        libraryHaskellDepends = [
          base binary bytestring cryptoids cryptoids-types exceptions uuid
        ];
@@ -204217,23 +204770,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "validation_0_6_0" = callPackage
-    ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, directory
-     , doctest, filepath, lens, mtl, QuickCheck, semigroupoids
-     , semigroups, template-haskell, transformers
+  "validation_0_6_2" = callPackage
+    ({ mkDerivation, base, bifunctors, hedgehog, HUnit, lens, mtl
+     , semigroupoids, semigroups, transformers
      }:
      mkDerivation {
        pname = "validation";
-       version = "0.6.0";
-       sha256 = "1x2mi8lgy18q7g2gwwk8c31kg77lkfpmjkxf5nkli5pri9z947av";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       version = "0.6.2";
+       sha256 = "0631g3ffxchgg6hpy8w94a3713plgqp1k45zq85vaxyjg2x5bh7r";
        libraryHaskellDepends = [
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
-       testHaskellDepends = [
-         base cabal-doctest directory doctest filepath QuickCheck
-         template-haskell
-       ];
+       testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
        homepage = "https://github.com/qfpl/validation";
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
@@ -205259,8 +205807,8 @@ self: {
        pname = "vector-space-points";
        version = "0.2.1.2";
        sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy";
-       revision = "1";
-       editedCabalFile = "1vgywmhxkkb7mfirl0wik5mk8xj9s3d23f9zwj5svnbyvdkc3fl4";
+       revision = "2";
+       editedCabalFile = "0jnnzhwkc82flvaxqc1vv30d8vpdwnyi82614c34j79m51wcmvya";
        libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -205484,10 +206032,8 @@ self: {
      }:
      mkDerivation {
        pname = "vgrep";
-       version = "0.2.0.0";
-       sha256 = "0crd7hrnvl4z5xb1b6km47b6250ica1yv4sy370m7lkjx00c4lrb";
-       revision = "1";
-       editedCabalFile = "0qljh5nddpgv2w7y3nq5h12jpwc509yyizqv8cjzdr1krfsnk4ck";
+       version = "0.2.1.0";
+       sha256 = "0k74bpi995wqxmin6h7bx3yjiwh403c708yjp19igbw1971irxjr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -206975,6 +207521,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-middleware-brotli" = callPackage
+    ({ mkDerivation, base, binary, bytestring, directory, filepath
+     , hs-brotli, http-types, mtl, tasty, tasty-hspec, tasty-hunit, unix
+     , wai, wai-app-static, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "wai-middleware-brotli";
+       version = "0.1.0.0";
+       sha256 = "1gv3s2y49179kzkjqzs905g2rq1a9al9n716y86ivan8nnkhxjnq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring directory filepath hs-brotli http-types unix
+         wai
+       ];
+       executableHaskellDepends = [
+         base http-types wai wai-app-static wai-extra warp
+       ];
+       testHaskellDepends = [
+         base bytestring hs-brotli http-types mtl tasty tasty-hspec
+         tasty-hunit wai wai-extra
+       ];
+       homepage = "https://github.com/iand675/wai-middleware-brotli#readme";
+       description = "WAI middleware for brotli compression";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-middleware-cache" = callPackage
     ({ mkDerivation, base, binary, blaze-builder-conduit, bytestring
      , conduit, crypto-conduit, http-types, HUnit, pureMD5
@@ -207790,8 +208364,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-session-postgresql";
-       version = "0.2.1.0";
-       sha256 = "16myzcxas9nwhd54bc5pi1biym39vrz707rfmmc1mar6ia7a1xil";
+       version = "0.2.1.1";
+       sha256 = "0yab46s0xyd49s46skrgm9hk4pvzqv3sr8mzr58231jvn7lijyf9";
        libraryHaskellDepends = [
          base bytestring cereal cookie data-default entropy
          postgresql-simple resource-pool text time transformers wai
@@ -209778,6 +210352,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wigner-ville-accelerate" = callPackage
+    ({ mkDerivation, accelerate, accelerate-fft, base, wigner }:
+     mkDerivation {
+       pname = "wigner-ville-accelerate";
+       version = "0.1.0.2";
+       sha256 = "1h5zdn3lkjnlr4m7s2xxiv36cr6hs7bnkr5rq20z585rfhbhavj5";
+       libraryHaskellDepends = [ accelerate accelerate-fft base ];
+       testHaskellDepends = [ base wigner ];
+       homepage = "https://github.com/Haskell-mouse/wigner-ville-accelerate";
+       description = "Wigner-ville transform using the Accelerate library";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {wigner = null;};
+
   "wikicfp-scraper" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
      , scalpel-core, text, time
@@ -209900,6 +210488,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "windns" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, dnsapi }:
+     mkDerivation {
+       pname = "windns";
+       version = "0.1.0.0";
+       sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c";
+       revision = "1";
+       editedCabalFile = "0kz6gv4dpppnnnyl57ibxi9gvykmkbmaz22yssx92mq306wbyimv";
+       libraryHaskellDepends = [ base bytestring deepseq ];
+       librarySystemDepends = [ dnsapi ];
+       description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {dnsapi = null;};
+
   "windowslive" = callPackage
     ({ mkDerivation, base, Crypto, dataenc, mtl, network, parsec
      , pretty, split, time, urlencoded
@@ -210085,6 +210688,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "witherable_0_2" = callPackage
+    ({ mkDerivation, base, base-orphans, containers, hashable
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "witherable";
+       version = "0.2";
+       sha256 = "0bga2vx3bkg1m6pwdvnxbqjbljpwr6mxyq94fi87j3zy08mmmnwx";
+       libraryHaskellDepends = [
+         base base-orphans containers hashable transformers
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/fumieval/witherable";
+       description = "filterable traversable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "witness" = callPackage
     ({ mkDerivation, base, constraints, semigroupoids, transformers }:
      mkDerivation {
@@ -210356,8 +210977,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.26";
-       sha256 = "1wa1qpz5fdsgisvm9idla3jri1gzdgycmiphhynkn1k0337j0xy9";
+       version = "0.3.29";
+       sha256 = "147s2xg9y77gw81gnqgijnfzfx728ddv018n7zs2sl231asjqy3i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -210466,8 +211087,8 @@ self: {
      }:
      mkDerivation {
        pname = "wordchoice";
-       version = "0.1.2.0";
-       sha256 = "01zmgxs09dplk8hf41cfqjcm6w9mjnd6szn22kz2ycjxxdd7kncv";
+       version = "0.1.2.1";
+       sha256 = "0b9la9lh00x0rnh4mpgl8djgik72x75q5070r96ibzkl5hp6483w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -210481,6 +211102,7 @@ self: {
        homepage = "https://github.com/githubuser/wordchoice#readme";
        description = "Get word counts and distributions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wordcloud" = callPackage
@@ -211117,6 +211739,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ws" = callPackage
+    ({ mkDerivation, async, base, bytestring, exceptions, haskeline
+     , mtl, network, network-uri, optparse-applicative, text, websockets
+     , wuss
+     }:
+     mkDerivation {
+       pname = "ws";
+       version = "0.0.1";
+       sha256 = "1i9jglq199pwxs9giigf3xgndspiwp30s2fb833mc7fl5s5mghhh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring exceptions haskeline mtl network network-uri
+         text websockets wuss
+       ];
+       executableHaskellDepends = [
+         base exceptions network-uri optparse-applicative
+       ];
+       description = "A simple CLI utility for interacting with a websocket";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ws-chans" = callPackage
     ({ mkDerivation, async, base, http-types, HUnit, network
      , QuickCheck, quickcheck-instances, test-framework
@@ -212175,6 +212819,7 @@ self: {
        homepage = "https://github.com/aisamanra/xleb";
        description = "A simple monadic language for parsing XML structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xls" = callPackage
@@ -212595,19 +213240,22 @@ self: {
      }) {};
 
   "xml-isogen" = callPackage
-    ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck
-     , semigroups, template-haskell, text, xml-conduit
-     , xml-conduit-writer
+    ({ mkDerivation, base, data-default, dom-parser, generic-arbitrary
+     , hspec, lens, mtl, QuickCheck, quickcheck-instances, semigroups
+     , template-haskell, text, xml-conduit, xml-conduit-writer
      }:
      mkDerivation {
        pname = "xml-isogen";
-       version = "0.2.0";
-       sha256 = "1dmf660cyrs96ih1swlw44spd2g05dfikpak9mmjag40mab36116";
+       version = "0.2.1";
+       sha256 = "1kfv09ykz96dqd45bi618qi2qhzjkifh377ccylfzd55jkqnvn6l";
        libraryHaskellDepends = [
          base dom-parser lens mtl QuickCheck semigroups template-haskell
          text xml-conduit xml-conduit-writer
        ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base data-default dom-parser generic-arbitrary hspec QuickCheck
+         quickcheck-instances semigroups xml-conduit xml-conduit-writer
+       ];
        homepage = "https://github.com/typeable/xml-isogen";
        description = "Generate XML-isomorphic types";
        license = stdenv.lib.licenses.mit;
@@ -213217,6 +213865,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xmonad-extras_0_13_2" = callPackage
+    ({ mkDerivation, alsa-mixer, base, bytestring, containers, hint
+     , libmpd, mtl, network, regex-posix, X11, xmonad, xmonad-contrib
+     }:
+     mkDerivation {
+       pname = "xmonad-extras";
+       version = "0.13.2";
+       sha256 = "1ixnr76gmym9gab6m6r2rvrrvakxa5kda6cll9nbq954sjvj54jx";
+       configureFlags = [
+         "-f-with_hlist" "-fwith_parsec" "-fwith_split"
+       ];
+       libraryHaskellDepends = [
+         alsa-mixer base bytestring containers hint libmpd mtl network
+         regex-posix X11 xmonad xmonad-contrib
+       ];
+       homepage = "https://github.com/xmonad/xmonad-extras";
+       description = "Third party extensions for xmonad with wacky dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xmonad-screenshot" = callPackage
     ({ mkDerivation, base, gtk, xmonad }:
      mkDerivation {
@@ -217285,8 +217954,8 @@ self: {
      }:
      mkDerivation {
        pname = "yst";
-       version = "0.5.1.2";
-       sha256 = "0q185phadgi8m45ii90x5k7mpw2xqf021q55q00nqyw8l7yai8pr";
+       version = "0.6";
+       sha256 = "059mbh2x4i521kg99b2mmgvc2rwbid641ilzc14ri7ym7ljkw1mv";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
-- 
GitLab


From 4c263586f6d48996095d08a4dbfc4c32dbe1847f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Oct 2017 20:46:18 +0200
Subject: [PATCH 357/877] git-annex: fix hash after version update

---
 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 2b050dd613f..7bb62e1ccd0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -98,7 +98,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "1143qcsljp66v0xvq2a2nqji24890rnmxcmwnxw8xj818gqk0p3m";
+      sha256 = "0iz0yz0bwkmpza5qahsxr9plg1ylmkv7znp1a8f0z65px7f300an";
     };
   })).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
-- 
GitLab


From eb725c373bca426cdaa9746d5e4a4fdfb7ecf789 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 31 Oct 2017 19:18:26 +0100
Subject: [PATCH 358/877] websocket++: 0.4.0 -> 0.7.0

---
 pkgs/development/libraries/websocket++/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix
index 2672d6efbec..fbfc460db96 100644
--- a/pkgs/development/libraries/websocket++/default.nix
+++ b/pkgs/development/libraries/websocket++/default.nix
@@ -2,21 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "websocket++-${version}";
-  version = "0.4.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "zaphoyd";
     repo = "websocketpp";
     rev = version;
-    sha256 = "1n6j0dh3qpis0f7crd49a2nhxd5459h0blch408z3kwlasx2g0i5";
+    sha256 = "1i64sps52kvy8yffysjbmmbb109pi28kqai0qdxxz1dcj3xfckqd";
   };
 
   buildInputs = [ cmake ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.zaphoyd.com/websocketpp/;
     description = "C++/Boost Asio based websocket client/server library";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ andir ];
   };
 }
-- 
GitLab


From e0318379ae3b5cb5fa75629b1b5392dbd270cfe8 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Wed, 1 Nov 2017 02:53:24 +0800
Subject: [PATCH 359/877] nixos/ssh: fix example

---
 nixos/modules/programs/ssh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index e0fbba897fa..0935bf0cae7 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -148,11 +148,11 @@ in
           [
             {
               hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
-              publicKeyFile = "./pubkeys/myhost_ssh_host_dsa_key.pub";
+              publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
             }
             {
               hostNames = [ "myhost2" ];
-              publicKeyFile = "./pubkeys/myhost2_ssh_host_dsa_key.pub";
+              publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
             }
           ]
         '';
-- 
GitLab


From 67982125718b34d73df80520ea18160f6021e0d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Tue, 31 Oct 2017 16:05:41 +0100
Subject: [PATCH 360/877] languagetool: add command for HTTP server

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

diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 8aed674a644..4f3f8af3256 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
     EXE
     chmod +x $out/bin/$lt
     done
+    cat > $out/bin/languagetool-http-server <<EXE
+    #!${stdenv.shell}
+    ${jdk}/bin/java -cp $out/share/languagetool-server.jar org.languagetool.server.HTTPServer "\$@"
+    EXE
+    chmod +x $out/bin/languagetool-http-server
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 399020d2f557f056b9cdcaff3905d5e06d7820f9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 31 Oct 2017 15:42:08 -0500
Subject: [PATCH 361/877] musl: 1.1.17 -> 1.1.18

Use this as an opportunity to remove
empty patches array.
---
 pkgs/os-specific/linux/musl/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index c51b8b26c80..aaef5315b0f 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "musl-${version}";
-  version = "1.1.17";
+  version = "1.1.18";
 
   src = fetchurl {
     url    = "http://www.musl-libc.org/releases/${name}.tar.gz";
-    sha256 = "0r0lyp2w6v2bvm8h1si7w3p2qx037szl14qnxm5p00568z3m3an8";
+    sha256 = "0651lnj5spckqjf83nz116s8qhhydgqdy3rkl4icbh5f05fyw5yh";
   };
 
   enableParallelBuilding = true;
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
     "CFLAGS=-fstack-protector-strong"
   ];
 
-  patches = [];
-
   dontDisableStatic = true;
 
   meta = {
-- 
GitLab


From fb9e4daa41404cb1cb19f18222e9e0d38ab99ace Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 31 Oct 2017 22:01:31 +0100
Subject: [PATCH 362/877] dnschain: move to nodePackages.dnschain

---
 pkgs/development/node-packages/default-v6.nix |    7 +
 pkgs/servers/dnschain/default.nix             |   51 -
 pkgs/servers/dnschain/package.json            |    3 -
 pkgs/servers/dnschain/package.nix             | 2188 -----------------
 pkgs/top-level/all-packages.nix               |    2 -
 5 files changed, 7 insertions(+), 2244 deletions(-)
 delete mode 100644 pkgs/servers/dnschain/default.nix
 delete mode 100644 pkgs/servers/dnschain/package.json
 delete mode 100644 pkgs/servers/dnschain/package.nix

diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
index 334c79a8267..759d3fc1f85 100644
--- a/pkgs/development/node-packages/default-v6.nix
+++ b/pkgs/development/node-packages/default-v6.nix
@@ -6,6 +6,13 @@ let
   };
 in
 nodePackages // {
+  dnschain =  nodePackages.dnschain.override (oldAttrs: {
+    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ];
+    postInstall = ''
+      wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
+    '';
+  });
+
   node-inspector = nodePackages.node-inspector.override (oldAttrs: {
     buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
   });
diff --git a/pkgs/servers/dnschain/default.nix b/pkgs/servers/dnschain/default.nix
deleted file mode 100644
index 52cccae50c5..00000000000
--- a/pkgs/servers/dnschain/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchFromGitHub, callPackage, makeWrapper, openssl }:
-
-let
-  nodePackages = callPackage (import ../../top-level/node-packages.nix) {
-    self = nodePackages;
-    generated = ./package.nix;
-  };
-
-in nodePackages.buildNodePackage rec {
-  name    = "dnschain-${version}";
-  version = "0.5.3";
-
-  src = fetchFromGitHub {
-    owner  = "okTurtles";
-    repo   = "dnschain";
-    rev    = "a8d477f9ad33d7790f94ffc563e2205823e62515";
-    sha256 = "0j5glbxf0fxnxl4l1lysb3a619b18rk0l1ks57wd255llc2mw7zy";
-  };
-
-  deps = with nodePackages; [
-    by-spec."bluebird"."2.9.9"
-    by-spec."bottleneck"."1.5.x"
-    by-spec."event-stream"."3.2.2"
-    by-spec."express"."4.11.2"
-    by-spec."hiredis"."0.4.1"
-    by-spec."json-rpc2"."0.8.1"
-    by-spec."lodash"."3.1.0"
-    by-spec."native-dns"."git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402"
-    by-spec."native-dns-packet"."0.1.1"
-    by-spec."nconf"."0.7.1"
-    by-spec."properties"."1.2.1"
-    by-spec."redis"."0.12.x"
-    by-spec."string"."2.0.1"
-    by-spec."winston"."0.8.0"
-    by-spec."superagent"."0.21.0"
-  ];
-
-  buildInputs = [ makeWrapper nodePackages.coffee-script ];
-  postInstall = ''
-      wrapProgram $out/bin/dnschain --suffix PATH : ${openssl.bin}/bin
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A blockchain-based DNS + HTTP server";
-    homepage    = https://okturtles.com/;
-    license     = licenses.mpl20;
-    maintainers = with maintainers; [ rnhmjoj ];
-    platforms   = platforms.unix;
-  };
-
-}
diff --git a/pkgs/servers/dnschain/package.json b/pkgs/servers/dnschain/package.json
deleted file mode 100644
index fda40c8a90a..00000000000
--- a/pkgs/servers/dnschain/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[ "dnschain"
-, "coffee-script"
-]
diff --git a/pkgs/servers/dnschain/package.nix b/pkgs/servers/dnschain/package.nix
deleted file mode 100644
index 600f5a94684..00000000000
--- a/pkgs/servers/dnschain/package.nix
+++ /dev/null
@@ -1,2188 +0,0 @@
-
-{ self, fetchurl, fetchgit ? null, lib }:
-
-{
-  by-spec."accepts"."~1.2.3" =
-    self.by-version."accepts"."1.2.13";
-  by-version."accepts"."1.2.13" = self.buildNodePackage {
-    name = "accepts-1.2.13";
-    version = "1.2.13";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz";
-      name = "accepts-1.2.13.tgz";
-      sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea";
-    };
-    deps = {
-      "mime-types-2.1.14" = self.by-version."mime-types"."2.1.14";
-      "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."assert-plus"."^1.0.0" =
-    self.by-version."assert-plus"."1.0.0";
-  by-version."assert-plus"."1.0.0" = self.buildNodePackage {
-    name = "assert-plus-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
-      name = "assert-plus-1.0.0.tgz";
-      sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."async"."0.2.x" =
-    self.by-version."async"."0.2.10";
-  by-version."async"."0.2.10" = self.buildNodePackage {
-    name = "async-0.2.10";
-    version = "0.2.10";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
-      name = "async-0.2.10.tgz";
-      sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."async"."~0.9.0" =
-    self.by-version."async"."0.9.2";
-  by-version."async"."0.9.2" = self.buildNodePackage {
-    name = "async-0.9.2";
-    version = "0.9.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
-      name = "async-0.9.2.tgz";
-      sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."better-curry"."1.x.x" =
-    self.by-version."better-curry"."1.6.0";
-  by-version."better-curry"."1.6.0" = self.buildNodePackage {
-    name = "better-curry-1.6.0";
-    version = "1.6.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz";
-      name = "better-curry-1.6.0.tgz";
-      sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."binaryheap".">= 0.0.3" =
-    self.by-version."binaryheap"."0.0.3";
-  by-version."binaryheap"."0.0.3" = self.buildNodePackage {
-    name = "binaryheap-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz";
-      name = "binaryheap-0.0.3.tgz";
-      sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bindings"."*" =
-    self.by-version."bindings"."1.2.1";
-  by-version."bindings"."1.2.1" = self.buildNodePackage {
-    name = "bindings-1.2.1";
-    version = "1.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
-      name = "bindings-1.2.1.tgz";
-      sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bluebird"."2.9.9" =
-    self.by-version."bluebird"."2.9.9";
-  by-version."bluebird"."2.9.9" = self.buildNodePackage {
-    name = "bluebird-2.9.9";
-    version = "2.9.9";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz";
-      name = "bluebird-2.9.9.tgz";
-      sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bottleneck"."1.5.x" =
-    self.by-version."bottleneck"."1.5.3";
-  by-version."bottleneck"."1.5.3" = self.buildNodePackage {
-    name = "bottleneck-1.5.3";
-    version = "1.5.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz";
-      name = "bottleneck-1.5.3.tgz";
-      sha1 = "55fa64920d9670087d44150404525d59f9511c20";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."buffercursor".">= 0.0.12" =
-    self.by-version."buffercursor"."0.0.12";
-  by-version."buffercursor"."0.0.12" = self.buildNodePackage {
-    name = "buffercursor-0.0.12";
-    version = "0.0.12";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz";
-      name = "buffercursor-0.0.12.tgz";
-      sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
-    };
-    deps = {
-      "verror-1.9.0" = self.by-version."verror"."1.9.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."buffercursor".">= 0.0.5" =
-    self.by-version."buffercursor"."0.0.12";
-  by-spec."coffee-script"."*" =
-    self.by-version."coffee-script"."1.12.2";
-  by-version."coffee-script"."1.12.2" = self.buildNodePackage {
-    name = "coffee-script-1.12.2";
-    version = "1.12.2";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
-      name = "coffee-script-1.12.2.tgz";
-      sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "coffee-script" = self.by-version."coffee-script"."1.12.2";
-  by-spec."colors"."0.6.x" =
-    self.by-version."colors"."0.6.2";
-  by-version."colors"."0.6.2" = self.buildNodePackage {
-    name = "colors-0.6.2";
-    version = "0.6.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
-      name = "colors-0.6.2.tgz";
-      sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."combined-stream"."~0.0.4" =
-    self.by-version."combined-stream"."0.0.7";
-  by-version."combined-stream"."0.0.7" = self.buildNodePackage {
-    name = "combined-stream-0.0.7";
-    version = "0.0.7";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
-      name = "combined-stream-0.0.7.tgz";
-      sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
-    };
-    deps = {
-      "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."component-emitter"."1.1.2" =
-    self.by-version."component-emitter"."1.1.2";
-  by-version."component-emitter"."1.1.2" = self.buildNodePackage {
-    name = "component-emitter-1.1.2";
-    version = "1.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
-      name = "component-emitter-1.1.2.tgz";
-      sha1 = "296594f2753daa63996d2af08d15a95116c9aec3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."content-disposition"."0.5.0" =
-    self.by-version."content-disposition"."0.5.0";
-  by-version."content-disposition"."0.5.0" = self.buildNodePackage {
-    name = "content-disposition-0.5.0";
-    version = "0.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
-      name = "content-disposition-0.5.0.tgz";
-      sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cookie"."0.1.2" =
-    self.by-version."cookie"."0.1.2";
-  by-version."cookie"."0.1.2" = self.buildNodePackage {
-    name = "cookie-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
-      name = "cookie-0.1.2.tgz";
-      sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cookie-signature"."1.0.5" =
-    self.by-version."cookie-signature"."1.0.5";
-  by-version."cookie-signature"."1.0.5" = self.buildNodePackage {
-    name = "cookie-signature-1.0.5";
-    version = "1.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz";
-      name = "cookie-signature-1.0.5.tgz";
-      sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cookiejar"."2.0.1" =
-    self.by-version."cookiejar"."2.0.1";
-  by-version."cookiejar"."2.0.1" = self.buildNodePackage {
-    name = "cookiejar-2.0.1";
-    version = "2.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
-      name = "cookiejar-2.0.1.tgz";
-      sha1 = "3d12752f6adf68a892f332433492bd5812bb668f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."core-util-is"."1.0.2" =
-    self.by-version."core-util-is"."1.0.2";
-  by-version."core-util-is"."1.0.2" = self.buildNodePackage {
-    name = "core-util-is-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-      name = "core-util-is-1.0.2.tgz";
-      sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."core-util-is"."~1.0.0" =
-    self.by-version."core-util-is"."1.0.2";
-  by-spec."crc"."3.2.1" =
-    self.by-version."crc"."3.2.1";
-  by-version."crc"."3.2.1" = self.buildNodePackage {
-    name = "crc-3.2.1";
-    version = "3.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
-      name = "crc-3.2.1.tgz";
-      sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cycle"."1.0.x" =
-    self.by-version."cycle"."1.0.3";
-  by-version."cycle"."1.0.3" = self.buildNodePackage {
-    name = "cycle-1.0.3";
-    version = "1.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
-      name = "cycle-1.0.3.tgz";
-      sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."debug"."1.x.x" =
-    self.by-version."debug"."1.0.4";
-  by-version."debug"."1.0.4" = self.buildNodePackage {
-    name = "debug-1.0.4";
-    version = "1.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
-      name = "debug-1.0.4.tgz";
-      sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
-    };
-    deps = {
-      "ms-0.6.2" = self.by-version."ms"."0.6.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."debug"."2" =
-    self.by-version."debug"."2.6.0";
-  by-version."debug"."2.6.0" = self.buildNodePackage {
-    name = "debug-2.6.0";
-    version = "2.6.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
-      name = "debug-2.6.0.tgz";
-      sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
-    };
-    deps = {
-      "ms-0.7.2" = self.by-version."ms"."0.7.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."debug"."~2.1.1" =
-    self.by-version."debug"."2.1.3";
-  by-version."debug"."2.1.3" = self.buildNodePackage {
-    name = "debug-2.1.3";
-    version = "2.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz";
-      name = "debug-2.1.3.tgz";
-      sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e";
-    };
-    deps = {
-      "ms-0.7.0" = self.by-version."ms"."0.7.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."delayed-stream"."0.0.5" =
-    self.by-version."delayed-stream"."0.0.5";
-  by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
-    name = "delayed-stream-0.0.5";
-    version = "0.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
-      name = "delayed-stream-0.0.5.tgz";
-      sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."depd"."~1.0.0" =
-    self.by-version."depd"."1.0.1";
-  by-version."depd"."1.0.1" = self.buildNodePackage {
-    name = "depd-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
-      name = "depd-1.0.1.tgz";
-      sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."destroy"."1.0.3" =
-    self.by-version."destroy"."1.0.3";
-  by-version."destroy"."1.0.3" = self.buildNodePackage {
-    name = "destroy-1.0.3";
-    version = "1.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
-      name = "destroy-1.0.3.tgz";
-      sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."duplexer"."~0.1.1" =
-    self.by-version."duplexer"."0.1.1";
-  by-version."duplexer"."0.1.1" = self.buildNodePackage {
-    name = "duplexer-0.1.1";
-    version = "0.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
-      name = "duplexer-0.1.1.tgz";
-      sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ee-first"."1.1.0" =
-    self.by-version."ee-first"."1.1.0";
-  by-version."ee-first"."1.1.0" = self.buildNodePackage {
-    name = "ee-first-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
-      name = "ee-first-1.1.0.tgz";
-      sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."es5class"."2.x.x" =
-    self.by-version."es5class"."2.3.1";
-  by-version."es5class"."2.3.1" = self.buildNodePackage {
-    name = "es5class-2.3.1";
-    version = "2.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz";
-      name = "es5class-2.3.1.tgz";
-      sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66";
-    };
-    deps = {
-      "better-curry-1.6.0" = self.by-version."better-curry"."1.6.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."escape-html"."1.0.1" =
-    self.by-version."escape-html"."1.0.1";
-  by-version."escape-html"."1.0.1" = self.buildNodePackage {
-    name = "escape-html-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
-      name = "escape-html-1.0.1.tgz";
-      sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."etag"."~1.5.1" =
-    self.by-version."etag"."1.5.1";
-  by-version."etag"."1.5.1" = self.buildNodePackage {
-    name = "etag-1.5.1";
-    version = "1.5.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz";
-      name = "etag-1.5.1.tgz";
-      sha1 = "54c50de04ee42695562925ac566588291be7e9ea";
-    };
-    deps = {
-      "crc-3.2.1" = self.by-version."crc"."3.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."event-stream"."3.2.2" =
-    self.by-version."event-stream"."3.2.2";
-  by-version."event-stream"."3.2.2" = self.buildNodePackage {
-    name = "event-stream-3.2.2";
-    version = "3.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz";
-      name = "event-stream-3.2.2.tgz";
-      sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d";
-    };
-    deps = {
-      "through-2.3.8" = self.by-version."through"."2.3.8";
-      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
-      "from-0.1.3" = self.by-version."from"."0.1.3";
-      "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0";
-      "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11";
-      "split-0.3.3" = self.by-version."split"."0.3.3";
-      "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."eventemitter3"."0.x.x" =
-    self.by-version."eventemitter3"."0.1.6";
-  by-version."eventemitter3"."0.1.6" = self.buildNodePackage {
-    name = "eventemitter3-0.1.6";
-    version = "0.1.6";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz";
-      name = "eventemitter3-0.1.6.tgz";
-      sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."express"."4.11.2" =
-    self.by-version."express"."4.11.2";
-  by-version."express"."4.11.2" = self.buildNodePackage {
-    name = "express-4.11.2";
-    version = "4.11.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz";
-      name = "express-4.11.2.tgz";
-      sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148";
-    };
-    deps = {
-      "accepts-1.2.13" = self.by-version."accepts"."1.2.13";
-      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "methods-1.1.2" = self.by-version."methods"."1.1.2";
-      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
-      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
-      "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
-      "proxy-addr-1.0.10" = self.by-version."proxy-addr"."1.0.10";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
-      "send-0.11.1" = self.by-version."send"."0.11.1";
-      "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1";
-      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
-      "vary-1.0.1" = self.by-version."vary"."1.0.1";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."extend"."~1.2.1" =
-    self.by-version."extend"."1.2.1";
-  by-version."extend"."1.2.1" = self.buildNodePackage {
-    name = "extend-1.2.1";
-    version = "1.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
-      name = "extend-1.2.1.tgz";
-      sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."extsprintf"."^1.2.0" =
-    self.by-version."extsprintf"."1.3.0";
-  by-version."extsprintf"."1.3.0" = self.buildNodePackage {
-    name = "extsprintf-1.3.0";
-    version = "1.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
-      name = "extsprintf-1.3.0.tgz";
-      sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."eyes"."0.1.x" =
-    self.by-version."eyes"."0.1.8";
-  by-version."eyes"."0.1.8" = self.buildNodePackage {
-    name = "eyes-0.1.8";
-    version = "0.1.8";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
-      name = "eyes-0.1.8.tgz";
-      sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."faye-websocket"."0.x.x" =
-    self.by-version."faye-websocket"."0.11.0";
-  by-version."faye-websocket"."0.11.0" = self.buildNodePackage {
-    name = "faye-websocket-0.11.0";
-    version = "0.11.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz";
-      name = "faye-websocket-0.11.0.tgz";
-      sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50";
-    };
-    deps = {
-      "websocket-driver-0.6.5" = self.by-version."websocket-driver"."0.6.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."finalhandler"."0.3.3" =
-    self.by-version."finalhandler"."0.3.3";
-  by-version."finalhandler"."0.3.3" = self.buildNodePackage {
-    name = "finalhandler-0.3.3";
-    version = "0.3.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz";
-      name = "finalhandler-0.3.3.tgz";
-      sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426";
-    };
-    deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."form-data"."0.1.3" =
-    self.by-version."form-data"."0.1.3";
-  by-version."form-data"."0.1.3" = self.buildNodePackage {
-    name = "form-data-0.1.3";
-    version = "0.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
-      name = "form-data-0.1.3.tgz";
-      sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea";
-    };
-    deps = {
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "async-0.9.2" = self.by-version."async"."0.9.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."formidable"."1.0.14" =
-    self.by-version."formidable"."1.0.14";
-  by-version."formidable"."1.0.14" = self.buildNodePackage {
-    name = "formidable-1.0.14";
-    version = "1.0.14";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
-      name = "formidable-1.0.14.tgz";
-      sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."forwarded"."~0.1.0" =
-    self.by-version."forwarded"."0.1.0";
-  by-version."forwarded"."0.1.0" = self.buildNodePackage {
-    name = "forwarded-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
-      name = "forwarded-0.1.0.tgz";
-      sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."fresh"."0.2.4" =
-    self.by-version."fresh"."0.2.4";
-  by-version."fresh"."0.2.4" = self.buildNodePackage {
-    name = "fresh-0.2.4";
-    version = "0.2.4";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
-      name = "fresh-0.2.4.tgz";
-      sha1 = "3582499206c9723714190edd74b4604feb4a614c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."from"."~0" =
-    self.by-version."from"."0.1.3";
-  by-version."from"."0.1.3" = self.buildNodePackage {
-    name = "from-0.1.3";
-    version = "0.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz";
-      name = "from-0.1.3.tgz";
-      sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."hiredis"."0.4.1" =
-    self.by-version."hiredis"."0.4.1";
-  by-version."hiredis"."0.4.1" = self.buildNodePackage {
-    name = "hiredis-0.4.1";
-    version = "0.4.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz";
-      name = "hiredis-0.4.1.tgz";
-      sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f";
-    };
-    deps = {
-      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-2.5.0" = self.by-version."nan"."2.5.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."inherits"."~2.0.1" =
-    self.by-version."inherits"."2.0.3";
-  by-version."inherits"."2.0.3" = self.buildNodePackage {
-    name = "inherits-2.0.3";
-    version = "2.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-      name = "inherits-2.0.3.tgz";
-      sha1 = "633c2c83e3da42a502f52466022480f4208261de";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ini"."1.x.x" =
-    self.by-version."ini"."1.3.4";
-  by-version."ini"."1.3.4" = self.buildNodePackage {
-    name = "ini-1.3.4";
-    version = "1.3.4";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
-      name = "ini-1.3.4.tgz";
-      sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ipaddr.js"."1.0.5" =
-    self.by-version."ipaddr.js"."1.0.5";
-  by-version."ipaddr.js"."1.0.5" = self.buildNodePackage {
-    name = "ipaddr.js-1.0.5";
-    version = "1.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz";
-      name = "ipaddr.js-1.0.5.tgz";
-      sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ipaddr.js".">= 0.1.1" =
-    self.by-version."ipaddr.js"."1.2.0";
-  by-version."ipaddr.js"."1.2.0" = self.buildNodePackage {
-    name = "ipaddr.js-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz";
-      name = "ipaddr.js-1.2.0.tgz";
-      sha1 = "8aba49c9192799585bdd643e0ccb50e8ae777ba4";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."isarray"."0.0.1" =
-    self.by-version."isarray"."0.0.1";
-  by-version."isarray"."0.0.1" = self.buildNodePackage {
-    name = "isarray-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
-      name = "isarray-0.0.1.tgz";
-      sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."json-rpc2"."0.8.1" =
-    self.by-version."json-rpc2"."0.8.1";
-  by-version."json-rpc2"."0.8.1" = self.buildNodePackage {
-    name = "json-rpc2-0.8.1";
-    version = "0.8.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz";
-      name = "json-rpc2-0.8.1.tgz";
-      sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2";
-    };
-    deps = {
-      "jsonparse-0.0.6" = self.by-version."jsonparse"."0.0.6";
-      "debug-1.0.4" = self.by-version."debug"."1.0.4";
-      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
-      "es5class-2.3.1" = self.by-version."es5class"."2.3.1";
-      "faye-websocket-0.11.0" = self.by-version."faye-websocket"."0.11.0";
-      "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jsonparse"."0.x.x" =
-    self.by-version."jsonparse"."0.0.6";
-  by-version."jsonparse"."0.0.6" = self.buildNodePackage {
-    name = "jsonparse-0.0.6";
-    version = "0.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz";
-      name = "jsonparse-0.0.6.tgz";
-      sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash"."2.x.x" =
-    self.by-version."lodash"."2.4.2";
-  by-version."lodash"."2.4.2" = self.buildNodePackage {
-    name = "lodash-2.4.2";
-    version = "2.4.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
-      name = "lodash-2.4.2.tgz";
-      sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash"."3.1.0" =
-    self.by-version."lodash"."3.1.0";
-  by-version."lodash"."3.1.0" = self.buildNodePackage {
-    name = "lodash-3.1.0";
-    version = "3.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz";
-      name = "lodash-3.1.0.tgz";
-      sha1 = "d41b8b33530cb3be088853208ad30092d2c27961";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."map-stream"."~0.1.0" =
-    self.by-version."map-stream"."0.1.0";
-  by-version."map-stream"."0.1.0" = self.buildNodePackage {
-    name = "map-stream-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
-      name = "map-stream-0.1.0.tgz";
-      sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."media-typer"."0.3.0" =
-    self.by-version."media-typer"."0.3.0";
-  by-version."media-typer"."0.3.0" = self.buildNodePackage {
-    name = "media-typer-0.3.0";
-    version = "0.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
-      name = "media-typer-0.3.0.tgz";
-      sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."merge-descriptors"."0.0.2" =
-    self.by-version."merge-descriptors"."0.0.2";
-  by-version."merge-descriptors"."0.0.2" = self.buildNodePackage {
-    name = "merge-descriptors-0.0.2";
-    version = "0.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
-      name = "merge-descriptors-0.0.2.tgz";
-      sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."methods"."1.0.1" =
-    self.by-version."methods"."1.0.1";
-  by-version."methods"."1.0.1" = self.buildNodePackage {
-    name = "methods-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
-      name = "methods-1.0.1.tgz";
-      sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."methods"."~1.1.1" =
-    self.by-version."methods"."1.1.2";
-  by-version."methods"."1.1.2" = self.buildNodePackage {
-    name = "methods-1.1.2";
-    version = "1.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
-      name = "methods-1.1.2.tgz";
-      sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime"."1.2.11" =
-    self.by-version."mime"."1.2.11";
-  by-version."mime"."1.2.11" = self.buildNodePackage {
-    name = "mime-1.2.11";
-    version = "1.2.11";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
-      name = "mime-1.2.11.tgz";
-      sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime"."~1.2.11" =
-    self.by-version."mime"."1.2.11";
-  by-spec."mime-db"."~1.12.0" =
-    self.by-version."mime-db"."1.12.0";
-  by-version."mime-db"."1.12.0" = self.buildNodePackage {
-    name = "mime-db-1.12.0";
-    version = "1.12.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
-      name = "mime-db-1.12.0.tgz";
-      sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-db"."~1.26.0" =
-    self.by-version."mime-db"."1.26.0";
-  by-version."mime-db"."1.26.0" = self.buildNodePackage {
-    name = "mime-db-1.26.0";
-    version = "1.26.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
-      name = "mime-db-1.26.0.tgz";
-      sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-types"."~2.0.9" =
-    self.by-version."mime-types"."2.0.14";
-  by-version."mime-types"."2.0.14" = self.buildNodePackage {
-    name = "mime-types-2.0.14";
-    version = "2.0.14";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
-      name = "mime-types-2.0.14.tgz";
-      sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
-    };
-    deps = {
-      "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-types"."~2.1.6" =
-    self.by-version."mime-types"."2.1.14";
-  by-version."mime-types"."2.1.14" = self.buildNodePackage {
-    name = "mime-types-2.1.14";
-    version = "2.1.14";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
-      name = "mime-types-2.1.14.tgz";
-      sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
-    };
-    deps = {
-      "mime-db-1.26.0" = self.by-version."mime-db"."1.26.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."minimist"."~0.0.1" =
-    self.by-version."minimist"."0.0.10";
-  by-version."minimist"."0.0.10" = self.buildNodePackage {
-    name = "minimist-0.0.10";
-    version = "0.0.10";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
-      name = "minimist-0.0.10.tgz";
-      sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ms"."0.6.2" =
-    self.by-version."ms"."0.6.2";
-  by-version."ms"."0.6.2" = self.buildNodePackage {
-    name = "ms-0.6.2";
-    version = "0.6.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
-      name = "ms-0.6.2.tgz";
-      sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ms"."0.7.0" =
-    self.by-version."ms"."0.7.0";
-  by-version."ms"."0.7.0" = self.buildNodePackage {
-    name = "ms-0.7.0";
-    version = "0.7.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz";
-      name = "ms-0.7.0.tgz";
-      sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ms"."0.7.2" =
-    self.by-version."ms"."0.7.2";
-  by-version."ms"."0.7.2" = self.buildNodePackage {
-    name = "ms-0.7.2";
-    version = "0.7.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
-      name = "ms-0.7.2.tgz";
-      sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."nan"."^2.0.5" =
-    self.by-version."nan"."2.5.0";
-  by-version."nan"."2.5.0" = self.buildNodePackage {
-    name = "nan-2.5.0";
-    version = "2.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
-      name = "nan-2.5.0.tgz";
-      sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."native-dns"."git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" =
-    self.by-version."native-dns"."0.6.1";
-  by-version."native-dns"."0.6.1" = self.buildNodePackage {
-    name = "native-dns-0.6.1";
-    version = "0.6.1";
-    bin = false;
-    src = fetchgit {
-      url = "https://github.com/okTurtles/node-dns.git";
-      rev = "08433ec98f517eed3c6d5e47bdf62603539cd402";
-      sha256 = "9c3faf4d39fda7bb6dd52a82036625f37ed442d5e948d295acb2f055dd367080";
-    };
-    deps = {
-      "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0";
-      "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2";
-      "native-dns-packet-0.0.4" = self.by-version."native-dns-packet"."0.0.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."native-dns-cache"."git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" =
-    self.by-version."native-dns-cache"."0.0.2";
-  by-version."native-dns-cache"."0.0.2" = self.buildNodePackage {
-    name = "native-dns-cache-0.0.2";
-    version = "0.0.2";
-    bin = false;
-    src = fetchgit {
-      url = "https://github.com/okTurtles/native-dns-cache.git";
-      rev = "8714196bb9223cc9a4064a4fddf9e82ec50b7d4d";
-      sha256 = "3f06b2577afc3c1e428533baae3c51bad44a2e1e02fca147a1303943c214f841";
-    };
-    deps = {
-      "binaryheap-0.0.3" = self.by-version."binaryheap"."0.0.3";
-      "native-dns-packet-0.0.3" = self.by-version."native-dns-packet"."0.0.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."native-dns-packet"."0.1.1" =
-    self.by-version."native-dns-packet"."0.1.1";
-  by-version."native-dns-packet"."0.1.1" = self.buildNodePackage {
-    name = "native-dns-packet-0.1.1";
-    version = "0.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz";
-      name = "native-dns-packet-0.1.1.tgz";
-      sha1 = "97da90570b8438a00194701ce24d011fd3cc109a";
-    };
-    deps = {
-      "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
-      "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" =
-    self.by-version."native-dns-packet"."0.0.3";
-  by-version."native-dns-packet"."0.0.3" = self.buildNodePackage {
-    name = "native-dns-packet-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchgit {
-      url = "https://github.com/okTurtles/native-dns-packet.git";
-      rev = "307e77a47ebba57a5ae9118a284e916e5ebb305a";
-      sha256 = "3ab023906deb8ee86bcb34c3e67e03cebeed1ba2dcb0b1d561c362ca995b0739";
-    };
-    deps = {
-      "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
-      "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" =
-    self.by-version."native-dns-packet"."0.0.4";
-  by-version."native-dns-packet"."0.0.4" = self.buildNodePackage {
-    name = "native-dns-packet-0.0.4";
-    version = "0.0.4";
-    bin = false;
-    src = fetchgit {
-      url = "https://github.com/okTurtles/native-dns-packet.git";
-      rev = "8bf2714c318cfe7d31bca2006385882ccbf503e4";
-      sha256 = "2a5951696b4e514ab5dee36e4e5394781656a8e94c6aacba83b03f7e647f8df3";
-    };
-    deps = {
-      "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
-      "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."nconf"."0.7.1" =
-    self.by-version."nconf"."0.7.1";
-  by-version."nconf"."0.7.1" = self.buildNodePackage {
-    name = "nconf-0.7.1";
-    version = "0.7.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz";
-      name = "nconf-0.7.1.tgz";
-      sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b";
-    };
-    deps = {
-      "async-0.9.2" = self.by-version."async"."0.9.2";
-      "ini-1.3.4" = self.by-version."ini"."1.3.4";
-      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."negotiator"."0.5.3" =
-    self.by-version."negotiator"."0.5.3";
-  by-version."negotiator"."0.5.3" = self.buildNodePackage {
-    name = "negotiator-0.5.3";
-    version = "0.5.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
-      name = "negotiator-0.5.3.tgz";
-      sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."on-finished"."~2.2.0" =
-    self.by-version."on-finished"."2.2.1";
-  by-version."on-finished"."2.2.1" = self.buildNodePackage {
-    name = "on-finished-2.2.1";
-    version = "2.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
-      name = "on-finished-2.2.1.tgz";
-      sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
-    };
-    deps = {
-      "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."optimist"."~0.6.0" =
-    self.by-version."optimist"."0.6.1";
-  by-version."optimist"."0.6.1" = self.buildNodePackage {
-    name = "optimist-0.6.1";
-    version = "0.6.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
-      name = "optimist-0.6.1.tgz";
-      sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
-    };
-    deps = {
-      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."parseurl"."~1.3.0" =
-    self.by-version."parseurl"."1.3.1";
-  by-version."parseurl"."1.3.1" = self.buildNodePackage {
-    name = "parseurl-1.3.1";
-    version = "1.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz";
-      name = "parseurl-1.3.1.tgz";
-      sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."path-to-regexp"."0.1.3" =
-    self.by-version."path-to-regexp"."0.1.3";
-  by-version."path-to-regexp"."0.1.3" = self.buildNodePackage {
-    name = "path-to-regexp-0.1.3";
-    version = "0.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
-      name = "path-to-regexp-0.1.3.tgz";
-      sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."pause-stream"."0.0.11" =
-    self.by-version."pause-stream"."0.0.11";
-  by-version."pause-stream"."0.0.11" = self.buildNodePackage {
-    name = "pause-stream-0.0.11";
-    version = "0.0.11";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
-      name = "pause-stream-0.0.11.tgz";
-      sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
-    };
-    deps = {
-      "through-2.3.8" = self.by-version."through"."2.3.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."pkginfo"."0.3.x" =
-    self.by-version."pkginfo"."0.3.1";
-  by-version."pkginfo"."0.3.1" = self.buildNodePackage {
-    name = "pkginfo-0.3.1";
-    version = "0.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz";
-      name = "pkginfo-0.3.1.tgz";
-      sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."properties"."1.2.1" =
-    self.by-version."properties"."1.2.1";
-  by-version."properties"."1.2.1" = self.buildNodePackage {
-    name = "properties-1.2.1";
-    version = "1.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz";
-      name = "properties-1.2.1.tgz";
-      sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."proxy-addr"."~1.0.6" =
-    self.by-version."proxy-addr"."1.0.10";
-  by-version."proxy-addr"."1.0.10" = self.buildNodePackage {
-    name = "proxy-addr-1.0.10";
-    version = "1.0.10";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz";
-      name = "proxy-addr-1.0.10.tgz";
-      sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5";
-    };
-    deps = {
-      "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
-      "ipaddr.js-1.0.5" = self.by-version."ipaddr.js"."1.0.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."qs"."1.2.0" =
-    self.by-version."qs"."1.2.0";
-  by-version."qs"."1.2.0" = self.buildNodePackage {
-    name = "qs-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
-      name = "qs-1.2.0.tgz";
-      sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."qs"."2.3.3" =
-    self.by-version."qs"."2.3.3";
-  by-version."qs"."2.3.3" = self.buildNodePackage {
-    name = "qs-2.3.3";
-    version = "2.3.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
-      name = "qs-2.3.3.tgz";
-      sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."range-parser"."~1.0.2" =
-    self.by-version."range-parser"."1.0.3";
-  by-version."range-parser"."1.0.3" = self.buildNodePackage {
-    name = "range-parser-1.0.3";
-    version = "1.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz";
-      name = "range-parser-1.0.3.tgz";
-      sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."readable-stream"."1.0.27-1" =
-    self.by-version."readable-stream"."1.0.27-1";
-  by-version."readable-stream"."1.0.27-1" = self.buildNodePackage {
-    name = "readable-stream-1.0.27-1";
-    version = "1.0.27-1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
-      name = "readable-stream-1.0.27-1.tgz";
-      sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
-    };
-    deps = {
-      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
-      "inherits-2.0.3" = self.by-version."inherits"."2.0.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."redis"."0.12.x" =
-    self.by-version."redis"."0.12.1";
-  by-version."redis"."0.12.1" = self.buildNodePackage {
-    name = "redis-0.12.1";
-    version = "0.12.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
-      name = "redis-0.12.1.tgz";
-      sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."reduce-component"."1.0.1" =
-    self.by-version."reduce-component"."1.0.1";
-  by-version."reduce-component"."1.0.1" = self.buildNodePackage {
-    name = "reduce-component-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
-      name = "reduce-component-1.0.1.tgz";
-      sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."send"."0.11.1" =
-    self.by-version."send"."0.11.1";
-  by-version."send"."0.11.1" = self.buildNodePackage {
-    name = "send-0.11.1";
-    version = "0.11.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz";
-      name = "send-0.11.1.tgz";
-      sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5";
-    };
-    deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "ms-0.7.0" = self.by-version."ms"."0.7.0";
-      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
-      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."serve-static"."~1.8.1" =
-    self.by-version."serve-static"."1.8.1";
-  by-version."serve-static"."1.8.1" = self.buildNodePackage {
-    name = "serve-static-1.8.1";
-    version = "1.8.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz";
-      name = "serve-static-1.8.1.tgz";
-      sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c";
-    };
-    deps = {
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
-      "send-0.11.1" = self.by-version."send"."0.11.1";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."split"."0.3" =
-    self.by-version."split"."0.3.3";
-  by-version."split"."0.3.3" = self.buildNodePackage {
-    name = "split-0.3.3";
-    version = "0.3.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz";
-      name = "split-0.3.3.tgz";
-      sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f";
-    };
-    deps = {
-      "through-2.3.8" = self.by-version."through"."2.3.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."stack-trace"."0.0.x" =
-    self.by-version."stack-trace"."0.0.9";
-  by-version."stack-trace"."0.0.9" = self.buildNodePackage {
-    name = "stack-trace-0.0.9";
-    version = "0.0.9";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
-      name = "stack-trace-0.0.9.tgz";
-      sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."stream-combiner"."~0.0.4" =
-    self.by-version."stream-combiner"."0.0.4";
-  by-version."stream-combiner"."0.0.4" = self.buildNodePackage {
-    name = "stream-combiner-0.0.4";
-    version = "0.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
-      name = "stream-combiner-0.0.4.tgz";
-      sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
-    };
-    deps = {
-      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."string"."2.0.1" =
-    self.by-version."string"."2.0.1";
-  by-version."string"."2.0.1" = self.buildNodePackage {
-    name = "string-2.0.1";
-    version = "2.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/string/-/string-2.0.1.tgz";
-      name = "string-2.0.1.tgz";
-      sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."string_decoder"."~0.10.x" =
-    self.by-version."string_decoder"."0.10.31";
-  by-version."string_decoder"."0.10.31" = self.buildNodePackage {
-    name = "string_decoder-0.10.31";
-    version = "0.10.31";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
-      name = "string_decoder-0.10.31.tgz";
-      sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."superagent"."0.21.0" =
-    self.by-version."superagent"."0.21.0";
-  by-version."superagent"."0.21.0" = self.buildNodePackage {
-    name = "superagent-0.21.0";
-    version = "0.21.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
-      name = "superagent-0.21.0.tgz";
-      sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87";
-    };
-    deps = {
-      "qs-1.2.0" = self.by-version."qs"."1.2.0";
-      "formidable-1.0.14" = self.by-version."formidable"."1.0.14";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
-      "methods-1.0.1" = self.by-version."methods"."1.0.1";
-      "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1";
-      "debug-2.6.0" = self.by-version."debug"."2.6.0";
-      "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1";
-      "extend-1.2.1" = self.by-version."extend"."1.2.1";
-      "form-data-0.1.3" = self.by-version."form-data"."0.1.3";
-      "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."through"."2" =
-    self.by-version."through"."2.3.8";
-  by-version."through"."2.3.8" = self.buildNodePackage {
-    name = "through-2.3.8";
-    version = "2.3.8";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
-      name = "through-2.3.8.tgz";
-      sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."through"."~2.3" =
-    self.by-version."through"."2.3.8";
-  by-spec."through"."~2.3.1" =
-    self.by-version."through"."2.3.8";
-  by-spec."type-is"."~1.5.6" =
-    self.by-version."type-is"."1.5.7";
-  by-version."type-is"."1.5.7" = self.buildNodePackage {
-    name = "type-is-1.5.7";
-    version = "1.5.7";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz";
-      name = "type-is-1.5.7.tgz";
-      sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90";
-    };
-    deps = {
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."utils-merge"."1.0.0" =
-    self.by-version."utils-merge"."1.0.0";
-  by-version."utils-merge"."1.0.0" = self.buildNodePackage {
-    name = "utils-merge-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
-      name = "utils-merge-1.0.0.tgz";
-      sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."vary"."~1.0.0" =
-    self.by-version."vary"."1.0.1";
-  by-version."vary"."1.0.1" = self.buildNodePackage {
-    name = "vary-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz";
-      name = "vary-1.0.1.tgz";
-      sha1 = "99e4981566a286118dfb2b817357df7993376d10";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."verror"."^1.4.0" =
-    self.by-version."verror"."1.9.0";
-  by-version."verror"."1.9.0" = self.buildNodePackage {
-    name = "verror-1.9.0";
-    version = "1.9.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz";
-      name = "verror-1.9.0.tgz";
-      sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee";
-    };
-    deps = {
-      "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0";
-      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
-      "extsprintf-1.3.0" = self.by-version."extsprintf"."1.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."websocket-driver".">=0.5.1" =
-    self.by-version."websocket-driver"."0.6.5";
-  by-version."websocket-driver"."0.6.5" = self.buildNodePackage {
-    name = "websocket-driver-0.6.5";
-    version = "0.6.5";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz";
-      name = "websocket-driver-0.6.5.tgz";
-      sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36";
-    };
-    deps = {
-      "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."websocket-extensions".">=0.1.1" =
-    self.by-version."websocket-extensions"."0.1.1";
-  by-version."websocket-extensions"."0.1.1" = self.buildNodePackage {
-    name = "websocket-extensions-0.1.1";
-    version = "0.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz";
-      name = "websocket-extensions-0.1.1.tgz";
-      sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."winston"."0.8.0" =
-    self.by-version."winston"."0.8.0";
-  by-version."winston"."0.8.0" = self.buildNodePackage {
-    name = "winston-0.8.0";
-    version = "0.8.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
-      name = "winston-0.8.0.tgz";
-      sha1 = "61d0830fa699706212206b0a2b5ca69a93043668";
-    };
-    deps = {
-      "async-0.2.10" = self.by-version."async"."0.2.10";
-      "colors-0.6.2" = self.by-version."colors"."0.6.2";
-      "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
-      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
-      "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."wordwrap"."~0.0.2" =
-    self.by-version."wordwrap"."0.0.3";
-  by-version."wordwrap"."0.0.3" = self.buildNodePackage {
-    name = "wordwrap-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
-      name = "wordwrap-0.0.3.tgz";
-      sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b64dd498b6d..a6109c55b6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11473,8 +11473,6 @@ with pkgs;
     inherit (perlPackages) Error MailDKIM MIMEtools NetServer;
   };
 
-  dnschain = callPackage ../servers/dnschain { };
-
   dovecot = callPackage ../servers/mail/dovecot { };
   dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { };
   dovecot_antispam = callPackage ../servers/mail/dovecot/plugins/antispam { };
-- 
GitLab


From ea8714ecb16fc5e000c8e4638a937063c430780c Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 31 Oct 2017 22:03:38 +0100
Subject: [PATCH 363/877] nixos/dnschain: use nodePackages.dnschain

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

diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
index ab7bbb15ad4..ee1cd360003 100644
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -158,7 +158,7 @@ in
       serviceConfig = {
         User = "dnschain";
         Restart = "on-failure";
-        ExecStart = "${pkgs.dnschain}/bin/dnschain";
+        ExecStart = "${pkgs.nodePackages.dnschain}/bin/dnschain";
       };
 
       preStart = ''
-- 
GitLab


From fe83d911577dce6a3ed35a30332cb699dd9438d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 31 Oct 2017 19:39:07 +0100
Subject: [PATCH 364/877] rustc: disable a test failing on Hydra repeatedly

The problem doesn't happen for me locally, but on Hydra
we tend to experience more flakiness in networking tests.
---
 pkgs/development/compilers/rust/rustc.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 6eb160add26..a113f5db480 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -85,6 +85,9 @@ stdenv.mkDerivation {
     # https://reviews.llvm.org/rL281650
     rm -vr src/test/run-pass/issue-36474.rs || true
 
+    # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
+    sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
+
     # Disable some failing gdb tests. Try re-enabling these when gdb
     # is updated past version 7.12.
     rm src/test/debuginfo/basic-types-globals.rs
-- 
GitLab


From 252da8a66ebcd59baca63ea2b1886e3c47b0b44a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 31 Oct 2017 22:31:05 +0100
Subject: [PATCH 365/877] wlroots: init at 2017-10-31

In preparation for Sway 1.0 which will use wlroots instead of wlc.
---
 .../development/libraries/wlroots/default.nix | 35 +++++++++++++++++++
 .../libraries/wlroots/libdrm.patch            |  9 +++++
 .../libraries/wlroots/no-werror.patch         | 10 ++++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/libraries/wlroots/default.nix
 create mode 100644 pkgs/development/libraries/wlroots/libdrm.patch
 create mode 100644 pkgs/development/libraries/wlroots/no-werror.patch

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
new file mode 100644
index 00000000000..79bd8bb9665
--- /dev/null
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+, wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman
+, xcbutilwm, libX11, libcap
+}:
+
+let pname = "wlroots";
+    version = "unstable-2017-10-31";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "swaywm";
+    repo = "wlroots";
+    rev = "7200d643363e988edf6777c38e7f8fcd451a2c50";
+    sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac";
+  };
+
+  # TODO: Temporary workaround for compilation errors
+  patches = [ ./libdrm.patch ./no-werror.patch ];
+
+  nativeBuildInputs = [ meson ninja pkgconfig ];
+
+  buildInputs = [
+    wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman
+    xcbutilwm libX11 libcap
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A modular Wayland compositor library";
+    inherit (src.meta) homepage;
+    license     = licenses.mit;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/development/libraries/wlroots/libdrm.patch b/pkgs/development/libraries/wlroots/libdrm.patch
new file mode 100644
index 00000000000..2b9d8538276
--- /dev/null
+++ b/pkgs/development/libraries/wlroots/libdrm.patch
@@ -0,0 +1,9 @@
+--- a/backend/meson.build	2017-10-31 22:08:01.112927610 +0100
++++ b/backend/meson.build	2017-10-31 22:09:28.155264343 +0100
+@@ -43,5 +43,5 @@
+ 	'wlr_backend',
+ 	backend_files,
+ 	include_directories: wlr_inc,
+-	dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos],
++	dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos, drm],
+ )
diff --git a/pkgs/development/libraries/wlroots/no-werror.patch b/pkgs/development/libraries/wlroots/no-werror.patch
new file mode 100644
index 00000000000..78c374d9dbb
--- /dev/null
+++ b/pkgs/development/libraries/wlroots/no-werror.patch
@@ -0,0 +1,10 @@
+--- a/meson.build	2017-10-31 22:08:01.132927689 +0100
++++ b/meson.build	2017-10-31 22:20:58.215784350 +0100
+@@ -5,7 +5,6 @@
+ 	default_options: [
+ 		'c_std=c11',
+ 		'warning_level=2',
+-		'werror=true',
+ 	],
+ )
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a76c4eac651..16da59781e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15072,6 +15072,7 @@ with pkgs;
   spectrwm = callPackage ../applications/window-managers/spectrwm { };
 
   wlc = callPackage ../development/libraries/wlc { };
+  wlroots = callPackage ../development/libraries/wlroots { };
   orbment = callPackage ../applications/window-managers/orbment { };
   sway = callPackage ../applications/window-managers/sway { };
   swaylock = callPackage ../applications/window-managers/sway { };
-- 
GitLab


From b400e36548aab5a5adc1021f85cdde0054b06904 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 31 Oct 2017 21:23:58 +0000
Subject: [PATCH 366/877] pip-tools: update tests for 1.9.0 -> 1.10.1

---
 .../python-modules/pip-tools/default.nix           | 14 ++++++++++----
 pkgs/top-level/python-packages.nix                 |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 2c297d8d719..d916f9b95b1 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first
-, setuptools_scm, glibcLocales, mock }:
+, setuptools_scm, git, glibcLocales, mock }:
 
 buildPythonPackage rec {
   pname = "pip-tools";
@@ -12,12 +12,18 @@ buildPythonPackage rec {
   };
 
   LC_ALL = "en_US.UTF-8";
-  checkInputs = [ pytest glibcLocales mock ];
+  checkInputs = [ pytest git glibcLocales mock ];
   propagatedBuildInputs = [ pip click six first setuptools_scm ];
 
   checkPhase = ''
-    export HOME=$(mktemp -d)
-    py.test -k "not test_realistic_complex_sub_dependencies" # requires network
+    export HOME=$(mktemp -d) VIRTUAL_ENV=1
+    tests_without_network_access="
+      not test_realistic_complex_sub_dependencies \
+      and not test_editable_package_vcs \
+      and not test_generate_hashes_all_platforms \
+      and not test_generate_hashes_without_interfering_with_each_other \
+    "
+    py.test -k "$tests_without_network_access"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9c5fa93dfa..0be1ff17ee0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15114,6 +15114,7 @@ in {
   };
 
   pip-tools = callPackage ../development/python-modules/pip-tools {
+    git = pkgs.gitMinimal;
     glibcLocales = pkgs.glibcLocales;
   };
 
-- 
GitLab


From f90c468ea555c424c910681d471566925bd2c3b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 31 Oct 2017 23:03:34 +0100
Subject: [PATCH 367/877] nginxModules.moreheaders: fix source hash

An amended git tag, apparently.  There are only changes in documentation
and whitespace changes in code.  Sigh.  Uncovered by c3255fe8ec.
---
 pkgs/servers/http/nginx/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index f3222f2982b..9f0f5ac4bb9 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -35,7 +35,7 @@
       owner = "openresty";
       repo = "headers-more-nginx-module";
       rev = "v0.26";
-      sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn";
+      sha256 = "0zhr3ai4xf5yghxvlbrwv8n06fgx33f1n1d4a6gmsczdfjzf8g6g";
     };
   };
 
-- 
GitLab


From 947d48cdaf1dbe2440fba7396ce1007ec4226229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 31 Oct 2017 23:11:23 +0100
Subject: [PATCH 368/877] 9pfs: fix src download

Fortunately the hash is the same, so I don't really need to check
authenticity.  Uncovered by c3255fe8ec.
---
 pkgs/tools/filesystems/9pfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix
index c75cc45170a..5ad54adc08a 100644
--- a/pkgs/tools/filesystems/9pfs/default.nix
+++ b/pkgs/tools/filesystems/9pfs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "9pfs";
 
   src = fetchFromGitHub {
-    owner = "spewspew";
+    owner = "mischief";
     repo = "9pfs";
     rev = "7f4ca4cd750d650c1215b92ac3cc2a28041960e4";
     sha256 = "007s2idsn6bspmfxv1qabj39ggkgvn6gwdbhczwn04lb4c6gh3xc";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = https://github.com/spewspew/9pfs;
+    #homepage = https://github.com/spewspew/9pfs; # the account apparently doesn't exist
     description = "FUSE-based client of the 9P network filesystem protocol";
     maintainers = [ lib.maintainers.eelco ];
     platforms = lib.platforms.linux;
-- 
GitLab


From 39e958b61e7fa04ad9ee74d62fb909b612ef3a1e Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 20 Oct 2017 05:24:19 +0200
Subject: [PATCH 369/877] lxqt-panel: fix patch hash

... and switch to fetchpatch to avoid GitHub hash changes.
---
 pkgs/desktops/lxqt/core/lxqt-panel/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
index d2faf9c0eee..8dbe8990937 100644
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv, fetchFromGitHub, fetchurl, standardPatch,
+  stdenv, fetchFromGitHub, fetchpatch, standardPatch,
   cmake, pkgconfig, lxqt-build-tools,
   qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
   kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat,
@@ -50,9 +50,10 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    (fetchurl {
+    (fetchpatch {
        url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch;
-       sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr";
+       name = "fix-compile-explicit-keyword.patch";
+       sha256 = "1grda0dw175kbsfq90lr5qaf79akwikzxw85jhd5f339nnramp81";
     })
   ];
 
-- 
GitLab


From a1923194f37e0a2d16a7e3e64c7052bc07998b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 31 Oct 2017 23:16:47 +0100
Subject: [PATCH 370/877] altcoins.bitcoin-unlimited: fix source hash

An amended git tag, apparently.  Only lengthened GIT_COMMIT_ID.  Sigh.
Uncovered by c3255fe8ec.
---
 pkgs/applications/altcoins/bitcoin-unlimited.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
index 2ad8e3fb350..9eb1e54b909 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "bitcoinunlimited";
     repo = "bitcoinunlimited";
     rev = "v${version}";
-    sha256 = "0rhk6xvzvzyfppg0pgq72nqgm2rmkiw0nhg3rwnzcvvj90nrz3da";
+    sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-- 
GitLab


From ff437fca45584b86d850c35de67333f908c0b5ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 31 Oct 2017 23:37:45 +0100
Subject: [PATCH 371/877] scrot: 0.8-17 -> 0.8-18

The old patch-set isn't available on Debian anymore.
Uncovered by c3255fe8ec.
---
 pkgs/tools/graphics/scrot/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix
index 5e4fd3ff062..49bd74ea412 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -2,23 +2,21 @@
 
 let
   debPatch = fetchzip {
-    url = mirror://debian/pool/main/s/scrot/scrot_0.8-17.debian.tar.xz;
-    sha256 = "0ydsr3vah5wkcbnp91knkdbil4hx0cn0iy57frl03azqzc29bkw5";
+    url = mirror://debian/pool/main/s/scrot/scrot_0.8-18.debian.tar.xz;
+    sha256 = "1m8m8ad0idf3nzw0k57f6rfbw8n7dza69a7iikriqgbrpyvxqybx";
   };
 in
 stdenv.mkDerivation rec {
-  name = "scrot-0.8-17";
+  name = "scrot-0.8-18";
 
   src = fetchurl {
     url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz";
     sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1";
   };
 
-  inherit debPatch;
-
   postPatch = ''
-    for patch in $(cat $debPatch/patches/series); do
-      patch -p1 < "$debPatch/patches/$patch"
+    for patch in $(cat ${debPatch}/patches/series); do
+      patch -p1 < "${debPatch}/patches/$patch"
     done
   '';
 
-- 
GitLab


From 681c6f99a85bc1fc9cc5ecd4c7cfa361ef75e8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 31 Oct 2017 23:46:32 +0100
Subject: [PATCH 372/877] luaPackages.mpack: fix sourceRoot

Uncovered by c3255fe8ec.
---
 pkgs/top-level/lua-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 7a0b0a56c9b..f233ae43ad1 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -619,7 +619,7 @@ let
     # NOTE: For updating, new Lua mpack bindings live at:
     # https://github.com/libmpack/libmpack-lua.
     src = libmpack.src;
-    sourceRoot = "libmpack-${libmpack.rev}-src/binding/lua";
+    sourceRoot = "${src.name}/binding/lua";
 
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libmpack ]; # ++ [ libtool lua ];
-- 
GitLab


From ebc8ffb010eeaf1a418853b9f0c66cd1cef41c66 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 31 Oct 2017 23:49:26 +0100
Subject: [PATCH 373/877] groovebasin: remove

---
 .../audio/groovebasin/default.nix             |   69 -
 .../audio/groovebasin/package.nix             | 4396 -----------------
 pkgs/top-level/all-packages.nix               |    2 -
 3 files changed, 4467 deletions(-)
 delete mode 100644 pkgs/applications/audio/groovebasin/default.nix
 delete mode 100644 pkgs/applications/audio/groovebasin/package.nix

diff --git a/pkgs/applications/audio/groovebasin/default.nix b/pkgs/applications/audio/groovebasin/default.nix
deleted file mode 100644
index 7eb2e85f7be..00000000000
--- a/pkgs/applications/audio/groovebasin/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchFromGitHub, makeWrapper, callPackage, libgroove, python, utillinux, nodejs }:
-
-with stdenv.lib;
-
-let
-  nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
-    inherit nodejs;
-    neededNatives = [ libgroove python utillinux ];
-    self = nodePackages;
-    generated = ./package.nix;
-  };
-
-in nodePackages.buildNodePackage rec {
-  version = "1.5.1";
-  name = "groovebasin-${version}";
-
-  src = fetchFromGitHub {
-    owner = "andrewrk";
-    repo = "groovebasin";
-    rev = "${version}";
-    sha256 = "1g7v0qhvgzpb050hf45pibp68qd67hnnry5npw58f4dvaxdd8yhd";
-  };
-
-  deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
-
-  buildInputs = [ makeWrapper ];
-
-  postInstall = ''
-    mkdir -p "$out/lib/node_modules/groovebasin/public"
-    stylus -o "$out/lib/node_modules/groovebasin/public/" -c --include-css "$out/lib/node_modules/groovebasin/src/client/styles"
-    browserify-lite "$out/lib/node_modules/groovebasin/src/client/app.js" --outfile "$out/lib/node_modules/groovebasin/public/app.js"
-    wrapProgram "$out/bin/groovebasin" --set NODE_PATH "$out/lib/node_modules/groovebasin/node_modules/"
-  '';
-
-  passthru.names = ["groovebasin"];
-
-  meta = {
-    description = "Music player server with a web-based user interface";
-    homepage = http://groovebasin.com/;
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.andrewrk ];
-    longDescription = ''
-      Groove Basin runs on a server optionally connected to speakers. Guests can
-      control the music player by connecting with a laptop, tablet, or smart phone.
-      Further, users can stream their music libraries remotely.
-
-      Groove Basin comes with a fast, responsive web interface that supports keyboard
-      shortcuts and drag drop. It also provides the ability to upload songs,
-      download songs, and import songs by URL, including YouTube URLs.
-
-      Groove Basin supports Dynamic Mode which automatically queues random songs,
-      favoring songs that have not been queued recently.
-
-      Groove Basin automatically performs ReplayGain scanning on every song using
-      the EBU R128 loudness standard, and automatically switches between track
-      and album mode.
-
-      Groove Basin supports the MPD protocol, which means it is compatible with MPD
-      clients. There is also a more powerful Groove Basin protocol which you can
-      use if the MPD protocol does not meet your needs.
-
-      Groove Basin supports Last.fm scrobbling.
-    '';
-    # groovebasin was built with nodejs 0.10 which reached end of LTS
-    # in October 216, it doesn't built with nodejs 4.x
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/audio/groovebasin/package.nix b/pkgs/applications/audio/groovebasin/package.nix
deleted file mode 100644
index 3f307cd32f0..00000000000
--- a/pkgs/applications/audio/groovebasin/package.nix
+++ /dev/null
@@ -1,4396 +0,0 @@
-{ self, fetchurl, fetchgit ? null, lib }:
-
-{
-  by-spec."CSSselect"."~0.4.0" =
-    self.by-version."CSSselect"."0.4.1";
-  by-version."CSSselect"."0.4.1" = self.buildNodePackage {
-    name = "CSSselect-0.4.1";
-    version = "0.4.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
-      name = "CSSselect-0.4.1.tgz";
-      sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2";
-    };
-    deps = {
-      "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7";
-      "domutils-1.4.3" = self.by-version."domutils"."1.4.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."CSSwhat"."0.4" =
-    self.by-version."CSSwhat"."0.4.7";
-  by-version."CSSwhat"."0.4.7" = self.buildNodePackage {
-    name = "CSSwhat-0.4.7";
-    version = "0.4.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
-      name = "CSSwhat-0.4.7.tgz";
-      sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."abbrev"."1" =
-    self.by-version."abbrev"."1.0.7";
-  by-version."abbrev"."1.0.7" = self.buildNodePackage {
-    name = "abbrev-1.0.7";
-    version = "1.0.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz";
-      name = "abbrev-1.0.7.tgz";
-      sha1 = "5b6035b2ee9d4fb5cf859f08a9be81b208491843";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."abstract-leveldown"."~2.2.1" =
-    self.by-version."abstract-leveldown"."2.2.2";
-  by-version."abstract-leveldown"."2.2.2" = self.buildNodePackage {
-    name = "abstract-leveldown-2.2.2";
-    version = "2.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.2.2.tgz";
-      name = "abstract-leveldown-2.2.2.tgz";
-      sha1 = "ecaff98c20641422710ab04b01e8f04d6b64fe77";
-    };
-    deps = {
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."accepts"."~1.2.7" =
-    self.by-version."accepts"."1.2.9";
-  by-version."accepts"."1.2.9" = self.buildNodePackage {
-    name = "accepts-1.2.9";
-    version = "1.2.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/accepts/-/accepts-1.2.9.tgz";
-      name = "accepts-1.2.9.tgz";
-      sha1 = "76e9631d05e3ff192a34afb9389f7b3953ded001";
-    };
-    deps = {
-      "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1";
-      "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."amdefine".">=0.0.4" =
-    self.by-version."amdefine"."0.1.1";
-  by-version."amdefine"."0.1.1" = self.buildNodePackage {
-    name = "amdefine-0.1.1";
-    version = "0.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz";
-      name = "amdefine-0.1.1.tgz";
-      sha1 = "b5c75c532052dccd6a39c0064c772c8d57a06cd2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ansi-regex"."^1.0.0" =
-    self.by-version."ansi-regex"."1.1.1";
-  by-version."ansi-regex"."1.1.1" = self.buildNodePackage {
-    name = "ansi-regex-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
-      name = "ansi-regex-1.1.1.tgz";
-      sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ansi-regex"."^1.1.0" =
-    self.by-version."ansi-regex"."1.1.1";
-  by-spec."ansi-styles"."^2.0.1" =
-    self.by-version."ansi-styles"."2.0.1";
-  by-version."ansi-styles"."2.0.1" = self.buildNodePackage {
-    name = "ansi-styles-2.0.1";
-    version = "2.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz";
-      name = "ansi-styles-2.0.1.tgz";
-      sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."asn1"."0.1.11" =
-    self.by-version."asn1"."0.1.11";
-  by-version."asn1"."0.1.11" = self.buildNodePackage {
-    name = "asn1-0.1.11";
-    version = "0.1.11";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
-      name = "asn1-0.1.11.tgz";
-      sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."assert-plus"."^0.1.5" =
-    self.by-version."assert-plus"."0.1.5";
-  by-version."assert-plus"."0.1.5" = self.buildNodePackage {
-    name = "assert-plus-0.1.5";
-    version = "0.1.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
-      name = "assert-plus-0.1.5.tgz";
-      sha1 = "ee74009413002d84cec7219c6ac811812e723160";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."async"."~0.9.0" =
-    self.by-version."async"."0.9.2";
-  by-version."async"."0.9.2" = self.buildNodePackage {
-    name = "async-0.9.2";
-    version = "0.9.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
-      name = "async-0.9.2.tgz";
-      sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."aws-sign2"."~0.5.0" =
-    self.by-version."aws-sign2"."0.5.0";
-  by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
-    name = "aws-sign2-0.5.0";
-    version = "0.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
-      name = "aws-sign2-0.5.0.tgz";
-      sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."base64url"."0.0.3" =
-    self.by-version."base64url"."0.0.3";
-  by-version."base64url"."0.0.3" = self.buildNodePackage {
-    name = "base64url-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/base64url/-/base64url-0.0.3.tgz";
-      name = "base64url-0.0.3.tgz";
-      sha1 = "50c20edac277dde1a0b15059954ced7a2d102d57";
-    };
-    deps = {
-      "tap-0.3.3" = self.by-version."tap"."0.3.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."base64url"."~0.0.4" =
-    self.by-version."base64url"."0.0.6";
-  by-version."base64url"."0.0.6" = self.buildNodePackage {
-    name = "base64url-0.0.6";
-    version = "0.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz";
-      name = "base64url-0.0.6.tgz";
-      sha1 = "9597b36b330db1c42477322ea87ea8027499b82b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."base64url"."~1.0.4" =
-    self.by-version."base64url"."1.0.4";
-  by-version."base64url"."1.0.4" = self.buildNodePackage {
-    name = "base64url-1.0.4";
-    version = "1.0.4";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/base64url/-/base64url-1.0.4.tgz";
-      name = "base64url-1.0.4.tgz";
-      sha1 = "29a2a7ade9791fbb25f312ab35a2fd3126ceac0e";
-    };
-    deps = {
-      "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
-      "meow-2.0.0" = self.by-version."meow"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bindings"."~1.2.1" =
-    self.by-version."bindings"."1.2.1";
-  by-version."bindings"."1.2.1" = self.buildNodePackage {
-    name = "bindings-1.2.1";
-    version = "1.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
-      name = "bindings-1.2.1.tgz";
-      sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bl"."~0.9.0" =
-    self.by-version."bl"."0.9.4";
-  by-version."bl"."0.9.4" = self.buildNodePackage {
-    name = "bl-0.9.4";
-    version = "0.9.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
-      name = "bl-0.9.4.tgz";
-      sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
-    };
-    deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bl"."~0.9.4" =
-    self.by-version."bl"."0.9.4";
-  by-spec."bluebird"."^2.9.26" =
-    self.by-version."bluebird"."2.9.30";
-  by-version."bluebird"."2.9.30" = self.buildNodePackage {
-    name = "bluebird-2.9.30";
-    version = "2.9.30";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz";
-      name = "bluebird-2.9.30.tgz";
-      sha1 = "edda875ec9aad1f29cf1f56d6e82fbab2b0df556";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."boom"."0.4.x" =
-    self.by-version."boom"."0.4.2";
-  by-version."boom"."0.4.2" = self.buildNodePackage {
-    name = "boom-0.4.2";
-    version = "0.4.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
-      name = "boom-0.4.2.tgz";
-      sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
-    };
-    deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."boom"."2.x.x" =
-    self.by-version."boom"."2.8.0";
-  by-version."boom"."2.8.0" = self.buildNodePackage {
-    name = "boom-2.8.0";
-    version = "2.8.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-2.8.0.tgz";
-      name = "boom-2.8.0.tgz";
-      sha1 = "317bdfd47018fe7dd79b0e9da73efe244119fdf1";
-    };
-    deps = {
-      "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."browserify-lite"."~0.2.4" =
-    self.by-version."browserify-lite"."0.2.4";
-  by-version."browserify-lite"."0.2.4" = self.buildNodePackage {
-    name = "browserify-lite-0.2.4";
-    version = "0.2.4";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/browserify-lite/-/browserify-lite-0.2.4.tgz";
-      name = "browserify-lite-0.2.4.tgz";
-      sha1 = "00a32f466c8f3dbbd1074250fd0aa775716ab140";
-    };
-    deps = {
-      "pend-1.2.0" = self.by-version."pend"."1.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "browserify-lite" = self.by-version."browserify-lite"."0.2.4";
-  by-spec."buffer-crc32"."~0.2.3" =
-    self.by-version."buffer-crc32"."0.2.5";
-  by-version."buffer-crc32"."0.2.5" = self.buildNodePackage {
-    name = "buffer-crc32-0.2.5";
-    version = "0.2.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
-      name = "buffer-crc32-0.2.5.tgz";
-      sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."buffer-equal"."~0.0.0" =
-    self.by-version."buffer-equal"."0.0.1";
-  by-version."buffer-equal"."0.0.1" = self.buildNodePackage {
-    name = "buffer-equal-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz";
-      name = "buffer-equal-0.0.1.tgz";
-      sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."buffer-equal-constant-time"."^1.0.1" =
-    self.by-version."buffer-equal-constant-time"."1.0.1";
-  by-version."buffer-equal-constant-time"."1.0.1" = self.buildNodePackage {
-    name = "buffer-equal-constant-time-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
-      name = "buffer-equal-constant-time-1.0.1.tgz";
-      sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bunker"."0.1.X" =
-    self.by-version."bunker"."0.1.2";
-  by-version."bunker"."0.1.2" = self.buildNodePackage {
-    name = "bunker-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
-      name = "bunker-0.1.2.tgz";
-      sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c";
-    };
-    deps = {
-      "burrito-0.2.12" = self.by-version."burrito"."0.2.12";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."burrito".">=0.2.5 <0.3" =
-    self.by-version."burrito"."0.2.12";
-  by-version."burrito"."0.2.12" = self.buildNodePackage {
-    name = "burrito-0.2.12";
-    version = "0.2.12";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
-      name = "burrito-0.2.12.tgz";
-      sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b";
-    };
-    deps = {
-      "traverse-0.5.2" = self.by-version."traverse"."0.5.2";
-      "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."camelcase"."^1.0.1" =
-    self.by-version."camelcase"."1.1.0";
-  by-version."camelcase"."1.1.0" = self.buildNodePackage {
-    name = "camelcase-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz";
-      name = "camelcase-1.1.0.tgz";
-      sha1 = "953b25c3bc98671ee59a44cb9d542672da7331b9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."camelcase-keys"."^1.0.0" =
-    self.by-version."camelcase-keys"."1.0.0";
-  by-version."camelcase-keys"."1.0.0" = self.buildNodePackage {
-    name = "camelcase-keys-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
-      name = "camelcase-keys-1.0.0.tgz";
-      sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
-    };
-    deps = {
-      "camelcase-1.1.0" = self.by-version."camelcase"."1.1.0";
-      "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."caseless"."~0.10.0" =
-    self.by-version."caseless"."0.10.0";
-  by-version."caseless"."0.10.0" = self.buildNodePackage {
-    name = "caseless-0.10.0";
-    version = "0.10.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz";
-      name = "caseless-0.10.0.tgz";
-      sha1 = "ed6b2719adcd1fd18f58dc081c0f1a5b43963909";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."caseless"."~0.8.0" =
-    self.by-version."caseless"."0.8.0";
-  by-version."caseless"."0.8.0" = self.buildNodePackage {
-    name = "caseless-0.8.0";
-    version = "0.8.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz";
-      name = "caseless-0.8.0.tgz";
-      sha1 = "5bca2881d41437f54b2407ebe34888c7b9ad4f7d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."caseless"."~0.9.0" =
-    self.by-version."caseless"."0.9.0";
-  by-version."caseless"."0.9.0" = self.buildNodePackage {
-    name = "caseless-0.9.0";
-    version = "0.9.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz";
-      name = "caseless-0.9.0.tgz";
-      sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."chalk"."^1.0.0" =
-    self.by-version."chalk"."1.0.0";
-  by-version."chalk"."1.0.0" = self.buildNodePackage {
-    name = "chalk-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
-      name = "chalk-1.0.0.tgz";
-      sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
-    };
-    deps = {
-      "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1";
-      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
-      "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3";
-      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
-      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."charm"."0.1.x" =
-    self.by-version."charm"."0.1.2";
-  by-version."charm"."0.1.2" = self.buildNodePackage {
-    name = "charm-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
-      name = "charm-0.1.2.tgz";
-      sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cheerio"."^0.18.0" =
-    self.by-version."cheerio"."0.18.0";
-  by-version."cheerio"."0.18.0" = self.buildNodePackage {
-    name = "cheerio-0.18.0";
-    version = "0.18.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cheerio/-/cheerio-0.18.0.tgz";
-      name = "cheerio-0.18.0.tgz";
-      sha1 = "4e1c06377e725b740e996e0dfec353863de677fa";
-    };
-    deps = {
-      "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1";
-      "entities-1.1.1" = self.by-version."entities"."1.1.1";
-      "htmlparser2-3.8.3" = self.by-version."htmlparser2"."3.8.3";
-      "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1";
-      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."clarinet"."~0.8.1" =
-    self.by-version."clarinet"."0.8.1";
-  by-version."clarinet"."0.8.1" = self.buildNodePackage {
-    name = "clarinet-0.8.1";
-    version = "0.8.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/clarinet/-/clarinet-0.8.1.tgz";
-      name = "clarinet-0.8.1.tgz";
-      sha1 = "ddfd10cd292abf5cab239140774e394bfd1ee7a6";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."combined-stream"."~0.0.4" =
-    self.by-version."combined-stream"."0.0.7";
-  by-version."combined-stream"."0.0.7" = self.buildNodePackage {
-    name = "combined-stream-0.0.7";
-    version = "0.0.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
-      name = "combined-stream-0.0.7.tgz";
-      sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
-    };
-    deps = {
-      "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."combined-stream"."~0.0.5" =
-    self.by-version."combined-stream"."0.0.7";
-  by-spec."combined-stream"."~1.0.1" =
-    self.by-version."combined-stream"."1.0.5";
-  by-version."combined-stream"."1.0.5" = self.buildNodePackage {
-    name = "combined-stream-1.0.5";
-    version = "1.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
-      name = "combined-stream-1.0.5.tgz";
-      sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
-    };
-    deps = {
-      "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."commander"."^2.8.1" =
-    self.by-version."commander"."2.8.1";
-  by-version."commander"."2.8.1" = self.buildNodePackage {
-    name = "commander-2.8.1";
-    version = "2.8.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
-      name = "commander-2.8.1.tgz";
-      sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
-    };
-    deps = {
-      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."concat-stream"."~1.4.7" =
-    self.by-version."concat-stream"."1.4.10";
-  by-version."concat-stream"."1.4.10" = self.buildNodePackage {
-    name = "concat-stream-1.4.10";
-    version = "1.4.10";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz";
-      name = "concat-stream-1.4.10.tgz";
-      sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."connect-static"."~1.5.0" =
-    self.by-version."connect-static"."1.5.0";
-  by-version."connect-static"."1.5.0" = self.buildNodePackage {
-    name = "connect-static-1.5.0";
-    version = "1.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/connect-static/-/connect-static-1.5.0.tgz";
-      name = "connect-static-1.5.0.tgz";
-      sha1 = "f8b455532e04de7c3dc7c1e062207f0b7a626ec7";
-    };
-    deps = {
-      "findit2-2.2.3" = self.by-version."findit2"."2.2.3";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "pend-1.2.0" = self.by-version."pend"."1.2.0";
-      "streamsink-1.2.0" = self.by-version."streamsink"."1.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "connect-static" = self.by-version."connect-static"."1.5.0";
-  by-spec."content-disposition"."0.5.0" =
-    self.by-version."content-disposition"."0.5.0";
-  by-version."content-disposition"."0.5.0" = self.buildNodePackage {
-    name = "content-disposition-0.5.0";
-    version = "0.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
-      name = "content-disposition-0.5.0.tgz";
-      sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."content-disposition"."~0.5.0" =
-    self.by-version."content-disposition"."0.5.0";
-  "content-disposition" = self.by-version."content-disposition"."0.5.0";
-  by-spec."content-type"."~1.0.1" =
-    self.by-version."content-type"."1.0.1";
-  by-version."content-type"."1.0.1" = self.buildNodePackage {
-    name = "content-type-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz";
-      name = "content-type-1.0.1.tgz";
-      sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cookie"."0.1.2" =
-    self.by-version."cookie"."0.1.2";
-  by-version."cookie"."0.1.2" = self.buildNodePackage {
-    name = "cookie-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
-      name = "cookie-0.1.2.tgz";
-      sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cookie-signature"."1.0.6" =
-    self.by-version."cookie-signature"."1.0.6";
-  by-version."cookie-signature"."1.0.6" = self.buildNodePackage {
-    name = "cookie-signature-1.0.6";
-    version = "1.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
-      name = "cookie-signature-1.0.6.tgz";
-      sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cookies"."~0.5.0" =
-    self.by-version."cookies"."0.5.0";
-  by-version."cookies"."0.5.0" = self.buildNodePackage {
-    name = "cookies-0.5.0";
-    version = "0.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz";
-      name = "cookies-0.5.0.tgz";
-      sha1 = "164cac46a1d3ca3b3b87427414c24931d8381025";
-    };
-    deps = {
-      "keygrip-1.0.1" = self.by-version."keygrip"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "cookies" = self.by-version."cookies"."0.5.0";
-  by-spec."core-util-is"."~1.0.0" =
-    self.by-version."core-util-is"."1.0.1";
-  by-version."core-util-is"."1.0.1" = self.buildNodePackage {
-    name = "core-util-is-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
-      name = "core-util-is-1.0.1.tgz";
-      sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."crc"."3.2.1" =
-    self.by-version."crc"."3.2.1";
-  by-version."crc"."3.2.1" = self.buildNodePackage {
-    name = "crc-3.2.1";
-    version = "3.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
-      name = "crc-3.2.1.tgz";
-      sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cryptiles"."0.2.x" =
-    self.by-version."cryptiles"."0.2.2";
-  by-version."cryptiles"."0.2.2" = self.buildNodePackage {
-    name = "cryptiles-0.2.2";
-    version = "0.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
-      name = "cryptiles-0.2.2.tgz";
-      sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
-    };
-    deps = {
-      "boom-0.4.2" = self.by-version."boom"."0.4.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cryptiles"."2.x.x" =
-    self.by-version."cryptiles"."2.0.4";
-  by-version."cryptiles"."2.0.4" = self.buildNodePackage {
-    name = "cryptiles-2.0.4";
-    version = "2.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz";
-      name = "cryptiles-2.0.4.tgz";
-      sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
-    };
-    deps = {
-      "boom-2.8.0" = self.by-version."boom"."2.8.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."css-parse"."1.7.x" =
-    self.by-version."css-parse"."1.7.0";
-  by-version."css-parse"."1.7.0" = self.buildNodePackage {
-    name = "css-parse-1.7.0";
-    version = "1.7.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
-      name = "css-parse-1.7.0.tgz";
-      sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ctype"."0.5.3" =
-    self.by-version."ctype"."0.5.3";
-  by-version."ctype"."0.5.3" = self.buildNodePackage {
-    name = "ctype-0.5.3";
-    version = "0.5.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
-      name = "ctype-0.5.3.tgz";
-      sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."curlydiff"."~2.0.1" =
-    self.by-version."curlydiff"."2.0.1";
-  by-version."curlydiff"."2.0.1" = self.buildNodePackage {
-    name = "curlydiff-2.0.1";
-    version = "2.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/curlydiff/-/curlydiff-2.0.1.tgz";
-      name = "curlydiff-2.0.1.tgz";
-      sha1 = "6ac4b754ea5b63af2632022d03a152306f7eac0b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "curlydiff" = self.by-version."curlydiff"."2.0.1";
-  by-spec."debug"."*" =
-    self.by-version."debug"."2.2.0";
-  by-version."debug"."2.2.0" = self.buildNodePackage {
-    name = "debug-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
-      name = "debug-2.2.0.tgz";
-      sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
-    };
-    deps = {
-      "ms-0.7.1" = self.by-version."ms"."0.7.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."debug"."~2.2.0" =
-    self.by-version."debug"."2.2.0";
-  by-spec."deep-equal"."~0.0.0" =
-    self.by-version."deep-equal"."0.0.0";
-  by-version."deep-equal"."0.0.0" = self.buildNodePackage {
-    name = "deep-equal-0.0.0";
-    version = "0.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
-      name = "deep-equal-0.0.0.tgz";
-      sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."deep-is"."0.1.x" =
-    self.by-version."deep-is"."0.1.3";
-  by-version."deep-is"."0.1.3" = self.buildNodePackage {
-    name = "deep-is-0.1.3";
-    version = "0.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
-      name = "deep-is-0.1.3.tgz";
-      sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."delayed-stream"."0.0.5" =
-    self.by-version."delayed-stream"."0.0.5";
-  by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
-    name = "delayed-stream-0.0.5";
-    version = "0.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
-      name = "delayed-stream-0.0.5.tgz";
-      sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."delayed-stream"."~1.0.0" =
-    self.by-version."delayed-stream"."1.0.0";
-  by-version."delayed-stream"."1.0.0" = self.buildNodePackage {
-    name = "delayed-stream-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
-      name = "delayed-stream-1.0.0.tgz";
-      sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."depd"."~1.0.1" =
-    self.by-version."depd"."1.0.1";
-  by-version."depd"."1.0.1" = self.buildNodePackage {
-    name = "depd-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
-      name = "depd-1.0.1.tgz";
-      sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."destroy"."1.0.3" =
-    self.by-version."destroy"."1.0.3";
-  by-version."destroy"."1.0.3" = self.buildNodePackage {
-    name = "destroy-1.0.3";
-    version = "1.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
-      name = "destroy-1.0.3.tgz";
-      sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."diacritics"."~1.2.1" =
-    self.by-version."diacritics"."1.2.1";
-  by-version."diacritics"."1.2.1" = self.buildNodePackage {
-    name = "diacritics-1.2.1";
-    version = "1.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/diacritics/-/diacritics-1.2.1.tgz";
-      name = "diacritics-1.2.1.tgz";
-      sha1 = "e4d323a7c564197f7af514c5964bd45d0eb8cf77";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."difflet"."~0.2.0" =
-    self.by-version."difflet"."0.2.6";
-  by-version."difflet"."0.2.6" = self.buildNodePackage {
-    name = "difflet-0.2.6";
-    version = "0.2.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
-      name = "difflet-0.2.6.tgz";
-      sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa";
-    };
-    deps = {
-      "traverse-0.6.6" = self.by-version."traverse"."0.6.6";
-      "charm-0.1.2" = self.by-version."charm"."0.1.2";
-      "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."dom-serializer"."0" =
-    self.by-version."dom-serializer"."0.1.0";
-  by-version."dom-serializer"."0.1.0" = self.buildNodePackage {
-    name = "dom-serializer-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
-      name = "dom-serializer-0.1.0.tgz";
-      sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
-    };
-    deps = {
-      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
-      "entities-1.1.1" = self.by-version."entities"."1.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."dom-serializer"."~0.0.0" =
-    self.by-version."dom-serializer"."0.0.1";
-  by-version."dom-serializer"."0.0.1" = self.buildNodePackage {
-    name = "dom-serializer-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz";
-      name = "dom-serializer-0.0.1.tgz";
-      sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf";
-    };
-    deps = {
-      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
-      "entities-1.1.1" = self.by-version."entities"."1.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."domelementtype"."1" =
-    self.by-version."domelementtype"."1.3.0";
-  by-version."domelementtype"."1.3.0" = self.buildNodePackage {
-    name = "domelementtype-1.3.0";
-    version = "1.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
-      name = "domelementtype-1.3.0.tgz";
-      sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."domelementtype"."~1.1.1" =
-    self.by-version."domelementtype"."1.1.3";
-  by-version."domelementtype"."1.1.3" = self.buildNodePackage {
-    name = "domelementtype-1.1.3";
-    version = "1.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
-      name = "domelementtype-1.1.3.tgz";
-      sha1 = "bd28773e2642881aec51544924299c5cd822185b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."domhandler"."2.3" =
-    self.by-version."domhandler"."2.3.0";
-  by-version."domhandler"."2.3.0" = self.buildNodePackage {
-    name = "domhandler-2.3.0";
-    version = "2.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
-      name = "domhandler-2.3.0.tgz";
-      sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
-    };
-    deps = {
-      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."domutils"."1.4" =
-    self.by-version."domutils"."1.4.3";
-  by-version."domutils"."1.4.3" = self.buildNodePackage {
-    name = "domutils-1.4.3";
-    version = "1.4.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
-      name = "domutils-1.4.3.tgz";
-      sha1 = "0865513796c6b306031850e175516baf80b72a6f";
-    };
-    deps = {
-      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."domutils"."1.5" =
-    self.by-version."domutils"."1.5.1";
-  by-version."domutils"."1.5.1" = self.buildNodePackage {
-    name = "domutils-1.5.1";
-    version = "1.5.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
-      name = "domutils-1.5.1.tgz";
-      sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
-    };
-    deps = {
-      "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0";
-      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ee-first"."1.1.0" =
-    self.by-version."ee-first"."1.1.0";
-  by-version."ee-first"."1.1.0" = self.buildNodePackage {
-    name = "ee-first-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
-      name = "ee-first-1.1.0.tgz";
-      sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."entities"."1.0" =
-    self.by-version."entities"."1.0.0";
-  by-version."entities"."1.0.0" = self.buildNodePackage {
-    name = "entities-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
-      name = "entities-1.0.0.tgz";
-      sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."entities"."~1.1.1" =
-    self.by-version."entities"."1.1.1";
-  by-version."entities"."1.1.1" = self.buildNodePackage {
-    name = "entities-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
-      name = "entities-1.1.1.tgz";
-      sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."escape-html"."1.0.1" =
-    self.by-version."escape-html"."1.0.1";
-  by-version."escape-html"."1.0.1" = self.buildNodePackage {
-    name = "escape-html-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
-      name = "escape-html-1.0.1.tgz";
-      sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."escape-string-regexp"."^1.0.2" =
-    self.by-version."escape-string-regexp"."1.0.3";
-  by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage {
-    name = "escape-string-regexp-1.0.3";
-    version = "1.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
-      name = "escape-string-regexp-1.0.3.tgz";
-      sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."etag"."~1.6.0" =
-    self.by-version."etag"."1.6.0";
-  by-version."etag"."1.6.0" = self.buildNodePackage {
-    name = "etag-1.6.0";
-    version = "1.6.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/etag/-/etag-1.6.0.tgz";
-      name = "etag-1.6.0.tgz";
-      sha1 = "8bcb2c6af1254c481dfc8b997c906ef4e442c207";
-    };
-    deps = {
-      "crc-3.2.1" = self.by-version."crc"."3.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."express"."~4.12.3" =
-    self.by-version."express"."4.12.4";
-  by-version."express"."4.12.4" = self.buildNodePackage {
-    name = "express-4.12.4";
-    version = "4.12.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-4.12.4.tgz";
-      name = "express-4.12.4.tgz";
-      sha1 = "8fec2510255bc6b2e58107c48239c0fa307c1aa2";
-    };
-    deps = {
-      "accepts-1.2.9" = self.by-version."accepts"."1.2.9";
-      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.6.0" = self.by-version."etag"."1.6.0";
-      "finalhandler-0.3.6" = self.by-version."finalhandler"."0.3.6";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
-      "methods-1.1.1" = self.by-version."methods"."1.1.1";
-      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
-      "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8";
-      "qs-2.4.2" = self.by-version."qs"."2.4.2";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.12.3" = self.by-version."send"."0.12.3";
-      "serve-static-1.9.3" = self.by-version."serve-static"."1.9.3";
-      "type-is-1.6.3" = self.by-version."type-is"."1.6.3";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "express" = self.by-version."express"."4.12.4";
-  by-spec."fast-future"."~1.0.0" =
-    self.by-version."fast-future"."1.0.1";
-  by-version."fast-future"."1.0.1" = self.buildNodePackage {
-    name = "fast-future-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/fast-future/-/fast-future-1.0.1.tgz";
-      name = "fast-future-1.0.1.tgz";
-      sha1 = "6cbd22d999ab39cd10fc79392486e7a678716818";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."fd-slicer"."~1.0.0" =
-    self.by-version."fd-slicer"."1.0.1";
-  by-version."fd-slicer"."1.0.1" = self.buildNodePackage {
-    name = "fd-slicer-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
-      name = "fd-slicer-1.0.1.tgz";
-      sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
-    };
-    deps = {
-      "pend-1.2.0" = self.by-version."pend"."1.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."fd-slicer"."~1.0.1" =
-    self.by-version."fd-slicer"."1.0.1";
-  by-spec."finalhandler"."0.3.6" =
-    self.by-version."finalhandler"."0.3.6";
-  by-version."finalhandler"."0.3.6" = self.buildNodePackage {
-    name = "finalhandler-0.3.6";
-    version = "0.3.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz";
-      name = "finalhandler-0.3.6.tgz";
-      sha1 = "daf9c4161b1b06e001466b1411dfdb6973be138b";
-    };
-    deps = {
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."findit2"."~2.2.3" =
-    self.by-version."findit2"."2.2.3";
-  by-version."findit2"."2.2.3" = self.buildNodePackage {
-    name = "findit2-2.2.3";
-    version = "2.2.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz";
-      name = "findit2-2.2.3.tgz";
-      sha1 = "58a466697df8a6205cdfdbf395536b8bd777a5f6";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "findit2" = self.by-version."findit2"."2.2.3";
-  by-spec."forever-agent"."~0.5.0" =
-    self.by-version."forever-agent"."0.5.2";
-  by-version."forever-agent"."0.5.2" = self.buildNodePackage {
-    name = "forever-agent-0.5.2";
-    version = "0.5.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
-      name = "forever-agent-0.5.2.tgz";
-      sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."forever-agent"."~0.6.0" =
-    self.by-version."forever-agent"."0.6.1";
-  by-version."forever-agent"."0.6.1" = self.buildNodePackage {
-    name = "forever-agent-0.6.1";
-    version = "0.6.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
-      name = "forever-agent-0.6.1.tgz";
-      sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."form-data"."~0.2.0" =
-    self.by-version."form-data"."0.2.0";
-  by-version."form-data"."0.2.0" = self.buildNodePackage {
-    name = "form-data-0.2.0";
-    version = "0.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
-      name = "form-data-0.2.0.tgz";
-      sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
-    };
-    deps = {
-      "async-0.9.2" = self.by-version."async"."0.9.2";
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."forwarded"."~0.1.0" =
-    self.by-version."forwarded"."0.1.0";
-  by-version."forwarded"."0.1.0" = self.buildNodePackage {
-    name = "forwarded-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
-      name = "forwarded-0.1.0.tgz";
-      sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."fresh"."0.2.4" =
-    self.by-version."fresh"."0.2.4";
-  by-version."fresh"."0.2.4" = self.buildNodePackage {
-    name = "fresh-0.2.4";
-    version = "0.2.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
-      name = "fresh-0.2.4.tgz";
-      sha1 = "3582499206c9723714190edd74b4604feb4a614c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."gapitoken"."~0.1.2" =
-    self.by-version."gapitoken"."0.1.4";
-  by-version."gapitoken"."0.1.4" = self.buildNodePackage {
-    name = "gapitoken-0.1.4";
-    version = "0.1.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.4.tgz";
-      name = "gapitoken-0.1.4.tgz";
-      sha1 = "643dedb26cb142466f62b73d2782e7822a6f1ad8";
-    };
-    deps = {
-      "jws-0.0.2" = self.by-version."jws"."0.0.2";
-      "request-2.57.0" = self.by-version."request"."2.57.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."generate-function"."^2.0.0" =
-    self.by-version."generate-function"."2.0.0";
-  by-version."generate-function"."2.0.0" = self.buildNodePackage {
-    name = "generate-function-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
-      name = "generate-function-2.0.0.tgz";
-      sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."generate-object-property"."^1.1.0" =
-    self.by-version."generate-object-property"."1.2.0";
-  by-version."generate-object-property"."1.2.0" = self.buildNodePackage {
-    name = "generate-object-property-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
-      name = "generate-object-property-1.2.0.tgz";
-      sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
-    };
-    deps = {
-      "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."get-stdin"."^4.0.1" =
-    self.by-version."get-stdin"."4.0.1";
-  by-version."get-stdin"."4.0.1" = self.buildNodePackage {
-    name = "get-stdin-4.0.1";
-    version = "4.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
-      name = "get-stdin-4.0.1.tgz";
-      sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."glob"."3.2.x" =
-    self.by-version."glob"."3.2.11";
-  by-version."glob"."3.2.11" = self.buildNodePackage {
-    name = "glob-3.2.11";
-    version = "3.2.11";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
-      name = "glob-3.2.11.tgz";
-      sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."google-auth-library"."~0.9.3" =
-    self.by-version."google-auth-library"."0.9.6";
-  by-version."google-auth-library"."0.9.6" = self.buildNodePackage {
-    name = "google-auth-library-0.9.6";
-    version = "0.9.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/google-auth-library/-/google-auth-library-0.9.6.tgz";
-      name = "google-auth-library-0.9.6.tgz";
-      sha1 = "57aa09f2621d6eafe8852b0167c9100759a67220";
-    };
-    deps = {
-      "async-0.9.2" = self.by-version."async"."0.9.2";
-      "gtoken-1.1.1" = self.by-version."gtoken"."1.1.1";
-      "lodash.noop-3.0.0" = self.by-version."lodash.noop"."3.0.0";
-      "jws-3.0.0" = self.by-version."jws"."3.0.0";
-      "request-2.51.0" = self.by-version."request"."2.51.0";
-      "string-template-0.2.1" = self.by-version."string-template"."0.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."google-p12-pem"."^0.0.1" =
-    self.by-version."google-p12-pem"."0.0.1";
-  by-version."google-p12-pem"."0.0.1" = self.buildNodePackage {
-    name = "google-p12-pem-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.0.1.tgz";
-      name = "google-p12-pem-0.0.1.tgz";
-      sha1 = "965638d464f13b4a866356a5ba047163ec0b08b7";
-    };
-    deps = {
-      "node-forge-0.6.16" = self.by-version."node-forge"."0.6.16";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."googleapis"."~2.0.3" =
-    self.by-version."googleapis"."2.0.5";
-  by-version."googleapis"."2.0.5" = self.buildNodePackage {
-    name = "googleapis-2.0.5";
-    version = "2.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/googleapis/-/googleapis-2.0.5.tgz";
-      name = "googleapis-2.0.5.tgz";
-      sha1 = "fb2d678f97152eb0a336da84bbc1eeb16a9c8310";
-    };
-    deps = {
-      "async-0.9.2" = self.by-version."async"."0.9.2";
-      "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4";
-      "google-auth-library-0.9.6" = self.by-version."google-auth-library"."0.9.6";
-      "request-2.54.0" = self.by-version."request"."2.54.0";
-      "string-template-0.2.1" = self.by-version."string-template"."0.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "googleapis" = self.by-version."googleapis"."2.0.5";
-  by-spec."graceful-readlink".">= 1.0.0" =
-    self.by-version."graceful-readlink"."1.0.1";
-  by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
-    name = "graceful-readlink-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
-      name = "graceful-readlink-1.0.1.tgz";
-      sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."groove"."~2.3.3" =
-    self.by-version."groove"."2.3.4";
-  by-version."groove"."2.3.4" = self.buildNodePackage {
-    name = "groove-2.3.4";
-    version = "2.3.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/groove/-/groove-2.3.4.tgz";
-      name = "groove-2.3.4.tgz";
-      sha1 = "bbfb8e40584c5921f6df9d52d4017f2acb0a7e45";
-    };
-    deps = {
-      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-1.8.4" = self.by-version."nan"."1.8.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "groove" = self.by-version."groove"."2.3.4";
-  by-spec."gtoken"."^1.1.0" =
-    self.by-version."gtoken"."1.1.1";
-  by-version."gtoken"."1.1.1" = self.buildNodePackage {
-    name = "gtoken-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/gtoken/-/gtoken-1.1.1.tgz";
-      name = "gtoken-1.1.1.tgz";
-      sha1 = "969af828d1f7efea32a500ea09b0edfa8e0c438a";
-    };
-    deps = {
-      "google-p12-pem-0.0.1" = self.by-version."google-p12-pem"."0.0.1";
-      "jws-3.0.0" = self.by-version."jws"."3.0.0";
-      "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "request-2.57.0" = self.by-version."request"."2.57.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."har-validator"."^1.4.0" =
-    self.by-version."har-validator"."1.7.1";
-  by-version."har-validator"."1.7.1" = self.buildNodePackage {
-    name = "har-validator-1.7.1";
-    version = "1.7.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz";
-      name = "har-validator-1.7.1.tgz";
-      sha1 = "8ec8952f8287d21b451ba3e36f27ed8d997d8a95";
-    };
-    deps = {
-      "bluebird-2.9.30" = self.by-version."bluebird"."2.9.30";
-      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "commander-2.8.1" = self.by-version."commander"."2.8.1";
-      "is-my-json-valid-2.12.0" = self.by-version."is-my-json-valid"."2.12.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."har-validator"."^1.6.1" =
-    self.by-version."har-validator"."1.7.1";
-  by-spec."has-ansi"."^1.0.3" =
-    self.by-version."has-ansi"."1.0.3";
-  by-version."has-ansi"."1.0.3" = self.buildNodePackage {
-    name = "has-ansi-1.0.3";
-    version = "1.0.3";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
-      name = "has-ansi-1.0.3.tgz";
-      sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538";
-    };
-    deps = {
-      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
-      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."hawk"."1.1.1" =
-    self.by-version."hawk"."1.1.1";
-  by-version."hawk"."1.1.1" = self.buildNodePackage {
-    name = "hawk-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
-      name = "hawk-1.1.1.tgz";
-      sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9";
-    };
-    deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
-      "boom-0.4.2" = self.by-version."boom"."0.4.2";
-      "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
-      "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."hawk"."~2.3.0" =
-    self.by-version."hawk"."2.3.1";
-  by-version."hawk"."2.3.1" = self.buildNodePackage {
-    name = "hawk-2.3.1";
-    version = "2.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
-      name = "hawk-2.3.1.tgz";
-      sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
-    };
-    deps = {
-      "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
-      "boom-2.8.0" = self.by-version."boom"."2.8.0";
-      "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
-      "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."hoek"."0.9.x" =
-    self.by-version."hoek"."0.9.1";
-  by-version."hoek"."0.9.1" = self.buildNodePackage {
-    name = "hoek-0.9.1";
-    version = "0.9.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
-      name = "hoek-0.9.1.tgz";
-      sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."hoek"."2.x.x" =
-    self.by-version."hoek"."2.14.0";
-  by-version."hoek"."2.14.0" = self.buildNodePackage {
-    name = "hoek-2.14.0";
-    version = "2.14.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz";
-      name = "hoek-2.14.0.tgz";
-      sha1 = "81211691f52a5a835ae49edbf1e89c9003476aa4";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."htmlparser2"."~3.8.1" =
-    self.by-version."htmlparser2"."3.8.3";
-  by-version."htmlparser2"."3.8.3" = self.buildNodePackage {
-    name = "htmlparser2-3.8.3";
-    version = "3.8.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
-      name = "htmlparser2-3.8.3.tgz";
-      sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
-    };
-    deps = {
-      "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0";
-      "domutils-1.5.1" = self.by-version."domutils"."1.5.1";
-      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "entities-1.0.0" = self.by-version."entities"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."http-signature"."~0.10.0" =
-    self.by-version."http-signature"."0.10.1";
-  by-version."http-signature"."0.10.1" = self.buildNodePackage {
-    name = "http-signature-0.10.1";
-    version = "0.10.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
-      name = "http-signature-0.10.1.tgz";
-      sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
-    };
-    deps = {
-      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
-      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
-      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."http-signature"."~0.11.0" =
-    self.by-version."http-signature"."0.11.0";
-  by-version."http-signature"."0.11.0" = self.buildNodePackage {
-    name = "http-signature-0.11.0";
-    version = "0.11.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
-      name = "http-signature-0.11.0.tgz";
-      sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
-    };
-    deps = {
-      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
-      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
-      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."httpolyglot"."~0.1.1" =
-    self.by-version."httpolyglot"."0.1.1";
-  by-version."httpolyglot"."0.1.1" = self.buildNodePackage {
-    name = "httpolyglot-0.1.1";
-    version = "0.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.1.tgz";
-      name = "httpolyglot-0.1.1.tgz";
-      sha1 = "cd0f5c995cbb95dde325d16a7537f90c0048e53d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "httpolyglot" = self.by-version."httpolyglot"."0.1.1";
-  by-spec."human-size"."~1.1.0" =
-    self.by-version."human-size"."1.1.0";
-  by-version."human-size"."1.1.0" = self.buildNodePackage {
-    name = "human-size-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/human-size/-/human-size-1.1.0.tgz";
-      name = "human-size-1.1.0.tgz";
-      sha1 = "052562be999841c037022c20259990c56ea996f9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "human-size" = self.by-version."human-size"."1.1.0";
-  by-spec."indent-string"."^1.1.0" =
-    self.by-version."indent-string"."1.2.1";
-  by-version."indent-string"."1.2.1" = self.buildNodePackage {
-    name = "indent-string-1.2.1";
-    version = "1.2.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz";
-      name = "indent-string-1.2.1.tgz";
-      sha1 = "294c5930792f8bb5b14462a4aa425b94f07d3a56";
-    };
-    deps = {
-      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
-      "repeating-1.1.3" = self.by-version."repeating"."1.1.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."inherits"."*" =
-    self.by-version."inherits"."2.0.1";
-  by-version."inherits"."2.0.1" = self.buildNodePackage {
-    name = "inherits-2.0.1";
-    version = "2.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
-      name = "inherits-2.0.1.tgz";
-      sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."inherits"."2" =
-    self.by-version."inherits"."2.0.1";
-  by-spec."inherits"."~2.0.1" =
-    self.by-version."inherits"."2.0.1";
-  by-spec."ipaddr.js"."1.0.1" =
-    self.by-version."ipaddr.js"."1.0.1";
-  by-version."ipaddr.js"."1.0.1" = self.buildNodePackage {
-    name = "ipaddr.js-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz";
-      name = "ipaddr.js-1.0.1.tgz";
-      sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."is-finite"."^1.0.0" =
-    self.by-version."is-finite"."1.0.1";
-  by-version."is-finite"."1.0.1" = self.buildNodePackage {
-    name = "is-finite-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz";
-      name = "is-finite-1.0.1.tgz";
-      sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b";
-    };
-    deps = {
-      "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."is-my-json-valid"."^2.12.0" =
-    self.by-version."is-my-json-valid"."2.12.0";
-  by-version."is-my-json-valid"."2.12.0" = self.buildNodePackage {
-    name = "is-my-json-valid-2.12.0";
-    version = "2.12.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz";
-      name = "is-my-json-valid-2.12.0.tgz";
-      sha1 = "8fa6c408b26be95b45a23e8f8c4b464a53874d2b";
-    };
-    deps = {
-      "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
-      "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0";
-      "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."is-property"."^1.0.0" =
-    self.by-version."is-property"."1.0.2";
-  by-version."is-property"."1.0.2" = self.buildNodePackage {
-    name = "is-property-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
-      name = "is-property-1.0.2.tgz";
-      sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."isarray"."0.0.1" =
-    self.by-version."isarray"."0.0.1";
-  by-version."isarray"."0.0.1" = self.buildNodePackage {
-    name = "isarray-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
-      name = "isarray-0.0.1.tgz";
-      sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."isstream"."~0.1.1" =
-    self.by-version."isstream"."0.1.2";
-  by-version."isstream"."0.1.2" = self.buildNodePackage {
-    name = "isstream-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
-      name = "isstream-0.1.2.tgz";
-      sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."json-stringify-safe"."~5.0.0" =
-    self.by-version."json-stringify-safe"."5.0.1";
-  by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage {
-    name = "json-stringify-safe-5.0.1";
-    version = "5.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
-      name = "json-stringify-safe-5.0.1.tgz";
-      sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jsonpointer"."^1.1.0" =
-    self.by-version."jsonpointer"."1.1.0";
-  by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
-    name = "jsonpointer-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
-      name = "jsonpointer-1.1.0.tgz";
-      sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jstream"."~0.2.7" =
-    self.by-version."jstream"."0.2.7";
-  by-version."jstream"."0.2.7" = self.buildNodePackage {
-    name = "jstream-0.2.7";
-    version = "0.2.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jstream/-/jstream-0.2.7.tgz";
-      name = "jstream-0.2.7.tgz";
-      sha1 = "55f06cd6d4204caeac4907a5de1b90aabf4d60da";
-    };
-    deps = {
-      "clarinet-0.8.1" = self.by-version."clarinet"."0.8.1";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jwa"."~1.0.0" =
-    self.by-version."jwa"."1.0.0";
-  by-version."jwa"."1.0.0" = self.buildNodePackage {
-    name = "jwa-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jwa/-/jwa-1.0.0.tgz";
-      name = "jwa-1.0.0.tgz";
-      sha1 = "040b64fb582171a65f3368e96837ea4dcf42f3d8";
-    };
-    deps = {
-      "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
-      "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jws"."0.0.2" =
-    self.by-version."jws"."0.0.2";
-  by-version."jws"."0.0.2" = self.buildNodePackage {
-    name = "jws-0.0.2";
-    version = "0.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jws/-/jws-0.0.2.tgz";
-      name = "jws-0.0.2.tgz";
-      sha1 = "8c6916977183cce3361da48c8c2e0c606e7a95c6";
-    };
-    deps = {
-      "tap-0.3.3" = self.by-version."tap"."0.3.3";
-      "base64url-0.0.3" = self.by-version."base64url"."0.0.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jws"."^3.0.0" =
-    self.by-version."jws"."3.0.0";
-  by-version."jws"."3.0.0" = self.buildNodePackage {
-    name = "jws-3.0.0";
-    version = "3.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jws/-/jws-3.0.0.tgz";
-      name = "jws-3.0.0.tgz";
-      sha1 = "da5f267897dd4e9cf8137979db33fc54a3c05418";
-    };
-    deps = {
-      "jwa-1.0.0" = self.by-version."jwa"."1.0.0";
-      "base64url-1.0.4" = self.by-version."base64url"."1.0.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jws"."~3.0.0" =
-    self.by-version."jws"."3.0.0";
-  by-spec."keese"."~1.1.1" =
-    self.by-version."keese"."1.1.1";
-  by-version."keese"."1.1.1" = self.buildNodePackage {
-    name = "keese-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/keese/-/keese-1.1.1.tgz";
-      name = "keese-1.1.1.tgz";
-      sha1 = "69a1f971e64ee5d2094af002f6d92fa806250842";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "keese" = self.by-version."keese"."1.1.1";
-  by-spec."keygrip"."~1.0.0" =
-    self.by-version."keygrip"."1.0.1";
-  by-version."keygrip"."1.0.1" = self.buildNodePackage {
-    name = "keygrip-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
-      name = "keygrip-1.0.1.tgz";
-      sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lastfm"."~0.9.2" =
-    self.by-version."lastfm"."0.9.2";
-  by-version."lastfm"."0.9.2" = self.buildNodePackage {
-    name = "lastfm-0.9.2";
-    version = "0.9.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lastfm/-/lastfm-0.9.2.tgz";
-      name = "lastfm-0.9.2.tgz";
-      sha1 = "d00ca2e3b30eb484e510792875525900e4d77d88";
-    };
-    deps = {
-      "underscore-1.6.0" = self.by-version."underscore"."1.6.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "lastfm" = self.by-version."lastfm"."0.9.2";
-  by-spec."leveldown"."~1.0.6" =
-    self.by-version."leveldown"."1.0.7";
-  by-version."leveldown"."1.0.7" = self.buildNodePackage {
-    name = "leveldown-1.0.7";
-    version = "1.0.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/leveldown/-/leveldown-1.0.7.tgz";
-      name = "leveldown-1.0.7.tgz";
-      sha1 = "39bbe95f92ce09992ec12de47ade5167be2b6874";
-    };
-    deps = {
-      "abstract-leveldown-2.2.2" = self.by-version."abstract-leveldown"."2.2.2";
-      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "fast-future-1.0.1" = self.by-version."fast-future"."1.0.1";
-      "nan-1.8.4" = self.by-version."nan"."1.8.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "leveldown" = self.by-version."leveldown"."1.0.7";
-  by-spec."lodash"."~2.4.1" =
-    self.by-version."lodash"."2.4.2";
-  by-version."lodash"."2.4.2" = self.buildNodePackage {
-    name = "lodash-2.4.2";
-    version = "2.4.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
-      name = "lodash-2.4.2.tgz";
-      sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash.noop"."~3.0.0" =
-    self.by-version."lodash.noop"."3.0.0";
-  by-version."lodash.noop"."3.0.0" = self.buildNodePackage {
-    name = "lodash.noop-3.0.0";
-    version = "3.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.0.tgz";
-      name = "lodash.noop-3.0.0.tgz";
-      sha1 = "f383ca8dba97d8f217e49afcd2b824db9e5e8d68";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lru-cache"."2" =
-    self.by-version."lru-cache"."2.6.4";
-  by-version."lru-cache"."2.6.4" = self.buildNodePackage {
-    name = "lru-cache-2.6.4";
-    version = "2.6.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz";
-      name = "lru-cache-2.6.4.tgz";
-      sha1 = "2675190ccd1b0701ec2f652a4d0d3d400d76c0dd";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."map-obj"."^1.0.0" =
-    self.by-version."map-obj"."1.0.1";
-  by-version."map-obj"."1.0.1" = self.buildNodePackage {
-    name = "map-obj-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
-      name = "map-obj-1.0.1.tgz";
-      sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."media-typer"."0.3.0" =
-    self.by-version."media-typer"."0.3.0";
-  by-version."media-typer"."0.3.0" = self.buildNodePackage {
-    name = "media-typer-0.3.0";
-    version = "0.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
-      name = "media-typer-0.3.0.tgz";
-      sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."meow"."~2.0.0" =
-    self.by-version."meow"."2.0.0";
-  by-version."meow"."2.0.0" = self.buildNodePackage {
-    name = "meow-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/meow/-/meow-2.0.0.tgz";
-      name = "meow-2.0.0.tgz";
-      sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1";
-    };
-    deps = {
-      "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0";
-      "indent-string-1.2.1" = self.by-version."indent-string"."1.2.1";
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
-      "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."merge-descriptors"."1.0.0" =
-    self.by-version."merge-descriptors"."1.0.0";
-  by-version."merge-descriptors"."1.0.0" = self.buildNodePackage {
-    name = "merge-descriptors-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
-      name = "merge-descriptors-1.0.0.tgz";
-      sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mess"."~0.1.2" =
-    self.by-version."mess"."0.1.2";
-  by-version."mess"."0.1.2" = self.buildNodePackage {
-    name = "mess-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mess/-/mess-0.1.2.tgz";
-      name = "mess-0.1.2.tgz";
-      sha1 = "2c81a424efc87a69ad11f1c7129d1f6f6353b9c0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "mess" = self.by-version."mess"."0.1.2";
-  by-spec."methods"."~1.1.1" =
-    self.by-version."methods"."1.1.1";
-  by-version."methods"."1.1.1" = self.buildNodePackage {
-    name = "methods-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz";
-      name = "methods-1.1.1.tgz";
-      sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime"."1.3.4" =
-    self.by-version."mime"."1.3.4";
-  by-version."mime"."1.3.4" = self.buildNodePackage {
-    name = "mime-1.3.4";
-    version = "1.3.4";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
-      name = "mime-1.3.4.tgz";
-      sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime"."^1.2.11" =
-    self.by-version."mime"."1.3.4";
-  by-spec."mime"."~1.2.11" =
-    self.by-version."mime"."1.2.11";
-  by-version."mime"."1.2.11" = self.buildNodePackage {
-    name = "mime-1.2.11";
-    version = "1.2.11";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
-      name = "mime-1.2.11.tgz";
-      sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-db"."~1.12.0" =
-    self.by-version."mime-db"."1.12.0";
-  by-version."mime-db"."1.12.0" = self.buildNodePackage {
-    name = "mime-db-1.12.0";
-    version = "1.12.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
-      name = "mime-db-1.12.0.tgz";
-      sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-db"."~1.13.0" =
-    self.by-version."mime-db"."1.13.0";
-  by-version."mime-db"."1.13.0" = self.buildNodePackage {
-    name = "mime-db-1.13.0";
-    version = "1.13.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.13.0.tgz";
-      name = "mime-db-1.13.0.tgz";
-      sha1 = "fd6808168fe30835e7ea2205fc981d3b633e4e34";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-types"."~1.0.1" =
-    self.by-version."mime-types"."1.0.2";
-  by-version."mime-types"."1.0.2" = self.buildNodePackage {
-    name = "mime-types-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
-      name = "mime-types-1.0.2.tgz";
-      sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-types"."~2.0.1" =
-    self.by-version."mime-types"."2.0.14";
-  by-version."mime-types"."2.0.14" = self.buildNodePackage {
-    name = "mime-types-2.0.14";
-    version = "2.0.14";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
-      name = "mime-types-2.0.14.tgz";
-      sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
-    };
-    deps = {
-      "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-types"."~2.0.3" =
-    self.by-version."mime-types"."2.0.14";
-  by-spec."mime-types"."~2.1.1" =
-    self.by-version."mime-types"."2.1.1";
-  by-version."mime-types"."2.1.1" = self.buildNodePackage {
-    name = "mime-types-2.1.1";
-    version = "2.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.1.tgz";
-      name = "mime-types-2.1.1.tgz";
-      sha1 = "c7b692796d5166f4826d10b4675c8a916657d04e";
-    };
-    deps = {
-      "mime-db-1.13.0" = self.by-version."mime-db"."1.13.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."minimatch"."0.3" =
-    self.by-version."minimatch"."0.3.0";
-  by-version."minimatch"."0.3.0" = self.buildNodePackage {
-    name = "minimatch-0.3.0";
-    version = "0.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
-      name = "minimatch-0.3.0.tgz";
-      sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
-    };
-    deps = {
-      "lru-cache-2.6.4" = self.by-version."lru-cache"."2.6.4";
-      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."minimist"."0.0.8" =
-    self.by-version."minimist"."0.0.8";
-  by-version."minimist"."0.0.8" = self.buildNodePackage {
-    name = "minimist-0.0.8";
-    version = "0.0.8";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-      name = "minimist-0.0.8.tgz";
-      sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."minimist"."^1.1.0" =
-    self.by-version."minimist"."1.1.1";
-  by-version."minimist"."1.1.1" = self.buildNodePackage {
-    name = "minimist-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz";
-      name = "minimist-1.1.1.tgz";
-      sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mkdirp"."0.3.x" =
-    self.by-version."mkdirp"."0.3.5";
-  by-version."mkdirp"."0.3.5" = self.buildNodePackage {
-    name = "mkdirp-0.3.5";
-    version = "0.3.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
-      name = "mkdirp-0.3.5.tgz";
-      sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mkdirp"."~0.3" =
-    self.by-version."mkdirp"."0.3.5";
-  by-spec."mkdirp"."~0.5.0" =
-    self.by-version."mkdirp"."0.5.1";
-  by-version."mkdirp"."0.5.1" = self.buildNodePackage {
-    name = "mkdirp-0.5.1";
-    version = "0.5.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-      name = "mkdirp-0.5.1.tgz";
-      sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
-    };
-    deps = {
-      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mkdirp"."~0.5.1" =
-    self.by-version."mkdirp"."0.5.1";
-  "mkdirp" = self.by-version."mkdirp"."0.5.1";
-  by-spec."ms"."0.7.1" =
-    self.by-version."ms"."0.7.1";
-  by-version."ms"."0.7.1" = self.buildNodePackage {
-    name = "ms-0.7.1";
-    version = "0.7.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
-      name = "ms-0.7.1.tgz";
-      sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."multiparty"."~4.1.2" =
-    self.by-version."multiparty"."4.1.2";
-  by-version."multiparty"."4.1.2" = self.buildNodePackage {
-    name = "multiparty-4.1.2";
-    version = "4.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/multiparty/-/multiparty-4.1.2.tgz";
-      name = "multiparty-4.1.2.tgz";
-      sha1 = "54f8ec9712052fa1dfd8ec975056c8230d6f2370";
-    };
-    deps = {
-      "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "multiparty" = self.by-version."multiparty"."4.1.2";
-  by-spec."music-library-index"."~1.3.0" =
-    self.by-version."music-library-index"."1.3.0";
-  by-version."music-library-index"."1.3.0" = self.buildNodePackage {
-    name = "music-library-index-1.3.0";
-    version = "1.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/music-library-index/-/music-library-index-1.3.0.tgz";
-      name = "music-library-index-1.3.0.tgz";
-      sha1 = "f7dbf6f7df5a0c8c50382542183872aedc5cb86a";
-    };
-    deps = {
-      "diacritics-1.2.1" = self.by-version."diacritics"."1.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "music-library-index" = self.by-version."music-library-index"."1.3.0";
-  by-spec."mv"."~2.0.3" =
-    self.by-version."mv"."2.0.3";
-  by-version."mv"."2.0.3" = self.buildNodePackage {
-    name = "mv-2.0.3";
-    version = "2.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz";
-      name = "mv-2.0.3.tgz";
-      sha1 = "e9ab707d71dc38de24edcc637a8e2f5f480c7f32";
-    };
-    deps = {
-      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
-      "ncp-0.6.0" = self.by-version."ncp"."0.6.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "mv" = self.by-version."mv"."2.0.3";
-  by-spec."nan"."~1.8.4" =
-    self.by-version."nan"."1.8.4";
-  by-version."nan"."1.8.4" = self.buildNodePackage {
-    name = "nan-1.8.4";
-    version = "1.8.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz";
-      name = "nan-1.8.4.tgz";
-      sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ncp"."~0.6.0" =
-    self.by-version."ncp"."0.6.0";
-  by-version."ncp"."0.6.0" = self.buildNodePackage {
-    name = "ncp-0.6.0";
-    version = "0.6.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz";
-      name = "ncp-0.6.0.tgz";
-      sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."negotiator"."0.5.3" =
-    self.by-version."negotiator"."0.5.3";
-  by-version."negotiator"."0.5.3" = self.buildNodePackage {
-    name = "negotiator-0.5.3";
-    version = "0.5.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
-      name = "negotiator-0.5.3.tgz";
-      sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."node-forge"."0.6.16" =
-    self.by-version."node-forge"."0.6.16";
-  by-version."node-forge"."0.6.16" = self.buildNodePackage {
-    name = "node-forge-0.6.16";
-    version = "0.6.16";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-forge/-/node-forge-0.6.16.tgz";
-      name = "node-forge-0.6.16.tgz";
-      sha1 = "aae85babf97034d46f1b74a39bfe5891282ae842";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."node-uuid"."~1.4.0" =
-    self.by-version."node-uuid"."1.4.3";
-  by-version."node-uuid"."1.4.3" = self.buildNodePackage {
-    name = "node-uuid-1.4.3";
-    version = "1.4.3";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
-      name = "node-uuid-1.4.3.tgz";
-      sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."nopt"."~2" =
-    self.by-version."nopt"."2.2.1";
-  by-version."nopt"."2.2.1" = self.buildNodePackage {
-    name = "nopt-2.2.1";
-    version = "2.2.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
-      name = "nopt-2.2.1.tgz";
-      sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
-    };
-    deps = {
-      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."number-is-nan"."^1.0.0" =
-    self.by-version."number-is-nan"."1.0.0";
-  by-version."number-is-nan"."1.0.0" = self.buildNodePackage {
-    name = "number-is-nan-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz";
-      name = "number-is-nan-1.0.0.tgz";
-      sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."oauth-sign"."~0.5.0" =
-    self.by-version."oauth-sign"."0.5.0";
-  by-version."oauth-sign"."0.5.0" = self.buildNodePackage {
-    name = "oauth-sign-0.5.0";
-    version = "0.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz";
-      name = "oauth-sign-0.5.0.tgz";
-      sha1 = "d767f5169325620eab2e087ef0c472e773db6461";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."oauth-sign"."~0.6.0" =
-    self.by-version."oauth-sign"."0.6.0";
-  by-version."oauth-sign"."0.6.0" = self.buildNodePackage {
-    name = "oauth-sign-0.6.0";
-    version = "0.6.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
-      name = "oauth-sign-0.6.0.tgz";
-      sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."oauth-sign"."~0.8.0" =
-    self.by-version."oauth-sign"."0.8.0";
-  by-version."oauth-sign"."0.8.0" = self.buildNodePackage {
-    name = "oauth-sign-0.8.0";
-    version = "0.8.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz";
-      name = "oauth-sign-0.8.0.tgz";
-      sha1 = "938fdc875765ba527137d8aec9d178e24debc553";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."object-assign"."^1.0.0" =
-    self.by-version."object-assign"."1.0.0";
-  by-version."object-assign"."1.0.0" = self.buildNodePackage {
-    name = "object-assign-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
-      name = "object-assign-1.0.0.tgz";
-      sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."on-finished"."~2.2.1" =
-    self.by-version."on-finished"."2.2.1";
-  by-version."on-finished"."2.2.1" = self.buildNodePackage {
-    name = "on-finished-2.2.1";
-    version = "2.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
-      name = "on-finished-2.2.1.tgz";
-      sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
-    };
-    deps = {
-      "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."os-tmpdir"."^1.0.0" =
-    self.by-version."os-tmpdir"."1.0.1";
-  by-version."os-tmpdir"."1.0.1" = self.buildNodePackage {
-    name = "os-tmpdir-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz";
-      name = "os-tmpdir-1.0.1.tgz";
-      sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."osenv"."~0.1.0" =
-    self.by-version."osenv"."0.1.2";
-  by-version."osenv"."0.1.2" = self.buildNodePackage {
-    name = "osenv-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/osenv/-/osenv-0.1.2.tgz";
-      name = "osenv-0.1.2.tgz";
-      sha1 = "f4d23ebeceaef078600fb78c0ea58fac5996a02d";
-    };
-    deps = {
-      "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "osenv" = self.by-version."osenv"."0.1.2";
-  by-spec."parseurl"."~1.3.0" =
-    self.by-version."parseurl"."1.3.0";
-  by-version."parseurl"."1.3.0" = self.buildNodePackage {
-    name = "parseurl-1.3.0";
-    version = "1.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
-      name = "parseurl-1.3.0.tgz";
-      sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."path-to-regexp"."0.1.3" =
-    self.by-version."path-to-regexp"."0.1.3";
-  by-version."path-to-regexp"."0.1.3" = self.buildNodePackage {
-    name = "path-to-regexp-0.1.3";
-    version = "0.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
-      name = "path-to-regexp-0.1.3.tgz";
-      sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."pend"."~1.2.0" =
-    self.by-version."pend"."1.2.0";
-  by-version."pend"."1.2.0" = self.buildNodePackage {
-    name = "pend-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
-      name = "pend-1.2.0.tgz";
-      sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "pend" = self.by-version."pend"."1.2.0";
-  by-spec."proxy-addr"."~1.0.8" =
-    self.by-version."proxy-addr"."1.0.8";
-  by-version."proxy-addr"."1.0.8" = self.buildNodePackage {
-    name = "proxy-addr-1.0.8";
-    version = "1.0.8";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz";
-      name = "proxy-addr-1.0.8.tgz";
-      sha1 = "db54ec878bcc1053d57646609219b3715678bafe";
-    };
-    deps = {
-      "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
-      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."qs"."2.4.2" =
-    self.by-version."qs"."2.4.2";
-  by-version."qs"."2.4.2" = self.buildNodePackage {
-    name = "qs-2.4.2";
-    version = "2.4.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
-      name = "qs-2.4.2.tgz";
-      sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."qs"."~2.3.1" =
-    self.by-version."qs"."2.3.3";
-  by-version."qs"."2.3.3" = self.buildNodePackage {
-    name = "qs-2.3.3";
-    version = "2.3.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
-      name = "qs-2.3.3.tgz";
-      sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."qs"."~2.4.0" =
-    self.by-version."qs"."2.4.2";
-  by-spec."qs"."~3.1.0" =
-    self.by-version."qs"."3.1.0";
-  by-version."qs"."3.1.0" = self.buildNodePackage {
-    name = "qs-3.1.0";
-    version = "3.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-3.1.0.tgz";
-      name = "qs-3.1.0.tgz";
-      sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."range-parser"."~1.0.2" =
-    self.by-version."range-parser"."1.0.2";
-  by-version."range-parser"."1.0.2" = self.buildNodePackage {
-    name = "range-parser-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
-      name = "range-parser-1.0.2.tgz";
-      sha1 = "06a12a42e5131ba8e457cd892044867f2344e549";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."readable-stream"."1.1" =
-    self.by-version."readable-stream"."1.1.13";
-  by-version."readable-stream"."1.1.13" = self.buildNodePackage {
-    name = "readable-stream-1.1.13";
-    version = "1.1.13";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
-      name = "readable-stream-1.1.13.tgz";
-      sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
-    };
-    deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."readable-stream"."~1.0.26" =
-    self.by-version."readable-stream"."1.0.33";
-  by-version."readable-stream"."1.0.33" = self.buildNodePackage {
-    name = "readable-stream-1.0.33";
-    version = "1.0.33";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
-      name = "readable-stream-1.0.33.tgz";
-      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
-    };
-    deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."readable-stream"."~1.1.9" =
-    self.by-version."readable-stream"."1.1.13";
-  by-spec."repeating"."^1.1.0" =
-    self.by-version."repeating"."1.1.3";
-  by-version."repeating"."1.1.3" = self.buildNodePackage {
-    name = "repeating-1.1.3";
-    version = "1.1.3";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
-      name = "repeating-1.1.3.tgz";
-      sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
-    };
-    deps = {
-      "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."request"."^2.37.0" =
-    self.by-version."request"."2.57.0";
-  by-version."request"."2.57.0" = self.buildNodePackage {
-    name = "request-2.57.0";
-    version = "2.57.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.57.0.tgz";
-      name = "request-2.57.0.tgz";
-      sha1 = "d445105a42d009b9d724289633b449a6d723d989";
-    };
-    deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.10.0" = self.by-version."caseless"."0.10.0";
-      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
-      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
-      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
-      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "qs-3.1.0" = self.by-version."qs"."3.1.0";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
-      "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
-      "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0";
-      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
-      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
-      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."request"."^2.54.0" =
-    self.by-version."request"."2.57.0";
-  by-spec."request"."^2.55.0" =
-    self.by-version."request"."2.57.0";
-  by-spec."request"."~2.51.0" =
-    self.by-version."request"."2.51.0";
-  by-version."request"."2.51.0" = self.buildNodePackage {
-    name = "request-2.51.0";
-    version = "2.51.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz";
-      name = "request-2.51.0.tgz";
-      sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e";
-    };
-    deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.8.0" = self.by-version."caseless"."0.8.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
-      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
-      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0";
-      "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."request"."~2.54.0" =
-    self.by-version."request"."2.54.0";
-  by-version."request"."2.54.0" = self.buildNodePackage {
-    name = "request-2.54.0";
-    version = "2.54.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.54.0.tgz";
-      name = "request-2.54.0.tgz";
-      sha1 = "a13917cd8e8fa73332da0bf2f84a30181def1953";
-    };
-    deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
-      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
-      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
-      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
-      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "qs-2.4.2" = self.by-version."qs"."2.4.2";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
-      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."rimraf"."~2.2.8" =
-    self.by-version."rimraf"."2.2.8";
-  by-version."rimraf"."2.2.8" = self.buildNodePackage {
-    name = "rimraf-2.2.8";
-    version = "2.2.8";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
-      name = "rimraf-2.2.8.tgz";
-      sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."runforcover"."~0.0.2" =
-    self.by-version."runforcover"."0.0.2";
-  by-version."runforcover"."0.0.2" = self.buildNodePackage {
-    name = "runforcover-0.0.2";
-    version = "0.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
-      name = "runforcover-0.0.2.tgz";
-      sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc";
-    };
-    deps = {
-      "bunker-0.1.2" = self.by-version."bunker"."0.1.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sax"."0.5.x" =
-    self.by-version."sax"."0.5.8";
-  by-version."sax"."0.5.8" = self.buildNodePackage {
-    name = "sax-0.5.8";
-    version = "0.5.8";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
-      name = "sax-0.5.8.tgz";
-      sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."semver"."~4.3.4" =
-    self.by-version."semver"."4.3.6";
-  by-version."semver"."4.3.6" = self.buildNodePackage {
-    name = "semver-4.3.6";
-    version = "4.3.6";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
-      name = "semver-4.3.6.tgz";
-      sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "semver" = self.by-version."semver"."4.3.6";
-  by-spec."send"."0.12.3" =
-    self.by-version."send"."0.12.3";
-  by-version."send"."0.12.3" = self.buildNodePackage {
-    name = "send-0.12.3";
-    version = "0.12.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.12.3.tgz";
-      name = "send-0.12.3.tgz";
-      sha1 = "cd12dc58fde21e4f91902b39b2fda05a7a6d9bdc";
-    };
-    deps = {
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.6.0" = self.by-version."etag"."1.6.0";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "ms-0.7.1" = self.by-version."ms"."0.7.1";
-      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."serve-static"."~1.9.3" =
-    self.by-version."serve-static"."1.9.3";
-  by-version."serve-static"."1.9.3" = self.buildNodePackage {
-    name = "serve-static-1.9.3";
-    version = "1.9.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz";
-      name = "serve-static-1.9.3.tgz";
-      sha1 = "5f8da07323ad385ff3dc541f1a7917b2e436eb57";
-    };
-    deps = {
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "send-0.12.3" = self.by-version."send"."0.12.3";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "serve-static" = self.by-version."serve-static"."1.9.3";
-  by-spec."sigmund"."~1.0.0" =
-    self.by-version."sigmund"."1.0.1";
-  by-version."sigmund"."1.0.1" = self.buildNodePackage {
-    name = "sigmund-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
-      name = "sigmund-1.0.1.tgz";
-      sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."slide"."*" =
-    self.by-version."slide"."1.1.6";
-  by-version."slide"."1.1.6" = self.buildNodePackage {
-    name = "slide-1.1.6";
-    version = "1.1.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
-      name = "slide-1.1.6.tgz";
-      sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sntp"."0.2.x" =
-    self.by-version."sntp"."0.2.4";
-  by-version."sntp"."0.2.4" = self.buildNodePackage {
-    name = "sntp-0.2.4";
-    version = "0.2.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
-      name = "sntp-0.2.4.tgz";
-      sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
-    };
-    deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sntp"."1.x.x" =
-    self.by-version."sntp"."1.0.9";
-  by-version."sntp"."1.0.9" = self.buildNodePackage {
-    name = "sntp-1.0.9";
-    version = "1.0.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
-      name = "sntp-1.0.9.tgz";
-      sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
-    };
-    deps = {
-      "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."source-map"."0.1.x" =
-    self.by-version."source-map"."0.1.43";
-  by-version."source-map"."0.1.43" = self.buildNodePackage {
-    name = "source-map-0.1.43";
-    version = "0.1.43";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
-      name = "source-map-0.1.43.tgz";
-      sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
-    };
-    deps = {
-      "amdefine-0.1.1" = self.by-version."amdefine"."0.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."streamsink"."~1.2.0" =
-    self.by-version."streamsink"."1.2.0";
-  by-version."streamsink"."1.2.0" = self.buildNodePackage {
-    name = "streamsink-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz";
-      name = "streamsink-1.2.0.tgz";
-      sha1 = "efafee9f1e22d3591ed7de3dcaa95c3f5e79f73c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."string-template"."~0.2.0" =
-    self.by-version."string-template"."0.2.1";
-  by-version."string-template"."0.2.1" = self.buildNodePackage {
-    name = "string-template-0.2.1";
-    version = "0.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz";
-      name = "string-template-0.2.1.tgz";
-      sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."string_decoder"."~0.10.x" =
-    self.by-version."string_decoder"."0.10.31";
-  by-version."string_decoder"."0.10.31" = self.buildNodePackage {
-    name = "string_decoder-0.10.31";
-    version = "0.10.31";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
-      name = "string_decoder-0.10.31.tgz";
-      sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."stringstream"."~0.0.4" =
-    self.by-version."stringstream"."0.0.4";
-  by-version."stringstream"."0.0.4" = self.buildNodePackage {
-    name = "stringstream-0.0.4";
-    version = "0.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
-      name = "stringstream-0.0.4.tgz";
-      sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."strip-ansi"."^2.0.1" =
-    self.by-version."strip-ansi"."2.0.1";
-  by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
-    name = "strip-ansi-2.0.1";
-    version = "2.0.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
-      name = "strip-ansi-2.0.1.tgz";
-      sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
-    };
-    deps = {
-      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."stylus"."~0.49.3" =
-    self.by-version."stylus"."0.49.3";
-  by-version."stylus"."0.49.3" = self.buildNodePackage {
-    name = "stylus-0.49.3";
-    version = "0.49.3";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz";
-      name = "stylus-0.49.3.tgz";
-      sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511";
-    };
-    deps = {
-      "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "sax-0.5.8" = self.by-version."sax"."0.5.8";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
-      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "stylus" = self.by-version."stylus"."0.49.3";
-  by-spec."supports-color"."^1.3.0" =
-    self.by-version."supports-color"."1.3.1";
-  by-version."supports-color"."1.3.1" = self.buildNodePackage {
-    name = "supports-color-1.3.1";
-    version = "1.3.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
-      name = "supports-color-1.3.1.tgz";
-      sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."tap"."~0.3.3" =
-    self.by-version."tap"."0.3.3";
-  by-version."tap"."0.3.3" = self.buildNodePackage {
-    name = "tap-0.3.3";
-    version = "0.3.3";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tap/-/tap-0.3.3.tgz";
-      name = "tap-0.3.3.tgz";
-      sha1 = "c862237af0a213f97fff46594bd1d44eca705d63";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "yamlish-0.0.7" = self.by-version."yamlish"."0.0.7";
-      "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2";
-      "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "difflet-0.2.6" = self.by-version."difflet"."0.2.6";
-      "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
-      "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."tough-cookie".">=0.12.0" =
-    self.by-version."tough-cookie"."2.0.0";
-  by-version."tough-cookie"."2.0.0" = self.buildNodePackage {
-    name = "tough-cookie-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz";
-      name = "tough-cookie-2.0.0.tgz";
-      sha1 = "41ce08720b35cf90beb044dd2609fb19e928718f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."traverse"."0.6.x" =
-    self.by-version."traverse"."0.6.6";
-  by-version."traverse"."0.6.6" = self.buildNodePackage {
-    name = "traverse-0.6.6";
-    version = "0.6.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
-      name = "traverse-0.6.6.tgz";
-      sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."traverse"."~0.5.1" =
-    self.by-version."traverse"."0.5.2";
-  by-version."traverse"."0.5.2" = self.buildNodePackage {
-    name = "traverse-0.5.2";
-    version = "0.5.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
-      name = "traverse-0.5.2.tgz";
-      sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."tunnel-agent"."~0.4.0" =
-    self.by-version."tunnel-agent"."0.4.0";
-  by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
-    name = "tunnel-agent-0.4.0";
-    version = "0.4.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
-      name = "tunnel-agent-0.4.0.tgz";
-      sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."type-is"."~1.6.2" =
-    self.by-version."type-is"."1.6.3";
-  by-version."type-is"."1.6.3" = self.buildNodePackage {
-    name = "type-is-1.6.3";
-    version = "1.6.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/type-is/-/type-is-1.6.3.tgz";
-      name = "type-is-1.6.3.tgz";
-      sha1 = "d87d201777f76dfc526ac202679715d41a28c580";
-    };
-    deps = {
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."typedarray"."~0.0.5" =
-    self.by-version."typedarray"."0.0.6";
-  by-version."typedarray"."0.0.6" = self.buildNodePackage {
-    name = "typedarray-0.0.6";
-    version = "0.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
-      name = "typedarray-0.0.6.tgz";
-      sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."uglify-js"."~1.1.1" =
-    self.by-version."uglify-js"."1.1.1";
-  by-version."uglify-js"."1.1.1" = self.buildNodePackage {
-    name = "uglify-js-1.1.1";
-    version = "1.1.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
-      name = "uglify-js-1.1.1.tgz";
-      sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."underscore"."^1.6.0" =
-    self.by-version."underscore"."1.8.3";
-  by-version."underscore"."1.8.3" = self.buildNodePackage {
-    name = "underscore-1.8.3";
-    version = "1.8.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
-      name = "underscore-1.8.3.tgz";
-      sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."underscore"."~1.6.0" =
-    self.by-version."underscore"."1.6.0";
-  by-version."underscore"."1.6.0" = self.buildNodePackage {
-    name = "underscore-1.6.0";
-    version = "1.6.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
-      name = "underscore-1.6.0.tgz";
-      sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."utils-merge"."1.0.0" =
-    self.by-version."utils-merge"."1.0.0";
-  by-version."utils-merge"."1.0.0" = self.buildNodePackage {
-    name = "utils-merge-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
-      name = "utils-merge-1.0.0.tgz";
-      sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."vary"."~1.0.0" =
-    self.by-version."vary"."1.0.0";
-  by-version."vary"."1.0.0" = self.buildNodePackage {
-    name = "vary-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
-      name = "vary-1.0.0.tgz";
-      sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."xtend"."^4.0.0" =
-    self.by-version."xtend"."4.0.0";
-  by-version."xtend"."4.0.0" = self.buildNodePackage {
-    name = "xtend-4.0.0";
-    version = "4.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
-      name = "xtend-4.0.0.tgz";
-      sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."xtend"."~4.0.0" =
-    self.by-version."xtend"."4.0.0";
-  by-spec."yamlish"."*" =
-    self.by-version."yamlish"."0.0.7";
-  by-version."yamlish"."0.0.7" = self.buildNodePackage {
-    name = "yamlish-0.0.7";
-    version = "0.0.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.7.tgz";
-      name = "yamlish-0.0.7.tgz";
-      sha1 = "b4af9a1dcc63618873c3d6e451ec3213c39a57fb";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."yauzl"."~2.3.0" =
-    self.by-version."yauzl"."2.3.1";
-  by-version."yauzl"."2.3.1" = self.buildNodePackage {
-    name = "yauzl-2.3.1";
-    version = "2.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/yauzl/-/yauzl-2.3.1.tgz";
-      name = "yauzl-2.3.1.tgz";
-      sha1 = "6707fe2b6a4dac9445cc429bf04a11c7dedfa36a";
-    };
-    deps = {
-      "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1";
-      "pend-1.2.0" = self.by-version."pend"."1.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "yauzl" = self.by-version."yauzl"."2.3.1";
-  by-spec."yawl"."~1.0.2" =
-    self.by-version."yawl"."1.0.2";
-  by-version."yawl"."1.0.2" = self.buildNodePackage {
-    name = "yawl-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/yawl/-/yawl-1.0.2.tgz";
-      name = "yawl-1.0.2.tgz";
-      sha1 = "df1301cb50e5bc74cc36d5c1ef9cfbd1f84b408e";
-    };
-    deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "pend-1.2.0" = self.by-version."pend"."1.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "yawl" = self.by-version."yawl"."1.0.2";
-  by-spec."yazl"."~2.2.2" =
-    self.by-version."yazl"."2.2.2";
-  by-version."yazl"."2.2.2" = self.buildNodePackage {
-    name = "yazl-2.2.2";
-    version = "2.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/yazl/-/yazl-2.2.2.tgz";
-      name = "yazl-2.2.2.tgz";
-      sha1 = "60187f4ce6df314e7501c3c0e40bcf1b58fda183";
-    };
-    deps = {
-      "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "yazl" = self.by-version."yazl"."2.2.2";
-  by-spec."ytdl-core".">=0.5.1" =
-    self.by-version."ytdl-core"."0.5.1";
-  by-version."ytdl-core"."0.5.1" = self.buildNodePackage {
-    name = "ytdl-core-0.5.1";
-    version = "0.5.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ytdl-core/-/ytdl-core-0.5.1.tgz";
-      name = "ytdl-core-0.5.1.tgz";
-      sha1 = "3c48d696b019d7faae635a3f1e4eaa9131110f43";
-    };
-    deps = {
-      "cheerio-0.18.0" = self.by-version."cheerio"."0.18.0";
-      "jstream-0.2.7" = self.by-version."jstream"."0.2.7";
-      "request-2.57.0" = self.by-version."request"."2.57.0";
-      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "ytdl-core" = self.by-version."ytdl-core"."0.5.1";
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a66bf5b53c9..efdf05fdad3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11551,8 +11551,6 @@ with pkgs;
 
   grafana = callPackage ../servers/monitoring/grafana { };
 
-  groovebasin = callPackage ../applications/audio/groovebasin { nodejs = nodejs-4_x; };
-
   haka = callPackage ../tools/security/haka { };
 
   heapster = callPackage ../servers/monitoring/heapster { };
-- 
GitLab


From e83ee4938623e0d222b5855b1ddae99ba20765a7 Mon Sep 17 00:00:00 2001
From: Sergiu Ivanov <sivanov@colimite.fr>
Date: Tue, 31 Oct 2017 23:54:11 +0100
Subject: [PATCH 374/877] icicles: 2014-11-06 -> 2017-10-28

Also add icicles to the new Emacs infrastructure.
---
 .../editors/emacs-modes/icicles/default.nix   | 37 ++++++++++---------
 pkgs/top-level/emacs-packages.nix             |  2 +
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 11ccff3df01..f0d120dd803 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -2,27 +2,28 @@
 
 let
   modules = [
-    { name = "icicles.el"; sha256 = "175g8w620vy73pp3zyasfjspgljk6g0lki71kdnvw5z88w3s9d1n"; }
-    { name = "icicles-chg.el"; sha256 = "1bx5xdhirvnrjqk4pk0sjp9bpj1syymsjnckklsw04gv6y0x8zik"; }
-    { name = "icicles-cmd1.el"; sha256 = "1ff0mndin9zxrswwwq3a7b1s879rr6gy8rzxanr7kxg1ppciafad"; }
-    { name = "icicles-cmd2.el"; sha256 = "1a44l86jacp9nsy4z260azz6y672drjw3w5a0jsc8w26fgsrnx1k"; }
-    { name = "icicles-doc1.el"; sha256 = "0s3r4z3y06hd1nxp18wd0b8b88z2a7ryy0j8sx5fzibbmp58ars1"; }
-    { name = "icicles-doc2.el"; sha256 = "0c10jg91qxyrg1zwiyi4m57dbw3yf43jdrpi4nnby3pkzh6i37ic"; }
-    { name = "icicles-face.el"; sha256 = "0n0vcbhwgd2lyj7anq1zpwja28xry018qxbm8sprxkh6y3vlw8d2"; }
-    { name = "icicles-fn.el"; sha256 = "1i10593a7hp465bxd86h7h7gwrdyqxx0d13in53z4jnab8icp3d4"; }
-    { name = "icicles-mac.el"; sha256 = "1piq0jk8nz0hz9wwci7dkxnfxscdpygjzpj5zg3310vs22l7rrsz"; }
-    { name = "icicles-mcmd.el"; sha256 = "0c4325yp84i46605nlxmjm6n0f4fh69shsihvd0wb9ryg0a8qa65"; }
-    { name = "icicles-mode.el"; sha256 = "069wx5clqpsq2c9aavgd9xihvlad3g00iwwrc3cpl47v64dvlipq"; }
-    { name = "icicles-opt.el"; sha256 = "16487l3361ca8l6il2c0z892843sc5l9v4gr7lx5fxbmrlsswvvn"; }
-    { name = "icicles-var.el"; sha256 = "1a9cwxpi10x44fngxa7qnrg8hqfvdjb8s8k47gnn1rbh63blkkry"; }
+    { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; }
+    { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; }
+    { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; }
+    { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; }
+    { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; }
+    { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; }
+    { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; }
+    { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; }
+    { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; }
+    { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; }
+    { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; }
+    { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; }
+    { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; }
   ];
 
   forAll = f: map f modules;
 in
-stdenv.mkDerivation {
-  name = "icicles-2014-11-06";
+stdenv.mkDerivation rec {
+  version = "2017-10-28";
+  name = "icicles-${version}";
 
-  srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs-en/download/${name}"; inherit sha256; });
+  srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
 
   buildInputs = [ emacs ];
 
@@ -30,11 +31,13 @@ stdenv.mkDerivation {
 
   buildPhase = "emacs --batch -L . -f batch-byte-compile *.el";
 
-  installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/";
+  installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/";
 
   meta = {
     homepage = http://www.emacswiki.org/emacs/Icicles;
     description = "Enhance Emacs minibuffer input with cycling and powerful completion";
     license = stdenv.lib.licenses.gpl2Plus;
+    platforms   = emacs.meta.platforms;
+    maintainers = with stdenv.lib.maintainers; [ scolobb ];
   };
 }
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index dbddc05a23e..4ff8d23424c 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -268,6 +268,8 @@ let
     };
   };
 
+  icicles = callPackage ../applications/editors/emacs-modes/icicles { };
+
   rtags = melpaBuild rec {
     pname = "rtags";
     version = "2.12";
-- 
GitLab


From f1e81386303d40376bac2b732c6a7347071f6e7f Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Wed, 1 Nov 2017 00:07:58 +0100
Subject: [PATCH 375/877] nodejs: 8.8.1 -> 8.9.0

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

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index 49cc205c024..c47a65bb4e1 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "8.8.1";
+    version = "8.9.0";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "0ymmhw41n5a81qkxvq7lrssis4y53jh5gxs2k6s2v6brnxxc9qjw";
+      sha256 = "128ir6rkdz1xj55hbflw0sh7snrrvjwgvxmgnka7cyhjkvw5i0mf";
     };
 
     patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
-- 
GitLab


From 5a43c92ffdbdf4aa15cf8641f275611de3ef4e8a Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Wed, 1 Nov 2017 00:55:05 +0100
Subject: [PATCH 376/877] nodejs: init at 9.0.0

---
 pkgs/development/web/nodejs/v9.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  9 +++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/web/nodejs/v9.nix

diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix
new file mode 100644
index 00000000000..7b99275eedc
--- /dev/null
+++ b/pkgs/development/web/nodejs/v9.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
+, pkgconfig, runCommand, which, libtool, fetchpatch
+, callPackage
+, darwin ? null
+, enableNpm ? true
+}@args:
+
+let
+  nodejs = import ./nodejs.nix args;
+  baseName = if enableNpm then "nodejs" else "nodejs-slim";
+in
+  stdenv.mkDerivation (nodejs // rec {
+    version = "9.0.0";
+    name = "${baseName}-${version}";
+    src = fetchurl {
+      url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
+      sha256 = "19az7mxcb3d1aj0f7gvhriyyghn1rwn0425924pa84d6j1mbsljv";
+    };
+
+    patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
+  })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efdf05fdad3..60fad0499da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3057,6 +3057,15 @@ with pkgs;
     enableNpm = false;
   };
 
+  nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {
+    libtool = darwin.cctools;
+  };
+
+  nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix {
+    libtool = darwin.cctools;
+    enableNpm = false;
+  };
+
   nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix {
     nodejs = pkgs.nodejs-6_x;
   };
-- 
GitLab


From d05b21d7c0c53a11319279f05ba56333f9016818 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 6 Oct 2016 23:26:34 +0200
Subject: [PATCH 377/877] goDeps: support fetchFromGiHub to fetch Go libs

https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-246252087
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245297782
---
 pkgs/development/go-modules/generic/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 5a1a0eb52eb..3a973fc2644 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,4 +1,5 @@
-{ go, govers, parallel, lib, fetchgit, fetchhg, fetchbzr, rsync, removeReferencesTo }:
+{ go, govers, parallel, lib, fetchgit, fetchhg, fetchbzr, rsync
+, removeReferencesTo, fetchFromGitHub }:
 
 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
 
@@ -58,6 +59,10 @@ let
         fetchbzr {
           inherit (goDep.fetch) url rev sha256;
         }
+      else if goDep.fetch.type == "FromGitHub" then
+        fetchFromGitHub {
+          inherit (goDep.fetch) owner repo rev sha256;
+        }
       else abort "Unrecognized package fetch type: ${goDep.fetch.type}";
     };
 
-- 
GitLab


From 36c92a0df79d40cd6fb32da24b4fd072f15fceee Mon Sep 17 00:00:00 2001
From: Evan Wallace <mankarse.git@alethrea.net>
Date: Wed, 1 Nov 2017 06:21:37 +0000
Subject: [PATCH 378/877] utox: 0.13.1 -> 0.16.1

---
 .../networking/instant-messengers/utox/default.nix     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index d74d3fe3865..7506949f153 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
-, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }:
+, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }:
 
 stdenv.mkDerivation rec {
   name = "utox-${version}";
-  # >= 0.14 should have unit tests and dbus support
-  version = "0.13.1";
+
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner  = "uTox";
     repo   = "uTox";
     rev    = "v${version}";
-    sha256 = "07aa92isknxf7531jr9kgk89wl5rvv34jrvir043fs9xvim5zq99";
+    sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828";
   };
 
   buildInputs = [
     libtoxcore dbus libvpx libX11 openal freetype
     libv4l libXrender fontconfig libXext libXft filter-audio
-    libsodium
+    libsodium libopus check
   ];
 
   nativeBuildInputs = [
-- 
GitLab


From 732057238787f1ed5769d7946525834b7999b269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 1 Nov 2017 07:40:49 +0100
Subject: [PATCH 379/877] closure-info: half-blind attempt to fix on Hydra

I'm not sure why these started to block channel several days ago.
I've been unable to reproduce the failures locally.
---
 pkgs/build-support/closure-info.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix
index f1b0930cdcf..537cc1fbb75 100644
--- a/pkgs/build-support/closure-info.nix
+++ b/pkgs/build-support/closure-info.nix
@@ -19,7 +19,7 @@ if builtins.langVersion >= 5 then
 
     exportReferencesGraph.closure = rootPaths;
 
-    PATH = "${coreutils}/bin:${jq}/bin";
+    nativeBuildInputs = [ jq ];
 
     builder = builtins.toFile "builder"
       ''
-- 
GitLab


From 87202cf4dc3e5312c95a1da58b7e55e59fd47b02 Mon Sep 17 00:00:00 2001
From: midchildan <midchildan+git@gmail.com>
Date: Tue, 31 Oct 2017 13:33:52 +0900
Subject: [PATCH 380/877] mikutter: 3.5.7 -> 3.5.13

---
 .../instant-messengers/mikutter/Gemfile       | 11 ++-
 .../instant-messengers/mikutter/Gemfile.lock  | 85 ++++++++--------
 .../mikutter/core/plugin/gtk/Gemfile          |  2 +-
 .../instant-messengers/mikutter/default.nix   |  5 +-
 .../instant-messengers/mikutter/gemset.nix    | 97 ++++++++++---------
 .../ruby-modules/gem-config/default.nix       | 22 ++++-
 6 files changed, 125 insertions(+), 97 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
index 66b17ff8760..0eed9808ab4 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
@@ -11,13 +11,13 @@ group :default do
   gem 'oauth', '>= 0.5.1'
   gem 'json_pure', '~> 1.8'
   gem 'addressable', '~> 2.3'
-  gem 'memoist', '~> 0.14'
+  gem 'memoist', '>= 0.16', '< 0.17'
   gem 'ruby-hmac', '~> 0.4'
   gem 'typed-array', '~> 0.1'
   gem 'delayer', '~> 0.0'
   gem 'pluggaloid', '>= 1.1.1', '< 2.0'
-  gem 'delayer-deferred', '>= 1.0.4', '< 2.0'
-  gem 'twitter-text', '1.14.2'
+  gem 'delayer-deferred', '>= 1.0.4', '< 1.1'
+  gem 'twitter-text', '>= 1.14.6'
 end
 
 group :test do
@@ -31,7 +31,10 @@ end
 
 
 group :plugin do
-  Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "core/plugin/*/Gemfile"))){ |path|
+  Dir.glob(File.expand_path(File.join(__dir__, 'core/plugin/*/Gemfile'))){ |path|
+    eval File.open(path).read
+  }
+  Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path|
     eval File.open(path).read
   }
 end
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
index 58f41087919..69530be4a44 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
+++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
@@ -1,67 +1,72 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    atk (3.1.1)
-      glib2 (= 3.1.1)
-    cairo (1.15.7)
-      native-package-installer
-      pkg-config (>= 1.1.5)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    atk (3.1.9)
+      glib2 (= 3.1.9)
+    cairo (1.15.10)
+      native-package-installer (>= 1.0.3)
+      pkg-config (>= 1.2.2)
+    cairo-gobject (3.1.9)
+      cairo
+      glib2 (= 3.1.9)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     delayer (0.0.2)
-    delayer-deferred (1.1.1)
+    delayer-deferred (1.0.4)
       delayer (>= 0.0.2, < 0.1)
-    gdk_pixbuf2 (3.1.1)
-      gio2 (= 3.1.1)
+    gdk_pixbuf2 (3.1.9)
+      gio2 (= 3.1.9)
     gettext (3.0.9)
       locale (>= 2.0.5)
       text
-    gio2 (3.1.1)
-      glib2 (= 3.1.1)
-      gobject-introspection (= 3.1.1)
-    glib2 (3.1.1)
-      pkg-config
-    gobject-introspection (3.1.1)
-      glib2 (= 3.1.1)
-    gtk2 (3.1.1)
-      atk (= 3.1.1)
-      gdk_pixbuf2 (= 3.1.1)
-      pango (= 3.1.1)
-    hashdiff (0.3.4)
+    gio2 (3.1.9)
+      glib2 (= 3.1.9)
+      gobject-introspection (= 3.1.9)
+    glib2 (3.1.9)
+      native-package-installer (>= 1.0.3)
+      pkg-config (>= 1.2.2)
+    gobject-introspection (3.1.9)
+      glib2 (= 3.1.9)
+    gtk2 (3.1.9)
+      atk (= 3.1.9)
+      gdk_pixbuf2 (= 3.1.9)
+      pango (= 3.1.9)
+    hashdiff (0.3.7)
     httpclient (2.8.3)
     instance_storage (1.0.0)
     json_pure (1.8.6)
     locale (2.1.2)
-    memoist (0.15.0)
+    memoist (0.16.0)
     metaclass (0.0.4)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.3.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     moneta (1.0.0)
-    native-package-installer (1.0.1)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
-    oauth (0.5.1)
-    pango (3.1.1)
+    native-package-installer (1.0.4)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    oauth (0.5.3)
+    pango (3.1.9)
       cairo (>= 1.14.0)
-      glib2 (= 3.1.1)
-    pkg-config (1.2.0)
+      cairo-gobject (= 3.1.9)
+      gobject-introspection (= 3.1.9)
+    pkg-config (1.2.8)
     pluggaloid (1.1.1)
       delayer
       instance_storage (>= 1.0.0, < 2.0.0)
-    power_assert (1.0.2)
-    public_suffix (2.0.5)
+    power_assert (1.1.1)
+    public_suffix (3.0.0)
     rake (10.5.0)
     ruby-hmac (0.4.0)
     ruby-prof (0.16.2)
     safe_yaml (1.0.4)
-    test-unit (3.2.3)
+    test-unit (3.2.6)
       power_assert
     text (1.3.1)
     totoridipjp (0.1.0)
-    twitter-text (1.14.2)
+    twitter-text (1.14.7)
       unf (~> 0.1.0)
     typed-array (0.1.2)
     unf (0.1.4)
@@ -79,12 +84,12 @@ PLATFORMS
 DEPENDENCIES
   addressable (~> 2.3)
   delayer (~> 0.0)
-  delayer-deferred (>= 1.0.4, < 2.0)
+  delayer-deferred (>= 1.0.4, < 1.1)
   gettext (~> 3.0.1)
-  gtk2 (= 3.1.1)
+  gtk2 (= 3.1.9)
   httpclient
   json_pure (~> 1.8)
-  memoist (~> 0.14)
+  memoist (>= 0.16, < 0.17)
   mocha (~> 0.14)
   moneta
   nokogiri
@@ -95,10 +100,10 @@ DEPENDENCIES
   ruby-prof
   test-unit (~> 3.0)
   totoridipjp
-  twitter-text (= 1.14.2)
+  twitter-text (>= 1.14.6)
   typed-array (~> 0.1)
   watch (~> 0.1)
   webmock (~> 1.17)
 
 BUNDLED WITH
-   1.14.4
+   1.14.6
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
index 4015fbec1bc..b7d19db3763 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'gtk2', '3.1.1'
+gem 'gtk2', '3.1.9'
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index e00468d9a4c..6b17eb0a897 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mikutter-${version}";
-  version = "3.5.7";
+  version = "3.5.13";
 
   src = fetchurl {
     url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz";
-    sha256 = "1vh5ap92q869j69hmmbznailaflmdp0km4sqdv06cpq7v8pwm28w";
+    sha256 = "2e01cd6cfe0caad663a381e5263f6d8030f0fb7cd8d4f858d320166516c7c320";
   };
 
   env = bundlerEnv {
@@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    broken = true;
     description = "An extensible Twitter client";
     homepage = https://mikutter.hachune.net;
     maintainers = with maintainers; [ midchildan ];
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
index d6d99f3d55b..ef7091689b3 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
@@ -3,28 +3,37 @@
     dependencies = ["public_suffix"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh";
+      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
       type = "gem";
     };
-    version = "2.5.1";
+    version = "2.5.2";
   };
   atk = {
     dependencies = ["glib2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17x88g596s3pqfxplm5ia7anpcmd9kxs4nzmpf2h74bqwkbq2jrz";
+      sha256 = "18l99gv6828rn59q8k6blxg146b025fj44klrcisffw6h9s9qqxm";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.1.9";
   };
   cairo = {
     dependencies = ["native-package-installer" "pkg-config"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "115ksrswbs7pg7kdfi2w8bi9xxv9gzmfvcjj8qj4dxy8dkvp3k4d";
+      sha256 = "1f0n057cj6cjz7f38pwnflrkbwkl8pm3g9ssa51flyxr7lcpcw7c";
       type = "gem";
     };
-    version = "1.15.7";
+    version = "1.15.10";
+  };
+  cairo-gobject = {
+    dependencies = ["cairo" "glib2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qnsd9203qc6hl2i4hfzngr8v06rfk4vxfn6sbr8b4c1q4n0lq26";
+      type = "gem";
+    };
+    version = "3.1.9";
   };
   crack = {
     dependencies = ["safe_yaml"];
@@ -47,19 +56,19 @@
     dependencies = ["delayer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bw48i6qbxmjf2al4a0mw23nlkcrjrwsrdrabbwz62v8sdmdynpc";
+      sha256 = "1rp2hpik8gs1kzwwq831jwj1iv5bhfwd3dmm9nvizy3nqpz1gvvb";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.0.4";
   };
   gdk_pixbuf2 = {
     dependencies = ["gio2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0x9fzsazfi6f3iq7zkqc0vjl6311876dvff0000vg41rajv3rhh1";
+      sha256 = "0x7vna77qw26479dydzfs1sq7xmq31xfly2pn5fvh35wg0q4y07d";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.1.9";
   };
   gettext = {
     dependencies = ["locale" "text"];
@@ -74,45 +83,45 @@
     dependencies = ["glib2" "gobject-introspection"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ki9yxp860xk5cf04hrgvh386n93bkr0pf4c0kl3fx6pnwr4w3v0";
+      sha256 = "1dxyaxp32m19mynw20x39vkb50wa4jcxczwmbkq7pcg55j76wwhm";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.1.9";
   };
   glib2 = {
-    dependencies = ["pkg-config"];
+    dependencies = ["native-package-installer" "pkg-config"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "131jd26n2wwp2lrkyyfq5nb3qriasaym1zpygm991qzcaq79i444";
+      sha256 = "1y1ws895345a88wikqil1x87cpd7plmwfi635piam7il6vsb4h73";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.1.9";
   };
   gobject-introspection = {
     dependencies = ["glib2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fbi1pxyq73d674cwznya6kda38yjp4ahc2xgxi9shsdqmqcx3vs";
+      sha256 = "04gla6z9y8g0d69wlwl0wr7pwyzqg132pfs1n9fq6fgkjb6l7sm3";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.1.9";
   };
   gtk2 = {
     dependencies = ["atk" "gdk_pixbuf2" "pango"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00cbfl306xkglk0cc758vsvv1saaa24gvwh0m2jnzwgfwxk7mc5w";
+      sha256 = "1mshgsw2x0w5wfcp17qnsja50aafbjxy2g42kvk5sr19l0chkkkq";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.1.9";
   };
   hashdiff = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
+      sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9";
       type = "gem";
     };
-    version = "0.3.4";
+    version = "0.3.7";
   };
   httpclient = {
     source = {
@@ -149,10 +158,10 @@
   memoist = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q";
+      sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
       type = "gem";
     };
-    version = "0.15.0";
+    version = "0.16.0";
   };
   metaclass = {
     source = {
@@ -165,10 +174,10 @@
   mini_portile2 = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
+      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.3.0";
   };
   mocha = {
     dependencies = ["metaclass"];
@@ -190,44 +199,44 @@
   native-package-installer = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zh5x87y9dr16ic7vif2c3rnpr5k5wfs6kihpy4dnb9s0mqyqhsj";
+      sha256 = "0svj2sg7y7izl90qrvzd2fcb1rkq8bv3bd6lr9sh1ml18v3w882a";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.0.4";
   };
   nokogiri = {
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jd8q3pr5rkrxx1vklvhcqcgl8kmfv5c8ny36ni3z5mirw6cm70c";
+      sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
       type = "gem";
     };
-    version = "1.7.2";
+    version = "1.8.1";
   };
   oauth = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky";
+      sha256 = "1a5cfg9pm3mxsmlk1slj652vza8nha2lpbpbmf3rrk0lh6zi4d0b";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.5.3";
   };
   pango = {
-    dependencies = ["cairo" "glib2"];
+    dependencies = ["cairo" "cairo-gobject" "gobject-introspection"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18cc24lz4dmb7pavfspivbhbsypf40fhcbdzj8885zs0zr0dknby";
+      sha256 = "0swld0s01djjlqrari0ib75703mb7qr4ydn00cqfhdr7xim66hjk";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.1.9";
   };
   pkg-config = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fklf2dnk354ahxma3iki5cx7b8yn9khby162pz17z6f1f3xk84g";
+      sha256 = "056qb6cwbw2l9riq376wazx4kwd67cdilyclpa6j38mfsswpmzws";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.2.8";
   };
   pluggaloid = {
     dependencies = ["delayer" "instance_storage"];
@@ -241,18 +250,18 @@
   power_assert = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "168ac459nv45a2lhdf86zv35lv9nr569ny5nh3kfnglnxyzyx0kr";
+      sha256 = "0h0s1clasynlbk3782801c61yx24pdv959fpw53g5yl8gxqj34iz";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.1.1";
   };
   public_suffix = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+      sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f";
       type = "gem";
     };
-    version = "2.0.5";
+    version = "3.0.0";
   };
   rake = {
     source = {
@@ -290,10 +299,10 @@
     dependencies = ["power_assert"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kngxp21sqbm7kv7wnxfqk99ik3wv1bjab519vcbj8xj30a5y4py";
+      sha256 = "1gl5b2d6bysnm0a1zx54qn6iwd67f6gsjy0c7zb68ag0453rqcnv";
       type = "gem";
     };
-    version = "3.2.3";
+    version = "3.2.6";
   };
   text = {
     source = {
@@ -315,10 +324,10 @@
     dependencies = ["unf"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lld6d8rzj1zrgs6b227mp675bn8ds56f1c9w9wvx321f6ibn6np";
+      sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg";
       type = "gem";
     };
-    version = "1.14.2";
+    version = "1.14.7";
   };
   typed-array = {
     source = {
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index ff5398a4293..05415b88968 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -22,7 +22,7 @@
 , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
 , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xlibs, gtk2, buildRubyGem
-, re2
+, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf
 }@args:
 
 let
@@ -41,7 +41,7 @@ in
 {
   atk = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gtk2 pcre ];
+    buildInputs = [ gtk2 pcre rake ];
   };
 
   bundler = attrs:
@@ -64,6 +64,11 @@ in
     buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp];
   };
 
+  cairo-gobject = attrs: {
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ cairo pcre xlibs.libpthreadstubs xlibs.libXdmcp ];
+  };
+
   capybara-webkit = attrs: {
     buildInputs = [ qt48 ];
   };
@@ -71,7 +76,7 @@ in
   charlock_holmes = attrs: {
     buildInputs = [ which icu zlib ];
   };
-  
+
   curb = attrs: {
     buildInputs = [ curl ];
   };
@@ -93,6 +98,11 @@ in
     buildInputs = [ libffi ];
   };
 
+  gdk_pixbuf2 = attrs: {
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ rake gdk_pixbuf ];
+  };
+
   gpgme = attrs: {
     buildInputs = [ gpgme ];
   };
@@ -116,8 +126,10 @@ in
     CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  gobject-introspection = attrs: { buildInputs = [ gtk2 pcre ]; };
+  gobject-introspection = attrs: {
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ gobjectIntrospection gtk2 pcre ];
+  };
 
   grpc = attrs: {
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From c4be15a83b95b882357990488a7c8ccd47feb94b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 1 Nov 2017 08:07:15 +0100
Subject: [PATCH 381/877] closure-info: another half-blind attempt to fix on
 Hydra

The previous one was very bad and worsened the situation.
But even running with some nix-1.12 I'm unable to reproduce
the original failure.  Let's unblock channels for now.
---
 pkgs/build-support/closure-info.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix
index 537cc1fbb75..4d178ac96c5 100644
--- a/pkgs/build-support/closure-info.nix
+++ b/pkgs/build-support/closure-info.nix
@@ -8,7 +8,10 @@
 
 { rootPaths }:
 
-if builtins.langVersion >= 5 then
+#if builtins.langVersion >= 5 then
+# FIXME: it doesn't work on Hydra, failing to find mkdir;
+#   perhaps .attrs.sh clobbers PATH with new nix?
+if false then
 
   # Nix >= 1.12: Include NAR hash / size info.
 
@@ -19,7 +22,7 @@ if builtins.langVersion >= 5 then
 
     exportReferencesGraph.closure = rootPaths;
 
-    nativeBuildInputs = [ jq ];
+    PATH = "${coreutils}/bin:${jq}/bin";
 
     builder = builtins.toFile "builder"
       ''
-- 
GitLab


From 3dd5d52b72f22edcd5555bed47862033c7187799 Mon Sep 17 00:00:00 2001
From: midchildan <midchildan+git@gmail.com>
Date: Wed, 1 Nov 2017 16:09:25 +0900
Subject: [PATCH 382/877] mikutter: prevent gems from locally-installed plugins
 from being included as a dependency

---
 .../networking/instant-messengers/mikutter/shell.nix             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix
index efa57175b23..bc83767af32 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix
@@ -8,6 +8,7 @@ pkgs.stdenv.mkDerivation {
   ];
 
   shellHook = ''
+    export MIKUTTER_CONFROOT="/homeless-shelter"
     truncate --size 0 Gemfile.lock
     bundle lock
     bundle package --path=vendor/bundle --no-install
-- 
GitLab


From 398705ba863b65b27e90436ead111536665caae3 Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Wed, 1 Nov 2017 10:25:26 +0200
Subject: [PATCH 383/877] containers: autoStart doc typo

---
 nixos/modules/virtualisation/containers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 82dfc1c9f1c..8618a9c93dd 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -537,7 +537,7 @@ in
               type = types.bool;
               default = false;
               description = ''
-                Wether the container is automatically started at boot-time.
+                Whether the container is automatically started at boot-time.
               '';
             };
 
-- 
GitLab


From 0671a2b6d40079af17896abe30bd89399c182ae0 Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Wed, 1 Nov 2017 10:35:20 +0100
Subject: [PATCH 384/877] pythonPackage.jug: 1.6.1 -> 1.6.3

Minor update to Jug (Python package)
---
 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 0be1ff17ee0..64d79d22a77 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6111,7 +6111,7 @@ in {
   jsbeautifier = callPackage ../development/python-modules/jsbeautifier {};
 
   jug = buildPythonPackage rec {
-    version = "1.6.1";
+    version = "1.6.3";
     name = "jug-${version}";
     buildInputs = with self; [ nose numpy ];
     propagatedBuildInputs = with self; [
@@ -6125,7 +6125,7 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz";
-      sha256 = "15lv998mz6kpp65kh8wsfnrl5ay02bk1lm07nbbdv2k455bhrn1i";
+      sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86";
     };
 
     meta = {
-- 
GitLab


From af0c3fca1de900de881f19a1fae3806ea34427cc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 1 Nov 2017 17:41:21 +0800
Subject: [PATCH 385/877] tvheadend: fix version detection and wrap bzip2 to
 support backups

---
 pkgs/servers/tvheadend/default.nix | 52 ++++++++++++++++++------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index 851149ad7f7..7ff0796811a 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -1,20 +1,26 @@
-{avahi, cmake, dbus, fetchurl, gettext, git, gnutar, gzip, bzip2, ffmpeg, libiconv, openssl, pkgconfig, python
-, stdenv, which, zlib}:
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig
+, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg, libiconv, openssl, python
+, which, zlib }:
 
-with stdenv.lib;
+let
+  version = "4.2.1";
 
-let version = "4.2.1";
-    pkgName = "tvheadend";
+in stdenv.mkDerivation rec {
+  name = "tvheadend-${version}";
 
-in
+  src = fetchFromGitHub {
+    owner  = "tvheadend";
+    repo   = "tvheadend";
+    rev    = "v${version}";
+    sha256 = "1lhk8psvifmn4kjwyfxjj21z0apyr59zizzsfd4j22v7bk66rrl9";
+  };
 
-stdenv.mkDerivation rec {
-  name = "${pkgName}-${version}";
+  buildInputs = [
+    avahi dbus gettext git gnutar gzip bzip2 ffmpeg libiconv openssl python
+    which zlib
+  ];
 
-  src = fetchurl {
-    url = "https://github.com/tvheadend/tvheadend/archive/v${version}.tar.gz";
-    sha256 = "1wrj3w595c1hfl2vmfdmp5qncy5samqi7iisyq76jf3nlzgw6dvn";
-  };
+  nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
 
   enableParallelBuilding = true;
 
@@ -28,28 +34,32 @@ stdenv.mkDerivation rec {
     "--disable-hdhomerun_static"
   ];
 
-  buildPhase = "make";
-
   dontUseCmakeConfigure = true;
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ avahi dbus cmake gettext git gnutar gzip bzip2 ffmpeg libiconv openssl python
-    which zlib ];
-
   preConfigure = ''
     patchShebangs ./configure
+
     substituteInPlace src/config.c --replace /usr/bin/tar ${gnutar}/bin/tar
+
+    # the version detection script `support/version` reads this file if it
+    # exists, so let's just use that
+    echo ${version} > rpm/version
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/tvheadend \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ bzip2 ]}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "TV streaming server";
     longDescription = ''
-	Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android 
+	Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android
         supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources.
 	Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.'';
     homepage = https://tvheadend.org;
     license = licenses.gpl3;
     platforms = platforms.unix;
-    maintainers = [ maintainers.simonvandel ];
+    maintainers = with maintainers; [ simonvandel ];
   };
 }
-- 
GitLab


From cbd65e79801170a0d3133900f6da5cb29cc76d87 Mon Sep 17 00:00:00 2001
From: "Andrew R. M" <nixy@nixy.moe>
Date: Wed, 1 Nov 2017 05:49:01 -0400
Subject: [PATCH 386/877] pythonPackages.rply: move to python-modules/

---
 lib/maintainers.nix                           |  2 +-
 .../python-modules/rply/default.nix           | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +----------------
 3 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/rply/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index dc2281401e0..797adae97b1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -443,7 +443,7 @@
   nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";
   nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
   NikolaMandic = "Ratko Mladic <nikola@mandic.email>";
-  nixy = "Andrew R. M. <andrewmiller237@gmail.com>";
+  nixy = "Andrew R. M. <nixy@nixy.moe>";
   nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>";
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix
new file mode 100644
index 00000000000..8dee7bcff2e
--- /dev/null
+++ b/pkgs/development/python-modules/rply/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, buildPythonPackage, appdirs }:
+
+buildPythonPackage rec {
+  pname = "rply";
+  name = "${pname}-${version}";
+  version = "0.7.4";
+
+  src = fetchurl {
+    url = "mirror://pypi/r/rply/${name}.tar.gz";
+    sha256 = "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj";
+  };
+
+  buildInputs = [ appdirs ];
+
+  meta = with stdenv.lib; {
+    description = "A python Lex/Yacc that works with RPython";
+    homepage = https://github.com/alex/rply;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ nixy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0be1ff17ee0..cbd573c2f68 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18308,24 +18308,7 @@ in {
 
   rpkg = callPackage ../development/python-modules/rpkg/default.nix {};
 
-  rply = buildPythonPackage rec {
-    name = "rply-${version}";
-    version = "0.7.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/rply/${name}.tar.gz";
-      sha256 = "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj";
-    };
-
-    buildInputs = with self; [ appdirs ];
-
-    meta = with pkgs.stdenv.lib; {
-      description = "A python Lex/Yacc that works with RPython";
-      homepage = https://github.com/alex/rply;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ nixy ];
-    };
-  };
+  rply = callPackage ../development/python-modules/rply/default.nix {};
 
   rpm = (pkgs.rpm.override{inherit python;});
 
-- 
GitLab


From 6743ff237983e1ca6d57dc9689fcf15b70ba714c Mon Sep 17 00:00:00 2001
From: "Andrew R. M" <nixy@nixy.moe>
Date: Wed, 1 Nov 2017 05:51:50 -0400
Subject: [PATCH 387/877] pythonPackages.rply: 0.7.4 -> 0.7.5

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

diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix
index 8dee7bcff2e..91f80291214 100644
--- a/pkgs/development/python-modules/rply/default.nix
+++ b/pkgs/development/python-modules/rply/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "rply";
   name = "${pname}-${version}";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchurl {
     url = "mirror://pypi/r/rply/${name}.tar.gz";
-    sha256 = "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj";
+    sha256 = "0lv428895zxsz43968qx0q9bimwqnfykndz4dpjbq515w2gvzhjh";
   };
 
   buildInputs = [ appdirs ];
-- 
GitLab


From 09bdae2dd77257c659ebf0595562ea939d73b79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 1 Nov 2017 05:14:33 -0500
Subject: [PATCH 388/877] pythonPackages.rply: enable tests

---
 pkgs/development/python-modules/rply/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix
index 91f80291214..912b3fd6ab0 100644
--- a/pkgs/development/python-modules/rply/default.nix
+++ b/pkgs/development/python-modules/rply/default.nix
@@ -1,17 +1,24 @@
-{ stdenv, fetchurl, buildPythonPackage, appdirs }:
+{ stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }:
 
 buildPythonPackage rec {
   pname = "rply";
   name = "${pname}-${version}";
   version = "0.7.5";
 
-  src = fetchurl {
-    url = "mirror://pypi/r/rply/${name}.tar.gz";
-    sha256 = "0lv428895zxsz43968qx0q9bimwqnfykndz4dpjbq515w2gvzhjh";
+  src = fetchFromGitHub {
+    owner = "alex";
+    repo = "rply";
+    rev = "v${version}";
+    sha256 = "0v05gdy5dval30wvz96lywvz2jyf000dp0pnrd1lwdx3cyywq659";
   };
 
   buildInputs = [ appdirs ];
 
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    HOME=$(mktemp -d) py.test tests
+  '';
+
   meta = with stdenv.lib; {
     description = "A python Lex/Yacc that works with RPython";
     homepage = https://github.com/alex/rply;
-- 
GitLab


From 25ed4dcac58ff9b727bf3baafeda765ff80b78c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 1 Nov 2017 05:25:58 -0500
Subject: [PATCH 389/877] python.pkgs.jug: move to python modules

---
 .../python-modules/jug/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +---------------
 2 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/jug/default.nix

diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix
new file mode 100644
index 00000000000..ab94d7b40ac
--- /dev/null
+++ b/pkgs/development/python-modules/jug/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, nose, numpy
+, bottle, pyyaml, redis, six
+, zlib }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "Jug";
+  version = "1.6.3";
+  buildInputs = [ nose numpy ];
+  propagatedBuildInputs = [
+    bottle
+    pyyaml
+    redis
+    six
+
+    zlib
+  ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A Task-Based Parallelization Framework";
+    license = licenses.mit;
+    url = https://jug.readthedocs.io/;
+    maintainers = with maintainers; [ luispedro ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 64d79d22a77..8c3dfe0e0d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6110,31 +6110,7 @@ in {
 
   jsbeautifier = callPackage ../development/python-modules/jsbeautifier {};
 
-  jug = buildPythonPackage rec {
-    version = "1.6.3";
-    name = "jug-${version}";
-    buildInputs = with self; [ nose numpy ];
-    propagatedBuildInputs = with self; [
-      bottle
-      pyyaml
-      redis
-      six
-
-      pkgs.zlib
-    ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz";
-      sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86";
-    };
-
-    meta = {
-      description = "A Task-Based Parallelization Framework";
-      license = licenses.mit;
-      url = https://jug.readthedocs.io/;
-      maintainers = with maintainers; [ luispedro ];
-    };
-  };
+  jug = callPackage ../development/python-modules/jug {};
 
   jsmin = callPackage ../development/python-modules/jsmin { };
 
-- 
GitLab


From e2f8fa37f27a4281429f35367c7ca3d489cb4feb Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Tue, 31 Oct 2017 10:25:51 +0000
Subject: [PATCH 390/877] Flag my-self as owner of Nixpkgs and NixOS internals

---
 .github/CODEOWNERS | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bd24a2e0cab..ab64ddb3e67 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -15,7 +15,31 @@ pkgs/stdenv/    @edolstra
 pkgs/build-support/cc-wrapper/  @edolstra
 
 # Libraries
-lib/  @edolstra
+lib/                       @edolstra @nbp
+
+# Nixpkgs Internals
+default.nix                @nbp
+pkgs/top-level/default.nix @nbp
+pkgs/top-level/impure.nix  @nbp
+pkgs/top-level/stage.nix   @nbp
+
+# NixOS Internals
+nixos/default.nix         @nbp
+nixos/lib/from-env.nix    @nbp
+nixos/lib/eval-config.nix @nbp
+nixos/doc/manual/configuration/abstractions.xml      @nbp
+nixos/doc/manual/configuration/config-file.xml       @nbp
+nixos/doc/manual/configuration/config-syntax.xml     @nbp
+nixos/doc/manual/configuration/modularity.xml        @nbp
+nixos/doc/manual/development/assertions.xml          @nbp
+nixos/doc/manual/development/meta-attributes.xml     @nbp
+nixos/doc/manual/development/option-declarations.xml @nbp
+nixos/doc/manual/development/option-def.xml          @nbp
+nixos/doc/manual/development/option-types.xml        @nbp
+nixos/doc/manual/development/replace-modules.xml     @nbp
+nixos/doc/manual/development/writing-modules.xml     @nbp
+nixos/doc/manual/man-nixos-option.xml                @nbp
+nixos/modules/installer/tools/nixos-option.sh        @nbp
 
 # Python-related code and docs
 pkgs/top-level/python-packages.nix      @FRidh
-- 
GitLab


From 8a59ef7354cb1ff66bbf815312946faab9b4a3b2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Nov 2017 10:57:54 +0000
Subject: [PATCH 391/877] wireguard: 0.0.20171017 -> 0.0.20171101

---
 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 18ed3287edc..cc1890438f9 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 "3.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20171017";
+  version = "0.0.20171101";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1k9m980d7zmnhpj9kanyfavqrn7ryva16iblk9jrk6sdhxi9mdsp";
+    sha256 = "0983aivw7wc5qq8didh4bdbdxcmddbpganf0z1xnqmjyls168sq9";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From a4d5586d4781e5f2d2994c6a5773af7d03a6e59c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 1 Nov 2017 05:59:03 -0500
Subject: [PATCH 392/877] gcc: 5.4.0 -> 5.5.0

Switch to xz since there is no bz2 variant (apparently)
---
 pkgs/development/compilers/gcc/5/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index d1c76b6097e..346ea928b76 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -59,8 +59,8 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "5.4.0";
-    sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0";
+let version = "5.5.0";
+    sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
@@ -217,7 +217,7 @@ stdenv.mkDerivation ({
   builder = ../builder.sh;
 
   src = fetchurl {
-    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
+    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz";
     inherit sha256;
   };
 
-- 
GitLab


From fb7924eaecadf1f7b6b6ec65497e1375d5184192 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 1 Nov 2017 14:10:01 +0300
Subject: [PATCH 393/877] mpv: wayland support by default

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa4488b9317..19eeffc8488 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15714,6 +15714,7 @@ with pkgs;
     lua5_sockets = lua5_1_sockets;
     youtube-dl = pythonPackages.youtube-dl;
     libva = libva-full;
+    waylandSupport = stdenv.isLinux;
   };
 
   mpvScripts = {
-- 
GitLab


From 737b4660311bd691200ebe1d422a8ff4958ad676 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 31 Oct 2017 15:10:47 -0700
Subject: [PATCH 394/877] fix ghcjs socket.io

---
 pkgs/development/compilers/ghcjs/base.nix     |    7 +-
 .../ghcjs/node-packages-generated.nix         |  943 ---------
 .../compilers/ghcjs/node-packages.json        |    1 -
 .../haskell-modules/generic-builder.nix       |    3 +-
 .../haskell-modules/with-packages-wrapper.nix |    3 +
 .../node-packages/node-packages-v6.json       |    1 +
 .../node-packages/node-packages-v6.nix        | 1690 +++++++++--------
 7 files changed, 887 insertions(+), 1761 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghcjs/node-packages-generated.nix
 delete mode 100644 pkgs/development/compilers/ghcjs/node-packages.json

diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index a7381fa1a14..d4418b058d9 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -40,11 +40,6 @@
 , coreutils
 , libiconv
 
-, ghcjsNodePkgs ? callPackage ../../../top-level/node-packages.nix {
-    generated = ./node-packages-generated.nix;
-    self = ghcjsNodePkgs;
-  }
-
 , version ? "0.2.0"
 , ghcjsSrc ? fetchFromGitHub {
     owner = "ghcjs";
@@ -178,7 +173,7 @@ in mkDerivation (rec {
     isCross = true;
     isGhcjs = true;
     inherit nodejs ghcjsBoot;
-    inherit (ghcjsNodePkgs) "socket.io";
+    socket-io = pkgs.nodePackages."socket.io";
 
     inherit stage1Packages;
     mkStage2 = stage2 {
diff --git a/pkgs/development/compilers/ghcjs/node-packages-generated.nix b/pkgs/development/compilers/ghcjs/node-packages-generated.nix
deleted file mode 100644
index a3c882ff76c..00000000000
--- a/pkgs/development/compilers/ghcjs/node-packages-generated.nix
+++ /dev/null
@@ -1,943 +0,0 @@
-{ self, fetchurl, fetchgit ? null, lib }:
-
-{
-  by-spec."accepts"."1.1.4" =
-    self.by-version."accepts"."1.1.4";
-  by-version."accepts"."1.1.4" = self.buildNodePackage {
-    name = "accepts-1.1.4";
-    version = "1.1.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
-      name = "accepts-1.1.4.tgz";
-      sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
-    };
-    deps = {
-      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
-      "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."after"."0.8.1" =
-    self.by-version."after"."0.8.1";
-  by-version."after"."0.8.1" = self.buildNodePackage {
-    name = "after-0.8.1";
-    version = "0.8.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz";
-      name = "after-0.8.1.tgz";
-      sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."arraybuffer.slice"."0.0.6" =
-    self.by-version."arraybuffer.slice"."0.0.6";
-  by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage {
-    name = "arraybuffer.slice-0.0.6";
-    version = "0.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz";
-      name = "arraybuffer.slice-0.0.6.tgz";
-      sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."backo2"."1.0.2" =
-    self.by-version."backo2"."1.0.2";
-  by-version."backo2"."1.0.2" = self.buildNodePackage {
-    name = "backo2-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
-      name = "backo2-1.0.2.tgz";
-      sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."base64-arraybuffer"."0.1.2" =
-    self.by-version."base64-arraybuffer"."0.1.2";
-  by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage {
-    name = "base64-arraybuffer-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
-      name = "base64-arraybuffer-0.1.2.tgz";
-      sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."base64id"."0.1.0" =
-    self.by-version."base64id"."0.1.0";
-  by-version."base64id"."0.1.0" = self.buildNodePackage {
-    name = "base64id-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
-      name = "base64id-0.1.0.tgz";
-      sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."benchmark"."1.0.0" =
-    self.by-version."benchmark"."1.0.0";
-  by-version."benchmark"."1.0.0" = self.buildNodePackage {
-    name = "benchmark-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
-      name = "benchmark-1.0.0.tgz";
-      sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."better-assert"."~1.0.0" =
-    self.by-version."better-assert"."1.0.2";
-  by-version."better-assert"."1.0.2" = self.buildNodePackage {
-    name = "better-assert-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz";
-      name = "better-assert-1.0.2.tgz";
-      sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
-    };
-    deps = {
-      "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."blob"."0.0.4" =
-    self.by-version."blob"."0.0.4";
-  by-version."blob"."0.0.4" = self.buildNodePackage {
-    name = "blob-0.0.4";
-    version = "0.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/blob/-/blob-0.0.4.tgz";
-      name = "blob-0.0.4.tgz";
-      sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."callsite"."1.0.0" =
-    self.by-version."callsite"."1.0.0";
-  by-version."callsite"."1.0.0" = self.buildNodePackage {
-    name = "callsite-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
-      name = "callsite-1.0.0.tgz";
-      sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."component-bind"."1.0.0" =
-    self.by-version."component-bind"."1.0.0";
-  by-version."component-bind"."1.0.0" = self.buildNodePackage {
-    name = "component-bind-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
-      name = "component-bind-1.0.0.tgz";
-      sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."component-emitter"."1.1.2" =
-    self.by-version."component-emitter"."1.1.2";
-  by-version."component-emitter"."1.1.2" = self.buildNodePackage {
-    name = "component-emitter-1.1.2";
-    version = "1.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
-      name = "component-emitter-1.1.2.tgz";
-      sha1 = "296594f2753daa63996d2af08d15a95116c9aec3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."component-emitter"."1.2.0" =
-    self.by-version."component-emitter"."1.2.0";
-  by-version."component-emitter"."1.2.0" = self.buildNodePackage {
-    name = "component-emitter-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz";
-      name = "component-emitter-1.2.0.tgz";
-      sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."component-inherit"."0.0.3" =
-    self.by-version."component-inherit"."0.0.3";
-  by-version."component-inherit"."0.0.3" = self.buildNodePackage {
-    name = "component-inherit-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
-      name = "component-inherit-0.0.3.tgz";
-      sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."debug"."0.7.4" =
-    self.by-version."debug"."0.7.4";
-  by-version."debug"."0.7.4" = self.buildNodePackage {
-    name = "debug-0.7.4";
-    version = "0.7.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
-      name = "debug-0.7.4.tgz";
-      sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."debug"."2.2.0" =
-    self.by-version."debug"."2.2.0";
-  by-version."debug"."2.2.0" = self.buildNodePackage {
-    name = "debug-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
-      name = "debug-2.2.0.tgz";
-      sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
-    };
-    deps = {
-      "ms-0.7.1" = self.by-version."ms"."0.7.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."engine.io"."1.6.8" =
-    self.by-version."engine.io"."1.6.8";
-  by-version."engine.io"."1.6.8" = self.buildNodePackage {
-    name = "engine.io-1.6.8";
-    version = "1.6.8";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io/-/engine.io-1.6.8.tgz";
-      name = "engine.io-1.6.8.tgz";
-      sha1 = "de05a06b757e7517695e088c7b051c47819f511b";
-    };
-    deps = {
-      "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "ws-1.0.1" = self.by-version."ws"."1.0.1";
-      "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4";
-      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."engine.io-client"."1.6.8" =
-    self.by-version."engine.io-client"."1.6.8";
-  by-version."engine.io-client"."1.6.8" = self.buildNodePackage {
-    name = "engine.io-client-1.6.8";
-    version = "1.6.8";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.8.tgz";
-      name = "engine.io-client-1.6.8.tgz";
-      sha1 = "6e2db11648b45e405c46b172ea3e3dac37cc0ceb";
-    };
-    deps = {
-      "has-cors-1.1.0" = self.by-version."has-cors"."1.1.0";
-      "ws-1.0.1" = self.by-version."ws"."1.0.1";
-      "xmlhttprequest-ssl-1.5.1" = self.by-version."xmlhttprequest-ssl"."1.5.1";
-      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
-      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
-      "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4";
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4";
-      "parsejson-0.0.1" = self.by-version."parsejson"."0.0.1";
-      "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2";
-      "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3";
-      "yeast-0.1.2" = self.by-version."yeast"."0.1.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."engine.io-parser"."1.2.4" =
-    self.by-version."engine.io-parser"."1.2.4";
-  by-version."engine.io-parser"."1.2.4" = self.buildNodePackage {
-    name = "engine.io-parser-1.2.4";
-    version = "1.2.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz";
-      name = "engine.io-parser-1.2.4.tgz";
-      sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42";
-    };
-    deps = {
-      "after-0.8.1" = self.by-version."after"."0.8.1";
-      "arraybuffer.slice-0.0.6" = self.by-version."arraybuffer.slice"."0.0.6";
-      "base64-arraybuffer-0.1.2" = self.by-version."base64-arraybuffer"."0.1.2";
-      "blob-0.0.4" = self.by-version."blob"."0.0.4";
-      "has-binary-0.1.6" = self.by-version."has-binary"."0.1.6";
-      "utf8-2.1.0" = self.by-version."utf8"."2.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."has-binary"."0.1.6" =
-    self.by-version."has-binary"."0.1.6";
-  by-version."has-binary"."0.1.6" = self.buildNodePackage {
-    name = "has-binary-0.1.6";
-    version = "0.1.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
-      name = "has-binary-0.1.6.tgz";
-      sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
-    };
-    deps = {
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."has-binary"."0.1.7" =
-    self.by-version."has-binary"."0.1.7";
-  by-version."has-binary"."0.1.7" = self.buildNodePackage {
-    name = "has-binary-0.1.7";
-    version = "0.1.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz";
-      name = "has-binary-0.1.7.tgz";
-      sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
-    };
-    deps = {
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."has-cors"."1.1.0" =
-    self.by-version."has-cors"."1.1.0";
-  by-version."has-cors"."1.1.0" = self.buildNodePackage {
-    name = "has-cors-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
-      name = "has-cors-1.1.0.tgz";
-      sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."indexof"."0.0.1" =
-    self.by-version."indexof"."0.0.1";
-  by-version."indexof"."0.0.1" = self.buildNodePackage {
-    name = "indexof-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
-      name = "indexof-0.0.1.tgz";
-      sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."isarray"."0.0.1" =
-    self.by-version."isarray"."0.0.1";
-  by-version."isarray"."0.0.1" = self.buildNodePackage {
-    name = "isarray-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
-      name = "isarray-0.0.1.tgz";
-      sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."json3"."3.2.6" =
-    self.by-version."json3"."3.2.6";
-  by-version."json3"."3.2.6" = self.buildNodePackage {
-    name = "json3-3.2.6";
-    version = "3.2.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
-      name = "json3-3.2.6.tgz";
-      sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."json3"."3.3.2" =
-    self.by-version."json3"."3.3.2";
-  by-version."json3"."3.3.2" = self.buildNodePackage {
-    name = "json3-3.3.2";
-    version = "3.3.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
-      name = "json3-3.3.2.tgz";
-      sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-db"."~1.12.0" =
-    self.by-version."mime-db"."1.12.0";
-  by-version."mime-db"."1.12.0" = self.buildNodePackage {
-    name = "mime-db-1.12.0";
-    version = "1.12.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
-      name = "mime-db-1.12.0.tgz";
-      sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-types"."~2.0.4" =
-    self.by-version."mime-types"."2.0.14";
-  by-version."mime-types"."2.0.14" = self.buildNodePackage {
-    name = "mime-types-2.0.14";
-    version = "2.0.14";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
-      name = "mime-types-2.0.14.tgz";
-      sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
-    };
-    deps = {
-      "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ms"."0.7.1" =
-    self.by-version."ms"."0.7.1";
-  by-version."ms"."0.7.1" = self.buildNodePackage {
-    name = "ms-0.7.1";
-    version = "0.7.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
-      name = "ms-0.7.1.tgz";
-      sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."negotiator"."0.4.9" =
-    self.by-version."negotiator"."0.4.9";
-  by-version."negotiator"."0.4.9" = self.buildNodePackage {
-    name = "negotiator-0.4.9";
-    version = "0.4.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
-      name = "negotiator-0.4.9.tgz";
-      sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."object-component"."0.0.3" =
-    self.by-version."object-component"."0.0.3";
-  by-version."object-component"."0.0.3" = self.buildNodePackage {
-    name = "object-component-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
-      name = "object-component-0.0.3.tgz";
-      sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."options".">=0.0.5" =
-    self.by-version."options"."0.0.6";
-  by-version."options"."0.0.6" = self.buildNodePackage {
-    name = "options-0.0.6";
-    version = "0.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz";
-      name = "options-0.0.6.tgz";
-      sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."parsejson"."0.0.1" =
-    self.by-version."parsejson"."0.0.1";
-  by-version."parsejson"."0.0.1" = self.buildNodePackage {
-    name = "parsejson-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
-      name = "parsejson-0.0.1.tgz";
-      sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
-    };
-    deps = {
-      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."parseqs"."0.0.2" =
-    self.by-version."parseqs"."0.0.2";
-  by-version."parseqs"."0.0.2" = self.buildNodePackage {
-    name = "parseqs-0.0.2";
-    version = "0.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
-      name = "parseqs-0.0.2.tgz";
-      sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
-    };
-    deps = {
-      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."parseuri"."0.0.4" =
-    self.by-version."parseuri"."0.0.4";
-  by-version."parseuri"."0.0.4" = self.buildNodePackage {
-    name = "parseuri-0.0.4";
-    version = "0.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
-      name = "parseuri-0.0.4.tgz";
-      sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
-    };
-    deps = {
-      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."socket.io"."*" =
-    self.by-version."socket.io"."1.4.5";
-  by-version."socket.io"."1.4.5" = self.buildNodePackage {
-    name = "socket.io-1.4.5";
-    version = "1.4.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io/-/socket.io-1.4.5.tgz";
-      name = "socket.io-1.4.5.tgz";
-      sha1 = "f202f49eeb9cf7cf6c0971ad75d8d96d451ea4f7";
-    };
-    deps = {
-      "engine.io-1.6.8" = self.by-version."engine.io"."1.6.8";
-      "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6";
-      "socket.io-client-1.4.5" = self.by-version."socket.io-client"."1.4.5";
-      "socket.io-adapter-0.4.0" = self.by-version."socket.io-adapter"."0.4.0";
-      "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7";
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "socket.io" = self.by-version."socket.io"."1.4.5";
-  by-spec."socket.io-adapter"."0.4.0" =
-    self.by-version."socket.io-adapter"."0.4.0";
-  by-version."socket.io-adapter"."0.4.0" = self.buildNodePackage {
-    name = "socket.io-adapter-0.4.0";
-    version = "0.4.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz";
-      name = "socket.io-adapter-0.4.0.tgz";
-      sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f";
-    };
-    deps = {
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "socket.io-parser-2.2.2" = self.by-version."socket.io-parser"."2.2.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."socket.io-client"."1.4.5" =
-    self.by-version."socket.io-client"."1.4.5";
-  by-version."socket.io-client"."1.4.5" = self.buildNodePackage {
-    name = "socket.io-client-1.4.5";
-    version = "1.4.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.5.tgz";
-      name = "socket.io-client-1.4.5.tgz";
-      sha1 = "400d630c31e7c9579e45173f977e4f5bd8dc7d2e";
-    };
-    deps = {
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "engine.io-client-1.6.8" = self.by-version."engine.io-client"."1.6.8";
-      "component-bind-1.0.0" = self.by-version."component-bind"."1.0.0";
-      "component-emitter-1.2.0" = self.by-version."component-emitter"."1.2.0";
-      "object-component-0.0.3" = self.by-version."object-component"."0.0.3";
-      "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6";
-      "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7";
-      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
-      "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4";
-      "to-array-0.1.4" = self.by-version."to-array"."0.1.4";
-      "backo2-1.0.2" = self.by-version."backo2"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."socket.io-parser"."2.2.2" =
-    self.by-version."socket.io-parser"."2.2.2";
-  by-version."socket.io-parser"."2.2.2" = self.buildNodePackage {
-    name = "socket.io-parser-2.2.2";
-    version = "2.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
-      name = "socket.io-parser-2.2.2.tgz";
-      sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
-    };
-    deps = {
-      "debug-0.7.4" = self.by-version."debug"."0.7.4";
-      "json3-3.2.6" = self.by-version."json3"."3.2.6";
-      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."socket.io-parser"."2.2.6" =
-    self.by-version."socket.io-parser"."2.2.6";
-  by-version."socket.io-parser"."2.2.6" = self.buildNodePackage {
-    name = "socket.io-parser-2.2.6";
-    version = "2.2.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz";
-      name = "socket.io-parser-2.2.6.tgz";
-      sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99";
-    };
-    deps = {
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "json3-3.3.2" = self.by-version."json3"."3.3.2";
-      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."to-array"."0.1.4" =
-    self.by-version."to-array"."0.1.4";
-  by-version."to-array"."0.1.4" = self.buildNodePackage {
-    name = "to-array-0.1.4";
-    version = "0.1.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
-      name = "to-array-0.1.4.tgz";
-      sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ultron"."1.0.x" =
-    self.by-version."ultron"."1.0.2";
-  by-version."ultron"."1.0.2" = self.buildNodePackage {
-    name = "ultron-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz";
-      name = "ultron-1.0.2.tgz";
-      sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."utf8"."2.1.0" =
-    self.by-version."utf8"."2.1.0";
-  by-version."utf8"."2.1.0" = self.buildNodePackage {
-    name = "utf8-2.1.0";
-    version = "2.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz";
-      name = "utf8-2.1.0.tgz";
-      sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ws"."1.0.1" =
-    self.by-version."ws"."1.0.1";
-  by-version."ws"."1.0.1" = self.buildNodePackage {
-    name = "ws-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ws/-/ws-1.0.1.tgz";
-      name = "ws-1.0.1.tgz";
-      sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9";
-    };
-    deps = {
-      "options-0.0.6" = self.by-version."options"."0.0.6";
-      "ultron-1.0.2" = self.by-version."ultron"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."xmlhttprequest-ssl"."1.5.1" =
-    self.by-version."xmlhttprequest-ssl"."1.5.1";
-  by-version."xmlhttprequest-ssl"."1.5.1" = self.buildNodePackage {
-    name = "xmlhttprequest-ssl-1.5.1";
-    version = "1.5.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz";
-      name = "xmlhttprequest-ssl-1.5.1.tgz";
-      sha1 = "3b7741fea4a86675976e908d296d4445961faa67";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."yeast"."0.1.2" =
-    self.by-version."yeast"."0.1.2";
-  by-version."yeast"."0.1.2" = self.buildNodePackage {
-    name = "yeast-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz";
-      name = "yeast-0.1.2.tgz";
-      sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-}
diff --git a/pkgs/development/compilers/ghcjs/node-packages.json b/pkgs/development/compilers/ghcjs/node-packages.json
deleted file mode 100644
index 55fa86675e7..00000000000
--- a/pkgs/development/compilers/ghcjs/node-packages.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "socket.io" ]
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 5d8a28f5c2b..3e82003be43 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -362,8 +362,7 @@ stdenv.mkDerivation ({
 
     env = stdenv.mkDerivation {
       name = "interactive-${pname}-${version}-environment";
-      nativeBuildInputs = [ ghcEnv systemBuildInputs ]
-        ++ optional isGhcjs ghc."socket.io"; # for ghcjsi
+      nativeBuildInputs = [ ghcEnv systemBuildInputs ];
       LANG = "en_US.UTF-8";
       LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
       shellHook = ''
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index ec7d961581a..ac484b3c112 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -74,6 +74,9 @@ symlinkJoin {
           --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
           --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
           --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"                  \
+          ${lib.optionalString (ghc.isGhcjs or false)
+            ''--set NODE_PATH "${ghc.socket-io}/lib/node_modules"''
+          } \
           ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''}
       fi
     done
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 7ea7ce2d3ed..c2876f1128c 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -73,6 +73,7 @@
 , "sinopia"
 , "sloc"
 , "smartdc"
+, "socket.io"
 , "stylus"
 , "svgo"
 , "tern"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index ebf116fed73..1b80e08ad2e 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -157,13 +157,13 @@ let
         sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e";
       };
     };
-    "resolve-1.4.0" = {
+    "resolve-1.5.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz";
-        sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz";
+        sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6";
       };
     };
     "source-map-0.1.9" = {
@@ -1399,13 +1399,13 @@ let
         sha1 = "56da1a2d1cbf01d38b7e1afc31c10bcfa1929167";
       };
     };
-    "ms-rest-2.2.3" = {
+    "ms-rest-2.2.4" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "2.2.3";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.3.tgz";
-        sha1 = "f4f244de6282d9644504a50d11ac7f7cfb01b867";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.4.tgz";
+        sha512 = "0v97pcpwwnmp3a1wyz2i2a2csiqsk0pnb9wcjsc2q2glyqr0nzhz51x6qhk3fz5dja6099p49p5bl87rkjp6cilnszjg6cpsklsbni9";
       };
     };
     "ms-rest-azure-2.4.1" = {
@@ -2020,22 +2020,22 @@ let
         sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
       };
     };
-    "@types/node-8.0.46" = {
+    "@types/node-8.0.47" = {
       name = "@types/node";
       packageName = "@types/node";
-      version = "8.0.46";
+      version = "8.0.47";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.0.46.tgz";
-        sha512 = "0bmyn8y1ifdybpbvvr9r1m473d789767c3yc5vj96jh2na04a4mbf7abvgkrq9cly0390sf6dql3xklvhv6hjl408gq49gr8vi0y6dd";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.0.47.tgz";
+        sha512 = "24zynk3vnq6mz1x5s476q5hmksqcr3pwnsbqpkwyi2jlm8l61r4b9bh9l37zwhca9iaxb6v1ccyrxjzc3rfnpzqyizznmlnivphpv4h";
       };
     };
-    "@types/request-2.0.6" = {
+    "@types/request-2.0.7" = {
       name = "@types/request";
       packageName = "@types/request";
-      version = "2.0.6";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-2.0.6.tgz";
-        sha512 = "13hi2wdyaa8iypfbfhf051n1jjbkqzywy7sh2hy1w605q5jy2hfc0sr684jpxa7hwfigck8n5gv72f9icb9m31k866nny90r69l1xgk";
+        url = "https://registry.npmjs.org/@types/request/-/request-2.0.7.tgz";
+        sha512 = "1ncrcrax2iw3iwr7qcnlx4qcd2cpymjl89kblqpxp54415ldf9x4drqap21rs0d8a1sjvhq2wmkfb8qaw5sjw46vmsiqprvwcxjcnc6";
       };
     };
     "@types/uuid-3.4.3" = {
@@ -2047,13 +2047,13 @@ let
         sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75";
       };
     };
-    "is-buffer-1.1.5" = {
+    "is-buffer-1.1.6" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "1.1.5";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
-        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
+        sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
       };
     };
     "is-stream-1.1.0" = {
@@ -3046,6 +3046,15 @@ let
         sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188";
       };
     };
+    "mime-db-1.31.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.31.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz";
+        sha512 = "1yvkd7sias7i24nvvbv8kj6sagzn758wclfky650vs38mhz0aq28bwcyg3y8nx13pa2fck3kdn5855cg62rxs3px8fj7l3rbkvg07d0";
+      };
+    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -4108,13 +4117,13 @@ let
         sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a";
       };
     };
-    "asn1.js-4.9.1" = {
+    "asn1.js-4.9.2" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.9.1";
+      version = "4.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz";
-        sha1 = "48ba240b45a9280e94748990ba597d216617fd40";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz";
+        sha512 = "071d32h5646ddyfxvmm0yd0xc320zh2cdsjal4hs8cs0hgn9dpq7k9c9ndlhjq3y93nlawkinm99znqvp0cxx61ic7qy4nn7d5arwvg";
       };
     };
     "ripemd160-2.0.1" = {
@@ -6376,13 +6385,13 @@ let
         sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c";
       };
     };
-    "acorn-5.1.2" = {
+    "acorn-5.2.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "5.1.2";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz";
-        sha512 = "1cgdl1g9g05iz6r09i0hmf78cmjca2yafazwaj202w9dck00b7jnmyk4l27ackxy13g4g4ay6vkf6glh18wm29vpmjqsga1n9j8bpm3";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz";
+        sha512 = "3ryzhy30vzfnn2a0crafh3qsrx145ali8i88q1bc0lzl1dz0ycmjmmwh2yn9xfjs3vmjxl7nphpwcs4imgz3da5jb8fvjqbrvnjwvcc";
       };
     };
     "foreach-2.0.5" = {
@@ -9179,13 +9188,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.138.0" = {
+    "aws-sdk-2.141.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.138.0";
+      version = "2.141.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.138.0.tgz";
-        sha1 = "acb923132b51fafe8a464aa757f65d61ac30bd77";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.141.0.tgz";
+        sha1 = "3d96a5970fd9f540ceabcc1d4baeb33b71583aa7";
       };
     };
     "request-2.83.0" = {
@@ -9332,13 +9341,13 @@ let
         sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
       };
     };
-    "ajv-5.2.4" = {
+    "ajv-5.3.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "5.2.4";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-5.2.4.tgz";
-        sha1 = "3daf9a8b67221299fdae8d82d117ed8e6c80244b";
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz";
+        sha1 = "4414ff74a50879c208ee5fdc826e32c303549eda";
       };
     };
     "har-schema-2.0.0" = {
@@ -9368,6 +9377,15 @@ let
         sha1 = "96256a3bc975595eb36d82e9929d060d893439ff";
       };
     };
+    "fast-json-stable-stringify-2.0.0" = {
+      name = "fast-json-stable-stringify";
+      packageName = "fast-json-stable-stringify";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      };
+    };
     "json-schema-traverse-0.3.1" = {
       name = "json-schema-traverse";
       packageName = "json-schema-traverse";
@@ -9377,15 +9395,6 @@ let
         sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
       };
     };
-    "json-stable-stringify-1.0.1" = {
-      name = "json-stable-stringify";
-      packageName = "json-stable-stringify";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
-        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
-      };
-    };
     "hoek-4.2.0" = {
       name = "hoek";
       packageName = "hoek";
@@ -9413,13 +9422,13 @@ let
         sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
       };
     };
-    "sntp-2.0.2" = {
+    "sntp-2.1.0" = {
       name = "sntp";
       packageName = "sntp";
-      version = "2.0.2";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz";
-        sha1 = "5064110f0af85f7cfdb7d6b67a40028ce52b4b2b";
+        url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz";
+        sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
       };
     };
     "boom-5.2.0" = {
@@ -9935,13 +9944,13 @@ let
         sha1 = "898508da2226f380df904728456849c1501a4b0d";
       };
     };
-    "chalk-2.2.0" = {
+    "chalk-2.3.0" = {
       name = "chalk";
       packageName = "chalk";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz";
-        sha512 = "3vfffivwlp2hr7dwh84lvayba94a98ddhb8dwkv14magmfdj1n895880sik7liqv4xgnvvpr2v5jsm1gzl1fypl7nl9dpa6d3zhq4yh";
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz";
+        sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3";
       };
     };
     "indent-string-3.2.0" = {
@@ -10268,13 +10277,13 @@ let
         sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
       };
     };
-    "ignore-3.3.6" = {
+    "ignore-3.3.7" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.3.6";
+      version = "3.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.6.tgz";
-        sha512 = "2bv6fgfnwzivrdak4qc7bxfydydg6qqv9nynyqc9bpj2fq57m5ac4asylrl5m5n67nq8bxx86vrv97b8r9zq9g0vrd9y6ck28vndg0y";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz";
+        sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0";
       };
     };
     "inquirer-3.3.0" = {
@@ -10304,6 +10313,15 @@ let
         sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv";
       };
     };
+    "json-stable-stringify-1.0.1" = {
+      name = "json-stable-stringify";
+      packageName = "json-stable-stringify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
+        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
+      };
+    };
     "levn-0.3.0" = {
       name = "levn";
       packageName = "levn";
@@ -10538,13 +10556,13 @@ let
         sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
       };
     };
-    "jschardet-1.5.1" = {
+    "jschardet-1.6.0" = {
       name = "jschardet";
       packageName = "jschardet";
-      version = "1.5.1";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz";
-        sha512 = "3c44v9rz6j4z6i7gj2v3wmfcqv5i47psysgd1p4jcgz114vfk99fif1n1r08jbsdkp4g3smv1wx7x4ikwa7q9dp5i1bc77la17s2kdw";
+        url = "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz";
+        sha512 = "2crjzdrqdgc38g7nmam84m472pkagwnh3dj64d7pc87g5dgbw04p56ma6qqvmbb0b0r1pcx4wqr4kwvf7zplmk0434z1x681sys32y5";
       };
     };
     "tmp-0.0.33" = {
@@ -10664,13 +10682,13 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-keywords-2.1.0" = {
+    "ajv-keywords-2.1.1" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz";
-        sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz";
+        sha1 = "617997fc5f60576894c435f940d819e135b80762";
       };
     };
     "slice-ansi-1.0.0" = {
@@ -10682,13 +10700,13 @@ let
         sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw";
       };
     };
-    "eslint-4.9.0" = {
+    "eslint-4.10.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "4.9.0";
+      version = "4.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz";
-        sha1 = "76879d274068261b191fe0f2f56c74c2f4208e8b";
+        url = "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz";
+        sha512 = "284ihlnpkrds6jd5rwdbmknxhci60p5sv24p9aad5ra2rjwb1pcakk3p630bggahmq6jjsxngj9rfmpv31jy9gs29cl2qfxzzq6bi9h";
       };
     };
     "supports-color-3.2.3" = {
@@ -10754,13 +10772,13 @@ let
         sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
       };
     };
-    "extract-zip-1.6.5" = {
+    "extract-zip-1.6.6" = {
       name = "extract-zip";
       packageName = "extract-zip";
-      version = "1.6.5";
+      version = "1.6.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz";
-        sha1 = "99a06735b6ea20ea9b705d779acffcc87cff0440";
+        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz";
+        sha1 = "1290ede8d20d0872b429fd3f351ca128ec5ef85c";
       };
     };
     "https-proxy-agent-2.1.0" = {
@@ -10790,15 +10808,6 @@ let
         sha512 = "1bj83dg7c5sca2v9cpzz4m83y9mm8icldvpk2c9sq3216cr6cn7qvfwhw9hq881nq7pii3xxbg8lz6g2p6223ililwkzzp68ndbfd45";
       };
     };
-    "debug-2.2.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
-        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
-      };
-    };
     "mkdirp-0.5.0" = {
       name = "mkdirp";
       packageName = "mkdirp";
@@ -10817,15 +10826,6 @@ let
         sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
       };
     };
-    "ms-0.7.1" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
-        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
-      };
-    };
     "fd-slicer-1.0.1" = {
       name = "fd-slicer";
       packageName = "fd-slicer";
@@ -11438,13 +11438,13 @@ let
         sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
       };
     };
-    "tar-pack-3.4.0" = {
+    "tar-pack-3.4.1" = {
       name = "tar-pack";
       packageName = "tar-pack";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz";
-        sha1 = "23be2d7f671a8339376cbdb0b8fe3fdebf317984";
+        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz";
+        sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w";
       };
     };
     "console-control-strings-1.1.0" = {
@@ -13005,22 +13005,22 @@ let
         sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
       };
     };
-    "@ionic/cli-utils-1.13.1" = {
-      name = "@ionic/cli-utils";
-      packageName = "@ionic/cli-utils";
-      version = "1.13.1";
+    "@ionic/cli-framework-0.0.2" = {
+      name = "@ionic/cli-framework";
+      packageName = "@ionic/cli-framework";
+      version = "0.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.13.1.tgz";
-        sha512 = "0smk0gdbf976vrvp6n8yvcp1idyh5gp16810wyafah3hx4zgrmw3ni0xnq0a0m1lq914b9c5cfcw8hr5m94fb54381r62r684kr7b5g";
+        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.0.2.tgz";
+        sha512 = "0sx59z1970yad1c2k9h7mz0fkjj21im682qb503ypng99fr0bm3nl6p5sw37iy2x44jj9jbh3a7lcc3kzm8ymy5gqw4v7rxbmcn8vv0";
       };
     };
-    "@ionic/discover-0.3.3" = {
-      name = "@ionic/discover";
-      packageName = "@ionic/discover";
-      version = "0.3.3";
+    "@ionic/cli-utils-1.15.2" = {
+      name = "@ionic/cli-utils";
+      packageName = "@ionic/cli-utils";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.3.tgz";
-        sha512 = "3brs0chjqyz8drf7i6w67bmzxgvi88pb54m6qz3ml1wc3j42hgby7x0rjzwzdhkyx5573vbr91ias805gff1piyn7x7nq0c4568zj65";
+        url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.15.2.tgz";
+        sha512 = "1611izq9j89s32sjxkrv23zm9lihvk5wgyyxqwzn286npawpx2gxvs24xm45k5ysy0gxbba9k258ixj9a6vzaz644w69y63nh2fxw18";
       };
     };
     "opn-5.1.0" = {
@@ -13050,6 +13050,60 @@ let
         sha512 = "0k910mhnraax4m75hvgb3f2mhfj6yrsqn7fmyqm2sx137f1kqpz8icww9zhlmqka5pfi8hvprd0wcyflim0nvh7jb14yksjj9crcqna";
       };
     };
+    "ncp-2.0.0" = {
+      name = "ncp";
+      packageName = "ncp";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
+        sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
+      };
+    };
+    "superagent-3.8.0" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "3.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.0.tgz";
+        sha512 = "05p3nzd9iw05i37pkvil2wjvrvlxzwr4ym9m6f7ykdlssf2ljywmsmc6y6kbm0qd91d2lssks1riwvlpnp63809qb6l9vv71ddccmgg";
+      };
+    };
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+      };
+    };
+    "cookiejar-2.1.1" = {
+      name = "cookiejar";
+      packageName = "cookiejar";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz";
+        sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a";
+      };
+    };
+    "formidable-1.1.1" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz";
+        sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9";
+      };
+    };
+    "@ionic/discover-0.3.3" = {
+      name = "@ionic/discover";
+      packageName = "@ionic/discover";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.3.tgz";
+        sha512 = "3brs0chjqyz8drf7i6w67bmzxgvi88pb54m6qz3ml1wc3j42hgby7x0rjzwzdhkyx5573vbr91ias805gff1piyn7x7nq0c4568zj65";
+      };
+    };
     "archiver-2.1.0" = {
       name = "archiver";
       packageName = "archiver";
@@ -13104,15 +13158,6 @@ let
         sha1 = "e400e57f0e60d8ef2bd4d068dc428a54345dbcda";
       };
     };
-    "ncp-2.0.0" = {
-      name = "ncp";
-      packageName = "ncp";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
-        sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
-      };
-    };
     "proxy-middleware-0.15.0" = {
       name = "proxy-middleware";
       packageName = "proxy-middleware";
@@ -13131,15 +13176,6 @@ let
         sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c";
       };
     };
-    "superagent-3.7.0" = {
-      name = "superagent";
-      packageName = "superagent";
-      version = "3.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-3.7.0.tgz";
-        sha512 = "0dv80576bgsb7mq2mh3f0jgik6wnrki1ml5n8c2r21g4ql72z683fn7v63bxkf20s9ihh39gr1sqaadhpkj3yvnc5wbqv4dxv26pjzz";
-      };
-    };
     "tiny-lr-1.0.5" = {
       name = "tiny-lr";
       packageName = "tiny-lr";
@@ -13149,6 +13185,15 @@ let
         sha512 = "2b8y1xdv7szw0hvad64rghp2zdahs6qhx0k79c0s9xa0a35zbcrb9b9gywixhcxqi1c9ab7ah8ibra22k8baakh7rvmhf904d559g32";
       };
     };
+    "netmask-1.0.6" = {
+      name = "netmask";
+      packageName = "netmask";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz";
+        sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35";
+      };
+    };
     "archiver-utils-1.3.0" = {
       name = "archiver-utils";
       packageName = "archiver-utils";
@@ -13275,33 +13320,6 @@ let
         sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e";
       };
     };
-    "component-emitter-1.2.1" = {
-      name = "component-emitter";
-      packageName = "component-emitter";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
-        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
-      };
-    };
-    "cookiejar-2.1.1" = {
-      name = "cookiejar";
-      packageName = "cookiejar";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz";
-        sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a";
-      };
-    };
-    "formidable-1.1.1" = {
-      name = "formidable";
-      packageName = "formidable";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz";
-        sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9";
-      };
-    };
     "body-5.1.0" = {
       name = "body";
       packageName = "body";
@@ -13383,15 +13401,6 @@ let
         sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
       };
     };
-    "netmask-1.0.6" = {
-      name = "netmask";
-      packageName = "netmask";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz";
-        sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35";
-      };
-    };
     "is-wsl-1.1.0" = {
       name = "is-wsl";
       packageName = "is-wsl";
@@ -13455,15 +13464,6 @@ let
         sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d";
       };
     };
-    "@reactivex/rxjs-5.5.0" = {
-      name = "@reactivex/rxjs";
-      packageName = "@reactivex/rxjs";
-      version = "5.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.5.0.tgz";
-        sha512 = "3r28zxbg2644s5bc09s7bjngpgs5ws56r4j5vq7sk370zyl8vppri090phfblsmqnpv5y1hfb6qlb8j19mb8i2qzqvyqyzx98xd10jr";
-      };
-    };
     "chai-4.1.2" = {
       name = "chai";
       packageName = "chai";
@@ -13536,6 +13536,15 @@ let
         sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd";
       };
     };
+    "rxjs-5.5.2" = {
+      name = "rxjs";
+      packageName = "rxjs";
+      version = "5.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz";
+        sha512 = "208dclsk809q1ra99l8j8xzrl9kcm4wpzwjb89rwdqrz78x3i0861kkgqi1sp3v8sdnnvdq0flmazdv96ah7jxpvwf74lw1llh2h5m1";
+      };
+    };
     "semaphore-async-await-1.5.1" = {
       name = "semaphore-async-await";
       packageName = "semaphore-async-await";
@@ -13590,15 +13599,6 @@ let
         sha1 = "5043ae47ee4ac16af07bb3d0ca561235e0c0d2fa";
       };
     };
-    "symbol-observable-1.0.4" = {
-      name = "symbol-observable";
-      packageName = "symbol-observable";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz";
-        sha1 = "29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d";
-      };
-    };
     "assertion-error-1.0.2" = {
       name = "assertion-error";
       packageName = "assertion-error";
@@ -13734,6 +13734,15 @@ let
         sha1 = "e69e38a1babe969b0108207978b9f62b88604839";
       };
     };
+    "symbol-observable-1.0.4" = {
+      name = "symbol-observable";
+      packageName = "symbol-observable";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz";
+        sha1 = "29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d";
+      };
+    };
     "vscode-uri-1.0.1" = {
       name = "vscode-uri";
       packageName = "vscode-uri";
@@ -14724,6 +14733,15 @@ let
         sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
       };
     };
+    "debug-2.2.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+      };
+    };
     "json3-3.3.2" = {
       name = "json3";
       packageName = "json3";
@@ -14733,6 +14751,15 @@ let
         sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
       };
     };
+    "ms-0.7.1" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+      };
+    };
     "lru-cache-2.2.4" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -17424,13 +17451,13 @@ let
         sha1 = "892e47000a99be55bbf3774ffea0561d8879c259";
       };
     };
-    "moment-timezone-0.5.13" = {
+    "moment-timezone-0.5.14" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.13";
+      version = "0.5.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz";
-        sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz";
+        sha1 = "4eb38ff9538b80108ba467a458f3ed4268ccfcb1";
       };
     };
     "fresh-0.5.0" = {
@@ -17595,13 +17622,13 @@ let
         sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
       };
     };
-    "websocket-stream-5.0.1" = {
+    "websocket-stream-5.1.1" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
-      version = "5.0.1";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.1.tgz";
-        sha512 = "3w842xsi7pgjjr5fkdzbx9dfsjl87x6c8wrvxgy8i1lr399yjiggbwrfdvpccv698f7n4ywvf7dbc8g61ly99yw1lf7fwpfrypg8x9p";
+        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.1.tgz";
+        sha512 = "18iw90ncl6cpip9j7rxdf6mag5klhhn7fklhb5lz41dy3wk9vxp3lxxkmwsnldjk5zfx3fjww55xg47k5k1a4cpph92k7j26p9kk56a";
       };
     };
     "leven-1.0.2" = {
@@ -18756,13 +18783,13 @@ let
         sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e";
       };
     };
-    "query-string-5.0.0" = {
+    "query-string-5.0.1" = {
       name = "query-string";
       packageName = "query-string";
-      version = "5.0.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-5.0.0.tgz";
-        sha1 = "fbdf7004b4d2aff792f9871981b7a2794f555947";
+        url = "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz";
+        sha512 = "0lcnspv96dv03600bgjxk2ypak8mysp77n47jkddpz6ldcgscwyan1akqjrddii4abb2brz6gr6yq9pcbdx63m9i16kk8m5028qrkv8";
       };
     };
     "qw-1.0.1" = {
@@ -18819,13 +18846,13 @@ let
         sha1 = "1b5837cf90c0736d88627732b661c138f86de72f";
       };
     };
-    "worker-farm-1.5.0" = {
+    "worker-farm-1.5.1" = {
       name = "worker-farm";
       packageName = "worker-farm";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.0.tgz";
-        sha512 = "2lrlysxfbyzywla6i1q07xncmw30w1icgq18c4bra25dl6wvcd3mxg1lqbf88w5h7mqnf98j8ll657wnqwjq9rwd7pbmd9i11964x0c";
+        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.1.tgz";
+        sha512 = "0vwa4w6rn98nh8igcx2sni6hccs5wfwhh68zxzzgffimr7gmy5nw1ks0j2n0gra7g2ahsl7p7l34mcn8702n01y30qc6xxcdbllg4sg";
       };
     };
     "write-file-atomic-2.1.0" = {
@@ -19350,13 +19377,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.45.0" = {
+    "snyk-1.47.0" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.45.0";
+      version = "1.47.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.45.0.tgz";
-        sha1 = "890eae8b1c14ff8ff1be25388702cb585df86834";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.47.0.tgz";
+        sha1 = "2c86a734a842fdfc18b97df682a91d419fec70f3";
       };
     };
     "spawn-please-0.3.0" = {
@@ -19539,13 +19566,13 @@ let
         sha1 = "f27aec2498b24027ac719214026521591111508f";
       };
     };
-    "snyk-go-plugin-1.3.7" = {
+    "snyk-go-plugin-1.3.8" = {
       name = "snyk-go-plugin";
       packageName = "snyk-go-plugin";
-      version = "1.3.7";
+      version = "1.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.3.7.tgz";
-        sha512 = "0i5dcqyyfmb0caz9fa3qaqx7k1f79qyd9y6jn031c75647y8hmk265w6ynkpz8gkv7cn4w6cznrm5q436vg4wgs1ahqd5xrwkhsbxp4";
+        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.3.8.tgz";
+        sha512 = "0q7vax6wyzrd2d3rzymrvhqcb1mnhpya12f26v05ly4ydivj1x67mbw0bpcdccagzijy8lbsvn9pp7zy59mikyfvfaj1084xkml4xwc";
       };
     };
     "snyk-gradle-plugin-1.2.0" = {
@@ -19575,6 +19602,15 @@ let
         sha512 = "3ar9rk77y39sydnriw6k9p5s15qpv1in81365l0yjbvn6qis7v4na98xfibsmfnnkjyblnd5qs2q1j6fabdfx4g2x5yi7ld6hdm6r3r";
       };
     };
+    "snyk-nuget-plugin-1.0.0" = {
+      name = "snyk-nuget-plugin";
+      packageName = "snyk-nuget-plugin";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.0.0.tgz";
+        sha512 = "0kqpbx8ic08dxrlg4mw6xv4ka0bi7f20h53i77rfs0v7j2cnihaij945b78rn6q464simc3amr66jv7svfwyyimj10qcvzhbb02ghvj";
+      };
+    };
     "snyk-policy-1.7.1" = {
       name = "snyk-policy";
       packageName = "snyk-policy";
@@ -19755,6 +19791,42 @@ let
         sha1 = "d8773908e31256109952b1fdb9b3fa867d2775e1";
       };
     };
+    "zip-1.2.0" = {
+      name = "zip";
+      packageName = "zip";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/zip/-/zip-1.2.0.tgz";
+        sha1 = "ad0ad42265309be42eb56fc86194e17c24e66a9c";
+      };
+    };
+    "bops-0.1.1" = {
+      name = "bops";
+      packageName = "bops";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bops/-/bops-0.1.1.tgz";
+        sha1 = "062e02a8daa801fa10f2e5dbe6740cff801fe17e";
+      };
+    };
+    "base64-js-0.0.2" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz";
+        sha1 = "024f0f72afa25b75f9c0ee73cd4f55ec1bed9784";
+      };
+    };
+    "to-utf8-0.0.1" = {
+      name = "to-utf8";
+      packageName = "to-utf8";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz";
+        sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852";
+      };
+    };
     "minimatch-3.0.2" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -19900,13 +19972,13 @@ let
         sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
       };
     };
-    "domino-1.0.29" = {
+    "domino-1.0.30" = {
       name = "domino";
       packageName = "domino";
-      version = "1.0.29";
+      version = "1.0.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domino/-/domino-1.0.29.tgz";
-        sha1 = "de8aa1f6f98e3c5538feb7a61fa69c1eabbace06";
+        url = "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz";
+        sha512 = "1g3pbkg3gg3kjffah03vil47662ra58gckz5z8qymfgb9xq97k7vsd83410fmncbbll1p40rs0s4r0pgdypfvj9j2fq146j41dbqjla";
       };
     };
     "express-handlebars-3.0.0" = {
@@ -19918,13 +19990,13 @@ let
         sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f";
       };
     };
-    "mediawiki-title-0.5.6" = {
+    "mediawiki-title-0.6.4" = {
       name = "mediawiki-title";
       packageName = "mediawiki-title";
-      version = "0.5.6";
+      version = "0.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.5.6.tgz";
-        sha1 = "549069294e27728a1f13bed3d705d6beecf4ea24";
+        url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz";
+        sha1 = "b453ded9e0d9d7c97b7914f3100dbe68840c6e03";
       };
     };
     "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = {
@@ -19974,13 +20046,13 @@ let
         sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
       };
     };
-    "yargs-5.0.0" = {
+    "yargs-7.1.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "5.0.0";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz";
-        sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e";
+        url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz";
+        sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8";
       };
     };
     "is-arguments-1.0.2" = {
@@ -20037,13 +20109,13 @@ let
         sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669";
       };
     };
-    "hot-shots-4.7.0" = {
+    "hot-shots-4.7.1" = {
       name = "hot-shots";
       packageName = "hot-shots";
-      version = "4.7.0";
+      version = "4.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.7.0.tgz";
-        sha1 = "1fb2eecd234c938e3ccb56c93681b573455dd64c";
+        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.7.1.tgz";
+        sha1 = "35cb2d3691c66cd18a0fcdffcc9e5b21194275b0";
       };
     };
     "limitation-0.2.0" = {
@@ -20055,15 +20127,6 @@ let
         sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62";
       };
     };
-    "yargs-7.1.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "7.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz";
-        sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8";
-      };
-    };
     "dnscache-1.0.1" = {
       name = "dnscache";
       packageName = "dnscache";
@@ -20182,13 +20245,13 @@ let
         sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff";
       };
     };
-    "msgpack5-3.5.1" = {
+    "msgpack5-3.6.0" = {
       name = "msgpack5";
       packageName = "msgpack5";
-      version = "3.5.1";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.5.1.tgz";
-        sha512 = "3a93gp3vf9vwp9dk4xsf25d7m8hmlm779x1wbhv6a8fg9p0341nsmbp2nmip7ypa1bc59f2y07b92cr3lb99i8a62828l5bppsylv2j";
+        url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz";
+        sha512 = "3nr151ygx2w2pydaamcjrcn5ksl2rx09sdad8gh0rp1l07igigvfsw0xjjcnxrdws1rwy7g1j533qzhr7w25jisad6npv9rf1j84yz8";
       };
     };
     "dom-storage-2.0.2" = {
@@ -20200,15 +20263,6 @@ let
         sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0";
       };
     };
-    "yargs-parser-5.0.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz";
-        sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a";
-      };
-    };
     "lodash.clone-4.3.2" = {
       name = "lodash.clone";
       packageName = "lodash.clone";
@@ -20227,13 +20281,13 @@ let
         sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
       };
     };
-    "yargs-parser-3.2.0" = {
+    "yargs-parser-5.0.0" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "3.2.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz";
-        sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz";
+        sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a";
       };
     };
     "airplayer-2.0.0" = {
@@ -21362,13 +21416,13 @@ let
         sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414";
       };
     };
-    "sanitize-html-1.14.1" = {
+    "sanitize-html-1.15.0" = {
       name = "sanitize-html";
       packageName = "sanitize-html";
-      version = "1.14.1";
+      version = "1.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz";
-        sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8";
+        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.15.0.tgz";
+        sha512 = "26swjh5wivmim7l7g64f40vnr1dr7kyl5hr9csv84s2apa43rs19qypyf7y5r3a19v0pg9ibcs1spqykznq6jcxvmwrbwdihm78ndfn";
       };
     };
     "linkify-it-1.2.4" = {
@@ -21380,13 +21434,22 @@ let
         sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a";
       };
     };
-    "regexp-quote-0.0.0" = {
-      name = "regexp-quote";
-      packageName = "regexp-quote";
-      version = "0.0.0";
+    "lodash.escaperegexp-4.1.2" = {
+      name = "lodash.escaperegexp";
+      packageName = "lodash.escaperegexp";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz";
+        sha1 = "64762c48618082518ac3df4ccf5d5886dae20347";
+      };
+    };
+    "srcset-1.0.0" = {
+      name = "srcset";
+      packageName = "srcset";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz";
-        sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2";
+        url = "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz";
+        sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef";
       };
     };
     "domutils-1.6.2" = {
@@ -21776,49 +21839,166 @@ let
         sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
       };
     };
-    "coa-1.0.4" = {
+    "coa-2.0.0" = {
       name = "coa";
       packageName = "coa";
-      version = "1.0.4";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz";
-        sha1 = "a9ef153660d6a86a8bdec0289a5c684d217432fd";
+        url = "https://registry.npmjs.org/coa/-/coa-2.0.0.tgz";
+        sha1 = "af881ebe214fc29bee4e9e76b4956b6132295546";
       };
     };
-    "js-yaml-3.7.0" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "3.7.0";
+    "css-url-regex-1.1.0" = {
+      name = "css-url-regex";
+      packageName = "css-url-regex";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
-        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+        url = "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz";
+        sha1 = "83834230cc9f74c457de59eebd1543feeb83b7ec";
       };
     };
-    "whet.extend-0.9.9" = {
-      name = "whet.extend";
-      packageName = "whet.extend";
-      version = "0.9.9";
+    "unquote-1.1.0" = {
+      name = "unquote";
+      packageName = "unquote";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz";
-        sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1";
+        url = "https://registry.npmjs.org/unquote/-/unquote-1.1.0.tgz";
+        sha1 = "98e1fc608b6b854c75afb1b95afc099ba69d942f";
       };
     };
-    "csso-2.3.2" = {
+    "css-select-1.3.0-rc0" = {
+      name = "css-select";
+      packageName = "css-select";
+      version = "1.3.0-rc0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz";
+        sha1 = "6f93196aaae737666ea1036a8cb14a8fcb7a9231";
+      };
+    };
+    "css-select-base-adapter-0.1.0" = {
+      name = "css-select-base-adapter";
+      packageName = "css-select-base-adapter";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz";
+        sha1 = "0102b3d14630df86c3eb9fa9f5456270106cf990";
+      };
+    };
+    "css-tree-1.0.0-alpha25" = {
+      name = "css-tree";
+      packageName = "css-tree";
+      version = "1.0.0-alpha25";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz";
+        sha512 = "3a7768nyac729dk372kmbf8f28j0pajy699g45bs8vrlx605wiad3i692a8y58x437bvnfy7015lx08sxhm2vknmsi83a69dwnv2bjw";
+      };
+    };
+    "csso-3.3.1" = {
       name = "csso";
       packageName = "csso";
-      version = "2.3.2";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz";
-        sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85";
+        url = "https://registry.npmjs.org/csso/-/csso-3.3.1.tgz";
+        sha512 = "087ks3lnvyygbxivwf2fnn53a033ncz1ywm3jyarhz2hvsflka09iw611cwc55ix974bflcf0wmg6zvfkhxsjqmqfrz61w5y1yi6c9s";
       };
     };
-    "clap-1.2.3" = {
-      name = "clap";
-      packageName = "clap";
-      version = "1.2.3";
+    "object.values-1.0.4" = {
+      name = "object.values";
+      packageName = "object.values";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz";
+        sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a";
+      };
+    };
+    "stable-0.1.6" = {
+      name = "stable";
+      packageName = "stable";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz";
+        sha1 = "910f5d2aed7b520c6e777499c1f32e139fdecb10";
+      };
+    };
+    "util.promisify-1.0.0" = {
+      name = "util.promisify";
+      packageName = "util.promisify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz";
+        sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb";
+      };
+    };
+    "mdn-data-1.0.0" = {
+      name = "mdn-data";
+      packageName = "mdn-data";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz";
-        sha512 = "1ha66pbxhll7c6vv641rahzq0ylwaifskwpwggy9k4sfh8r9n0r8mpqbib22dppb7zfrk6a84a4dyaal7mqs12jvlaxszz11py0nap0";
+        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.0.0.tgz";
+        sha1 = "a69d9da76847b4d5834c1465ea25c0653a1fbf66";
+      };
+    };
+    "es-abstract-1.9.0" = {
+      name = "es-abstract";
+      packageName = "es-abstract";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz";
+        sha512 = "3frzxsmb5c319c73k3r0zn7djgqbzvnjch99hni35lram09a0q8jlh666m8mjaag9gjnlqjd9gl9xb769gkjd4pb3lhvv58h8kchkcj";
+      };
+    };
+    "es-to-primitive-1.1.1" = {
+      name = "es-to-primitive";
+      packageName = "es-to-primitive";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz";
+        sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d";
+      };
+    };
+    "is-callable-1.1.3" = {
+      name = "is-callable";
+      packageName = "is-callable";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz";
+        sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2";
+      };
+    };
+    "is-regex-1.0.4" = {
+      name = "is-regex";
+      packageName = "is-regex";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
+        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+      };
+    };
+    "is-date-object-1.0.1" = {
+      name = "is-date-object";
+      packageName = "is-date-object";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
+        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+      };
+    };
+    "is-symbol-1.0.1" = {
+      name = "is-symbol";
+      packageName = "is-symbol";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz";
+        sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572";
+      };
+    };
+    "object.getownpropertydescriptors-2.0.3" = {
+      name = "object.getownpropertydescriptors";
+      packageName = "object.getownpropertydescriptors";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
+        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
       };
     };
     "enhanced-resolve-2.3.0" = {
@@ -22001,13 +22181,13 @@ let
         sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de";
       };
     };
-    "typescript-2.5.3" = {
+    "typescript-2.6.1" = {
       name = "typescript";
       packageName = "typescript";
-      version = "2.5.3";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz";
-        sha512 = "3mhb4cnf07q9jnz7r8iy06iwsq32byfvn4z3f6bbbw2sknnppa4q2v5vm12bxix8lwvbdhhqhdvkr0v1bhdb0zkxf90pqcjrm1d5lm6";
+        url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz";
+        sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631";
       };
     };
     "zip-object-0.1.0" = {
@@ -22127,15 +22307,6 @@ let
         sha512 = "100j4z1046rpprbjyf9gkbq2nzj9z8g0a5sfkrdzxv929j11l2p1a3mz2isr4pi58fhvbymsfzbaxhiv4f90x062wmh7d4q60fynjdg";
       };
     };
-    "forever-monitor-1.1.0" = {
-      name = "forever-monitor";
-      packageName = "forever-monitor";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz";
-        sha1 = "439ce036f999601cff551aea7f5151001a869ef9";
-      };
-    };
     "getmac-1.2.1" = {
       name = "getmac";
       packageName = "getmac";
@@ -22181,6 +22352,15 @@ let
         sha1 = "e87958de77ad1e936f7ce645bab8b5d7c456d937";
       };
     };
+    "memorystore-1.6.0" = {
+      name = "memorystore";
+      packageName = "memorystore";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.0.tgz";
+        sha1 = "1fb5fb5f0b2edf1add184917e918f094a9ff3465";
+      };
+    };
     "node-cache-4.1.1" = {
       name = "node-cache";
       packageName = "node-cache";
@@ -22307,87 +22487,6 @@ let
         sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
       };
     };
-    "broadway-0.2.10" = {
-      name = "broadway";
-      packageName = "broadway";
-      version = "0.2.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz";
-        sha1 = "0f58532be140426e9000e49a93e242a0d1263238";
-      };
-    };
-    "minimatch-0.0.5" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
-        sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de";
-      };
-    };
-    "watch-0.5.1" = {
-      name = "watch";
-      packageName = "watch";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
-        sha1 = "50ea3a056358c98073e0bca59956de4afd20b213";
-      };
-    };
-    "utile-0.1.7" = {
-      name = "utile";
-      packageName = "utile";
-      version = "0.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
-        sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
-      };
-    };
-    "cliff-0.1.8" = {
-      name = "cliff";
-      packageName = "cliff";
-      version = "0.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
-        sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272";
-      };
-    };
-    "winston-0.7.2" = {
-      name = "winston";
-      packageName = "winston";
-      version = "0.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
-        sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb";
-      };
-    };
-    "lru-cache-1.0.6" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
-        sha1 = "aa50f97047422ac72543bda177a9c9d018d98452";
-      };
-    };
-    "ncp-0.2.7" = {
-      name = "ncp";
-      packageName = "ncp";
-      version = "0.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz";
-        sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1";
-      };
-    };
-    "rimraf-1.0.9" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
-        sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1";
-      };
-    };
     "extract-opts-3.3.1" = {
       name = "extract-opts";
       packageName = "extract-opts";
@@ -22964,13 +23063,13 @@ let
         sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4";
       };
     };
-    "pino-4.8.0" = {
+    "pino-4.8.2" = {
       name = "pino";
       packageName = "pino";
-      version = "4.8.0";
+      version = "4.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pino/-/pino-4.8.0.tgz";
-        sha1 = "ffe37684233ebf33ffa58140d7fb5c1f7e170ecd";
+        url = "https://registry.npmjs.org/pino/-/pino-4.8.2.tgz";
+        sha512 = "2cd8127wzi403lmj965crklncvs06pfnnc8can3s1m2v1lrs1cfpxmnqa4g4rgdph5zz5rqfsg16a0hwzb6j15fpqhxmw3agl5axv8a";
       };
     };
     "postcss-6.0.11" = {
@@ -24297,7 +24396,7 @@ in
       sources."moment-2.17.1"
       sources."node.extend-1.0.10"
       sources."pkginfo-0.2.2"
-      sources."resolve-1.4.0"
+      sources."resolve-1.5.0"
       sources."source-map-0.1.9"
       sources."walk-sync-0.3.2"
       sources."xml2tss-0.0.5"
@@ -24586,7 +24685,7 @@ in
         ];
       })
       sources."moment-2.19.1"
-      (sources."ms-rest-2.2.3" // {
+      (sources."ms-rest-2.2.4" // {
         dependencies = [
           sources."moment-2.18.1"
         ];
@@ -24692,10 +24791,10 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
-      sources."@types/node-8.0.46"
-      sources."@types/request-2.0.6"
+      sources."@types/node-8.0.47"
+      sources."@types/request-2.0.7"
       sources."@types/uuid-3.4.3"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."is-stream-1.1.0"
       sources."@types/form-data-2.2.0"
       sources."lodash-4.17.4"
@@ -24892,7 +24991,7 @@ in
       sources."ext-list-2.2.2"
       sources."meow-3.7.0"
       sources."sort-keys-length-1.0.1"
-      sources."mime-db-1.30.0"
+      sources."mime-db-1.31.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -25041,7 +25140,7 @@ in
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
       sources."readable-stream-2.3.3"
-      sources."resolve-1.4.0"
+      sources."resolve-1.5.0"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
@@ -25108,7 +25207,7 @@ in
       sources."hash.js-1.1.3"
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
-      sources."asn1.js-4.9.1"
+      sources."asn1.js-4.9.2"
       (sources."ripemd160-2.0.1" // {
         dependencies = [
           sources."hash-base-2.0.2"
@@ -25126,7 +25225,7 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."function-bind-1.1.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."lexical-scope-1.2.0"
       sources."astw-2.2.0"
       sources."acorn-4.0.13"
@@ -25702,7 +25801,7 @@ in
       sources."browserify-transform-tools-1.7.0"
       sources."falafel-2.1.0"
       sources."through-2.3.8"
-      sources."acorn-5.1.2"
+      sources."acorn-5.2.1"
       sources."foreach-2.0.5"
       sources."isarray-0.0.1"
       sources."object-keys-1.0.11"
@@ -25716,7 +25815,7 @@ in
       sources."interpret-1.0.4"
       sources."rechoir-0.6.2"
       sources."fs.realpath-1.0.0"
-      sources."resolve-1.4.0"
+      sources."resolve-1.5.0"
       sources."path-parse-1.0.5"
       (sources."browserify-14.4.0" // {
         dependencies = [
@@ -25841,7 +25940,7 @@ in
       sources."hash.js-1.1.3"
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
-      sources."asn1.js-4.9.1"
+      sources."asn1.js-4.9.2"
       (sources."ripemd160-2.0.1" // {
         dependencies = [
           sources."hash-base-2.0.2"
@@ -25850,7 +25949,7 @@ in
       sources."sha.js-2.4.9"
       sources."miller-rabin-4.0.1"
       sources."function-bind-1.1.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."lexical-scope-1.2.0"
       (sources."astw-2.2.0" // {
         dependencies = [
@@ -26532,7 +26631,7 @@ in
       sources."JSONStream-1.3.1"
       sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.138.0"
+      sources."aws-sdk-2.141.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.83.0"
@@ -26581,13 +26680,12 @@ in
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."hoek-4.2.0"
       sources."boom-4.3.1"
       (sources."cryptiles-3.1.2" // {
@@ -26595,7 +26693,7 @@ in
           sources."boom-5.2.0"
         ];
       })
-      sources."sntp-2.0.2"
+      sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
       sources."sshpk-1.13.1"
@@ -26637,7 +26735,7 @@ in
       sources."import-jsx-1.3.0"
       (sources."ink-0.3.1" // {
         dependencies = [
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."ansi-styles-3.2.0"
           sources."supports-color-4.5.0"
         ];
@@ -26869,20 +26967,20 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "4.9.0";
+    version = "4.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz";
-      sha1 = "76879d274068261b191fe0f2f56c74c2f4208e8b";
+      url = "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz";
+      sha512 = "284ihlnpkrds6jd5rwdbmknxhci60p5sv24p9aad5ra2rjwb1pcakk3p630bggahmq6jjsxngj9rfmpv31jy9gs29cl2qfxzzq6bi9h";
     };
     dependencies = [
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       (sources."babel-code-frame-6.26.0" // {
         dependencies = [
           sources."chalk-1.1.3"
           sources."strip-ansi-3.0.1"
         ];
       })
-      (sources."chalk-2.2.0" // {
+      (sources."chalk-2.3.0" // {
         dependencies = [
           sources."ansi-styles-3.2.0"
           sources."supports-color-4.5.0"
@@ -26901,7 +26999,7 @@ in
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
       sources."globals-9.18.0"
-      sources."ignore-3.3.6"
+      sources."ignore-3.3.7"
       sources."imurmurhash-0.1.4"
       sources."inquirer-3.3.0"
       sources."is-resolvable-1.0.0"
@@ -26928,6 +27026,7 @@ in
       sources."text-table-0.2.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."js-tokens-3.0.2"
       sources."ansi-styles-2.2.1"
@@ -26957,7 +27056,7 @@ in
       sources."ms-2.0.0"
       sources."esrecurse-4.2.0"
       sources."object-assign-4.1.1"
-      sources."acorn-5.1.2"
+      sources."acorn-5.2.1"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
@@ -27000,7 +27099,7 @@ in
       sources."signal-exit-3.0.2"
       sources."mimic-fn-1.1.0"
       sources."iconv-lite-0.4.19"
-      sources."jschardet-1.5.1"
+      sources."jschardet-1.6.0"
       sources."tmp-0.0.33"
       sources."os-tmpdir-1.0.2"
       sources."is-promise-2.1.0"
@@ -27022,7 +27121,7 @@ in
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
-      sources."ajv-keywords-2.1.0"
+      sources."ajv-keywords-2.1.1"
       sources."slice-ansi-1.0.0"
     ];
     buildInputs = globalBuildInputs;
@@ -27047,9 +27146,9 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."eslint-4.9.0" // {
+      (sources."eslint-4.10.0" // {
         dependencies = [
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
           sources."supports-color-4.5.0"
@@ -27057,7 +27156,7 @@ in
         ];
       })
       sources."optionator-0.8.2"
-      sources."resolve-1.4.0"
+      sources."resolve-1.5.0"
       (sources."supports-color-3.2.3" // {
         dependencies = [
           sources."has-flag-1.0.0"
@@ -27068,7 +27167,7 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."ansi-regex-2.1.1"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."babel-code-frame-6.26.0"
       sources."concat-stream-1.6.0"
       sources."cross-spawn-5.1.0"
@@ -27083,11 +27182,11 @@ in
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
       sources."globals-9.18.0"
-      sources."ignore-3.3.6"
+      sources."ignore-3.3.7"
       sources."imurmurhash-0.1.4"
       (sources."inquirer-3.3.0" // {
         dependencies = [
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
           sources."supports-color-4.5.0"
@@ -27110,7 +27209,7 @@ in
       sources."strip-json-comments-2.0.1"
       (sources."table-4.0.2" // {
         dependencies = [
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."ansi-styles-3.2.0"
           sources."supports-color-4.5.0"
         ];
@@ -27118,6 +27217,7 @@ in
       sources."text-table-0.2.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."js-tokens-3.0.2"
       sources."color-convert-1.9.0"
@@ -27142,7 +27242,7 @@ in
       sources."ms-2.0.0"
       sources."esrecurse-4.2.0"
       sources."object-assign-4.1.1"
-      sources."acorn-5.1.2"
+      sources."acorn-5.2.1"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
@@ -27190,7 +27290,7 @@ in
       sources."signal-exit-3.0.2"
       sources."mimic-fn-1.1.0"
       sources."iconv-lite-0.4.19"
-      sources."jschardet-1.5.1"
+      sources."jschardet-1.6.0"
       sources."tmp-0.0.33"
       sources."os-tmpdir-1.0.2"
       sources."is-promise-2.1.0"
@@ -27209,7 +27309,7 @@ in
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
-      sources."ajv-keywords-2.1.0"
+      sources."ajv-keywords-2.1.1"
       sources."slice-ansi-1.0.0"
       sources."deep-is-0.1.3"
       sources."wordwrap-1.0.0"
@@ -27248,7 +27348,7 @@ in
       sha512 = "261zykpcgv0r96yd3qck2g2a990psma49p37kdk1xgic657pv1jnp9n9js90hqv58spgmww85kig9bd7b05lyxagz4d8nm5algyc00x";
     };
     dependencies = [
-      sources."chalk-2.2.0"
+      sources."chalk-2.3.0"
       sources."log-update-2.2.0"
       sources."meow-3.7.0"
       (sources."ora-1.3.0" // {
@@ -27336,12 +27436,7 @@ in
         ];
       })
       sources."debug-2.6.9"
-      (sources."extract-zip-1.6.5" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
-        ];
-      })
+      sources."extract-zip-1.6.6"
       sources."https-proxy-agent-2.1.0"
       sources."mime-1.4.1"
       sources."progress-2.0.0"
@@ -27524,7 +27619,7 @@ in
       })
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
@@ -27562,7 +27657,7 @@ in
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
       sources."tar-2.2.1"
-      sources."tar-pack-3.4.0"
+      sources."tar-pack-3.4.1"
       sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
@@ -27846,7 +27941,7 @@ in
       sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."acorn-globals-1.0.9"
       sources."pop-iterate-1.0.1"
       sources."weak-map-1.0.5"
@@ -27957,7 +28052,7 @@ in
       sources."lodash.isstring-4.0.1"
       sources."lodash.mapvalues-4.6.0"
       sources."rechoir-0.6.2"
-      sources."resolve-1.4.0"
+      sources."resolve-1.5.0"
       sources."detect-file-0.1.0"
       sources."is-glob-2.0.1"
       sources."micromatch-2.3.11"
@@ -27997,7 +28092,7 @@ in
         ];
       })
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."remove-trailing-separator-1.1.0"
       sources."for-own-0.1.5"
@@ -28200,23 +28295,55 @@ in
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
-    version = "3.13.2";
+    version = "3.15.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ionic/-/ionic-3.13.2.tgz";
-      sha512 = "2wd7s9cn0x8ig8dpajdk40ssym0byplr6qv8gd2ppb96r4cyhmx519k8m0skdzdir02d5ady9hbaz90jcfl4j1zfzibjjwr9g8rddb1";
+      url = "https://registry.npmjs.org/ionic/-/ionic-3.15.2.tgz";
+      sha512 = "0sdvn9yk297mzlaw81phrpki1xcg06jyyg8kc5wkwkyxbki8vszans6ynzlicpfyq4nqj2a31h4nwh9qyb0pxm7p838a2kxl33016a6";
     };
     dependencies = [
-      sources."@ionic/cli-utils-1.13.1"
-      sources."@ionic/discover-0.3.3"
-      sources."chalk-2.2.0"
+      sources."@ionic/cli-framework-0.0.2"
+      sources."@ionic/cli-utils-1.15.2"
+      sources."chalk-2.3.0"
       sources."opn-5.1.0"
       sources."os-name-2.0.1"
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
       sources."tslib-1.8.0"
+      sources."ncp-2.0.0"
+      sources."strip-ansi-4.0.0"
+      sources."superagent-3.8.0"
+      sources."ansi-regex-3.0.0"
+      sources."component-emitter-1.2.1"
+      sources."cookiejar-2.1.1"
+      sources."debug-3.1.0"
+      sources."extend-3.0.1"
+      sources."form-data-2.3.1"
+      sources."formidable-1.1.1"
+      sources."methods-1.1.2"
+      sources."mime-1.4.1"
+      sources."qs-6.5.1"
+      sources."readable-stream-2.3.3"
+      sources."ms-2.0.0"
+      sources."asynckit-0.4.0"
+      sources."combined-stream-1.0.5"
+      sources."mime-types-2.1.17"
+      sources."delayed-stream-1.0.0"
+      sources."mime-db-1.30.0"
+      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."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
+      sources."util-deprecate-1.0.2"
+      sources."@ionic/discover-0.3.3"
       sources."archiver-2.1.0"
       sources."basic-auth-1.1.0"
-      sources."body-parser-1.18.2"
+      (sources."body-parser-1.18.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."chokidar-1.7.0"
       sources."ci-info-1.1.1"
       sources."cross-spawn-5.1.0"
@@ -28225,15 +28352,19 @@ in
       sources."elementtree-0.1.7"
       (sources."express-4.16.2" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."setprototypeof-1.1.0"
           sources."statuses-1.3.1"
         ];
       })
       sources."inquirer-3.3.0"
-      sources."leek-0.0.24"
+      (sources."leek-0.0.24" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."lodash-4.17.4"
       sources."minimist-1.2.0"
-      sources."ncp-2.0.0"
       sources."proxy-middleware-0.15.0"
       (sources."slice-ansi-1.0.0" // {
         dependencies = [
@@ -28246,27 +28377,20 @@ in
           sources."is-fullwidth-code-point-2.0.0"
         ];
       })
-      (sources."strip-ansi-4.0.0" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-        ];
-      })
-      (sources."superagent-3.7.0" // {
+      sources."tar-2.2.1"
+      (sources."tiny-lr-1.0.5" // {
         dependencies = [
-          sources."debug-3.1.0"
-          sources."form-data-2.3.1"
+          sources."debug-2.6.9"
         ];
       })
-      sources."tar-2.2.1"
-      sources."tiny-lr-1.0.5"
       sources."uuid-3.1.0"
       sources."wrap-ansi-3.0.1"
       sources."ws-3.2.0"
+      sources."netmask-1.0.6"
       sources."archiver-utils-1.3.0"
       sources."async-2.5.0"
       sources."buffer-crc32-0.2.13"
       sources."glob-7.1.2"
-      sources."readable-stream-2.3.3"
       sources."tar-stream-1.5.4"
       sources."zip-stream-1.2.0"
       sources."graceful-fs-4.1.11"
@@ -28275,7 +28399,6 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
@@ -28283,12 +28406,6 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.1"
-      sources."string_decoder-1.0.3"
-      sources."util-deprecate-1.0.2"
       sources."bl-1.2.1"
       sources."end-of-stream-1.4.0"
       sources."xtend-4.0.1"
@@ -28297,22 +28414,17 @@ in
       sources."crc-3.5.0"
       sources."bytes-3.0.0"
       sources."content-type-1.0.4"
-      sources."debug-2.6.9"
       sources."depd-1.1.1"
       sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
       sources."on-finished-2.3.0"
-      sources."qs-6.5.1"
       sources."raw-body-2.3.2"
       sources."type-is-1.6.15"
-      sources."ms-2.0.0"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.4.0"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.17"
-      sources."mime-db-1.30.0"
       sources."anymatch-1.3.2"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
@@ -28350,7 +28462,7 @@ in
         ];
       })
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
@@ -28373,11 +28485,16 @@ in
       sources."rc-1.2.2"
       (sources."request-2.81.0" // {
         dependencies = [
+          sources."form-data-2.1.4"
           sources."qs-6.4.0"
         ];
       })
       sources."hawk-3.1.3"
-      sources."tar-pack-3.4.0"
+      (sources."tar-pack-3.4.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
@@ -28388,6 +28505,7 @@ in
         dependencies = [
           sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
         ];
       })
       sources."set-blocking-2.0.0"
@@ -28400,22 +28518,19 @@ in
         dependencies = [
           sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
         ];
       })
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
@@ -28426,8 +28541,6 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
@@ -28492,18 +28605,19 @@ in
       sources."etag-1.8.1"
       (sources."finalhandler-1.1.0" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."statuses-1.3.1"
         ];
       })
       sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
-      sources."methods-1.1.2"
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-2.0.2"
       sources."range-parser-1.2.0"
       (sources."send-0.16.1" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."statuses-1.3.1"
         ];
       })
@@ -28514,7 +28628,6 @@ in
       sources."forwarded-0.1.2"
       sources."ipaddr.js-1.5.2"
       sources."destroy-1.0.4"
-      sources."mime-1.4.1"
       sources."ansi-escapes-3.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
@@ -28528,7 +28641,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."mimic-fn-1.1.0"
-      sources."jschardet-1.5.1"
+      sources."jschardet-1.6.0"
       sources."tmp-0.0.33"
       sources."escape-string-regexp-1.0.5"
       sources."is-promise-2.1.0"
@@ -28544,9 +28657,6 @@ in
       sources."lodash._getnative-3.9.1"
       sources."lodash.isarguments-3.1.0"
       sources."lodash.isarray-3.0.4"
-      sources."component-emitter-1.2.1"
-      sources."cookiejar-2.1.1"
-      sources."formidable-1.1.1"
       sources."block-stream-0.0.9"
       (sources."body-5.1.0" // {
         dependencies = [
@@ -28566,7 +28676,6 @@ in
       sources."websocket-extensions-0.1.2"
       sources."async-limiter-1.0.0"
       sources."ultron-1.1.0"
-      sources."netmask-1.0.6"
       sources."ansi-styles-3.2.0"
       sources."supports-color-4.5.0"
       sources."color-convert-1.9.0"
@@ -28681,7 +28790,7 @@ in
       sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."argparse-1.0.9"
       sources."sprintf-js-1.0.3"
       sources."has-flag-1.0.0"
@@ -28698,16 +28807,15 @@ in
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";
-    version = "2.5.2";
+    version = "2.5.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.2.tgz";
-      sha512 = "2vlp1rxalykzb0qwn4sv1pk58ph37nhaqqgnih83i39msplqh826dvbdd4j1791hl2almpj9g1snhdfy89cyn8y86bz7bcbr9mh6aih";
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.4.tgz";
+      sha512 = "08pa61nhkvmac5kwr61iqbw0251r6kwhix9l41rgxjinpi8p9s5anvy8a2zzfjrlkr93aqbbniy4qa095li7xn84vl8dv6aqxkpaba4";
     };
     dependencies = [
-      sources."@reactivex/rxjs-5.5.0"
       sources."chai-4.1.2"
       sources."chai-as-promised-7.1.1"
-      sources."chalk-2.2.0"
+      sources."chalk-2.3.0"
       sources."commander-2.11.0"
       sources."fast-json-patch-2.0.6"
       sources."glob-7.1.2"
@@ -28721,13 +28829,13 @@ in
       sources."mz-2.7.0"
       sources."object-hash-1.2.0"
       sources."opentracing-0.14.1"
+      sources."rxjs-5.5.2"
       sources."semaphore-async-await-1.5.1"
       sources."string-similarity-1.2.0"
       sources."typescript-2.4.2"
       sources."vscode-jsonrpc-3.4.1"
       sources."vscode-languageserver-3.4.3"
       sources."vscode-languageserver-types-3.4.0"
-      sources."symbol-observable-1.0.4"
       sources."assertion-error-1.0.2"
       sources."check-error-1.0.2"
       sources."deep-eql-3.0.1"
@@ -28764,6 +28872,7 @@ in
       sources."object-assign-4.1.1"
       sources."thenify-all-1.6.0"
       sources."thenify-3.3.0"
+      sources."symbol-observable-1.0.4"
       sources."vscode-uri-1.0.1"
       sources."vscode-languageserver-protocol-3.4.4"
     ];
@@ -28951,7 +29060,7 @@ in
       sources."argparse-1.0.9"
       sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
-      sources."superagent-3.7.0"
+      sources."superagent-3.8.0"
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.1"
       sources."debug-3.1.0"
@@ -29117,13 +29226,12 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."hoek-4.2.0"
       sources."boom-4.3.1"
       (sources."cryptiles-3.1.2" // {
@@ -29131,7 +29239,7 @@ in
           sources."boom-5.2.0"
         ];
       })
-      sources."sntp-2.0.2"
+      sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
       sources."sshpk-1.13.1"
@@ -29401,7 +29509,7 @@ in
       })
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
@@ -29436,7 +29544,7 @@ in
       sources."hawk-3.1.3"
       sources."semver-5.4.1"
       sources."tar-2.2.1"
-      sources."tar-pack-3.4.0"
+      sources."tar-pack-3.4.1"
       sources."minimist-0.0.8"
       sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
@@ -29794,7 +29902,7 @@ in
     };
     dependencies = [
       sources."async-1.5.2"
-      sources."chalk-2.2.0"
+      sources."chalk-2.3.0"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
       sources."command-join-2.0.0"
@@ -29959,7 +30067,7 @@ in
       sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."through-2.3.8"
       sources."JSONStream-1.3.1"
       sources."is-text-path-1.0.1"
@@ -30066,7 +30174,7 @@ in
       sources."onetime-2.0.1"
       sources."mimic-fn-1.1.0"
       sources."iconv-lite-0.4.19"
-      sources."jschardet-1.5.1"
+      sources."jschardet-1.6.0"
       sources."tmp-0.0.33"
       sources."is-promise-2.1.0"
       sources."is-fullwidth-code-point-2.0.0"
@@ -30247,7 +30355,7 @@ in
         ];
       })
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."remove-trailing-separator-1.1.0"
       sources."for-own-0.1.5"
@@ -30311,7 +30419,7 @@ in
           sources."hawk-6.0.2"
           sources."http-signature-1.2.0"
           sources."performance-now-2.1.0"
-          sources."ajv-5.2.4"
+          sources."ajv-5.3.0"
           sources."har-schema-2.0.0"
           sources."hoek-4.2.0"
           sources."boom-4.3.1"
@@ -30320,7 +30428,7 @@ in
               sources."boom-5.2.0"
             ];
           })
-          sources."sntp-2.0.2"
+          sources."sntp-2.1.0"
           sources."assert-plus-1.0.0"
         ];
       })
@@ -30384,7 +30492,7 @@ in
       })
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
@@ -30426,7 +30534,7 @@ in
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
       sources."tar-2.2.1"
-      sources."tar-pack-3.4.0"
+      sources."tar-pack-3.4.1"
       sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
@@ -30567,6 +30675,7 @@ in
       sources."html-entities-1.2.1"
       sources."is-wsl-1.1.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       (sources."engine.io-3.1.3" // {
         dependencies = [
@@ -30690,7 +30799,7 @@ in
       })
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
@@ -30728,7 +30837,7 @@ in
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
       sources."tar-2.2.1"
-      sources."tar-pack-3.4.0"
+      sources."tar-pack-3.4.1"
       sources."minimist-0.0.8"
       sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
@@ -30978,7 +31087,7 @@ in
       sources."slash-1.0.0"
       sources."uri-js-3.0.2"
       sources."lodash-4.17.4"
-      sources."superagent-3.7.0"
+      sources."superagent-3.8.0"
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.1"
       sources."debug-3.1.0"
@@ -31115,13 +31224,12 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."hoek-4.2.0"
       sources."boom-4.3.1"
       (sources."cryptiles-3.1.2" // {
@@ -31129,7 +31237,7 @@ in
           sources."boom-5.2.0"
         ];
       })
-      sources."sntp-2.0.2"
+      sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
       sources."sshpk-1.13.1"
@@ -31272,13 +31380,12 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."hoek-4.2.0"
       sources."boom-4.3.1"
       (sources."cryptiles-3.1.2" // {
@@ -31286,7 +31393,7 @@ in
           sources."boom-5.2.0"
         ];
       })
-      sources."sntp-2.0.2"
+      sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
       sources."sshpk-1.13.1"
@@ -31490,7 +31597,7 @@ in
       })
       sources."hawk-3.1.3"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.4.0" // {
+      (sources."tar-pack-3.4.1" // {
         dependencies = [
           sources."rimraf-2.6.2"
           sources."glob-7.1.2"
@@ -31623,7 +31730,7 @@ in
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
       sources."tar-2.2.1"
-      sources."tar-pack-3.4.0"
+      sources."tar-pack-3.4.1"
       sources."minimist-0.0.8"
       sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
@@ -31812,7 +31919,7 @@ in
       })
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
@@ -31846,7 +31953,7 @@ in
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
       sources."tar-2.2.1"
-      sources."tar-pack-3.4.0"
+      sources."tar-pack-3.4.1"
       sources."minimist-0.0.8"
       sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
@@ -31977,7 +32084,7 @@ in
           sources."ansi-regex-3.0.0"
         ];
       })
-      sources."chalk-2.2.0"
+      sources."chalk-2.3.0"
       sources."configstore-3.1.1"
       sources."import-lazy-2.1.0"
       sources."is-installed-globally-0.1.0"
@@ -32135,7 +32242,7 @@ in
               sources."boom-5.2.0"
             ];
           })
-          sources."sntp-2.0.2"
+          sources."sntp-2.1.0"
           sources."assert-plus-1.0.0"
         ];
       })
@@ -32193,7 +32300,7 @@ in
       sources."cookie-signature-1.0.6"
       sources."object-assign-4.1.1"
       sources."vary-1.1.2"
-      sources."moment-timezone-0.5.13"
+      sources."moment-timezone-0.5.14"
       sources."moment-2.19.1"
       sources."accepts-1.3.4"
       sources."array-flatten-1.1.1"
@@ -32251,7 +32358,7 @@ in
       sources."pump-1.0.2"
       sources."reinterval-1.1.0"
       sources."split2-2.2.0"
-      (sources."websocket-stream-5.0.1" // {
+      (sources."websocket-stream-5.1.1" // {
         dependencies = [
           sources."ws-3.2.0"
         ];
@@ -32469,10 +32576,11 @@ in
       sources."performance-now-2.1.0"
       sources."uuid-3.1.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."nan-2.6.2"
       (sources."node-pre-gyp-0.6.36" // {
@@ -32494,7 +32602,7 @@ in
               sources."boom-5.2.0"
             ];
           })
-          sources."sntp-2.0.2"
+          sources."sntp-2.1.0"
           sources."assert-plus-1.0.0"
         ];
       })
@@ -32502,7 +32610,7 @@ in
       sources."rc-1.2.2"
       sources."rimraf-2.6.2"
       sources."tar-2.2.1"
-      sources."tar-pack-3.4.0"
+      sources."tar-pack-3.4.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -32743,7 +32851,7 @@ in
       sources."path-is-inside-1.0.2"
       sources."promise-inflight-1.0.1"
       sources."qrcode-terminal-0.11.0"
-      sources."query-string-5.0.0"
+      sources."query-string-5.0.1"
       sources."qw-1.0.1"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
@@ -32783,7 +32891,7 @@ in
       sources."uuid-3.1.0"
       sources."validate-npm-package-name-3.0.0"
       sources."which-1.3.0"
-      sources."worker-farm-1.5.0"
+      sources."worker-farm-1.5.1"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.1.0"
       sources."debuglog-1.0.1"
@@ -32976,13 +33084,12 @@ in
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."hoek-4.2.0"
       sources."boom-4.3.1"
       (sources."cryptiles-3.1.2" // {
@@ -32990,7 +33097,7 @@ in
           sources."boom-5.2.0"
         ];
       })
-      sources."sntp-2.0.2"
+      sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
       sources."sshpk-1.13.1"
@@ -33016,7 +33123,7 @@ in
       sources."unique-slug-2.0.0"
       (sources."boxen-1.2.2" // {
         dependencies = [
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."string-width-2.1.1"
           sources."is-fullwidth-code-point-2.0.0"
         ];
@@ -33174,13 +33281,12 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."hoek-4.2.0"
       sources."boom-4.3.1"
       (sources."cryptiles-3.1.2" // {
@@ -33188,7 +33294,7 @@ in
           sources."boom-5.2.0"
         ];
       })
-      sources."sntp-2.0.2"
+      sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
       sources."sshpk-1.13.1"
@@ -33305,7 +33411,7 @@ in
       })
       sources."semver-5.4.1"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.45.0" // {
+      (sources."snyk-1.47.0" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -33320,7 +33426,7 @@ in
       (sources."update-notifier-2.3.0" // {
         dependencies = [
           sources."boxen-1.2.2"
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."configstore-3.1.1"
           sources."latest-version-3.1.0"
           sources."xdg-basedir-3.0.0"
@@ -33607,10 +33713,15 @@ in
       sources."open-0.0.5"
       sources."os-name-1.0.3"
       sources."snyk-config-1.0.1"
-      sources."snyk-go-plugin-1.3.7"
+      sources."snyk-go-plugin-1.3.8"
       sources."snyk-gradle-plugin-1.2.0"
       sources."snyk-module-1.8.1"
       sources."snyk-mvn-plugin-1.1.0"
+      (sources."snyk-nuget-plugin-1.0.0" // {
+        dependencies = [
+          sources."es6-promise-4.1.1"
+        ];
+      })
       sources."snyk-policy-1.7.1"
       sources."snyk-python-plugin-1.4.0"
       (sources."snyk-recursive-readdir-2.0.0" // {
@@ -33677,7 +33788,7 @@ in
       sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."graphlib-2.1.1"
       sources."toml-2.3.3"
       sources."clone-deep-0.3.0"
@@ -33697,6 +33808,13 @@ in
           sources."for-in-0.1.8"
         ];
       })
+      sources."xml2js-0.4.19"
+      sources."zip-1.2.0"
+      sources."sax-1.2.4"
+      sources."xmlbuilder-9.0.4"
+      sources."bops-0.1.1"
+      sources."base64-js-0.0.2"
+      sources."to-utf8-0.0.1"
       sources."js-yaml-3.10.0"
       sources."argparse-1.0.9"
       sources."esprima-4.0.0"
@@ -33869,10 +33987,10 @@ in
   parsoid = nodeEnv.buildNodePackage {
     name = "parsoid";
     packageName = "parsoid";
-    version = "0.7.1";
+    version = "0.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.7.1.tgz";
-      sha1 = "121dcf59d0bacd9247405988525888f9a6ba2328";
+      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.8.0.tgz";
+      sha1 = "fbedac4c5c0b721f4c241287b81bdc3e4c7987c9";
     };
     dependencies = [
       sources."async-0.9.2"
@@ -33887,47 +34005,36 @@ in
       sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
       sources."core-js-2.5.1"
       sources."diff-1.4.0"
-      sources."domino-1.0.29"
+      sources."domino-1.0.30"
       sources."entities-1.1.1"
       (sources."express-4.16.2" // {
         dependencies = [
           sources."content-type-1.0.4"
-          sources."finalhandler-1.1.0"
           sources."setprototypeof-1.1.0"
           sources."statuses-1.3.1"
         ];
       })
       sources."express-handlebars-3.0.0"
-      (sources."finalhandler-0.5.1" // {
+      (sources."finalhandler-1.1.0" // {
         dependencies = [
-          sources."debug-2.2.0"
           sources."statuses-1.3.1"
-          sources."ms-0.7.1"
         ];
       })
       sources."js-yaml-3.10.0"
-      sources."mediawiki-title-0.5.6"
+      sources."mediawiki-title-0.6.4"
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
-      sources."node-uuid-1.4.8"
       sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork"
       sources."prfun-2.1.4"
       sources."request-2.83.0"
       sources."semver-5.4.1"
       sources."serve-favicon-2.4.5"
-      (sources."service-runner-2.3.0" // {
-        dependencies = [
-          sources."yargs-7.1.0"
-          sources."camelcase-3.0.0"
-          sources."cliui-3.2.0"
-        ];
-      })
+      sources."service-runner-2.3.0"
       sources."simplediff-0.1.1"
-      (sources."yargs-5.0.0" // {
+      sources."uuid-3.1.0"
+      (sources."yargs-7.1.0" // {
         dependencies = [
-          sources."cliui-3.2.0"
-          sources."window-size-0.2.0"
-          sources."yargs-parser-3.2.0"
           sources."camelcase-3.0.0"
+          sources."cliui-3.2.0"
         ];
       })
       sources."asap-2.0.6"
@@ -34031,7 +34138,7 @@ in
       sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."function-bind-1.1.1"
       sources."object-keys-1.0.11"
       sources."define-properties-1.1.2"
@@ -34057,16 +34164,14 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."hoek-4.2.0"
       sources."boom-4.3.1"
       (sources."cryptiles-3.1.2" // {
@@ -34074,7 +34179,7 @@ in
           sources."boom-5.2.0"
         ];
       })
-      sources."sntp-2.0.2"
+      sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
       sources."sshpk-1.13.1"
@@ -34093,7 +34198,7 @@ in
       sources."bunyan-1.8.12"
       sources."bunyan-syslog-udp-0.1.0"
       sources."gelf-stream-1.1.1"
-      sources."hot-shots-4.7.0"
+      sources."hot-shots-4.7.1"
       (sources."limitation-0.2.0" // {
         dependencies = [
           sources."readable-stream-2.3.3"
@@ -34140,7 +34245,7 @@ in
       })
       sources."lodash-3.10.1"
       sources."merge-1.2.0"
-      (sources."msgpack5-3.5.1" // {
+      (sources."msgpack5-3.6.0" // {
         dependencies = [
           sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
@@ -34157,6 +34262,8 @@ in
           sources."string_decoder-1.0.3"
         ];
       })
+      sources."lodash.clone-4.3.2"
+      sources."lodash._baseclone-4.5.7"
       sources."get-caller-file-1.0.2"
       sources."os-locale-1.4.0"
       sources."read-pkg-up-1.0.1"
@@ -34200,9 +34307,6 @@ in
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."lodash.clone-4.3.2"
-      sources."lodash._baseclone-4.5.7"
-      sources."lodash.assign-4.2.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -35109,7 +35213,7 @@ in
           sources."string_decoder-1.0.3"
         ];
       })
-      sources."resolve-1.4.0"
+      sources."resolve-1.5.0"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
@@ -35175,7 +35279,7 @@ in
       sources."hash.js-1.1.3"
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
-      sources."asn1.js-4.9.1"
+      sources."asn1.js-4.9.2"
       (sources."ripemd160-2.0.1" // {
         dependencies = [
           sources."hash-base-2.0.2"
@@ -35184,7 +35288,7 @@ in
       sources."sha.js-2.4.9"
       sources."miller-rabin-4.0.1"
       sources."function-bind-1.1.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."lexical-scope-1.2.0"
       sources."astw-2.2.0"
       sources."acorn-4.0.13"
@@ -35294,7 +35398,7 @@ in
       sources."hawk-3.1.3"
       sources."semver-5.4.1"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.4.0" // {
+      (sources."tar-pack-3.4.1" // {
         dependencies = [
           sources."rimraf-2.6.2"
         ];
@@ -35557,13 +35661,12 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."hoek-4.2.0"
       sources."boom-4.3.1"
       (sources."cryptiles-3.1.2" // {
@@ -35571,7 +35674,7 @@ in
           sources."boom-5.2.0"
         ];
       })
-      sources."sntp-2.0.2"
+      sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
       sources."sshpk-1.13.1"
@@ -35613,10 +35716,10 @@ in
   serve = nodeEnv.buildNodePackage {
     name = "serve";
     packageName = "serve";
-    version = "6.3.1";
+    version = "6.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serve/-/serve-6.3.1.tgz";
-      sha512 = "3zimikqfpvw7vhrp8qaf1pk3wk9idqpa72jvla68f9skcyrl9027ksgb851y251fzxmklxzymipy42gf9m7vnp8jjvya4gwng7mmr6n";
+      url = "https://registry.npmjs.org/serve/-/serve-6.4.0.tgz";
+      sha512 = "0kb65fj5n5z4j11c8247zvabb0qp4w5w9ls29bypm11ay9g2a1riv5wl72ya44b4arwxhyawxxijb5r5zjlwfs9zsbklcp6vbc8mphs";
     };
     dependencies = [
       sources."args-3.0.7"
@@ -35637,7 +35740,11 @@ in
       sources."ip-1.1.5"
       sources."micro-9.0.0"
       sources."micro-compress-1.0.0"
-      sources."mime-types-2.1.17"
+      (sources."mime-types-2.1.17" // {
+        dependencies = [
+          sources."mime-db-1.30.0"
+        ];
+      })
       sources."node-version-1.1.0"
       sources."openssl-self-signed-certificate-1.1.6"
       sources."opn-5.1.0"
@@ -35730,7 +35837,7 @@ in
       sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."media-typer-0.3.0"
       sources."raw-body-2.3.2"
       sources."bytes-3.0.0"
@@ -35747,7 +35854,7 @@ in
       sources."on-headers-1.0.1"
       sources."vary-1.1.2"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.30.0"
+      sources."mime-db-1.31.0"
       sources."is-wsl-1.1.0"
       sources."pify-3.0.0"
       sources."destroy-1.0.4"
@@ -35939,13 +36046,12 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."hoek-4.2.0"
       sources."boom-4.3.1"
       (sources."cryptiles-3.1.2" // {
@@ -35953,7 +36059,7 @@ in
           sources."boom-5.2.0"
         ];
       })
-      sources."sntp-2.0.2"
+      sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
       sources."sshpk-1.13.1"
@@ -36000,7 +36106,7 @@ in
       sources."source-map-0.1.43"
       sources."amdefine-1.0.1"
       sources."markdown-it-4.4.0"
-      sources."sanitize-html-1.14.1"
+      sources."sanitize-html-1.15.0"
       sources."entities-1.1.1"
       sources."linkify-it-1.2.4"
       sources."mdurl-1.0.1"
@@ -36010,7 +36116,8 @@ in
           sources."readable-stream-2.3.3"
         ];
       })
-      sources."regexp-quote-0.0.0"
+      sources."lodash.escaperegexp-4.1.2"
+      sources."srcset-1.0.0"
       sources."xtend-4.0.1"
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.1"
@@ -36024,6 +36131,8 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."number-is-nan-1.0.1"
       sources."jsonparse-1.3.1"
       sources."through-2.3.8"
       sources."minimist-0.0.8"
@@ -36218,6 +36327,62 @@ in
     };
     production = true;
   };
+  "socket.io" = nodeEnv.buildNodePackage {
+    name = "socket.io";
+    packageName = "socket.io";
+    version = "2.0.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz";
+      sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014";
+    };
+    dependencies = [
+      sources."debug-2.6.9"
+      sources."engine.io-3.1.3"
+      sources."socket.io-adapter-1.1.1"
+      sources."socket.io-client-2.0.4"
+      sources."socket.io-parser-3.1.2"
+      sources."ms-2.0.0"
+      sources."accepts-1.3.3"
+      sources."base64id-1.0.0"
+      sources."engine.io-parser-2.1.1"
+      sources."ws-2.3.1"
+      sources."cookie-0.3.1"
+      sources."uws-0.14.5"
+      sources."mime-types-2.1.17"
+      sources."negotiator-0.6.1"
+      sources."mime-db-1.30.0"
+      sources."after-0.8.2"
+      sources."arraybuffer.slice-0.0.6"
+      sources."base64-arraybuffer-0.1.5"
+      sources."blob-0.0.4"
+      sources."has-binary2-1.0.2"
+      sources."isarray-2.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."ultron-1.1.0"
+      sources."backo2-1.0.2"
+      sources."component-bind-1.0.0"
+      sources."component-emitter-1.2.1"
+      sources."engine.io-client-3.1.3"
+      sources."has-cors-1.1.0"
+      sources."indexof-0.0.1"
+      sources."object-component-0.0.3"
+      sources."parseqs-0.0.5"
+      sources."parseuri-0.0.5"
+      sources."to-array-0.1.4"
+      sources."component-inherit-0.0.3"
+      sources."xmlhttprequest-ssl-1.5.4"
+      sources."yeast-0.1.2"
+      sources."better-assert-1.0.2"
+      sources."callsite-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "node.js realtime framework server";
+      homepage = "https://github.com/socketio/socket.io#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
   stylus = nodeEnv.buildNodePackage {
     name = "stylus";
     packageName = "stylus";
@@ -36258,33 +36423,56 @@ in
   svgo = nodeEnv.buildNodePackage {
     name = "svgo";
     packageName = "svgo";
-    version = "0.7.2";
+    version = "1.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz";
-      sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5";
+      url = "https://registry.npmjs.org/svgo/-/svgo-1.0.1.tgz";
+      sha512 = "2higmngdwd7fgjzcgy9drv5wgm201dza97l73s7arcwjvc725vkvwfqrzcs96agl989ya0mmi1k96d5k3hy6b9cb12jj5qz0dyy4h2q";
     };
     dependencies = [
-      sources."sax-1.2.4"
-      sources."coa-1.0.4"
-      sources."js-yaml-3.7.0"
+      sources."coa-2.0.0"
       sources."colors-1.1.2"
-      sources."whet.extend-0.9.9"
+      sources."css-url-regex-1.1.0"
+      sources."unquote-1.1.0"
       sources."mkdirp-0.5.1"
-      sources."csso-2.3.2"
+      sources."css-select-1.3.0-rc0"
+      sources."css-select-base-adapter-0.1.0"
+      sources."css-tree-1.0.0-alpha25"
+      sources."csso-3.3.1"
+      sources."js-yaml-3.10.0"
+      sources."object.values-1.0.4"
+      sources."sax-1.2.4"
+      sources."stable-0.1.6"
+      sources."util.promisify-1.0.0"
       sources."q-1.5.1"
-      sources."argparse-1.0.9"
-      sources."esprima-2.7.3"
-      sources."sprintf-js-1.0.3"
       sources."minimist-0.0.8"
-      sources."clap-1.2.3"
+      sources."boolbase-1.0.0"
+      sources."css-what-2.1.0"
+      sources."domutils-1.5.1"
+      sources."nth-check-1.0.1"
+      (sources."dom-serializer-0.1.0" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+        ];
+      })
+      sources."domelementtype-1.3.0"
+      sources."entities-1.1.1"
+      sources."mdn-data-1.0.0"
       sources."source-map-0.5.7"
-      sources."chalk-1.1.3"
-      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.1.1"
+      sources."argparse-1.0.9"
+      sources."esprima-4.0.0"
+      sources."sprintf-js-1.0.3"
+      sources."define-properties-1.1.2"
+      sources."es-abstract-1.9.0"
+      sources."has-1.0.1"
+      sources."function-bind-1.1.1"
+      sources."foreach-2.0.5"
+      sources."object-keys-1.0.11"
+      sources."es-to-primitive-1.1.1"
+      sources."is-callable-1.1.3"
+      sources."is-regex-1.0.4"
+      sources."is-date-object-1.0.1"
+      sources."is-symbol-1.0.1"
+      sources."object.getownpropertydescriptors-2.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -36342,10 +36530,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.5.3";
+    version = "2.6.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz";
-      sha512 = "3mhb4cnf07q9jnz7r8iy06iwsq32byfvn4z3f6bbbw2sknnppa4q2v5vm12bxix8lwvbdhhqhdvkr0v1bhdb0zkxf90pqcjrm1d5lm6";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz";
+      sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -36378,7 +36566,7 @@ in
       sources."typings-core-2.3.3"
       (sources."update-notifier-2.3.0" // {
         dependencies = [
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."ansi-styles-3.2.0"
           sources."supports-color-4.5.0"
         ];
@@ -36438,7 +36626,7 @@ in
       sources."thenify-3.3.0"
       sources."throat-3.2.0"
       sources."touch-1.0.0"
-      sources."typescript-2.5.3"
+      sources."typescript-2.6.1"
       sources."zip-object-0.1.0"
       sources."dot-prop-4.2.0"
       sources."make-dir-1.1.0"
@@ -36504,7 +36692,7 @@ in
       sources."abbrev-1.1.1"
       (sources."boxen-1.2.2" // {
         dependencies = [
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."ansi-styles-3.2.0"
           sources."supports-color-4.5.0"
         ];
@@ -36577,10 +36765,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.1.5";
+    version = "3.1.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.5.tgz";
-      sha512 = "1fgrmz71wwy21h9m0vg1f0hd9g4c5gdj1xa87cfcl920plwpv90ps0kkafs6xhgbvxl2a9bqmjz8k6sdp96x9hf9cap0r66pwxsaamm";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.6.tgz";
+      sha512 = "1hffvxym85dy9nzmjriwyazvy7k6x3iwp0j0dway300hawcdbmfirbglvshxjflzci25z725zl07650m5dgdfydlc0m648a275ixfzy";
     };
     dependencies = [
       sources."commander-2.11.0"
@@ -36597,10 +36785,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.33";
+    version = "1.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.33.tgz";
-      sha1 = "f5b42a9e36e6d236060df399ece5bd14066cf716";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.2.0.tgz";
+      sha512 = "3qbjszm2whg22ljrg0knwzn1d2ry9mxkpqsbh7pmnjgfzyalqjc8h8s7v8iyb71gavj78d6gmlk0dkhdlsr2hgcai9ndjs6vad8p6gg";
     };
     dependencies = [
       sources."async-2.5.0"
@@ -36622,10 +36810,9 @@ in
           sources."utils-merge-1.0.1"
         ];
       })
-      sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
-      sources."ignore-3.3.6"
+      sources."ignore-3.3.7"
       sources."just-detect-adblock-1.0.0"
       (sources."keen.io-0.1.3" // {
         dependencies = [
@@ -36633,72 +36820,27 @@ in
           sources."qs-1.2.0"
           sources."mime-1.2.11"
           sources."methods-1.0.1"
-          sources."form-data-0.1.3"
-          sources."async-0.9.2"
         ];
       })
       sources."knockout-3.4.2"
       sources."lodash-4.17.4"
-      (sources."mkdirp-0.5.1" // {
+      (sources."memorystore-1.6.0" // {
         dependencies = [
-          sources."minimist-0.0.8"
+          sources."debug-3.1.0"
         ];
       })
+      sources."mkdirp-0.5.1"
       sources."moment-2.18.1"
       sources."node-cache-4.1.1"
       (sources."npm-5.4.2" // {
         dependencies = [
-          sources."lru-cache-4.1.1"
           sources."nopt-4.0.1"
           sources."readable-stream-2.3.3"
-          sources."request-2.81.0"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.3"
-          sources."combined-stream-1.0.5"
-          sources."extend-3.0.1"
-          sources."forever-agent-0.6.1"
-          sources."form-data-2.1.4"
-          sources."hawk-3.1.3"
-          sources."json-stringify-safe-5.0.1"
-          sources."oauth-sign-0.8.2"
-          sources."qs-6.4.0"
-          sources."tunnel-agent-0.6.0"
-          sources."delayed-stream-1.0.0"
-          sources."hoek-2.16.3"
-          sources."boom-2.10.1"
-          sources."cryptiles-2.0.5"
-          sources."sntp-1.0.9"
-        ];
-      })
-      (sources."npm-registry-client-8.4.0" // {
-        dependencies = [
-          sources."request-2.83.0"
-          sources."aws-sign2-0.7.0"
-          sources."combined-stream-1.0.5"
-          sources."extend-3.0.1"
-          sources."forever-agent-0.6.1"
-          sources."form-data-2.3.1"
-          sources."har-validator-5.0.3"
-          sources."hawk-6.0.2"
-          sources."http-signature-1.2.0"
-          sources."json-stringify-safe-5.0.1"
-          sources."oauth-sign-0.8.2"
-          sources."performance-now-2.1.0"
-          sources."tunnel-agent-0.6.0"
-          sources."delayed-stream-1.0.0"
-          sources."ajv-5.2.4"
-          sources."har-schema-2.0.0"
-          sources."hoek-4.2.0"
-          sources."boom-4.3.1"
-          (sources."cryptiles-3.1.2" // {
-            dependencies = [
-              sources."boom-5.2.0"
-            ];
-          })
-          sources."sntp-2.0.2"
-          sources."assert-plus-1.0.0"
         ];
       })
+      sources."npm-registry-client-8.4.0"
       sources."octicons-3.5.0"
       sources."open-0.0.5"
       sources."os-homedir-1.0.2"
@@ -36706,8 +36848,6 @@ in
       sources."passport-local-1.0.0"
       (sources."raven-2.1.2" // {
         dependencies = [
-          sources."json-stringify-safe-5.0.1"
-          sources."stack-trace-0.0.9"
           sources."uuid-3.0.0"
         ];
       })
@@ -36744,7 +36884,6 @@ in
       (sources."winston-2.3.1" // {
         dependencies = [
           sources."async-1.0.0"
-          sources."colors-1.0.3"
         ];
       })
       sources."yargs-9.0.1"
@@ -36817,79 +36956,6 @@ in
       sources."on-headers-1.0.1"
       sources."uid-safe-2.1.5"
       sources."random-bytes-1.0.0"
-      (sources."broadway-0.2.10" // {
-        dependencies = [
-          sources."winston-0.7.2"
-          sources."utile-0.2.1"
-          sources."async-0.2.10"
-          sources."pkginfo-0.3.1"
-          sources."request-2.16.6"
-          sources."mime-1.2.11"
-          sources."qs-0.5.6"
-        ];
-      })
-      sources."minimatch-0.0.5"
-      sources."pkginfo-0.4.1"
-      sources."ps-tree-0.0.3"
-      sources."watch-0.5.1"
-      (sources."utile-0.1.7" // {
-        dependencies = [
-          sources."async-0.1.22"
-          sources."ncp-0.2.7"
-          sources."rimraf-1.0.9"
-        ];
-      })
-      (sources."cliff-0.1.8" // {
-        dependencies = [
-          sources."winston-0.6.2"
-          sources."async-0.1.22"
-          sources."pkginfo-0.2.3"
-        ];
-      })
-      sources."eventemitter2-0.4.14"
-      (sources."nconf-0.6.9" // {
-        dependencies = [
-          sources."async-0.2.9"
-        ];
-      })
-      sources."colors-0.6.2"
-      sources."eyes-0.1.8"
-      sources."cycle-1.0.3"
-      sources."request-2.9.203"
-      sources."stack-trace-0.0.10"
-      sources."ini-1.3.4"
-      sources."optimist-0.6.0"
-      sources."wordwrap-0.0.3"
-      sources."minimist-0.0.10"
-      (sources."form-data-0.0.10" // {
-        dependencies = [
-          sources."mime-1.2.11"
-          sources."async-0.2.10"
-        ];
-      })
-      sources."hawk-0.10.2"
-      sources."node-uuid-1.4.8"
-      sources."cookie-jar-0.2.0"
-      sources."aws-sign-0.2.0"
-      sources."oauth-sign-0.2.0"
-      sources."forever-agent-0.2.0"
-      sources."tunnel-agent-0.2.0"
-      sources."json-stringify-safe-3.0.0"
-      sources."combined-stream-0.0.7"
-      sources."delayed-stream-0.0.5"
-      sources."hoek-0.7.6"
-      sources."boom-0.3.8"
-      sources."cryptiles-0.1.3"
-      sources."sntp-0.1.4"
-      sources."deep-equal-1.0.1"
-      sources."i-0.3.6"
-      sources."ncp-0.4.2"
-      sources."lru-cache-1.0.6"
-      (sources."event-stream-0.5.3" // {
-        dependencies = [
-          sources."optimist-0.2.8"
-        ];
-      })
       sources."extract-opts-3.3.1"
       sources."eachr-3.2.0"
       sources."editions-1.3.3"
@@ -36900,10 +36966,22 @@ in
       sources."cookiejar-2.0.1"
       sources."reduce-component-1.0.1"
       sources."extend-1.2.1"
+      (sources."form-data-0.1.3" // {
+        dependencies = [
+          sources."mime-1.2.11"
+          sources."async-0.9.2"
+        ];
+      })
       sources."readable-stream-1.0.27-1"
+      sources."combined-stream-0.0.7"
+      sources."delayed-stream-0.0.5"
       sources."core-util-is-1.0.2"
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
+      sources."lru-cache-4.1.1"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."minimist-0.0.8"
       sources."clone-2.1.1"
       sources."JSONStream-1.3.1"
       sources."ansi-regex-3.0.0"
@@ -36911,11 +36989,7 @@ in
       sources."ansistyles-0.1.3"
       sources."aproba-1.1.2"
       sources."archy-1.0.0"
-      (sources."cacache-9.2.9" // {
-        dependencies = [
-          sources."lru-cache-4.1.1"
-        ];
-      })
+      sources."cacache-9.2.9"
       sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
@@ -36937,16 +37011,13 @@ in
           sources."string_decoder-1.0.3"
         ];
       })
-      (sources."glob-7.1.2" // {
-        dependencies = [
-          sources."minimatch-3.0.4"
-        ];
-      })
+      sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.5.0"
       sources."iferr-0.1.5"
       sources."inflight-1.0.6"
+      sources."ini-1.3.4"
       sources."init-package-json-1.10.1"
       sources."lazy-property-1.0.0"
       (sources."libnpx-9.6.0" // {
@@ -36965,7 +37036,6 @@ in
       sources."move-concurrently-1.0.1"
       (sources."node-gyp-3.6.2" // {
         dependencies = [
-          sources."minimatch-3.0.4"
           sources."nopt-3.0.6"
           sources."semver-5.3.0"
           sources."tar-2.2.1"
@@ -36982,12 +37052,7 @@ in
       sources."once-1.4.0"
       sources."opener-1.4.3"
       sources."osenv-0.1.4"
-      (sources."pacote-6.0.4" // {
-        dependencies = [
-          sources."lru-cache-4.1.1"
-          sources."minimatch-3.0.4"
-        ];
-      })
+      sources."pacote-6.0.4"
       sources."path-is-inside-1.0.2"
       sources."promise-inflight-1.0.1"
       sources."read-1.0.7"
@@ -36995,6 +37060,15 @@ in
       sources."read-installed-4.0.3"
       sources."read-package-json-2.0.12"
       sources."read-package-tree-5.1.6"
+      (sources."request-2.81.0" // {
+        dependencies = [
+          sources."combined-stream-1.0.5"
+          sources."extend-3.0.1"
+          sources."form-data-2.1.4"
+          sources."qs-6.4.0"
+          sources."delayed-stream-1.0.0"
+        ];
+      })
       sources."retry-0.10.1"
       sources."safe-buffer-5.1.1"
       (sources."sha-2.0.1" // {
@@ -37027,7 +37101,7 @@ in
       sources."uuid-3.1.0"
       sources."validate-npm-package-name-3.0.0"
       sources."which-1.3.0"
-      sources."worker-farm-1.5.0"
+      sources."worker-farm-1.5.1"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.1.0"
       sources."debuglog-1.0.1"
@@ -37043,8 +37117,6 @@ in
       sources."jsonparse-1.3.1"
       sources."through-2.3.8"
       sources."y18n-3.2.1"
-      sources."pseudomap-1.0.2"
-      sources."yallist-2.1.2"
       sources."wcwidth-1.0.1"
       (sources."defaults-1.0.3" // {
         dependencies = [
@@ -37056,6 +37128,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."fs.realpath-1.0.0"
+      sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
@@ -37097,11 +37170,7 @@ in
       sources."execa-0.7.0"
       sources."lcid-1.0.0"
       sources."mem-1.1.0"
-      (sources."cross-spawn-5.1.0" // {
-        dependencies = [
-          sources."lru-cache-4.1.1"
-        ];
-      })
+      sources."cross-spawn-5.1.0"
       sources."get-stream-3.0.0"
       sources."is-stream-1.1.0"
       sources."npm-run-path-2.0.2"
@@ -37187,11 +37256,7 @@ in
       sources."block-stream-0.0.9"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
-      (sources."ignore-walk-3.0.1" // {
-        dependencies = [
-          sources."minimatch-3.0.4"
-        ];
-      })
+      sources."ignore-walk-3.0.1"
       sources."npm-bundled-1.0.3"
       (sources."are-we-there-yet-1.1.4" // {
         dependencies = [
@@ -37218,11 +37283,7 @@ in
         ];
       })
       sources."os-tmpdir-1.0.2"
-      (sources."make-fetch-happen-2.5.0" // {
-        dependencies = [
-          sources."lru-cache-4.1.1"
-        ];
-      })
+      sources."make-fetch-happen-2.5.0"
       sources."npm-pick-manifest-1.0.4"
       sources."promise-retry-1.1.1"
       sources."protoduck-4.0.0"
@@ -37249,19 +37310,28 @@ in
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
+      sources."forever-agent-0.6.1"
       sources."har-validator-4.2.1"
+      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."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.3"
+      sources."tunnel-agent-0.6.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
+      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.4.1" // {
         dependencies = [
@@ -37312,7 +37382,7 @@ in
       sources."unique-slug-2.0.0"
       (sources."boxen-1.2.2" // {
         dependencies = [
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
         ];
       })
       (sources."chalk-1.1.3" // {
@@ -37378,11 +37448,10 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."fast-deep-equal-1.0.0"
-      sources."json-schema-traverse-0.3.1"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
+      sources."stack-trace-0.0.9"
       sources."deep-extend-0.4.2"
       sources."strip-json-comments-2.0.1"
       sources."eve-0.5.4"
@@ -37439,6 +37508,9 @@ in
       sources."yeast-0.1.2"
       sources."better-assert-1.0.2"
       sources."callsite-1.0.0"
+      sources."colors-1.0.3"
+      sources."cycle-1.0.3"
+      sources."eyes-0.1.8"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -37618,14 +37690,14 @@ in
       sha512 = "1pjbfhy4mpjb68hg0k70iz51c13yq6biln5wyb3jg8ddbgc3qwhnqgxvd19if6sihd10yc42yrj50p451qkgd4wmy2p5a0cddcwp5g5";
     };
     dependencies = [
-      sources."acorn-5.1.2"
+      sources."acorn-5.2.1"
       (sources."acorn-dynamic-import-2.0.2" // {
         dependencies = [
           sources."acorn-4.0.13"
         ];
       })
-      sources."ajv-5.2.4"
-      sources."ajv-keywords-2.1.0"
+      sources."ajv-5.3.0"
+      sources."ajv-keywords-2.1.1"
       sources."async-2.5.0"
       sources."enhanced-resolve-3.4.1"
       sources."escope-3.6.0"
@@ -37663,9 +37735,8 @@ in
       })
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."lodash-4.17.4"
       sources."graceful-fs-4.1.11"
       sources."object-assign-4.1.1"
@@ -37751,7 +37822,7 @@ in
       sources."hash.js-1.1.3"
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
-      sources."asn1.js-4.9.1"
+      sources."asn1.js-4.9.2"
       (sources."ripemd160-2.0.1" // {
         dependencies = [
           sources."hash-base-2.0.2"
@@ -37784,7 +37855,7 @@ in
       sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."chokidar-1.7.0"
       sources."anymatch-1.3.2"
       sources."async-each-1.0.1"
@@ -37852,7 +37923,7 @@ in
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
       sources."tar-2.2.1"
-      sources."tar-pack-3.4.0"
+      sources."tar-pack-3.4.1"
       sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
@@ -37902,6 +37973,8 @@ in
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."har-schema-1.0.5"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."assert-plus-0.2.0"
       (sources."jsprim-1.4.1" // {
         dependencies = [
@@ -38197,7 +38270,7 @@ in
       sources."esprima-3.1.3"
       sources."first-chunk-stream-2.0.0"
       sources."jed-1.1.1"
-      sources."pino-4.8.0"
+      sources."pino-4.8.2"
       (sources."postcss-6.0.11" // {
         dependencies = [
           sources."supports-color-4.5.0"
@@ -38395,7 +38468,7 @@ in
           sources."boom-5.2.0"
         ];
       })
-      sources."sntp-2.0.2"
+      sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
       sources."sshpk-1.13.1"
@@ -38487,7 +38560,7 @@ in
       sources."file-entry-cache-2.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
-      sources."ignore-3.3.6"
+      sources."ignore-3.3.7"
       sources."imurmurhash-0.1.4"
       (sources."inquirer-3.3.0" // {
         dependencies = [
@@ -38513,7 +38586,7 @@ in
       sources."typedarray-0.0.6"
       sources."esrecurse-4.2.0"
       sources."object-assign-4.1.1"
-      sources."acorn-5.1.2"
+      sources."acorn-5.2.1"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
@@ -38552,7 +38625,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."iconv-lite-0.4.19"
-      sources."jschardet-1.5.1"
+      sources."jschardet-1.6.0"
       sources."is-promise-2.1.0"
       sources."tryit-1.0.3"
       sources."argparse-1.0.9"
@@ -38562,7 +38635,7 @@ in
       sources."deep-is-0.1.3"
       sources."wordwrap-1.0.0"
       sources."fast-levenshtein-2.0.6"
-      sources."ajv-keywords-2.1.0"
+      sources."ajv-keywords-2.1.1"
       (sources."slice-ansi-1.0.0" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
@@ -38592,7 +38665,7 @@ in
       sources."is-property-1.0.2"
       sources."interpret-1.0.4"
       sources."rechoir-0.6.2"
-      sources."resolve-1.4.0"
+      sources."resolve-1.5.0"
       sources."path-parse-1.0.5"
       sources."fast-json-parse-1.0.3"
       sources."fast-safe-stringify-1.2.0"
@@ -38740,7 +38813,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."is-buffer-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
@@ -38774,7 +38847,7 @@ in
       sources."npmlog-4.1.2"
       sources."rc-1.2.2"
       sources."tar-2.2.1"
-      sources."tar-pack-3.4.0"
+      sources."tar-pack-3.4.1"
       sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."are-we-there-yet-1.1.4"
@@ -38899,7 +38972,7 @@ in
       sources."humanize-string-1.0.1"
       (sources."inquirer-3.3.0" // {
         dependencies = [
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
           sources."supports-color-4.5.0"
@@ -38981,7 +39054,7 @@ in
       sources."titleize-1.0.0"
       (sources."update-notifier-2.3.0" // {
         dependencies = [
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."ansi-styles-3.2.0"
           sources."supports-color-4.5.0"
         ];
@@ -38996,7 +39069,7 @@ in
       sources."yeoman-doctor-2.1.0"
       (sources."yeoman-environment-2.0.5" // {
         dependencies = [
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."debug-3.1.0"
           sources."log-symbols-2.1.0"
           sources."ansi-styles-3.2.0"
@@ -39096,7 +39169,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."iconv-lite-0.4.19"
-      sources."jschardet-1.5.1"
+      sources."jschardet-1.6.0"
       sources."tmp-0.0.33"
       sources."os-tmpdir-1.0.2"
       sources."is-promise-2.1.0"
@@ -39150,13 +39223,12 @@ in
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.4"
+      sources."ajv-5.3.0"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."hoek-4.2.0"
       sources."boom-4.3.1"
       (sources."cryptiles-3.1.2" // {
@@ -39164,7 +39236,7 @@ in
           sources."boom-5.2.0"
         ];
       })
-      sources."sntp-2.0.2"
+      sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
       sources."sshpk-1.13.1"
@@ -39272,7 +39344,7 @@ in
       (sources."boxen-1.2.2" // {
         dependencies = [
           sources."camelcase-4.1.0"
-          sources."chalk-2.2.0"
+          sources."chalk-2.3.0"
           sources."ansi-styles-3.2.0"
           sources."supports-color-4.5.0"
         ];
-- 
GitLab


From 04b3b00917ceec46ca0b678e0fcfa5f2eea3512e Mon Sep 17 00:00:00 2001
From: Peter Romfeld <peter.romfeld.hk@gmail.com>
Date: Wed, 1 Nov 2017 20:26:14 +0800
Subject: [PATCH 395/877] fastlane: 2.62.1 -> 2.63.0

---
 pkgs/tools/admin/fastlane/Gemfile.lock | 2 +-
 pkgs/tools/admin/fastlane/gemset.nix   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock
index 93cf658719c..30c75f19fbf 100644
--- a/pkgs/tools/admin/fastlane/Gemfile.lock
+++ b/pkgs/tools/admin/fastlane/Gemfile.lock
@@ -24,7 +24,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.62.1)
+    fastlane (2.63.0)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix
index 8e75f76ec35..8dd51a5733e 100644
--- a/pkgs/tools/admin/fastlane/gemset.nix
+++ b/pkgs/tools/admin/fastlane/gemset.nix
@@ -137,10 +137,10 @@
     dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1r6ci3rkrzsdk8cbxidzcjv94hbwq7ljwvm5whgxb8lcxcfl696k";
+      sha256 = "1al75bb3zq0y9r1ilrbhks198zmvwykmqnn2675jd9i2ijcbxv78";
       type = "gem";
     };
-    version = "2.62.1";
+    version = "2.63.0";
   };
   gh_inspector = {
     source = {
-- 
GitLab


From 8014307c643b8de8d04ad44e35f6cfb2a263162a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Stylianos=20Ramos?= <andre.stylianos@gmail.com>
Date: Wed, 1 Nov 2017 14:10:07 +0100
Subject: [PATCH 396/877] boot: 2.5.2 -> 2.7.2

---
 .../tools/build-managers/boot/default.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
index 6f9c2ce38a7..d9dc59ee72d 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jdk }:
 
 stdenv.mkDerivation rec {
-  version = "2.5.2";
+  version = "2.7.2";
   name = "boot-${version}";
 
   src = fetchurl {
     url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh";
-    sha256 = "0brsimvmmpksxwc4l5c0x0cl5hhdjz76crd26yxphjvzyf7fypc9";
+    sha256 = "1hqp3xxmsj5vkym0l3blhlaq9g3w0lhjgmp37g6y3rr741znkk8c";
   };
 
   inherit jdk;
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ jdk ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Build tooling for Clojure";
     homepage = http://boot-clj.com/;
-    license = stdenv.lib.licenses.epl10;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.ragge ];
+    license = licenses.epl10;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ ragge ];
   };
 }
-- 
GitLab


From 33cdc2b4839aecb39c807122512e716275a15737 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 1 Nov 2017 12:17:44 +0100
Subject: [PATCH 397/877] libtasn1: fix CVE number

Actually, this patch fixes CVE-2017-10790, not CVE-2017-9310 (Qemu: net: infinite loop in e1000e NIC emulation)
---
 pkgs/development/libraries/libtasn1/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 516005b874f..7fa53fe162b 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchurl {
-      name = "CVE-2017-9310.patch";
+      name = "CVE-2017-10790.patch";
       url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39";
       sha256 = "1v5w0dazp9qc2v7pc8b6g7s4dz5ak10hzrn35hx66q76yzrrzp7i";
     })
-- 
GitLab


From 107a11f5737cf7c5b2ffbddea6e7683dfffe6575 Mon Sep 17 00:00:00 2001
From: Avaq <aldwin.vlasblom@gmail.com>
Date: Fri, 20 Jan 2017 18:26:11 +0100
Subject: [PATCH 398/877] mongodb: 3.2.9 -> 3.4.2

---
 pkgs/servers/nosql/mongodb/default.nix        | 12 +++------
 .../nosql/mongodb/valgrind-include.patch      | 25 -------------------
 2 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/servers/nosql/mongodb/valgrind-include.patch

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index ee373878cb6..35b21882b7b 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 
-let version = "3.2.9";
+let version = "3.4.2";
     system-libraries = [
       "pcre"
       #"asio" -- XXX use package?
@@ -43,8 +43,8 @@ in stdenv.mkDerivation rec {
   name = "mongodb-${version}";
 
   src = fetchurl {
-    url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "06q6j2bjy31pjwqws53wdpmn2x8w2hafzsnv1s3wx15pc9vq3y15";
+    url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz";
+    sha256 = "0n8vspccrpd2z9xk3yjpz4gprd730dfacw914ksjzz9iadn0zdi9";
   };
 
   nativeBuildInputs = [ scons ];
@@ -52,12 +52,6 @@ in stdenv.mkDerivation rec {
 
   patches =
     [
-      # When not building with the system valgrind, the build should use the
-      # vendored header file - regardless of whether or not we're using the system
-      # tcmalloc - so we need to lift the include path manipulation out of the
-      # conditional.
-      ./valgrind-include.patch
-
       # MongoDB keeps track of its build parameters, which tricks nix into
       # keeping dependencies to build inputs in the final output.
       # We remove the build flags from buildInfo data.
diff --git a/pkgs/servers/nosql/mongodb/valgrind-include.patch b/pkgs/servers/nosql/mongodb/valgrind-include.patch
deleted file mode 100644
index 6b401525c08..00000000000
--- a/pkgs/servers/nosql/mongodb/valgrind-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript
-index 6add602..6e232d8 100644
---- a/src/mongo/util/SConscript
-+++ b/src/mongo/util/SConscript
-@@ -241,9 +241,6 @@ if get_option('allocator') == 'tcmalloc':
-         # Add in the include path for our vendored tcmalloc.
-         tcmspEnv.InjectThirdPartyIncludePaths('gperftools')
- 
--        # Include valgrind since tcmalloc disables itself while running under valgrind
--        tcmspEnv.InjectThirdPartyIncludePaths('valgrind')
--
-         # If our changes to tcmalloc are ever upstreamed, this should become set based on a top
-         # level configure check, though its effects should still be scoped just to these files.
-         tcmspEnv.Append(
-@@ -252,6 +249,10 @@ if get_option('allocator') == 'tcmalloc':
-             ]
-         )
- 
-+    # Include valgrind since tcmalloc disables itself while running under valgrind
-+    if not use_system_version_of_library('valgrind'):
-+        tcmspEnv.InjectThirdPartyIncludePaths('valgrind')
-+
-     tcmspEnv.Library(
-         target='tcmalloc_set_parameter',
-         source=[
-- 
GitLab


From a387a0f1717a23fc4e759adcfb1c96a7685bb446 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 1 Nov 2017 14:13:34 +0100
Subject: [PATCH 399/877] mongodb: fix darwin build

---
 pkgs/servers/nosql/mongodb/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 35b21882b7b..11720fb154f 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -81,6 +81,8 @@ in stdenv.mkDerivation rec {
       --replace 'engine("wiredTiger")' 'engine("mmapv1")'
   '';
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unused-command-line-argument";
+
   buildPhase = ''
     scons -j $NIX_BUILD_CORES core --release ${other-args}
   '';
-- 
GitLab


From a2437393f09c1d437df207653c7a47667754ad32 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 1 Nov 2017 10:46:44 +0100
Subject: [PATCH 400/877] slack: 2.8.0 -> 2.8.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes japanese input & some obscure security issues:
`An important Electron update improving security. A precautionary measure, but it’s always good to be up to date.` and
`A small release containing nothing but another Electron update, this one better than the last.`
---
 .../networking/instant-messengers/slack/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 93bc6feff3c..8f107c4f3c3 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -4,7 +4,7 @@
 
 let
 
-  version = "2.8.0";
+  version = "2.8.2";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -46,7 +46,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "02khqi0qf8ryj6bkfla95mr3scvb99zrhihwdprdjqpgvy06wqhm";
+        sha256 = "019gzij6m1y9bv561nhbhgf2njp2svjqi5hs907pdjf7xwciwrkm";
       }
     else
       throw "Slack is not supported on ${stdenv.system}";
-- 
GitLab


From e0b906c5cb667341c02c3badac1181d3bdd521df Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 1 Nov 2017 15:00:55 +0100
Subject: [PATCH 401/877] jython: 2.7.0 -> 2.7.1

addresses CVE-2016-4000
---
 pkgs/development/interpreters/jython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
index 80661c3feb9..e7bcef7bc3e 100644
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/pkgs/development/interpreters/jython/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "jython-${version}";
 
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchurl {
     url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar";
-    sha256 = "0sk4myh9v7ma7nmzb8khg41na77xfi2zck7876bs7kq18n8nc1nx";
+    sha256 = "0jwc4ly75cna78blnisv4q8nfcn5s0g4wk7jf4d16j0rfcd0shf4";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 17de809fb87d4c70d1239dcccd2977ec8dc15dc6 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 1 Nov 2017 15:08:25 +0100
Subject: [PATCH 402/877] hardlink: 2012.9.3ec908d539 --> 1.3-4

---
 pkgs/tools/system/hardlink/default.nix | 38 ++++++++++++++------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix
index b85ad32ca37..ea062115402 100644
--- a/pkgs/tools/system/hardlink/default.nix
+++ b/pkgs/tools/system/hardlink/default.nix
@@ -1,29 +1,33 @@
-{ fetchurl, stdenv, unzip }:
+{ stdenv, fetchurl, pcre2 }:
 
-let
-  rev = "3ec908d539";
-in
-stdenv.mkDerivation {
-  name = "hardlink-2012.9.${rev}";
+
+stdenv.mkDerivation rec {
+  name = "hardlink-${version}";
+  version = "1.3-4";
 
   src = fetchurl {
-    url = "http://pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip";
-    sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647";
-    name = "hardlink-${rev}.zip";
+    url = "http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz";
+    sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2";
   };
 
+  buildInputs = [ pcre2 ];
+  NIX_CFLAGS_LINK = "-lpcre2-8";
+
+  buildPhase = ''
+    $CC -O2 hardlink.c -o hardlink $NIX_CFLAGS_LINK
+  '';
+
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1
-    cc -O2 hardlink.c -o $out/bin/hardlink
-    mv hardlink.1 $out/share/man/man1/hardlink.1
+    cp -f hardlink $out/bin/hardlink
+    cp -f hardlink.1 $out/share/man/man1/hardlink.1
   '';
 
-  buildInputs = [ unzip ];
-
-  meta = {
-    homepage = http://pkgs.fedoraproject.org/cgit/hardlink.git/;
+  meta = with stdenv.lib; {
     description = "Consolidate duplicate files via hardlinks";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    homepage = https://pagure.io/hardlink;
+    repositories.git = http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git;
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From aa196db7ec8a012566be3d97f0a2c4bf8d830e85 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 1 Nov 2017 10:33:04 -0400
Subject: [PATCH 403/877] atom: 1.21.1 -> 1.21.2

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index f0af3b88c72..6ab881f2275 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.21.1";
+  version = "1.21.2";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "13mpj3wvcgsxz9q6lai36lkfgd7rabcjrrih1j5309kd1dqaswnn";
+    sha256 = "0snhhp8rjmk750snyzkqzwvi7f915pbc6qpa3vf0f57syf47m7vl";
     name = "${name}.deb";
   };
 
-- 
GitLab


From 4f88411e0d6830d33c43f27d09843a47d5f9b62e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 31 Oct 2017 23:24:13 +0100
Subject: [PATCH 404/877] eclipse-plugin-rustdt: fix Emacs nix-mode
 highlighting

---
 pkgs/applications/editors/eclipse/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index f3459e57d9b..554edde711b 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -394,7 +394,7 @@ rec {
       sha256 = "1xfj4j27d1h4bdf2v7f78zi8lz4zkkj7s9kskmsqx5jcs2d459yp";
       extraPostFetch =
         ''
-          mv "$out/${repo}-${rev}/releases/local-repo"/* "$out/"
+          mv "$out/${repo}-${rev}/releases/local-repo/"* "$out/"
         '';
     };
 
-- 
GitLab


From 94f2fdfe6cd7eeaf038468694b752cf4c5c1191f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 31 Oct 2017 23:24:53 +0100
Subject: [PATCH 405/877] eclipse-plugin-spotbugs: init at 3.1.0

---
 pkgs/applications/editors/eclipse/plugins.nix | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 554edde711b..f98d43a403f 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -424,6 +424,29 @@ rec {
     };
   };
 
+  spotbugs = buildEclipsePlugin rec {
+    name = "spotbugs-${version}";
+    version = "3.1.0.r201710241414-11c9895";
+
+    srcFeature = fetchurl {
+      url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar";
+      sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs";
+    };
+
+    srcPlugin = fetchurl {
+      url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar";
+      sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://spotbugs.github.io/;
+      description = "Plugin that uses static analysis to look for bugs in Java code";
+      license = licenses.lgpl21;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   testng = buildEclipsePlugin rec {
     name = "testng-${version}";
     version = "6.9.13.201609291640";
-- 
GitLab


From 9242f2fc7c1d30dc4ad87f6476a3f1e15cfc81ee Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 31 Oct 2017 23:35:21 +0100
Subject: [PATCH 406/877] josm: 12921 -> 13053

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 38eba46138e..46263f7d83b 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "12921";
+  version = "13053";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1fp6mpl8fa91dhdf3hw5hk8xsp1imj7558adjnjkb6n4vmrbszhm";
+    sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6";
   };
 
   buildInputs = [ jre8 makeWrapper ];
-- 
GitLab


From f179c389b50c80697c4f29eecc90b19afe90f616 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 31 Oct 2017 23:37:47 +0100
Subject: [PATCH 407/877] eclipse-plugin-anyedittools: 2.7.0 -> 2.7.1

---
 pkgs/applications/editors/eclipse/plugins.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index f98d43a403f..0aeaee2155a 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -106,16 +106,16 @@ rec {
 
   anyedittools = buildEclipsePlugin rec {
     name = "anyedit-${version}";
-    version = "2.7.0.201705171641";
+    version = "2.7.1.201709201439";
 
     srcFeature = fetchurl {
       url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
-      sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9";
+      sha256 = "1wqzl7wq85m9gil8rnvly45ps0a2m0svw613pg6djs5i7amhnayh";
     };
 
     srcPlugin = fetchurl {
-      url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
-      sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h";
+      url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.1/de.loskutov.anyedit.AnyEditTools_${version}.jar";
+      sha256 = "03iyb6j2srq74iigmg7dk098c2svyv0ygdfql5jqr44a32n07k8q";
     };
 
     meta = with stdenv.lib; {
-- 
GitLab


From 9d4fc88fbfe9efa8872c3c7ab9c80dade4da5fd5 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 31 Oct 2017 23:52:15 +0100
Subject: [PATCH 408/877] python-pycdio: 0.20 -> 0.21

---
 .../pycdio/add-cdtext-toc.patch               | 52 -------------------
 pkgs/top-level/python-packages.nix            |  6 +--
 2 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pycdio/add-cdtext-toc.patch

diff --git a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch b/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch
deleted file mode 100644
index 4e36612d80d..00000000000
--- a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nurp pycdio-0.20-orig/test/cdtext.toc pycdio-0.20/test/cdtext.toc
---- pycdio-0.20-orig/test/cdtext.toc	1970-01-01 01:00:00.000000000 +0100
-+++ pycdio-0.20/test/cdtext.toc	2014-11-06 23:36:12.520708320 +0100
-@@ -0,0 +1,48 @@
-+CD_DA
-+
-+// global CD-TEXT data
-+
-+CD_TEXT {
-+
-+  // Mapping from language number (0..7) used in 'LANGUAGE' statements 
-+  // to language code.
-+///  LANGUAGE_MAP {
-+///    0 : EN  // 9 is the code for ENGLISH,
-+///            // I don't know any other language code, yet
-+///  }
-+
-+  // Language number should always start with 0
-+  LANGUAGE 0 {
-+    // Required fields - at least all CD-TEXT CDs I've seen so far have them.
-+    TITLE "CD Title"
-+    PERFORMER "Performer"
-+    DISC_ID "XY12345"
-+    UPC_EAN "" // usually empty
-+
-+    // Further possible items, all of them are optional
-+    ARRANGER ""
-+    SONGWRITER ""
-+    MESSAGE "" 
-+    GENRE "" // I'm not sure if this should be really ascii data
-+  }
-+}
-+
-+
-+TRACK AUDIO
-+// track specific CD-TEXT data
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    // if an item is defined for one track it should be defined for all tracks
-+    TITLE "Track Title"
-+
-+    PERFORMER "Performer"
-+    ISRC "US-XX1-98-01234"
-+
-+    ARRANGER ""
-+    SONGWRITER ""
-+    MESSAGE "" 
-+  }
-+}
-+
-+SILENCE 1:0:0
-+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0777e894e71..60d5f9577e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15926,12 +15926,12 @@ in {
 
 
   pycdio = buildPythonPackage rec {
-    name = "pycdio-0.20";
+    name = "pycdio-0.21";
     disabled = !isPy27;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pycdio/${name}.tar.gz";
-      sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14";
+      sha256 = "1bkcmg838l2yffsw5lln93ap5f8ks3vmqwg02mygmdmay647rc3v";
     };
 
     prePatch = ''
@@ -15946,8 +15946,6 @@ in {
     buildInputs = [ self.setuptools self.nose pkgs.swig pkgs.libcdio ]
       ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv;
 
-    patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ];
-
     # Run tests using nosetests but first need to install the binaries
     # to the root source directory where they can be found.
     checkPhase = ''
-- 
GitLab


From e344aec6dbce7c24d082cdcf4f59d600025488b0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Nov 2017 14:34:36 +0100
Subject: [PATCH 409/877] perl-common-sense: change attribute name to match
 CPAN

Leave the old attribute name as a backwards compatible alias.
---
 pkgs/top-level/perl-packages.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c8dc8a59ed2..0c24ff1f68f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -152,7 +152,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
       sha256 = "2e3376d03bfa5f172f43d4c615ba496281c9ffe3093a828c539683e17e2fbbcb";
     };
-    propagatedBuildInputs = [ AnyEvent CommonSense ];
+    propagatedBuildInputs = [ AnyEvent commonsense ];
   };
 
   AnyEventI3 = buildPerlPackage rec {
@@ -2194,7 +2194,10 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CommonSense = buildPerlPackage rec {
+  # For backwards compatibility.
+  CommonSense = self.commonsense;
+
+  commonsense = buildPerlPackage rec {
     name = "common-sense-3.74";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
@@ -2202,6 +2205,8 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
+      description = "Implements some sane defaults for Perl programs";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
@@ -4938,7 +4943,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "2ae7f8734e2e4945510252152c3bea4be35f4aa58aad3db0504c38844b08a991";
     };
     buildInputs = [ CanaryStability ];
-    propagatedBuildInputs = [ CommonSense ];
+    propagatedBuildInputs = [ commonsense ];
     meta = {
       license = stdenv.lib.licenses.gpl1Plus;
     };
@@ -7584,7 +7589,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.34.tar.gz;
       sha256 = "1sh0i73skxp3rvd9w8phxqncw9m1r5ibnb9qxxm21bmrfwkxybx6";
     };
-    propagatedBuildInputs = [ CommonSense ];
+    propagatedBuildInputs = [ commonsense ];
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
@@ -7822,7 +7827,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/modules/by-module/Linux/${name}.tar.gz";
       sha256 = "1l916p8xak6c51x4x1vrzd8wpi55bld74wf0p5w5m4vr80zjb7dw";
     };
-    propagatedBuildInputs = [ CommonSense ];
+    propagatedBuildInputs = [ commonsense ];
   };
 
   ListAllUtils = buildPerlPackage {
-- 
GitLab


From 52bbba956b5d5f627518cd1889e41c9ddc928190 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Nov 2017 14:49:08 +0100
Subject: [PATCH 410/877] perl-Apache-Test: disable tests

The tests don't work even with the redirects, possibly due to
attempting to start Apache.

Also add basic meta section.
---
 pkgs/top-level/perl-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0c24ff1f68f..68191342037 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -227,11 +227,11 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.40.tar.gz;
       sha256 = "0h5fsi0is6nhclsd3wwkkqx2hfgl3bpdazxycafm9sqxr3qkgx9w";
     };
-    checkPhase = ''
-      make test \
-        NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \
-        LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so
-    '';
+    doCheck = false;
+    meta = {
+      description = "Test.pm wrapper with helpers for testing Apache";
+      license = stdenv.lib.licenses.asl20;
+    };
   };
 
   AppCLI = buildPerlPackage {
-- 
GitLab


From 406653f8e77041b4e65f3011c778cf452b49d6fb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Nov 2017 14:50:21 +0100
Subject: [PATCH 411/877] perl-ExtUtils-PkgConfig: 1.15 -> 1.16

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 68191342037..514a86428e6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5229,13 +5229,14 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExtUtilsPkgConfig = buildPerlPackage rec {
-    name = "ExtUtils-PkgConfig-1.15";
+    name = "ExtUtils-PkgConfig-1.16";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "1cxh6w8vmyqmhl6afys2q6z6jkp1m6zvacpk70196zmk48p1kcv9";
+      sha256 = "bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e";
     };
     propagatedBuildInputs = [ pkgs.pkgconfig ];
     meta = {
+      homepage = http://gtk2-perl.sourceforge.net;
       description = "Simplistic interface to pkg-config";
       license = stdenv.lib.licenses.lgpl21Plus;
     };
-- 
GitLab


From 2d145b03ee54e584e1ce78df45ae5387058b773f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Nov 2017 14:51:23 +0100
Subject: [PATCH 412/877] perl-Inline: 0.64 -> 0.80

---
 pkgs/top-level/perl-packages.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 514a86428e6..b705860be92 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7402,29 +7402,23 @@ let self = _self // overrides; _self = with self; {
   };
 
   Inline = buildPerlPackage rec {
-    name = "Inline-0.64";
-
+    name = "Inline-0.80";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/E/ET/ETJ/${name}.tar.gz";
-      sha256 = "17n3gbc9jigpfwqfhgmxpvbgr9rkdrij8jayxqpzw611ixcxrplw";
+      url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
+      sha256 = "7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6";
     };
-
     buildInputs = [ TestWarn ];
     propagatedBuildInputs = [ ParseRecDescent ];
-
     meta = {
-      description = "Inline -- Write Perl subroutines in other programming languages";
-
+      homepage = https://github.com/ingydotnet/inline-pm;
+      description = "Write Perl Subroutines in Other Programming Languages";
       longDescription = ''
         The Inline module allows you to put source code from other
         programming languages directly "inline" in a Perl script or
         module. The code is automatically compiled as needed, and then loaded
         for immediate access from Perl.
       '';
-
-      license = stdenv.lib.licenses.artistic2;
-
-      maintainers = [ ];
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
-- 
GitLab


From 01ab800212a9ee60959090775fc69204dafbaa8c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Nov 2017 14:52:00 +0100
Subject: [PATCH 413/877] perl-Inline-C: 0.76 -> 0.78

Also minor general cleanups.
---
 pkgs/top-level/perl-packages.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b705860be92..168a7fa8291 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7423,24 +7423,21 @@ let self = _self // overrides; _self = with self; {
   };
 
   InlineC = buildPerlPackage rec {
-    name = "Inline-C-0.76";
-
+    name = "Inline-C-0.78";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
-      sha256 = "0dcs39zjiglif3ss8p8yl0jyqk7qvc9g1ad9wi4kq79k9lxp3s92";
+      url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz";
+      sha256 = "9a7804d85c01a386073d2176582b0262b6374c5c0341049da3ef84c6f53efbc7";
     };
-
+    buildInputs = [ FileCopyRecursive FileShareDirInstall TestWarn YAMLLibYAML ];
+    propagatedBuildInputs = [ Inline ParseRecDescent Pegex ];
     postPatch = ''
       # this test will fail with chroot builds
       rm -f t/08taint.t
       rm -f t/28autowrap.t
     '';
-
-    buildInputs = [ TestWarn FileCopyRecursive FileShareDirInstall IOAll Pegex YAMLLibYAML ];
-    propagatedBuildInputs = [ Inline ];
-
     meta = {
-      description = "Write Perl Subroutines in C";
+      homepage = https://github.com/ingydotnet/inline-c-pm;
+      description = "C Language Support for Inline";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
-- 
GitLab


From e65b441cd3f210d345a33532d380df3713114953 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Nov 2017 14:52:34 +0100
Subject: [PATCH 414/877] perl-libapreq2: limit to "out" outputs

The build otherwise fails due to being unable to produce `devdoc`.
---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 168a7fa8291..6caf30612d1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7627,6 +7627,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz;
       sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e";
     };
+    outputs = [ "out" ];
     buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ];
     propagatedBuildInputs = [ mod_perl2 ];
     makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd.dev} --with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr.dev}/bin/apr-1-config --with-apu-config=${pkgs.aprutil.dev}/bin/apu-1-config";
-- 
GitLab


From a7d25d4bbca32ae858962918da15a64e471fe604 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Nov 2017 14:56:36 +0100
Subject: [PATCH 415/877] perl-Parse-RecDescent: 1.967009 -> 1.967015

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6caf30612d1..74532d8fd4a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10797,10 +10797,14 @@ let self = _self // overrides; _self = with self; {
   };
 
   ParseRecDescent = buildPerlPackage rec {
-    name = "Parse-RecDescent-1.967009";
+    name = "Parse-RecDescent-1.967015";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JT/JTBRAUN/${name}.tar.gz";
-      sha256 = "11y6fpz4j6kdimyaz2a6ig0jz0x7csqslhxaipxnjqi5h85hy071";
+      sha256 = "1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37";
+    };
+    meta = {
+      description = "Generate Recursive-Descent Parsers";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
-- 
GitLab


From daf78689d475d6e3355e4c47e9314208d877960d Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 3 Oct 2017 22:39:33 -0400
Subject: [PATCH 416/877] Fix buildStackProject in nix-build

---
 .../haskell-modules/generic-stack-builder.nix      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 7fbca53886e..6e43df9aba6 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -1,4 +1,4 @@
-{ stdenv, ghc, pkgconfig, glibcLocales, cacert }@depArgs:
+{ stdenv, ghc, pkgconfig, glibcLocales, cacert, stack }@depArgs:
 
 with stdenv.lib;
 
@@ -6,15 +6,17 @@ with stdenv.lib;
 , extraArgs ? []
 , LD_LIBRARY_PATH ? []
 , ghc ? depArgs.ghc
+, stack ? depArgs.stack
 , ...
 }@args:
 
-stdenv.mkDerivation (args // {
+let stackCmd = "stack --internal-re-exec-version=${stack.version}";
+in stdenv.mkDerivation (args // {
 
   buildInputs =
     buildInputs ++
     optional stdenv.isLinux glibcLocales ++
-    [ ghc pkgconfig ];
+    [ ghc pkgconfig stack ];
 
   STACK_PLATFORM_VARIANT="nix";
   STACK_IN_NIX_SHELL=1;
@@ -39,13 +41,13 @@ stdenv.mkDerivation (args // {
     export STACK_ROOT=$NIX_BUILD_TOP/.stack
   '';
 
-  buildPhase = args.buildPhase or "stack build";
+  buildPhase = args.buildPhase or "${stackCmd} build";
 
-  checkPhase = args.checkPhase or "stack test";
+  checkPhase = args.checkPhase or "${stackCmd} test";
 
   doCheck = args.doCheck or true;
 
   installPhase = args.installPhase or ''
-    stack --local-bin-path=$out/bin build --copy-bins
+    ${stackCmd} --local-bin-path=$out/bin build --copy-bins
   '';
 })
-- 
GitLab


From a209f56d6db2aec3314be79e543c2e1323410177 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Nov 2017 15:05:10 +0000
Subject: [PATCH 417/877] hashcat: 2.00 -> 4.0.0

remove 3.6.0 which was not the default
---
 pkgs/tools/security/hashcat/default.nix       | 49 +++++++++----------
 .../security/hashcat/hashcat3/default.nix     | 37 --------------
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 24 insertions(+), 63 deletions(-)
 delete mode 100644 pkgs/tools/security/hashcat/hashcat3/default.nix

diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix
index 298dd336be1..81c92415c50 100644
--- a/pkgs/tools/security/hashcat/default.nix
+++ b/pkgs/tools/security/hashcat/default.nix
@@ -1,40 +1,39 @@
-{ stdenv, fetchurl, gmp }:
+{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }:
 
-assert stdenv.isLinux;
-
-let
-  bits = if stdenv.system == "x86_64-linux" then "64" else "32";
-in
 stdenv.mkDerivation rec {
   name    = "hashcat-${version}";
-  version = "2.00";
+  version = "4.0.0";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://codeload.github.com/hashcat/hashcat/tar.gz/${version}";
-    sha256 = "0i2l4i1jkdhj9bkvycgd2nf809kki3jp83y0vrd4iwsdbbbyc9b3";
+    url = "https://hashcat.net/files/hashcat-${version}.tar.gz";
+    sha256 = "0l1vq4h1gfxc2yclxkvy6gfz6sii2vyzip8pw6ifq930y8dvi34y";
   };
 
-  buildInputs = [ gmp ];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ opencl-headers ];
 
-  buildFlags = [ "posix${bits}" ]
-    ++ stdenv.lib.optionals (bits == "64") [ "posixXOP" "posixAVX" ];
+  makeFlags = [
+    "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include"
+    "COMPTIME=1337"
+    "VERSION_TAG=${version}"
+  ];
 
-  # Upstream Makefile doesn't have 'install' target
-  installPhase = ''
-    mkdir -p $out/bin $out/libexec
-    cp -R * $out/libexec
+  # $out is not known until the build has started.
+  configurePhase = ''
+    runHook preConfigure
+    makeFlags="$makeFlags PREFIX=$out"
+    runHook postConfigure
+  '';
 
-    ln -s $out/libexec/hashcat-cli${bits}.bin $out/bin/hashcat
-    ln -s $out/libexec/hashcat-cliXOP.bin $out/bin/hashcat-xop
-    ln -s $out/libexec/hashcat-cliAVX.bin $out/bin/hashcat-avx
+  postFixup = ''
+    wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Fast password cracker";
-    homepage    = "https://hashcat.net/hashcat/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    homepage    = https://hashcat.net/hashcat/;
+    license     = licenses.mit;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ kierdavis zimbatm ];
   };
 }
diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix
deleted file mode 100644
index 7a0d7241bbf..00000000000
--- a/pkgs/tools/security/hashcat/hashcat3/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation rec {
-  name    = "hashcat-${version}";
-  version = "3.6.0";
-
-  src = fetchurl {
-    url = "https://hashcat.net/files/hashcat-${version}.tar.gz";
-    sha256 = "127hdvq6ikah7r5vch63jnnkcsj7y61f9h8x79c3w25x9w55bxry";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ opencl-headers ];
-
-  makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" ];
-
-  # $out is not known until the build has started.
-  configurePhase = ''
-    runHook preConfigure
-    makeFlags="$makeFlags PREFIX=$out"
-    runHook postConfigure
-  '';
-
-  postFixup = ''
-    wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib
-  '';
-
-  meta = {
-    description = "Fast password cracker";
-    homepage    = https://hashcat.net/hashcat/;
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.kierdavis ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa4488b9317..24bac10e9ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2525,7 +2525,6 @@ with pkgs;
   hardlink = callPackage ../tools/system/hardlink { };
 
   hashcat = callPackage ../tools/security/hashcat { };
-  hashcat3 = callPackage ../tools/security/hashcat/hashcat3 { };
 
   hash-slinger = callPackage ../tools/security/hash-slinger { };
 
-- 
GitLab


From d4450489d26c9a7e401cbb126d0a33a1a1f8776f Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Nov 2017 15:21:45 +0000
Subject: [PATCH 418/877] beignet: 1.3.1 -> 1.3.2

---
 .../development/libraries/beignet/default.nix | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index 18a15c70223..2484e287016 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -15,34 +15,34 @@
 , mesa_noglu
 , makeWrapper
 , beignet
-}: 
+}:
 
 stdenv.mkDerivation rec {
   name = "beignet-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchurl {
     url = "https://01.org/sites/default/files/${name}-source.tar.gz"; 
-    sha256 = "07snrgjlhwl5fxz82dyqp632cnf5hp0gfqrjd2930jv79p37p6rr";
-  };  
+    sha256 = "0hqb04jhjjslnmi3fnpzphanz84zywwkyw2sjr1k5qlx2jxfsmf5";
+  };
 
-  patches = [ ./clang_llvm.patch ]; 
+  patches = [ ./clang_llvm.patch ];
 
   enableParallelBuilding = true;
 
   postPatch = ''
     patchShebangs src/git_sha1.sh
-  ''; 
+  '';
 
   cmakeFlags = [ "-DCLANG_LIBRARY_DIR=${clang-unwrapped}/lib" ];
 
-  buildInputs = [ 
-    llvm 
+  buildInputs = [
+    llvm
     clang-unwrapped
-    libX11 
+    libX11
     libXext
     libpthreadstubs
-    libdrm 
+    libdrm
     libXdmcp
     libXdamage
     ocl-icd
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
       It supports the Intel OpenCL runtime library and compiler. 
     '';
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ artuuge ];
+    maintainers = with maintainers; [ artuuge zimbatm ];
     platforms = platforms.linux;
-  }; 
+  };
 }
-- 
GitLab


From 933a9c5f16d1cbb1a50f3a83db9137d82381a671 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 1 Nov 2017 11:39:10 -0400
Subject: [PATCH 419/877] elpa-packages: 2017-11-01

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

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index a2fc324a618..f0c4ca87aa2 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -95,10 +95,10 @@
     ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "ahungry-theme";
-        version = "1.6.0";
+        version = "1.8.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ahungry-theme-1.6.0.tar";
-          sha256 = "1b0x7g753gn7mym8286b937zmxv50jgdish2h6wc05w1g1lygwsz";
+          url = "https://elpa.gnu.org/packages/ahungry-theme-1.8.0.tar";
+          sha256 = "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -700,10 +700,10 @@
     ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
     elpaBuild {
         pname = "ebdb";
-        version = "0.3.4";
+        version = "0.4.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.3.4.tar";
-          sha256 = "1jj7s0646wqg9ykmpi52cc6m6m0gk2inqc2h6h7cr7gr4v7n2l00";
+          url = "https://elpa.gnu.org/packages/ebdb-0.4.1.tar";
+          sha256 = "0gv1q1xkhjab0l77c92znn6x0dfdbnj6hc48axmrx6a7zwbm3g2r";
         };
         packageRequires = [ cl-lib emacs seq ];
         meta = {
@@ -945,10 +945,10 @@
     gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "gnorb";
-        version = "1.3.0";
+        version = "1.3.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnorb-1.3.0.tar";
-          sha256 = "0c256473llp7ahl1wbm6m236cj2lhp9ms1clmxpsfv51ds27ljqv";
+          url = "https://elpa.gnu.org/packages/gnorb-1.3.1.tar";
+          sha256 = "1g6xldkc6l6zlzd1slqizbbd5b9k4pbr66nrf5svidgiy7mlifw5";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1556,10 +1556,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20171016";
+        version = "20171030";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20171016.tar";
-          sha256 = "1196kv83p953nd9c5gxkn8ndw2kmm2kfw34dldap6m89khqflz5a";
+          url = "https://elpa.gnu.org/packages/org-20171030.tar";
+          sha256 = "1lszws6b5s4r7w871cyigs433dflf6w0y33fj6rzrq8240d5092i";
         };
         packageRequires = [];
         meta = {
-- 
GitLab


From 086f27616739e0bbf403a206a0d0f4719f2755b1 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 1 Nov 2017 11:39:26 -0400
Subject: [PATCH 420/877] org-packages: 2017-11-01

---
 .../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 8d47f36f346..a6108093933 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 = "20171016";
+        version = "20171030";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20171016.tar";
-          sha256 = "1v89wl8xlxavvv2kdd5vms0rwpqaw2x73q0162ybxmrzf4a5f5mw";
+          url = "http://orgmode.org/elpa/org-20171030.tar";
+          sha256 = "1g2dyzy1844lli2hhfjnbskn1mskccgaaf0mxb1cm0zhhas8bnfd";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20171016";
+        version = "20171030";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20171016.tar";
-          sha256 = "0xy2xrndlhs4kyvh6mmv24dnh3fn5p63d2gaimnrypf1p8znwzh4";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20171030.tar";
+          sha256 = "0pq2hs5d2i6s036pcs0jn6ld2p1ap08dmbjf17hsh899741mg9cj";
         };
         packageRequires = [];
         meta = {
-- 
GitLab


From 70b132c9760fefef4e3990eef2cff13b6c00a0e1 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 1 Nov 2017 11:39:44 -0400
Subject: [PATCH 421/877] melpa-stable-packages: 2017-11-01

---
 .../emacs-modes/melpa-stable-generated.nix    | 365 +++++++++++++-----
 1 file changed, 267 insertions(+), 98 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 22c98d88ed2..51b9facd111 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -548,12 +548,12 @@
     ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "1.8";
+        version = "1.8.1";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
-          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+          rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+          sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -569,12 +569,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "1.8";
+        version = "1.8.1";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
-          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+          rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+          sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -989,12 +989,12 @@
     aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aes";
-        version = "0.8";
+        version = "0.9";
         src = fetchFromGitHub {
           owner = "Sauermann";
           repo = "emacs-aes";
-          rev = "d78796facc034b09f379cda5f27090f3139305ec";
-          sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2";
+          rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af";
+          sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes";
@@ -1073,12 +1073,12 @@
     ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ahungry-theme";
-        version = "1.6.0";
+        version = "1.8.0";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "color-theme-ahungry";
-          rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c";
-          sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d";
+          rev = "32ce7765c95559f6a0552cdaeedb6eb97bb7a476";
+          sha256 = "0c1xwqknhjx6y29fwca949r8d2fqb17mca5qc79pdxdlp3l606fg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@@ -3331,6 +3331,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "build-status";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "sshaw";
+          repo = "build-status";
+          rev = "c29a0146c5d0be274f5e17921e01698f572c23a1";
+          sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
+          sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92";
+          name = "build-status";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/build-status";
+          license = lib.licenses.free;
+        };
+      }) {};
     bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "bundler";
@@ -3670,12 +3691,12 @@
     caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "caml";
-        version = "4.6.0beta2";
+        version = "4.6.0pre1";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "ocaml";
-          rev = "817604da4d38362b6b2bd4c7787a5add6741cd21";
-          sha256 = "1d49kiv9nfr624924qwmf0mfsvja28mvliipaylfbslyb3f7jpkl";
+          rev = "500625015d40f716e19278209faaa44216dcff58";
+          sha256 = "1s10wirx080yl0gd2n09lw5kj8yy1mbiipmcr8gpfyc8dq7kfjna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@@ -4235,12 +4256,12 @@
     circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circadian";
-        version = "0.2.3";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "GuidoSchmidt";
           repo = "circadian.el";
-          rev = "0034de1551de9f420f42267f3ec081351c2b5d7f";
-          sha256 = "1khczk5lsiicyjra7g5m3dcl1rc6g43zbypigkj3izx2dsa47n5d";
+          rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee";
+          sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
@@ -4667,12 +4688,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.10.0pre3";
+        version = "3.10.0pre4";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "319622a49fb300cd8a7efd8378421a32204510de";
-          sha256 = "19n0s0kd051xh3av9nd5ncpccx6bmvay6115g0kqgmi8wbw7587q";
+          rev = "45da558742bad36be518e8d95dee0d0ec3793a64";
+          sha256 = "0qq7dhwcl290ymza5imc16cg3f9crxym1q6b4i7w9fax8x2vlc1m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -5294,6 +5315,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
+    melpaBuild {
+        pname = "company-lsp";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "tigersoldier";
+          repo = "company-lsp";
+          rev = "86fda23d29b732ba3987bf20901034da1515b077";
+          sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
+          sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
+          name = "company-lsp";
+        };
+        packageRequires = [ company emacs lsp-mode s ];
+        meta = {
+          homepage = "https://melpa.org/#/company-lsp";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
     melpaBuild {
         pname = "company-math";
@@ -5360,12 +5402,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "1.8";
+        version = "1.8.1";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
-          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+          rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+          sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -5660,12 +5702,12 @@
     conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "conda";
-        version = "0.0.7";
+        version = "0.0.8";
         src = fetchFromGitHub {
           owner = "necaris";
           repo = "conda.el";
-          rev = "6ba9ef5d72ef613f478e07e2ebf57b47066beee7";
-          sha256 = "0mp6jzyvz3m41vb4kwwikyvcjgc8qgryyx71n1m50jr2i23s9nk2";
+          rev = "526be691824f4a32299f560a883913697bc4d847";
+          sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@@ -6329,6 +6371,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
+    melpaBuild {
+        pname = "cwl-mode";
+        version = "0.2.4";
+        src = fetchFromGitHub {
+          owner = "tom-tan";
+          repo = "cwl-mode";
+          rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9";
+          sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
+          sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j";
+          name = "cwl-mode";
+        };
+        packageRequires = [ emacs yaml-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/cwl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyberpunk-theme";
@@ -6374,12 +6437,12 @@
     cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cython-mode";
-        version = "0.27.1";
+        version = "0.27.2";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "32538fc162be830bf01ff96e43a020bc4924a1ee";
-          sha256 = "03v4ig9zlh8dz9s0c31f5hz2wfpvjydiidb0zgghnrshlqacpyj3";
+          rev = "41b4a28d7c7c505d58502c9cf69bde2e33091de0";
+          sha256 = "04k534xyr8816821y0lf2dq24bzvb40v99ijdwgy5qhv4rjxbr18";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -8057,15 +8120,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eacl";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "eacl";
+          rev = "c7a8d705295dc51cc306cb4c2d8773e24c4c74f4";
+          sha256 = "1f3liqrw55v9wnf7g475iabx4pf7gbg2x82mqrf22hhkvxzi2b2b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
+          sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr";
+          name = "eacl";
+        };
+        packageRequires = [ emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/eacl";
+          license = lib.licenses.free;
+        };
+      }) {};
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "2.0.15";
+        version = "2.0.16";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "0b55c207c6552223857de03bf8aec8be3344ed26";
-          sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0";
+          rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0";
+          sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -9139,12 +9223,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "1.16.1";
+        version = "1.17.0";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "1e65cb6e988df088c299572464335b6f149addcd";
-          sha256 = "01mfrn6mn8h9fkpkqg2shp21864ffjr7q5h3rpbnk6wpa3pmjc1m";
+          rev = "99f0b6401bff25d40b9f58123533271f7870a286";
+          sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -9440,12 +9524,12 @@
     embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "embrace";
-        version = "0.1.3";
+        version = "0.1.4";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "embrace.el";
-          rev = "a57b4be5d60daf8c176f9bd35770540c2d3963c9";
-          sha256 = "0sn81a7f8g5i4q74byfkj0jlg4aj0rxpfvx9sqv8azcg6wq2f65l";
+          rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2";
+          sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@@ -9479,20 +9563,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "emms";
-        version = "4.3";
+        version = "4.4";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "4cb3ae341847e8e8586373a95a458a453469812d";
-          sha256 = "0bmxlrk2p51bw5lgh2arkcz1v9bw6rpflwk778rdzn0rhzhvhp5b";
+          rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d";
+          sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
           sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
           name = "emms";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/emms";
           license = lib.licenses.free;
@@ -10064,12 +10149,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20.1.2";
+        version = "20.1.3";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "919ef5de2858e606d4a9be3e0e995b0802c76e33";
-          sha256 = "0y76ci80wmzrxvj90bhiz6cvwbis34kcc6dzas9xxsj92b6sh7sk";
+          rev = "a98379d0519c28f9bc9b673ed2c09fb1ad52456e";
+          sha256 = "1672yqqh7ql88c6ifv555wvqrj8nyn5a2nph43n2nc43h7hhz17c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -12585,6 +12670,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, nim-mode }:
+    melpaBuild {
+        pname = "flycheck-nimsuggest";
+        version = "0.8.1";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "flycheck-nimsuggest";
+          rev = "8b1c69e9aa924368bc4dadd4cde818ff158cd3f0";
+          sha256 = "0vnwy7b3xs2smbr6ah6yk8hq7vvsciq7d6m1qr91nfnazdgvxmvg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest";
+          sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv";
+          name = "flycheck-nimsuggest";
+        };
+        packageRequires = [ emacs flycheck nim-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-nimsuggest";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-objc-clang";
@@ -19471,12 +19577,12 @@
     import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
     melpaBuild {
         pname = "import-js";
-        version = "1.0.0";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "Galooshi";
           repo = "emacs-import-js";
-          rev = "15d395126f57408d770a72db2e5f43271f90fa52";
-          sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l";
+          rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250";
+          sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
@@ -19992,6 +20098,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iter2";
+        version = "0.9.4";
+        src = fetchFromGitHub {
+          owner = "doublep";
+          repo = "iter2";
+          rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55";
+          sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
+          sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65";
+          name = "iter2";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/iter2";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
@@ -20452,6 +20579,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jetbrains";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "jetbrains.el";
+          rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8";
+          sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
+          sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7";
+          name = "jetbrains";
+        };
+        packageRequires = [ cl-lib emacs f ];
+        meta = {
+          homepage = "https://melpa.org/#/jetbrains";
+          license = lib.licenses.free;
+        };
+      }) {};
     jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jinja2-mode";
@@ -20518,12 +20666,12 @@
     js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js-auto-format-mode";
-        version = "1.0.1";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "ybiquitous";
           repo = "js-auto-format-mode";
-          rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09";
-          sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag";
+          rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb";
+          sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
@@ -20956,24 +21104,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
-        pname = "kaolin-theme";
-        version = "0.9";
+        pname = "kaolin-themes";
+        version = "1.0";
         src = fetchFromGitHub {
           owner = "ogdenwebb";
-          repo = "kaolin-theme";
-          rev = "d43ba0e8e6b13b08e4d74de20c6e594ebb225501";
-          sha256 = "0gg19rh5q1gl6ylwrmjq0dqh6p5fkms1av6bbgry6fqv8220xf8n";
+          repo = "emacs-kaolin-themes";
+          rev = "720762a42ad4cb4b325f78a9d41af380b8783501";
+          sha256 = "104prgkjqnnv1bqgpcl0di1q9sqkfnj4ibqvrk6ls32hw75shvdh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme";
-          sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c";
-          name = "kaolin-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
+          sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw";
+          name = "kaolin-themes";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ autothemer cl-lib emacs ];
         meta = {
-          homepage = "https://melpa.org/#/kaolin-theme";
+          homepage = "https://melpa.org/#/kaolin-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -24629,6 +24777,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nim-mode";
+        version = "0.4.1";
+        src = fetchFromGitHub {
+          owner = "nim-lang";
+          repo = "nim-mode";
+          rev = "86abed21b9b718ac65cc167f208e0bd5b92c79ed";
+          sha256 = "0h1paf9z6xvkay97ns74w2w9plwi46md5f2kik4jvjy74p57gxal";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
+          sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
+          name = "nim-mode";
+        };
+        packageRequires = [ commenter emacs epc flycheck let-alist ];
+        meta = {
+          homepage = "https://melpa.org/#/nim-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ninja-mode";
@@ -24682,8 +24851,8 @@
           sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode";
-          sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
+          sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5";
           name = "nix-mode";
         };
         packageRequires = [ emacs ];
@@ -25472,8 +25641,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a";
-          sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj";
+          rev = "906e29a702237f039f24c215fdb561a728a3df1b";
+          sha256 = "1l1rzl7y5j2wmlgx7ivivwvwvbn4h7pg5s7yqsk65n9kb59ha8s8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -26109,12 +26278,12 @@
     org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mru-clock";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-mru-clock";
-          rev = "096a7c514ab8487ec63def6281cf4dce24e3a626";
-          sha256 = "1hmyqvi1dj5yrlish8kw4sdh3yy0b0w33smw4cbjagp4rs29p3fp";
+          rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832";
+          sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -27136,12 +27305,12 @@
     ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-hugo";
-        version = "0.3.1";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "kaushalmodi";
           repo = "ox-hugo";
-          rev = "16cf5d595644ee4e05b05b351e0c4fdd5df0ac44";
-          sha256 = "1n5xbgwv9x2b9zmv7nw0x64qbll4ycjf2dp09rdj3m4bmcg2gv42";
+          rev = "c32359c71e7926c7f13039069d8d7481dfb9bc82";
+          sha256 = "1nw2dp6rn3hnnzzffvpr6yz7c154338h9i5ixxgh5vjxm9phzdml";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -28705,12 +28874,12 @@
     pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
     melpaBuild {
         pname = "pocket-reader";
-        version = "0.1";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "pocket-reader.el";
-          rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd";
-          sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh";
+          rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574";
+          sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
@@ -30957,22 +31126,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+    rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "rg";
-        version = "1.3.1";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "081685a8c624220ece68d6dca8d60016585b04ff";
-          sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z";
+          rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14";
+          sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
           sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
           name = "rg";
         };
-        packageRequires = [ cl-lib emacs s seq ];
+        packageRequires = [ cl-lib emacs s ];
         meta = {
           homepage = "https://melpa.org/#/rg";
           license = lib.licenses.free;
@@ -33457,12 +33626,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "2.1.1";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "262c46a282ce54ca4745b863cf323d9bf69e2faa";
-          sha256 = "02ai86c15x0fbgg2bw6a9k3k825gkhl3hy9abq62dfgdwc0cqxmn";
+          rev = "e220a0c0c478fee0be3622442651981cdd82090c";
+          sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -35135,12 +35304,12 @@
     tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tickscript-mode";
-        version = "0.3.1";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "tickscript-mode";
-          rev = "eb6eafee2df253a0f1356f260cc7f435ab68aea2";
-          sha256 = "04pd1dvvs914f98yaq5n0nv1jbjr2sjgi3a288vpismrmxfybcch";
+          rev = "9acf389dd055ae77c92170802769838810472490";
+          sha256 = "1v60y244papzrirwqk9c2wcwgz4qp9h7m3887kvgr5ffn5imjss8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
@@ -37237,22 +37406,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "winum";
-        version = "1.0.2";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "deb0ch";
           repo = "emacs-winum";
-          rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883";
-          sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37";
+          rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c";
+          sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
           sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
           name = "winum";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib dash ];
         meta = {
           homepage = "https://melpa.org/#/winum";
           license = lib.licenses.free;
@@ -38018,8 +38187,8 @@
         version = "1.80";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "ca7cf34e959c";
-          sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma";
+          rev = "16763e5b7481";
+          sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
@@ -38276,12 +38445,12 @@
     zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zoom";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "cyrus-and";
           repo = "zoom";
-          rev = "ed8aca43820678ff6e7b8ed697cba8dbb3a6136e";
-          sha256 = "1na1syvbayqwbsvd1d0ajyzjvhg8q3s3mqrx82ffcbxr0ijyzzj8";
+          rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40";
+          sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
-- 
GitLab


From 3ab147bee00dbe99adf1ab84f7fa158d099bc82a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 1 Nov 2017 11:42:16 -0400
Subject: [PATCH 422/877] melpa-packages: 2017-11-01

Removals:
 - axiom-environment: 404 not found error
 - ob-axiom: 404 not found error
---
 .../editors/emacs-modes/melpa-generated.nix   | 1663 ++++++++++-------
 1 file changed, 990 insertions(+), 673 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 8c17823105e..3db74fa9d4f 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -383,8 +383,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0";
-          sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic";
+          rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
+          sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -740,8 +740,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b";
-          sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9";
+          rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+          sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -757,12 +757,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20171017.422";
+        version = "20171022.808";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b";
-          sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9";
+          rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+          sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -803,8 +803,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8";
-          sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r";
+          rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+          sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -841,12 +841,12 @@
     ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
     melpaBuild {
         pname = "ac-slime";
-        version = "20150729.2035";
+        version = "20171027.1400";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "ac-slime";
-          rev = "fafc6f75c90b2dbf124edd3e2887860ce052081e";
-          sha256 = "0dix8giqbc9la5mycrjgq287j03s44nhrg9b1drsca2sc58cnach";
+          rev = "6c80cb602ddad46486288f94ad7546396c6e4b1a";
+          sha256 = "11w1z653klghi6inv9n92cigz8m3c67j3r18mdk39inc3izwplkj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime";
@@ -925,12 +925,12 @@
     ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-buffer";
-        version = "20170828.2153";
+        version = "20171031.850";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "ace-jump-buffer";
-          rev = "02797c22c10a817dbbdfbd8fddceeba6c4f0499a";
-          sha256 = "13wq92ia18q9vyhmvnz1grl1l18hxnaisb7hv13dhfc06alcsrw2";
+          rev = "ae5be0415c823f7bb66833aa4af2180d4cf99cef";
+          sha256 = "0zg4x5faxkp0gnjq7209hn74qkzmk8k7wbr7k8wxpssjbnmxkvd1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer";
@@ -1201,8 +1201,8 @@
         src = fetchFromGitHub {
           owner = "codesuki";
           repo = "add-node-modules-path";
-          rev = "6f7801b2c41e3711406b7e1654257ad5557f5bb3";
-          sha256 = "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6";
+          rev = "eb09f4743af210a8e27f21889b4e0fef33208e4a";
+          sha256 = "064gzcyx6nkq9wdrf6sd64fs8biwfrn25qj9vv7gznlrl5rg31x9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path";
@@ -1260,12 +1260,12 @@
     aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aes";
-        version = "20170607.157";
+        version = "20171028.2323";
         src = fetchFromGitHub {
           owner = "Sauermann";
           repo = "emacs-aes";
-          rev = "8d9ddaa7d13875745241f0f98758b1d72dd3be92";
-          sha256 = "1d998xyfnzgci62h0wv1n9a7hlk23ngcbl83k04ahz61g7haqnh2";
+          rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af";
+          sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes";
@@ -1405,12 +1405,12 @@
     ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ahungry-theme";
-        version = "20171009.1931";
+        version = "20171029.2107";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "color-theme-ahungry";
-          rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c";
-          sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d";
+          rev = "6b078bf41f59ea0158b01742cae428ed61c4bc35";
+          sha256 = "0c61wsvb82r2ygiyk3na559y0jhba266igampa43g4qdphkjzfqy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@@ -1468,12 +1468,12 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "alchemist";
-        version = "20170803.414";
+        version = "20171029.2307";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "8ea2db4781e367c1cf8ce2eec4222daa7d1b7b57";
-          sha256 = "0gq4l95krvirv2rb4l52gka39588k817g4kl483hj2ii9il32gd0";
+          rev = "4beb4c9ceee0534a36f7669aa35fcbdfd6bef7b7";
+          sha256 = "0k1k5rb95nyndzhin47r4nzap4fp3dr57gv557wzy3a6jpl88fgz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1489,12 +1489,12 @@
     alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alda-mode";
-        version = "20170913.926";
+        version = "20171030.1008";
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "0e800594796ae283f5c0a6a374b9c2f8ebdfef56";
-          sha256 = "06j1imqknya3kglnmhsz2jg18mcbcycrjlgjzb9c1n68z43xglyh";
+          rev = "3a08f8349a1ebe8e0ae8622f5bf6ed93491dd785";
+          sha256 = "1lrgxawhsaziwvvs16n0339xn0m1333028q0gj3md23bpgrjqa5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1531,12 +1531,12 @@
     alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
     melpaBuild {
         pname = "alert";
-        version = "20170824.1140";
+        version = "20171024.1907";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "alert";
-          rev = "08f42ced409b6edd70e4b13ed648f16240dc1ec1";
-          sha256 = "13my3m81binijaz9r113k1xll6p86qrcxacppzm20r71gpa1iifb";
+          rev = "206d7095c93a25bb41af17cd26fd3967ddd57e00";
+          sha256 = "1lyvq0zkamlyv3z23x8hb8dirjd45bihqhmwdgilnw3y139vhm4l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -2463,12 +2463,12 @@
     apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apiwrap";
-        version = "20171019.916";
+        version = "20171022.2203";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "apiwrap.el";
-          rev = "5d25972192cd34553997ba193c09eab093a2b870";
-          sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0";
+          rev = "79422b610f2c3d9f52fb35449485a2fc541bc5a0";
+          sha256 = "0i2k975szdgzmrbwkvcnhrk73ndvk0q215fn68sb5m4zf43ifwxz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2945,12 +2945,12 @@
     atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
     melpaBuild {
         pname = "atomic-chrome";
-        version = "20161213.730";
+        version = "20171022.107";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "atomic-chrome";
-          rev = "1b96d563c5d435baf8dfa9cdae5ef38ce34629b9";
-          sha256 = "0caiv0snjxj0f1p0rx18r1w4nbsk8shrin2dr2ddg54mpxzf8r98";
+          rev = "1bd79fc940d2be82eaec20aca2069677e156a697";
+          sha256 = "1j5brpmbahnrp8kxphq10g0l703czdalqa731y3s2p3m3gida54x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
@@ -3050,12 +3050,12 @@
     auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
     melpaBuild {
         pname = "auth-password-store";
-        version = "20170123.107";
+        version = "20171026.537";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "auth-password-store";
-          rev = "b9fb3ef8d4ebe7bef939a3cf574f9caa833347c9";
-          sha256 = "1rzqz560zqsymdpv84n1z17jyf7k75797y4bkzhk5grd3ry77x9j";
+          rev = "79e297e9f2c2bccb545994ddda356f958889b4ac";
+          sha256 = "11nc3hicp8n21rmj00svzh0kfhyb92w37ipk6nkl1fd3jk1xzr7d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -3680,12 +3680,12 @@
     autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "autobookmarks";
-        version = "20170417.1407";
+        version = "20171021.1532";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "autobookmarks";
-          rev = "cd19e15b8951a7af55d67a5bb4e0948e62b0a119";
-          sha256 = "1xv73ls9mhvgjxa9lpw3brmzdd8739zyn9nqb1lrnvx468bz4kry";
+          rev = "b40c69f2d1c419adad516bee81b07b99110e5cc3";
+          sha256 = "0dailajx26dixlibqps5wfh224ps7azm453lmzxjc2d10mgapi5v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks";
@@ -3974,12 +3974,12 @@
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "20171018.937";
+        version = "20171031.915";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "b583c34750044ad0da511341c44332ed94995520";
-          sha256 = "138q2gj32sxx69vmxbc4wcihph38g9ychak7q7sy2zziqwip1nlb";
+          rev = "5598fd25e483d8521e6d5f691802fa125947d7cf";
+          sha256 = "1gkn1qbywv8as3csp5s1fwmrp89bmbqgyl7av0c1v9ggx7gkhd5f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4034,26 +4034,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "axiom-environment";
-        version = "20171021.822";
-        src = fetchhg {
-          url = "https://bitbucket.com/pdo/axiom-environment";
-          rev = "f99f1eb2af8a";
-          sha256 = "1n4rrvq95bhhirak72wccwsd6822p38mvyyrrkgjz8ah1xfvfm1m";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment";
-          sha256 = "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66";
-          name = "axiom-environment";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/axiom-environment";
-          license = lib.licenses.free;
-        };
-      }) {};
     babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "babel";
@@ -4232,12 +4212,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20171005.1058";
+        version = "20171025.1545";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "e7e646b79b5e3cebdf34f0ed775bceb8a5f3645a";
-          sha256 = "1lgg54cxl1zhv1gh7y5z99dwfb15w64gn05g8iwha2f37kmk22r4";
+          rev = "1578c6cd8f76a664bda7fc9b2515ee8106552cb2";
+          sha256 = "0wp2vfk7hpvagdiad9g4wj5992f1fv4v77x387v1sz5w1zn195aj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4295,12 +4275,12 @@
     basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "basic-mode";
-        version = "20171011.1126";
+        version = "20171027.1114";
         src = fetchFromGitHub {
           owner = "dykstrom";
           repo = "basic-mode";
-          rev = "7683d9812b1f4c6ac33b386abf81461175075c30";
-          sha256 = "01pmxcff8v64sc49ahzkks636p778l4fy8s5x6p9rngnwm72gmnw";
+          rev = "7a76ec2d45f6bc1e4b5a4c8996c4bf27a31741e6";
+          sha256 = "02q9sxx9g8pqyiknbzy48qbmnvgl1pmcgsppbk7rybb68kq5zlqd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode";
@@ -4927,8 +4907,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "cb89901b52a9413b6c233d7fbb616a2d8f38b50a";
-          sha256 = "1fypvrmn1brrq2200kr8s8zbcc30z9nhfv3k8vs36iawab2g573k";
+          rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc";
+          sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5364,12 +5344,12 @@
     boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "boogie-friends";
-        version = "20170907.922";
+        version = "20171024.1955";
         src = fetchFromGitHub {
           owner = "boogie-org";
           repo = "boogie-friends";
-          rev = "c30b229fb765b42d059c15e76029379ed3fc7202";
-          sha256 = "1cdl0sxa4rwr162cg8qhlwhvav4i0pv0njkfca7dg6xwfjkq6g8l";
+          rev = "ff9903783013f3598b6f44c99d47b25c5cdbed00";
+          sha256 = "0vc1pym7x6aafd88rrmm8yibq5y9wrx6b1pbgsfr7spcdq0hwwvg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends";
@@ -5993,12 +5973,12 @@
     build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "build-status";
-        version = "20170323.1621";
+        version = "20171031.611";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "build-status";
-          rev = "01bb9cc1776e8eaab68147175aee9879d9541c4b";
-          sha256 = "1c6q6rk6rvip5xv2zdpqamprx9kqh0c6v3r939fn7m4fnyyz15fn";
+          rev = "c29a0146c5d0be274f5e17921e01698f572c23a1";
+          sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
@@ -6140,12 +6120,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20171020.527";
+        version = "20171029.1011";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "62c416a534a1b0c2acf1cababc49c435d4e33ea7";
-          sha256 = "140cwm0jirmq3b9xwcqf3hfy38xsbq0z8jnzbgblwf31zpzgj6qp";
+          rev = "bbbf6924ff214b518718687ead96ceec92bdbaba";
+          sha256 = "0z05rr85mf9as2byj3k1ai9x5ci45a7g425svv0ywgz1lgv2vsi4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6585,8 +6565,8 @@
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "ocaml";
-          rev = "09e545e159c5166ae374ab505f4c1b66fb3ec6fd";
-          sha256 = "00m9zd2dnv9bsg6y3imk6nj992zjsy1zf3ylg67iw6x88v01pvji";
+          rev = "65252925f597008101cdb68b6dd119227106f0e2";
+          sha256 = "0627mksg7hmmz1hzalyrklsnwpz2k3jzl41dyllk5b7xpap5s9q5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@@ -6623,12 +6603,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20170807.607";
+        version = "20171026.13";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "61f4673b2b4d76ed6404f2c905e5de57c41ccc97";
-          sha256 = "0nkrqmylyv2c7zrfy12p7j161mkg91zm9fb1gjjyq0k7ixad677q";
+          rev = "3ecf0b89b3d36874a301a7e2fb429fc026c73f35";
+          sha256 = "1mv1a0z379mr7y8by5s1lnkvp1kamch01j0yn1aqgxjry3z789dd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -7046,8 +7026,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "51b4a9aed3d18eb7b27e1580807ffacf5abd3bc2";
-          sha256 = "1g9wg331fr578sgdz9c7qk27aphi2ryddib0sqdk9wsc5h41cfmi";
+          rev = "b0979047d55db2aefda4adc40cd266c693a57b70";
+          sha256 = "15giw6kacnj1fa3w794gnaqjpywrdrz96rgq1igsygj1rjacrgi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7819,12 +7799,12 @@
     circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circadian";
-        version = "20170924.1440";
+        version = "20171022.724";
         src = fetchFromGitHub {
           owner = "GuidoSchmidt";
           repo = "circadian.el";
-          rev = "6412eca0dfd5030ccd18f949066f1352ed89b44d";
-          sha256 = "0y62c3cfsz439x7pp7s4zzfhavyasv07y4gkn37383p38k56xqdf";
+          rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee";
+          sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
@@ -7928,8 +7908,8 @@
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "clang-format";
-          rev = "1fc9ffb08a71d8747c26037a133fbd811673adc0";
-          sha256 = "0zldh5nk5i3y41q70kwlhf576xmv0baim3q4jam01d41p4p040mq";
+          rev = "6e6114fac0e4e600f1ffed7b2ce978f7adb001cd";
+          sha256 = "07zabj31bgckppkqgg5if515093k0lx2xyf3adh90ymmssvvgary";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format";
@@ -8314,12 +8294,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20171008.743";
+        version = "20171031.357";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "05b6f053eeb56cb8301361bb84f9fe1371a53818";
-          sha256 = "1vpa5k2f0ixgy2wzly420ywhrri07nvmimns6xkydilkqpp5mk1b";
+          rev = "061431d86f05a5a25d2e00fc5f317b22cb9d8a79";
+          sha256 = "09cv517p42nrzj435b1ma8lfl1k4izdv1dj1q9hi5y61q1q1zhp9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8339,8 +8319,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "05b6f053eeb56cb8301361bb84f9fe1371a53818";
-          sha256 = "1vpa5k2f0ixgy2wzly420ywhrri07nvmimns6xkydilkqpp5mk1b";
+          rev = "061431d86f05a5a25d2e00fc5f317b22cb9d8a79";
+          sha256 = "09cv517p42nrzj435b1ma8lfl1k4izdv1dj1q9hi5y61q1q1zhp9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8545,12 +8525,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20171017.608";
+        version = "20171101.236";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "cfdf8522159882a3e07bfa1f648b07d807afb650";
-          sha256 = "0wiv1bqgf3szg9dkdhccbxk28xgz07jdmfpfp24wic6dpny2vzjx";
+          rev = "114e2df27f79816f023a07e3e8024c7ab73603f0";
+          sha256 = "1n7zv325kjvmz694r11sbz6650b8y22kv2mbx4yrdha9r6y2m1f7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8570,8 +8550,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "3e0441d87735241eb496b22bb8856bb29575b941";
-          sha256 = "07q91k9fim3w646mfhwvj3ai56xkycs22izqlvz34ldlwysnx68q";
+          rev = "a57bad6c3d0dbc885bb71dfe465d09a380c35960";
+          sha256 = "1igyb96zbdr94sxry8irffhmhcz1wi0d4a65cf98j4vvnxz36b9w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9028,12 +9008,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20171014.1430";
+        version = "20171030.1358";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "acd7887256a77c07006fb45ebab67f1cd68df2f6";
-          sha256 = "0rjidxjwaxmkrc8dcz37v3h76rzm4kf2gjx2s2mj3dym8l6bg5cl";
+          rev = "e7f5d175916df20c411713e49be8b58aac36f7ed";
+          sha256 = "11n5ly2n8l4b7xph81w57av42zv43fk2vc6b6mjhxvvn86l97ma7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9049,12 +9029,12 @@
     color-theme-solarized = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-solarized";
-        version = "20160626.743";
+        version = "20171024.825";
         src = fetchFromGitHub {
           owner = "sellout";
           repo = "emacs-color-theme-solarized";
-          rev = "797229d0d3c9a2233fd8c69c0c2d9948be1d0685";
-          sha256 = "1mx4948qdbwg93261bxr0k5cjx05ws7c3cmhrv6znvjzp6gqxlcl";
+          rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee";
+          sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17096b452740bf6b7afa38e62df8e623494aa6b2/recipes/color-theme-solarized";
@@ -9112,12 +9092,12 @@
     column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "column-enforce-mode";
-        version = "20170103.1231";
+        version = "20171030.1200";
         src = fetchFromGitHub {
           owner = "jordonbiondo";
           repo = "column-enforce-mode";
-          rev = "379366fe0a5bcb333db2d55cddcf18d6e76ab3fc";
-          sha256 = "1vqydf174rydclwmcq6j8xpr16k9w049x9rilg1lvyjc67p7pyaf";
+          rev = "2341a2b6a33d4b8b74c35062ec9cfe1bffd61944";
+          sha256 = "0rcxb7daxxrp5f1i5cbv25viwawbbsn4ij1mnlclp5wz7ilcy2rs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode";
@@ -9614,8 +9594,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0";
-          sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic";
+          rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
+          sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9904,12 +9884,12 @@
     company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
     melpaBuild {
         pname = "company-lsp";
-        version = "20171019.2235";
+        version = "20171031.1844";
         src = fetchFromGitHub {
           owner = "tigersoldier";
           repo = "company-lsp";
-          rev = "2e32d6141370e0736644928a8dbd7812b89c717e";
-          sha256 = "0fyl2bkn289f3b6150kyg6civair659c2pg13ng6x5vn3pih5agk";
+          rev = "5fc50b6ad5c4ee71625bddf348646be44e69f396";
+          sha256 = "1gkabm9iaimv4s7v723aflvxa7z902py46m5mz0szpdcrrh36495";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
@@ -10034,8 +10014,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b";
-          sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9";
+          rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+          sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10187,8 +10167,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8";
-          sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r";
+          rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+          sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10376,8 +10356,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "f31894da73c2b784bc9e0885ddfa6e1077782417";
-          sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck";
+          rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4";
+          sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10456,12 +10436,12 @@
     conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "conda";
-        version = "20171009.1921";
+        version = "20171028.617";
         src = fetchFromGitHub {
           owner = "necaris";
           repo = "conda.el";
-          rev = "32f87d1f940058404858e5e6472877a069df219e";
-          sha256 = "0zr86fr0dswxchm28jvkc4fdqg3wp7hw5ch8jai2pm3cn45cqk7z";
+          rev = "526be691824f4a32299f560a883913697bc4d847";
+          sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@@ -10477,12 +10457,12 @@
     config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "config-general-mode";
-        version = "20170719.446";
+        version = "20171024.1140";
         src = fetchFromGitHub {
           owner = "tlinden";
           repo = "config-general-mode";
-          rev = "8927fd1c359275dc4236c5f48fea0e3ce8349bed";
-          sha256 = "04f6608ndhan6xmipzylzwzx2asx0bsqx8a9rnxfab3bza756c99";
+          rev = "b4a8e6ba0bb027a77e4a0f701409f3e57bb2e4c0";
+          sha256 = "115sk0h6i1bfnxw1v11719926cvnq7gyisjcysvkam40hp3d5fx5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode";
@@ -10813,12 +10793,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20171017.1029";
+        version = "20171031.1234";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe";
-          sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz";
+          rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c";
+          sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10876,12 +10856,12 @@
     counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "counsel-etags";
-        version = "20171020.2305";
+        version = "20171026.435";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "counsel-etags";
-          rev = "5d7b51ce7806bbe7e1f75077b4dde2ac17a53c5d";
-          sha256 = "0v3b3gs4jy8cqkvchnakwpws3a0igiklchb9q3754lnmk8784dn8";
+          rev = "19757e5d79a7a504760a1e7a7095779b48ec995f";
+          sha256 = "1qacqjl1x01r3ss1a9qwy0651gamnkp59nzl9i6krnrdfksc6gjz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@@ -10957,6 +10937,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    counsel-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "counsel-pydoc";
+        version = "20171018.1342";
+        src = fetchFromGitHub {
+          owner = "co-dh";
+          repo = "pydoc_utils";
+          rev = "1d8ff8ca3b9d69453cde423b1887fbb490a95c9e";
+          sha256 = "06kf93y8wb9nwvs70xi4lkd5x4g6sl8f83diy2wl7ha657dwx3m8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/110939c12b4e042a486e97be4c2a2426c5978ca6/recipes/counsel-pydoc";
+          sha256 = "1a3vwh4jf5y03z95bd4blk75n6wjd24l6yw6vpr3991bi4qrxclz";
+          name = "counsel-pydoc";
+        };
+        packageRequires = [ emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/counsel-pydoc";
+          license = lib.licenses.free;
+        };
+      }) {};
     counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "counsel-spotify";
@@ -11335,6 +11336,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "crystal-mode";
+        version = "20171023.212";
+        src = fetchFromGitHub {
+          owner = "crystal-lang-tools";
+          repo = "emacs-crystal-mode";
+          rev = "1e8061c049766c25f1c06d43e703d3133426f7c0";
+          sha256 = "0w11s1vmp9b4dlq9kvnxi63j69c94bqpg3fn9w4jasnpz4w9nkcf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
+          sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk";
+          name = "crystal-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/crystal-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     csgo-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "csgo-conf-mode";
@@ -11380,12 +11402,12 @@
     csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
     melpaBuild {
         pname = "csound-mode";
-        version = "20170923.807";
+        version = "20171025.401";
         src = fetchFromGitHub {
           owner = "hlolli";
           repo = "csound-mode";
-          rev = "b5abcb68cedf1231c2e419bf87e875bfdb8fbc42";
-          sha256 = "0r5c8g3jjb4p3a21mjdi9xcmify0c2r61d5y7ycbia7rjv9xpgdh";
+          rev = "5680a266a32c62e8d7ebd987bf6e5fd40033bbeb";
+          sha256 = "1zlb7bwx82rayzphf4q5f1w6yhm3r267fzgn74xmckh50jyq917y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
@@ -11573,8 +11595,8 @@
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "747f5bafad712b90da9eb7e6b893fff16683fe17";
-          sha256 = "1px9pycw44jvkl8gz1zz577hw61l7xvpmdl1bf1bl5wy72x13v42";
+          rev = "0cdd084498c3f5de53a26ae756e4a9f33625fa1f";
+          sha256 = "1zgdc4lm6dyh57fim52ynxx0jfs9hsdgbj739firblmin6cdvm32";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11671,6 +11693,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
+    melpaBuild {
+        pname = "cwl-mode";
+        version = "20171030.230";
+        src = fetchFromGitHub {
+          owner = "tom-tan";
+          repo = "cwl-mode";
+          rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9";
+          sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
+          sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j";
+          name = "cwl-mode";
+        };
+        packageRequires = [ emacs yaml-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/cwl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyberpunk-theme";
@@ -11804,8 +11847,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "d31160f49f8d8dfe0287181830303f42ab2a12d5";
-          sha256 = "05aggv2fzdnhpygkyabp8j2wg8m6zbn0bn8wqrgcybjr2dyp57mx";
+          rev = "ed44d37a80ef91ccb059a8ae056439a889eb6973";
+          sha256 = "08hk3lah5mx3aii4d6d4xb7dbz1d0m2ch0c2hf13pw2d7irqvfzp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11947,12 +11990,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20171018.624";
+        version = "20171101.339";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "d6e225cf5548ab67340697c2ba3a2a0f4149936a";
-          sha256 = "0ll3h6ckmcagvsa0d02jymac95c3x79kgs4pi8dlly28rr7qa6b4";
+          rev = "8d36d6dcddf36f89f06a3f848e69edbda28435eb";
+          sha256 = "1hsfqkf3xfql3h4dprrrzrpp5fansv8ckfii5dnx55a6gl6y3sdi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -12178,12 +12221,12 @@
     dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dart-mode";
-        version = "20171018.1115";
+        version = "20171024.2137";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "dart-mode";
-          rev = "570e58c28b7f70923dfb507496468b227d5905c2";
-          sha256 = "18zsqgdafphwj98jqiaaih0p0qy43z5i7d9ybsmy6b3d2qykbrwv";
+          rev = "adef2a5b672d503ae3e92b30bb80095879b030d0";
+          sha256 = "0bb790rpijlv4cjdcwgqzb249rnz6br557lnn74rb9g52wpabl69";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
@@ -12199,12 +12242,12 @@
     dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dash";
-        version = "20171010.131";
+        version = "20171028.854";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "a57c2c335d0527909f472ca51a2201ad44d38aab";
-          sha256 = "0dg032h4ypib2baw83x5hgz7kkclgr6fkc0fiqd6rcikjg10y2rm";
+          rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78";
+          sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12241,12 +12284,12 @@
     dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dash-functional";
-        version = "20160615.1351";
+        version = "20171028.804";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "a57c2c335d0527909f472ca51a2201ad44d38aab";
-          sha256 = "0dg032h4ypib2baw83x5hgz7kkclgr6fkc0fiqd6rcikjg10y2rm";
+          rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78";
+          sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12682,12 +12725,12 @@
     deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "deft";
-        version = "20160610.1739";
+        version = "20171031.530";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "deft";
-          rev = "86825cd420985112d9dd38060e0edb72b08c6dab";
-          sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l";
+          rev = "c7413a390ac22331ad5226a8c8c007bd08759bc8";
+          sha256 = "1rdjffw8vw71ay93zlr2klbr8q4q1sjnw03gsfdyll1q4idbarg1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
@@ -13189,8 +13232,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad";
-          sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw";
+          rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+          sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13206,12 +13249,12 @@
     dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-collapse";
-        version = "20171010.1222";
+        version = "20171026.159";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad";
-          sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw";
+          rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+          sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
@@ -13336,8 +13379,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad";
-          sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw";
+          rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+          sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13357,8 +13400,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad";
-          sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw";
+          rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+          sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13483,8 +13526,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad";
-          sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw";
+          rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+          sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13504,8 +13547,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad";
-          sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw";
+          rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+          sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13546,8 +13589,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad";
-          sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw";
+          rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+          sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13567,8 +13610,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad";
-          sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw";
+          rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+          sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13630,8 +13673,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad";
-          sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw";
+          rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+          sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -14406,8 +14449,8 @@
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "8070936871e0fbb20fb04c28630288ebe314b8b9";
-          sha256 = "0gk4ykvsv8wgfiym0z635a3n3jaw4wnvfmf78ppfinrzybg85r76";
+          rev = "4df5f94c78817a1f3755a7c9b1358349bf287270";
+          sha256 = "05ggavxq61w55n6b8g76xpqasfka3rbf3326jwxjrd1p6wzs1d3d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -15246,6 +15289,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dynamic-spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dynamic-spaces";
+        version = "20171027.1151";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "dynamic-spaces";
+          rev = "97ae8480c257ba573ca3d06dbf602f9b23c41d38";
+          sha256 = "0qs7gqjl6ilwwmd21663345az6766j7h1pv7wvd2kyh24yfs1xkj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e0b59ce66132cbe2b1f41b665dcb30bdd04bc48b/recipes/dynamic-spaces";
+          sha256 = "0l4hwqivzv51j7h5sgd91dxb5slylmrfrvf7r6w0k04bhld6ry0c";
+          name = "dynamic-spaces";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/dynamic-spaces";
+          license = lib.licenses.free;
+        };
+      }) {};
     e2ansi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "e2ansi";
@@ -15435,6 +15499,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eacl";
+        version = "20171028.258";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "eacl";
+          rev = "94b0eb062899db25f2ef0e535bc6ecace4b5c4e8";
+          sha256 = "042va8ysvnyr7vgwrhd970ly65q1fczk04n6vd9zqxn02cqvk2yh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
+          sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr";
+          name = "eacl";
+        };
+        packageRequires = [ emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/eacl";
+          license = lib.licenses.free;
+        };
+      }) {};
     easy-after-load = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-after-load";
@@ -15480,12 +15565,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20171020.503";
+        version = "20171025.1516";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "0b55c207c6552223857de03bf8aec8be3344ed26";
-          sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0";
+          rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0";
+          sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -15648,12 +15733,12 @@
     eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
     melpaBuild {
         pname = "eclim";
-        version = "20170921.1440";
+        version = "20171024.1038";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0";
-          sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic";
+          rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
+          sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -16173,12 +16258,12 @@
     edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "edts";
-        version = "20170821.149";
+        version = "20171030.9";
         src = fetchFromGitHub {
           owner = "tjarvstrand";
           repo = "edts";
-          rev = "8a737e0601ab4a3fbe2f1252f8b1474ca39df94c";
-          sha256 = "0dbha339yp7jd8nmz38g9igmj5bi03l9fz9gqy2z8j367br3afxs";
+          rev = "6ef4bdf571235ee1b078db321402270cabff7fda";
+          sha256 = "1nzf8wdv0hs4kp69cy3blwxh18c2bkxr4d4y6ggdp0vmwv41j3zi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
@@ -16269,8 +16354,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "170be423c79e8e28b99e5745bf7135ce3bf2de52";
-          sha256 = "1hi2ch08m48lpkhqz05ry736qj1mjva4krbqn2wkhcfdfrxpzhx6";
+          rev = "94d964066ed7cecaea2b31eda7703396032ea4ed";
+          sha256 = "0ln5dzbrbxzhlr797hphd5dmbrhh76cdfbm1fvgl3bi1fw59g8pq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16347,12 +16432,12 @@
     ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20171020.1157";
+        version = "20171024.1043";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "4909b176dcab9c762048dd654032722002e0f4ff";
-          sha256 = "0dr2xarq5irzq095hag6scwimqsp21866iaxjy27rygzgwp5g794";
+          rev = "eaded1e01378c61be8bc454d111e8cc4951a0b5b";
+          sha256 = "0m0dkzr44bmgc5sxzgsp290hvsylvyrsnmfk6ki44qkvp4qg0bxr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16554,12 +16639,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "20170729.1712";
+        version = "20171016.1743";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "f598a7537710f929c6f7592d8c543768361ba0de";
-          sha256 = "1ijnj8ldqhcv3bq22gw1knaasj08yk9vm0nyvnfca3p6w3zv65cm";
+          rev = "32f7a12c2eaacd60d48ed5e5482121154a507fb8";
+          sha256 = "0m1v3gjds2j16kpy05zipdh30fbsb2zrgjny156kgjjxy6fnrnki";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -16806,12 +16891,12 @@
     electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "electric-operator";
-        version = "20170311.533";
+        version = "20171022.625";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "5800e90f5ce23663fe370e4ad8fb40f59a4f93f5";
-          sha256 = "0d3fakycfg7rfblp6wqxyynvnqnpnz4hvi812fp5v4wqz4slfjxh";
+          rev = "278086fcffa1a4607392ca2b0ad57522e492b52c";
+          sha256 = "1kf1281igi6pzg04fsiqwhwrlqv56c1fi56a4z6ch76wh5s63vj3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -16894,8 +16979,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "f343cfa93b7d91024496b8b7f46280762fe86659";
-          sha256 = "0bysjh9626r2651n6vvq6mbbw36jrp41nmd45an6y9cl0z0wj58w";
+          rev = "23cbeb803a312fd0e3801ef240e4322bf9965656";
+          sha256 = "0vi0vbd2k4frj6ij2v8imx57vikgcp47gwk11w4qh4k0na4cjbfs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16964,8 +17049,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "f343cfa93b7d91024496b8b7f46280762fe86659";
-          sha256 = "0bysjh9626r2651n6vvq6mbbw36jrp41nmd45an6y9cl0z0wj58w";
+          rev = "23cbeb803a312fd0e3801ef240e4322bf9965656";
+          sha256 = "0vi0vbd2k4frj6ij2v8imx57vikgcp47gwk11w4qh4k0na4cjbfs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17191,12 +17276,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20171011.101";
+        version = "20171028.2337";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "9c182dbbd7170c6626afb031bbc6a399399d2cd9";
-          sha256 = "1vz8gc8az8cw2v7gg11l6ncg3cw09ynspxmp29rbcxl63qbis6fa";
+          rev = "6fa343ada4a74850840e21bbe787c14fe5a67155";
+          sha256 = "18yk029k12zd8xwgj4k0741lbxzl9djik0srvb5jn6bcbcp6hb9g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17419,15 +17504,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
+    elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20171015.548";
+        version = "20171029.955";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "36d40a66832a3ec37702813463e4acfbb7b6b5ac";
-          sha256 = "1030ihnb35dyad1v7a63kyn94jk0rdkdgil7wnj8pkpzxjvyrwqa";
+          rev = "434f6799e103fcce7d896b3281eb59e15a760783";
+          sha256 = "1mpxzyssvp6n1y17xqxmmpymvljz7g6j60whn9mdp3njn0ijyn5k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17436,6 +17521,7 @@
         };
         packageRequires = [
           company
+          emacs
           find-file-in-project
           highlight-indentation
           pyvenv
@@ -17954,12 +18040,12 @@
     embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "embrace";
-        version = "20170615.1131";
+        version = "20171031.1133";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "embrace.el";
-          rev = "394863dd7271e831cb9c257a1cd2249302ba962a";
-          sha256 = "14qs180p5kv1h4p9qsv4jj61pq7d7bsrvwm0wm85lhgpx8v64q7i";
+          rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2";
+          sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@@ -18431,8 +18517,8 @@
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "c1462183573258edfd8134581417d3c95f1c9c4c";
-          sha256 = "1xyg52qf8zpkrgifw1lxk8h91acrg1n7nw59mxmwq8f122lmllx7";
+          rev = "cc8e64baf7f7bcef2db5b7353ddda9d9733a11cc";
+          sha256 = "1bps5ld798av9nqkjsv7mnj8blnyp30dh809q0fk9qnwylpj74yy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -18511,12 +18597,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20171005.347";
+        version = "20171027.1433";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "82de811bde723e78a702e98592e46514ac700f9d";
-          sha256 = "15n01ni833y9viccdcvhjj80yyavm1131njxwp0q13gqgbzj3n5f";
+          rev = "483e94546d9b1de5841b8853882d5644cc419479";
+          sha256 = "0dd6agcjpncd3vkdx405ql03rpfacwda0njcz69f1cp7z8rc5cdz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -18624,12 +18710,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20171006.353";
+        version = "20171024.651";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "4258ca3457e9a7ac46d1f0bd7a80f1da51b360cb";
-          sha256 = "00v5ipcz642rrg4yicwmg1nam5n0yasqgrak13b3wqmzqx1qzf6f";
+          rev = "6114b78b84cd8a96a117b7652d1e5138eee4b896";
+          sha256 = "1fmvy8h3ng2ykfmr2n0zms2h3csq24f23ldf5zdxyg34riag4nl2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19106,12 +19192,12 @@
     ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20170915.1902";
+        version = "20171030.738";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "6231ee0ae7014bd8f8ef2a3adc13b4d3d403bf71";
-          sha256 = "1c3ryazy796zcxp550ic7a7qsgs4528sfqqywmwqpf8vl7p0p7xp";
+          rev = "3ce23bba3cb50562693860f87f3528c471d603ba";
+          sha256 = "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -19152,8 +19238,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "4b8255e9217c293f84a1e96b3ae8034d089e815b";
-          sha256 = "1nyya11mpvw0k6gvz90iqsxj65w3c5y72k9rf60171gy1rplsbib";
+          rev = "a51424af47f879e776b9344be813a03d2a4bcb5b";
+          sha256 = "18cyr3pmzwab6zqijl3c6h772wzkl1qh44j87p16hcn42sip9jz1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19756,12 +19842,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20171015.130";
+        version = "20171030.820";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "78d86bf3a842af4dc77f02b01ed7589d8f9eedd2";
-          sha256 = "064d3n05kkg8rkp6dnqsjpm9jy2qiiry01m6k7ifk25z6ab02kgn";
+          rev = "da48f2fff367191796b976100c72277bdfb504d2";
+          sha256 = "000rxx14fw1n4k3i6lsvy0bc249pdyx9m1pnpv3x02n0wvmfdq62";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20092,12 +20178,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20171016.3";
+        version = "20171031.22";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "6ca96e8df9fb957c423ae4738e6229106861d6b5";
-          sha256 = "1ij64cg6qq93vwxsj4w60xq7377rlzmrlddnqaxm95m2fkbwr7fp";
+          rev = "3735da896e6fc2672ee06c68e77d11befb99c9c1";
+          sha256 = "01p450ap0dvnnv83cbmasb7avz6jv6xycjg4hczf8485xzq0nmcr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -20995,12 +21081,12 @@
     evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
     melpaBuild {
         pname = "evil-smartparens";
-        version = "20161010.322";
+        version = "20171101.13";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "evil-smartparens";
-          rev = "7cde5544934930819e9dcaa1e0db2e3c58f0cd6f";
-          sha256 = "0pmw98n32fyqr4qnpl52a7vax4rk8dfq98v66v8400b78j6d0n3q";
+          rev = "3a9c2bf24db73c9443d3e2e65ca662df85653f36";
+          sha256 = "05g6j5z63gmvi2j9h6iax3dklqk61ds28yq84mkiihp58swwmfpw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
@@ -21146,8 +21232,8 @@
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "6ca96e8df9fb957c423ae4738e6229106861d6b5";
-          sha256 = "1ij64cg6qq93vwxsj4w60xq7377rlzmrlddnqaxm95m2fkbwr7fp";
+          rev = "3735da896e6fc2672ee06c68e77d11befb99c9c1";
+          sha256 = "01p450ap0dvnnv83cbmasb7avz6jv6xycjg4hczf8485xzq0nmcr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
@@ -21268,12 +21354,12 @@
     evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
     melpaBuild {
         pname = "evil-vimish-fold";
-        version = "20161103.333";
+        version = "20171030.451";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "evil-vimish-fold";
-          rev = "674a8a894e4ae7e7f4b2608b0c9f801a548c69eb";
-          sha256 = "1v2yr5q9c239xf002ymgwndmp5yp617rj7shw2zvfl13d7x229sg";
+          rev = "4db872d12274fdddf7c6e9d01cf68cbad9cfcf15";
+          sha256 = "05phnswbk2r7hdwawzkw6anhkfss9ig8sy469s4vsrqf7cky4gmn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold";
@@ -21456,12 +21542,12 @@
     exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exotica-theme";
-        version = "20171021.457";
+        version = "20171031.426";
         src = fetchFromGitHub {
           owner = "jbharat";
           repo = "exotica-theme";
-          rev = "d20ba97e36dfb8d6965e9f43768a5fdea752da96";
-          sha256 = "0am1l6b26sjdf06gnfd78qvgy5jif6r2lqrfvypb6spv4j62xy5n";
+          rev = "478dddaae45a8e2373bf2b868aeece64f1288d91";
+          sha256 = "17646sa3pgmlzg2s4yic82hkq1bdiqh1spgp5x2lhqh4643fi62s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme";
@@ -21926,12 +22012,12 @@
     fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fancy-narrow";
-        version = "20160124.403";
+        version = "20171030.1716";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "fancy-narrow";
-          rev = "c0f70b4333d4764323b7154e37a378adb1610ab7";
-          sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y";
+          rev = "9f4a587f6a5a387271fb665e13f59d41fd42504c";
+          sha256 = "0dl0fc3i8g193adpkr4fb2k151lw9r6gd8p27q9xgmm9brf9jf17";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow";
@@ -22238,12 +22324,12 @@
     fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fillcode";
-        version = "20150812.941";
+        version = "20171029.925";
         src = fetchFromGitHub {
           owner = "snarfed";
           repo = "fillcode";
-          rev = "1f64f0303a3157eabec355fd155571bb0c042489";
-          sha256 = "0cgrswhbmzyfpkrp8iznsn1lxnb61dz2f0181pqd9gdf55qrk67m";
+          rev = "d0a9e20f5fcc24a786d09ea19bfb9237681ba823";
+          sha256 = "1mf2gfcjaqbw523vkfbzs2nl1y9bn9gbgmbvn2phbyj78gzq18za";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85eb403503aa83799a6072bfe21bf66c8177ca73/recipes/fillcode";
@@ -22301,12 +22387,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20170906.2011";
+        version = "20171025.1943";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663";
-          sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v";
+          rev = "a3ecd28182ba3102fefdc080e807866464153edc";
+          sha256 = "08dk8jjg63rs15hq4rb32368nja2iwdsp8dxwb3isza96lsfkwmx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -22644,12 +22730,12 @@
     flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flappymacs";
-        version = "20140715.901";
+        version = "20171023.304";
         src = fetchFromGitHub {
           owner = "taksatou";
           repo = "flappymacs";
-          rev = "bbc69405f62e1bc488533709d4ab0b5eba919dbd";
-          sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
+          rev = "27f3e21acb22f786606481e3f4e5dc1edbaaaed4";
+          sha256 = "0zcwsbz93p1l2jb1fs6m4s5y9klcr5qg5nw10qg30j9l2bc1hda8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/flappymacs";
@@ -22791,12 +22877,12 @@
     flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flex-compile";
-        version = "20171006.905";
+        version = "20171031.2349";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "flex-compile";
-          rev = "e2a2820282458cad5bcac4037baa6c2e76b1bdce";
-          sha256 = "15dlfayyrcy54davrha8vm87vbip01sbqxgdjfbri4y134fljrk8";
+          rev = "031f4612a07dc0ddb03424a2f986ea18e7064fe7";
+          sha256 = "1vwvhaxhpmpcyrmzdfbwxsxif3fx40548gks3y4n0nhprji7wjmg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile";
@@ -23000,12 +23086,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20171019.835";
+        version = "20171026.610";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "ed41c2f1f7f97d866d379ee3f5d6f3d9f7847357";
-          sha256 = "1cjg14f44m2j3inxzzvbv3gyrpgaf93sl3wivagq5cjngh68w23a";
+          rev = "0d982b2860927a03e4cdf663750bd3b4c128918a";
+          sha256 = "0azjq7d3whlqwp0svj04drk1gxd1hm99d95lkqwj9pbag5hip3ly";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23168,12 +23254,12 @@
     flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-clang-tidy";
-        version = "20170621.202";
+        version = "20171024.108";
         src = fetchFromGitHub {
           owner = "ch1bo";
           repo = "flycheck-clang-tidy";
-          rev = "5b1c86477f7d1eaabd781bc83dd1bd105c79335c";
-          sha256 = "1zd6rqbrpvjxa9sclkldffb91mgyljh1jcvlvvd2cdlajcv98ciw";
+          rev = "b8ebd49693f67e08e420ba847cc88f6721ef9e3e";
+          sha256 = "0fnn1baw64f7x1zjb95adryr3mfynbblwppcd6ywh7pk0sq18b80";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy";
@@ -23630,12 +23716,12 @@
     flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-haskell";
-        version = "20170815.44";
+        version = "20171022.958";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-haskell";
-          rev = "b313b62866b8a28cadc7331749e51eb32e4ddac2";
-          sha256 = "1r94y0wj0ssmamyqfxv0gm0l5qbfrfka8qgsd5mbsaw1lzk5ikfb";
+          rev = "ab2e4f9b5ce4665a9b00c3e16dc8ecce30c99d01";
+          sha256 = "1508rd39zkvlwcakw708lpsahmkiq4pzagjd6j8zas0xn1gb6789";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell";
@@ -23900,6 +23986,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-nimsuggest";
+        version = "20171027.1508";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "flycheck-nimsuggest";
+          rev = "dc9a5de1cb3ee05db5794d824610959a1f603bc9";
+          sha256 = "1bf65hrz0s6f180kn2ir8l5qn7in789w8pyy96b9gqn21z50vb9d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest";
+          sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv";
+          name = "flycheck-nimsuggest";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-nimsuggest";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-objc-clang";
@@ -24180,8 +24287,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8";
-          sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r";
+          rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+          sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24411,8 +24518,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "f31894da73c2b784bc9e0885ddfa6e1077782417";
-          sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck";
+          rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4";
+          sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -25981,8 +26088,8 @@
         src = fetchFromGitHub {
           owner = "factor";
           repo = "factor";
-          rev = "021e595c589f45e8444e2d049d1300ce7811baa2";
-          sha256 = "1k7fkwfgnai33mrdh3wkqmm00cyydkb13j04zmxiwg3w6q4sx3a9";
+          rev = "d2f3977768f5588b9467cc73c12d9a1de204d9e8";
+          sha256 = "1cx1fyr372zhkf35mjvl46c3zim7whz8z2ax88dqavh67h92ai9h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
@@ -26061,12 +26168,12 @@
     function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "function-args";
-        version = "20171006.1056";
+        version = "20171031.1004";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "function-args";
-          rev = "bb0f76412de0f791d82685b4131195e3127e2ccf";
-          sha256 = "137fdy398f6fwp96pi7zqm3fmjlvdwh4h1kiivf8xasgp235f92z";
+          rev = "609b25305670fff08d5e357298e7128e4f4e3497";
+          sha256 = "1xymwk42n2l7c7iaigz23i4l580qpjgq8nqhgr4mnw6invdsgg2c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
@@ -26103,12 +26210,12 @@
     futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "futhark-mode";
-        version = "20171018.1049";
+        version = "20171026.722";
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "18a1d0228b28d8abb4c0fcb4af6d9815de19be07";
-          sha256 = "186915xday81bqxdpwp5h5cylmlyflk9s1w3x3ajr2wzp2q3arfi";
+          rev = "bfb9c4a565ac655322efe5c7bb1f77d255762846";
+          sha256 = "141q924pacsxxfsy3yngyh7a9saipjszpm529s0d4hqqws2glxvz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26229,12 +26336,12 @@
     fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fzf";
-        version = "20170908.945";
+        version = "20171026.554";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "fzf.el";
-          rev = "cbcc56c372ec2d907c690a05cb420a4bf643c355";
-          sha256 = "046hwfnn787c7q5y2pvqxzs5a67my2zmbg5l5rnw1g9swhfh9rfw";
+          rev = "ef1dc851077913a327261a6b971fab5f5f657831";
+          sha256 = "12zbvr7806xiyx2q944nfnqqfnm43v9ziaihkb9n10s2sp6ippb7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@@ -26413,22 +26520,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "general";
-        version = "20170708.104";
+        version = "20171031.1345";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "general.el";
-          rev = "00efad765a3ace42a2833c65a169d96c7925623b";
-          sha256 = "1jp0vp4g46pcxsyz9d8n9iqf1rsaw4lhsrilmdkayj7n3skg4ipj";
+          rev = "6828a859af771df5ec1bf50b67f0fcc7261b5a11";
+          sha256 = "13sm85dybjhnqqgkshc4n4m3vm6pd949ppxyb5li7f0znhq6l3ai";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
           sha256 = "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc";
           name = "general";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/general";
           license = lib.licenses.free;
@@ -26665,6 +26772,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ghost-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "ghost-blog";
+        version = "20171023.42";
+        src = fetchFromGitHub {
+          owner = "javaguirre";
+          repo = "ghost-blog-emacs";
+          rev = "71b358643cc9a2db1bf752281ff94aba9b59e4cc";
+          sha256 = "1fkh7zslkdi7a4x2xrk73acmigbi7yx9k6iaj75zbjfd49gyqj13";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a906d461bcb2aa07050b72669feb5787414d809/recipes/ghost-blog";
+          sha256 = "0c591cx5kkfmhhqh8jall470iicxdv01mm3m13irq5xhmp3i5kjy";
+          name = "ghost-blog";
+        };
+        packageRequires = [ markdown-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/ghost-blog";
+          license = lib.licenses.free;
+        };
+      }) {};
     ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ghq";
@@ -26903,8 +27031,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483";
-          sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi";
+          rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f";
+          sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27634,12 +27762,12 @@
     gmpl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gmpl-mode";
-        version = "20151116.1149";
+        version = "20171031.1354";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "gmpl-mode";
-          rev = "a4481bcbd84f67cd87e7bc87456b6f5b3a95fcf6";
-          sha256 = "0w9dfxpiwwfk1iy83a214xpvqf858k668xkcdr2n25bccg1i148y";
+          rev = "c5d362169819ee8b8e8954145daee7e260c54921";
+          sha256 = "00p2z6kbyc0bas21d1zygx7z49w6mf22y9kf1rcm9gqsnnadb4j9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode";
@@ -28051,6 +28179,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    go-gen-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "go-gen-test";
+        version = "20171022.2058";
+        src = fetchFromGitHub {
+          owner = "s-kostyaev";
+          repo = "go-gen-test";
+          rev = "44c202ac97e728e93a35cee028a0ea8dd6e4292c";
+          sha256 = "1vi5xsf0xbcbvapi20hsjangwyp38cbgi8kiccpmingnq2kp8ghs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0861c126161a2674f0e115eac6f948490b142b44/recipes/go-gen-test";
+          sha256 = "1pj8n8xj9ccq9ips4wy4v6hdxxgwv11pwi671l6jjrig38v13dzr";
+          name = "go-gen-test";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/go-gen-test";
+          license = lib.licenses.free;
+        };
+      }) {};
     go-gopath = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-gopath";
@@ -28492,22 +28641,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    google-contacts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }:
+    google-contacts = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }:
     melpaBuild {
         pname = "google-contacts";
-        version = "20170112.1022";
+        version = "20171027.1033";
         src = fetchFromGitHub {
           owner = "jd";
           repo = "google-contacts.el";
-          rev = "cf654c59b197a028eb8bf432d52776c2e0ad4135";
-          sha256 = "1qrn9zqn25wpsrqbacamn3ixf90xmgxa8ifkday6cxn5ks0kgyj4";
+          rev = "a40389bae006ae094aeb1a39fae9891ca687c0fa";
+          sha256 = "06mfdmr3dlmk4gyq8fxqv78c5jyis8vxx4ih2azcr5c831pkayzi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-contacts";
           sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn";
           name = "google-contacts";
         };
-        packageRequires = [ oauth2 ];
+        packageRequires = [ cl-lib oauth2 ];
         meta = {
           homepage = "https://melpa.org/#/google-contacts";
           license = lib.licenses.free;
@@ -28751,8 +28900,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "b729d2e8e0270dea62f10a63be34c021d123e41b";
-          sha256 = "187fkjpsvq1gyxsgnbvxi4z62hv773ii1lxna3vfz4rqjzcjgxh4";
+          rev = "b227a2582a9e5175fc778fc6a03b98aa14534927";
+          sha256 = "0ss8jqczipl557c9pipkpvz3h9x6lhzma15s799zw7jwyza6802y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28877,8 +29026,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "923c77a37a89811d583042eaec56a9d4f20cdac2";
-          sha256 = "1vp80iw0fgrpgph512ia36bx2akcyanp0ydkf6q02wg4iidaw6fz";
+          rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2";
+          sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29260,12 +29409,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20171015.430";
+        version = "20171024.221";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "923c77a37a89811d583042eaec56a9d4f20cdac2";
-          sha256 = "1vp80iw0fgrpgph512ia36bx2akcyanp0ydkf6q02wg4iidaw6fz";
+          rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2";
+          sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29470,12 +29619,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20171005.137";
+        version = "20171031.1241";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "6927d5afd2c4543bc97785d3f35e06a8b0fe86f3";
-          sha256 = "1hyghwnnkl7fsq3wm7acp4ia7a7zp396wbmmyk3zw93lnpjhwkpn";
+          rev = "b11ddb65044468a1d1d7091ee9636aab7b13afed";
+          sha256 = "0jhmc2s1xbr5dnmckszx8j0i3kfj7n868xw1d6sqplm7i0r0wm8s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -29575,12 +29724,12 @@
     habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "habitica";
-        version = "20170924.857";
+        version = "20171022.1922";
         src = fetchFromGitHub {
           owner = "abrochard";
           repo = "emacs-habitica";
-          rev = "752bd376bcf1db563d503d554802aa0ff6e2c054";
-          sha256 = "01g9kkfddn7lggbqw6s1vk3igbdjh0v6qslnlbp1llih8wa2vdlr";
+          rev = "e51ff7436fe1da10404e2c0872b15d6a7a926717";
+          sha256 = "1hiiqf82nagnpq2qdcdv6y2blfiqs6f8ia8k66a4zn5xgwpd13f4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica";
@@ -29974,12 +30123,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20171020.2109";
+        version = "20171022.26";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "19fe60b9d07b6a29a529bb58addf91fec5392416";
-          sha256 = "1x0vi50ibch57099ifzslyl6icw603bv2lasbrspz2w87qqg59mc";
+          rev = "9018ad5cac0b1b1b5e0a51586027fb0ca4076b1a";
+          sha256 = "0aj6mjv1i8m18klj9mp690fkmwc81wxh2q69cxjf78fdpgbrhcwl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30245,12 +30394,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20171019.2338";
+        version = "20171030.2225";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "e98a4279135d5d7f4a2fec06c7e7c8b1a1fcacf2";
-          sha256 = "075dvbfv5f36r1br7w17i6nhj1vxdnv3c0x2p28rgk5mv10bdpl2";
+          rev = "fe92240663f6b2314e79558f6eabbab955a797e3";
+          sha256 = "1ip2a9fh3k14s87h8zhw6flybkskcx6vrayyzj5929g97mr26a5k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30476,12 +30625,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20171012.332";
+        version = "20171022.220";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "1e1eecfdb62e80a9166cf6e7a3ddb8ff0e80846e";
-          sha256 = "0j8xfd11ragnmz51fgfnliwqcxsphghcs8l0cn7m44kfl1kpn9pj";
+          rev = "54de08577f9c19354cc303ee52836263aef486fb";
+          sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -30875,12 +31024,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20171020.1124";
+        version = "20171029.2252";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "e98a4279135d5d7f4a2fec06c7e7c8b1a1fcacf2";
-          sha256 = "075dvbfv5f36r1br7w17i6nhj1vxdnv3c0x2p28rgk5mv10bdpl2";
+          rev = "fe92240663f6b2314e79558f6eabbab955a797e3";
+          sha256 = "1ip2a9fh3k14s87h8zhw6flybkskcx6vrayyzj5929g97mr26a5k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30942,8 +31091,8 @@
         src = fetchFromGitHub {
           owner = "areina";
           repo = "helm-dash";
-          rev = "2551469fb7faa1b7fdcbbcc3b143fdc8cab1ae66";
-          sha256 = "1jmn6hyvi5y6zxbyddak6b3wxhck4w6mvi2fn7gnh04qvac2mb45";
+          rev = "08961190b3982dcb8c359e633daba556a6d92ce3";
+          sha256 = "1vdrfykhcfnmm254gd3aqypk9hfl0fcml1nc0wxmdjlimlsxadc3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
@@ -32177,12 +32326,12 @@
     helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-mu";
-        version = "20171009.1022";
+        version = "20171027.933";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-mu";
-          rev = "c3d7fb6fd55c760895e0bd6491bafe70aa11409c";
-          sha256 = "15jfn7djc8bdvb7xhw2j1d69bn2zn63xdss4cvcckd8dgxpkqrbh";
+          rev = "cda769ef48e1e11e3b21cdafa85adb8e36384d78";
+          sha256 = "0s7v2hdrsd3xmdw0iwd3zqpdj3zp3z0akcyyw3cicpmic7wrcc75";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu";
@@ -32790,8 +32939,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8";
-          sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r";
+          rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+          sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33944,8 +34093,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "e18ec3f55e288883f8042065190572e91651733d";
-          sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z";
+          rev = "578d1256e466eb8bf40fd7e441172eb12e878637";
+          sha256 = "02dvnlg3r9pfk18664d5paqc90ll6a4sc05a9w2phafmi9kypwgr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -34234,12 +34383,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20171003.647";
+        version = "20171031.1157";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "588c6a2df2ff4b8f77df49894808cf4ad3de6cad";
-          sha256 = "18hjnha1imqiygydbbwwfldp0wvfhf02ffzhzd967nq6gvl0vzdf";
+          rev = "7caae71ba87b592e08fb4caaaa1da8e9af80ec62";
+          sha256 = "17b5hg7fkm8fj2v477ir9z87kn7q07v75akga414k29xlfzmvdw3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -34484,12 +34633,12 @@
     ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ht";
-        version = "20171020.1146";
+        version = "20171024.1200";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ht.el";
-          rev = "9d659f04b44f416676e6a002728d9a16afc9bd96";
-          sha256 = "190vzs0pqcm120nv7959ri3v5qha5hnx4lgfby08wyl4973xncf4";
+          rev = "a741bac82797d25ec0542764df7443e9e7241033";
+          sha256 = "1m1v31bfaw2g3jymcxsl2bi1z37pj0sfhmldljk8m9zgjll56g6c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht";
@@ -34799,12 +34948,12 @@
     hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "hy-mode";
-        version = "20171021.30";
+        version = "20171030.1023";
         src = fetchFromGitHub {
           owner = "hylang";
           repo = "hy-mode";
-          rev = "903dfb4b1f46495d7a8a83fd62142c9e0dda3a03";
-          sha256 = "0v5a4xbzj3gbncwy05azahznh4fgj92f0vdz23l626w446cndz0x";
+          rev = "afb1610b0f78e059ee1a034048a876ece70118f1";
+          sha256 = "14b5dk7n9727dwyi9p80rcwm0f6i21y1x10rj05bal1s3lxq7frp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
@@ -34944,12 +35093,12 @@
     iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iasm-mode";
-        version = "20131004.1644";
+        version = "20171023.722";
         src = fetchFromGitHub {
           owner = "RAttab";
           repo = "iasm-mode";
-          rev = "6b404ff94bbfe971b3614007c8e5dcd5757c5727";
-          sha256 = "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5";
+          rev = "abbec7f308f9ce97beeb57e459fff35f559b4c18";
+          sha256 = "0hvpcckhlxab5f7w4s6iw5lhdbjrqn0l8gayg1w42rn6gssr3rap";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c230ec10eb62d1b3f6df10c05c5dbc2e25d4507/recipes/iasm-mode";
@@ -36054,12 +36203,12 @@
     import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
     melpaBuild {
         pname = "import-js";
-        version = "20161220.508";
+        version = "20171026.1628";
         src = fetchFromGitHub {
           owner = "Galooshi";
           repo = "emacs-import-js";
-          rev = "15d395126f57408d770a72db2e5f43271f90fa52";
-          sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l";
+          rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250";
+          sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
@@ -36180,12 +36329,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20171018.432";
+        version = "20171027.914";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "db3b727c9deedcf9afa13e07cd25734cbf7305a2";
-          sha256 = "1cm6zm8d7rywvlhzf1vpblqb1kgn6c7bwk9q2mjz7f5gdcsx1jp5";
+          rev = "f7b46c9dd39dfc7ffefb52e35b0795450d3ea96f";
+          sha256 = "0qba8c4qr8v0881lc2pnw6lddspzkdj7hsapf6x0vk1mwqmnww4x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -36222,12 +36371,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20171005.1130";
+        version = "20171029.40";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "b048358406c24f5f22a3fc51c0a1348236bcfde1";
-          sha256 = "0hw8981pi5xkcvs5023nj91vjq3agdlqabinmrrl0mj4wfh2q32q";
+          rev = "b04f05d2c735795b68a10cc7e699b676a8acc811";
+          sha256 = "16xsrny70f5lr6hr4sipyrnry813cvbhy25jxfx90kp2f9kkak53";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36478,8 +36627,8 @@
         src = fetchFromGitHub {
           owner = "ideasman42";
           repo = "emacs-inkpot-theme";
-          rev = "b992c0996b4a711f3d6ebb6730c6f57edbc75fc5";
-          sha256 = "1ykbf5hhs7z33bca5j0vk8vdyrwghbiqgdjy064nccgxlqyysy0k";
+          rev = "7b2f19ebd01535f77da407e28ca970c2ce442493";
+          sha256 = "1d2vi919fz6kdya5gafhy9wwmlzid88j9klcbslzh8bjmamnbxcx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
@@ -36683,12 +36832,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20171020.1447";
+        version = "20171023.1102";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "55b17bc6b9cf1e8621a210fd07de6177e55d1334";
-          sha256 = "0zx6p1i3sy771hp4n3dkfgypwrrr35qpa71hlhs5zrcn17xka9jg";
+          rev = "5697c86fde2b6131629e8d1c69f9b2363dadc7ae";
+          sha256 = "1zwvmchk8rymxfciiip78zf69p3f8jpbr7fqqj43cxv0lq9w284s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37184,6 +37333,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iter2";
+        version = "20171031.755";
+        src = fetchFromGitHub {
+          owner = "doublep";
+          repo = "iter2";
+          rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55";
+          sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
+          sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65";
+          name = "iter2";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/iter2";
+          license = lib.licenses.free;
+        };
+      }) {};
     iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iterator";
@@ -37250,12 +37420,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20171021.207";
+        version = "20171031.716";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe";
-          sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz";
+          rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c";
+          sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37271,12 +37441,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20171012.332";
+        version = "20171022.220";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "1e1eecfdb62e80a9166cf6e7a3ddb8ff0e80846e";
-          sha256 = "0j8xfd11ragnmz51fgfnliwqcxsphghcs8l0cn7m44kfl1kpn9pj";
+          rev = "54de08577f9c19354cc303ee52836263aef486fb";
+          sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -37380,8 +37550,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe";
-          sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz";
+          rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c";
+          sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37506,8 +37676,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8";
-          sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r";
+          rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+          sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38211,6 +38381,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jetbrains";
+        version = "20171027.2055";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "jetbrains.el";
+          rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8";
+          sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
+          sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7";
+          name = "jetbrains";
+        };
+        packageRequires = [ cl-lib emacs f ];
+        meta = {
+          homepage = "https://melpa.org/#/jetbrains";
+          license = lib.licenses.free;
+        };
+      }) {};
     jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "jg-quicknav";
@@ -38365,8 +38556,8 @@
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "jq-mode";
-          rev = "f2dc70af890694828b8227b2727240e82780d7e5";
-          sha256 = "18hprvhlwf110j7anyrrrjp4xjr3556yipz7n4jyqj69i0kvjw5c";
+          rev = "5c081859def7510dafc6b14449f5285916898f15";
+          sha256 = "14421p9k6b02syb8irprz527dcqbh1r4i2m86pi94sv6ffzbs0gg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode";
@@ -38424,12 +38615,12 @@
     js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js-auto-format-mode";
-        version = "20171019.2142";
+        version = "20171031.1819";
         src = fetchFromGitHub {
           owner = "ybiquitous";
           repo = "js-auto-format-mode";
-          rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09";
-          sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag";
+          rev = "68c6c51320f124d84145643dda59619966bb29f4";
+          sha256 = "04slx5ipcf1lj9fvx537yfyvqmg324pfji02w5iafqnyvyhdjy9p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
@@ -38442,6 +38633,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    js-codemod = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "js-codemod";
+        version = "20171017.1411";
+        src = fetchFromGitHub {
+          owner = "torgeir";
+          repo = "js-codemod.el";
+          rev = "cf0d0a47588cad640e4397f306fd17d2166a8f04";
+          sha256 = "04im9cs7hbs2bzx5ynibwgbypy91vvrz3jjy72hzfaamdglw7w8r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/81670a2467fa846a3f0e6c81e870e8ae140dd54e/recipes/js-codemod";
+          sha256 = "1m5wbyx12sc5qwbrh948ikskck10p6j05ahrrvmmflvfb3q4vpcj";
+          name = "js-codemod";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/js-codemod";
+          license = lib.licenses.free;
+        };
+      }) {};
     js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js-comint";
@@ -38909,8 +39121,8 @@
         src = fetchFromGitHub {
           owner = "tpapp";
           repo = "julia-repl";
-          rev = "fbee2f5995a7781576b7a3b9f0707ea1e7ead2c5";
-          sha256 = "18vqw0sz1ifhd6hpa5am9z2qykqz1dxwav65v8vgl6hrrbnkfzbq";
+          rev = "b20cadb67d65e52ecb57bbb07369215d01c956e0";
+          sha256 = "048jf00lmyrsr815kk8h5y5hdvpmbd6zvchq8x5vyziqd2vpsdc3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl";
@@ -39257,24 +39469,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
-        pname = "kaolin-theme";
-        version = "20171015.2347";
+        pname = "kaolin-themes";
+        version = "20171101.316";
         src = fetchFromGitHub {
           owner = "ogdenwebb";
-          repo = "kaolin-theme";
-          rev = "b0808035ab7bb9b5b03a0f80dfb01141beeac75d";
-          sha256 = "15bklknvd3x3n75shwis4j9gjfpwms37vaxvwd2bym3m1kx8kh2d";
+          repo = "emacs-kaolin-themes";
+          rev = "85d11341944ff91e7949306c588f237ebf8adc5e";
+          sha256 = "1cqmg3hksqb3vi2m77ysacx8znp6b94vqcxw7lm4psrdwb3ris8g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme";
-          sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c";
-          name = "kaolin-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
+          sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw";
+          name = "kaolin-themes";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ autothemer cl-lib emacs ];
         meta = {
-          homepage = "https://melpa.org/#/kaolin-theme";
+          homepage = "https://melpa.org/#/kaolin-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -39768,8 +39980,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "1f4fdb290b9ff6f3a0694cc0cdad56e78a9490bb";
-          sha256 = "0cmhsnc20x3n2njs16w6ng3s1csc8pp3k00p6ibigbbs06hd0v7l";
+          rev = "be946b5e33cc1fc734a29ba46ca734391803fbcd";
+          sha256 = "1ngpwjhilpg974xx4z8fiz6c2ycpdr6xbky1d3d24563hjp1a5kr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40076,6 +40288,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    kubernetes-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kubernetes-tramp";
+        version = "20171026.922";
+        src = fetchFromGitHub {
+          owner = "gruggiero";
+          repo = "kubernetes-tramp";
+          rev = "9fa84df71f6e88bc23a756cdf2df393a35aec945";
+          sha256 = "1l1ibc97ahp3zwwypqfg3201qdxad4sdpdaq7nsfb87gh46vsbz8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8ea4b15e64a9dc33b9977650488693cacadd1ab1/recipes/kubernetes-tramp";
+          sha256 = "15nlx3w2v0gky0zgbx7n0w1mdr6yaj4dh028ay2k19wg8wbsckjq";
+          name = "kubernetes-tramp";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/kubernetes-tramp";
+          license = lib.licenses.free;
+        };
+      }) {};
     kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "kurecolor";
@@ -41409,12 +41642,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170928.2107";
+        version = "20171029.1522";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "145d21d65b5469e682ef464ae8f4e0e3d8c0f04b";
-          sha256 = "1h188cprka13bd1prfj1w86m5z8c1nfaz4dw18g88jf6b0gyazhz";
+          rev = "2ecd23457ac26f30f7218a5506142ca71dc602be";
+          sha256 = "17d6p7i2yi3iawc2k8w4fkx5lwnr0x5kax73cgwapv6ghmr9yy42";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -41517,8 +41750,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "https://llvm.org/git/llvm";
-          rev = "7f2ed036912341ef20004385cf71d053a3cb156f";
-          sha256 = "1kzzh5sybp9y47xzc4mirk4b6lcf736sxvi91rvf8fm5gp075sq1";
+          rev = "26acced737715cfcbf29f6708f900b4bb8a6d5e8";
+          sha256 = "189c90wax1zyzk017j4brq2i25smkmpkb05wzakywkf0rgswxwqh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode";
@@ -41973,12 +42206,12 @@
     lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
     melpaBuild {
         pname = "lsp-java";
-        version = "20171021.330";
+        version = "20171023.650";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-java";
-          rev = "c3aefd421535e63929bef25cd341e893572abb18";
-          sha256 = "1mr3pd1744dmx0mk0advnf3d8l8axjmxkik7lqzwvv1rl7x734wx";
+          rev = "5176f63e80e8f971563c0b98658db7dc72404369";
+          sha256 = "07g259bx3vra2gf9mhxyd3qv1jb2s0lc0hndf0kvrcjdy29wwi52";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
@@ -41994,12 +42227,12 @@
     lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
     melpaBuild {
         pname = "lsp-javacomp";
-        version = "20171011.422";
+        version = "20171024.1547";
         src = fetchFromGitHub {
           owner = "tigersoldier";
           repo = "lsp-javacomp";
-          rev = "bd3c3714158fe52d19025e9a13efd5e490b1d202";
-          sha256 = "1gv0dl0vp2nkf7j74hin8kdmjppqz9cgfn2lhg06yj32yzvg6xbw";
+          rev = "ed23aaeee27e6253bed5752fb8fbb7a5fa61967c";
+          sha256 = "096rbyv0qwa454p1ns7g0py9lni5r6h1gw85wm5mwr00shjzq23n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp";
@@ -42015,12 +42248,12 @@
     lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
     melpaBuild {
         pname = "lsp-javascript-typescript";
-        version = "20171021.253";
+        version = "20171027.1005";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-javascript";
-          rev = "c349da788f77b60f7e8ec8917054e97b8f41bc70";
-          sha256 = "1b6lskd57p3c1dfz0c4pn80ksdq7vysjlbk3ja0az1nyxczmn44q";
+          rev = "8a565260906f90bb39f2da54cdb6179ec27005a6";
+          sha256 = "1dx0b7sq6wn309l1iy8s3ccn21hkv0xs061jbm53hz40pn30sjqc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript";
@@ -42036,12 +42269,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20171021.234";
+        version = "20171029.148";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "e67ecf89b3878f8d5d079af3ce2b57933aeb1765";
-          sha256 = "12ms4zl8j3s9nbqqasmglhnagxrpf8cjplagv2dakdlq7zllr8ri";
+          rev = "b221b2acce8936114649cdbdf0ce1d584487ef91";
+          sha256 = "0ndbhy1035ji31ffhc6hxybwm59kzmlp9hg1zjhfww4d0sym9hz9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -42054,6 +42287,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+    melpaBuild {
+        pname = "lsp-ocaml";
+        version = "20171022.308";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-ocaml";
+          rev = "3683281bcb56fbe778fadb23e4363a411b6f9e73";
+          sha256 = "102cfv52hicmpbczs1z3cfz8d03p2hwzdkp3n0ljx1asnk4l1b8x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7be2d7a7af3d744c531e5e018d791bf2566df428/recipes/lsp-ocaml";
+          sha256 = "17334qcgqrz4jd5npizyq20fmxy07z2p3pq98s5np2kc4h9ara33";
+          name = "lsp-ocaml";
+        };
+        packageRequires = [ emacs lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-ocaml";
+          license = lib.licenses.free;
+        };
+      }) {};
     lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
     melpaBuild {
         pname = "lsp-python";
@@ -42082,8 +42336,8 @@
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-rust";
-          rev = "da4877ea682e46d6d6bb0077be5d00269f4c14e8";
-          sha256 = "1miql5v987k6hgxxq0fqzj20al9y3qg79a5pi9d3y4yvzznidhpa";
+          rev = "239e0cb8912749266a6226b68c6bc3b4362876c1";
+          sha256 = "0ki66lcdc67hxx3llzw5x8vrsfi1p5m509jpcvkhrrxs1sqr4bqn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
@@ -42414,12 +42668,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20171021.1158";
+        version = "20171031.1141";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483";
-          sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi";
+          rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f";
+          sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42631,12 +42885,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20171020.1153";
+        version = "20171023.926";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483";
-          sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi";
+          rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f";
+          sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42757,12 +43011,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
     melpaBuild {
         pname = "magithub";
-        version = "20171021.1302";
+        version = "20171029.1959";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "e5f33e46032deb381ec67832451a6c69cfdcb1e2";
-          sha256 = "05s6cfsgxpqb6gvx6n4qdz5fznd87x7k26lz7ad0v7ky461any7w";
+          rev = "2fcd5eebf3e052234950b3b07e43d26ce632a794";
+          sha256 = "0k5bxxfj60vr58g7rnj562ls8ijb0ia66fdiqpyffi5sf0wan13i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -43290,12 +43544,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20171021.1428";
+        version = "20171031.1725";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "df31e2e82bf88655ed895c4a372e28e3a3569353";
-          sha256 = "179wa75kzr0k8kjgk4z5iq5v2c8zbg7c6ii21fq35kyikkp5n8n3";
+          rev = "7a62259a22ccbf59b0132d077348ee489edf5d1e";
+          sha256 = "137xkm76k6faak478hmnr6yrhymbfln0xs0ninzp4iy57kxyx9d9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44831,8 +45085,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "modalka";
-          rev = "7ee76939b9269c652f93065a8fcc7da24434a167";
-          sha256 = "0drhrid8gb9rk9rl8afsf3ninjzs4p78lnrp285xkhwn7hlri4v9";
+          rev = "88935a26318a574adeeb2301ae8d010f0102b1d3";
+          sha256 = "1zibawwflf2wx7hzg2ld7qvmlpljfd6nb86998ckzbx75s5yb20a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
@@ -46859,22 +47113,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+    nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck-nimsuggest, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20171021.1054";
+        version = "20171028.2219";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "fd1af9030443a49d333956afc36491936aa930fe";
-          sha256 = "010jr43xbwr2rfgcvjgb522ms92d0945svlngfdhkjq66bnl41a5";
+          rev = "10296ac3d9ee70bf31180b5158ac3b4a58f45d22";
+          sha256 = "0mswc1f141xif3h4zshza0ar64s99fp6j3l795c67a3yvmc7l50v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
           sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
           name = "nim-mode";
         };
-        packageRequires = [ commenter emacs epc flycheck let-alist ];
+        packageRequires = [ commenter emacs epc flycheck-nimsuggest let-alist ];
         meta = {
           homepage = "https://melpa.org/#/nim-mode";
           license = lib.licenses.free;
@@ -46883,12 +47137,12 @@
     nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nimbus-theme";
-        version = "20171003.1044";
+        version = "20171026.504";
         src = fetchFromGitHub {
           owner = "m-cat";
           repo = "nimbus-theme";
-          rev = "f62edeb70cc19bc4c8de9b815c4e9d257acff35d";
-          sha256 = "04y10x36bfgcg22cazza13ildkcsc3vmrd0z8qcsc74yd05n09zf";
+          rev = "e78561a828e50b5bd0984723d9040620367180c8";
+          sha256 = "04cbr0a3kvk79lyrriblm4q7y00j0banwl7a4r9li4iq92rgcivh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -46950,12 +47204,12 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix-mode";
-          rev = "eb7623fb3b23afec25619a76adab6bab5e338bf2";
-          sha256 = "1shgbh2iawml605qhr1s8bcmy0by7d455lm70wb2wkznsdlwv6wp";
+          rev = "3294f8a2f83ace2d71f16c274a262ff76be412dc";
+          sha256 = "1p1dka9v8fm6rklspkscj5rs5f21dwi3bq44d3hjqw6xva4q7bx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode";
-          sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
+          sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5";
           name = "nix-mode";
         };
         packageRequires = [ emacs ];
@@ -47303,8 +47557,8 @@
         version = "20170927.415";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "d6929040a4828cf17fb1a4f4d49b95816a5e7b7c";
-          sha256 = "1scgmw52ny6wwwdl7hcr3cw84ag2hrrvik6ppp16pfyzv58ywyw6";
+          rev = "1b91884296f7e423f2e190ccf7f590ccb3028fdd";
+          sha256 = "0f78b9nw7ccpkkf192ka40d5021gbj114capjlkf4d79qr8m91yh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47464,15 +47718,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree, which-key }:
+    nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }:
     melpaBuild {
         pname = "nu-mode";
-        version = "20171021.1508";
+        version = "20171028.1443";
         src = fetchFromGitHub {
           owner = "pyluyten";
           repo = "emacs-nu";
-          rev = "161f41f67b3fb10c2e3025670485a2dde24ab54b";
-          sha256 = "0bqc0v4q222lx39axys2yfcfby6a5mcllnmpr3jdgsgagdhxxk05";
+          rev = "683e2648a5b669e91138eec606f2e86f9f54ccd3";
+          sha256 = "0mf8cj729ag7c0z1155ziaqx9s119nwxg9231rb8i8qx17vdci2b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode";
@@ -47482,7 +47736,6 @@
         packageRequires = [
           ace-window
           avy
-          help-fns-plus
           transpose-frame
           undo-tree
           which-key
@@ -47765,26 +48018,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "ob-axiom";
-        version = "20171021.1448";
-        src = fetchhg {
-          url = "https://bitbucket.com/pdo/axiom-environment";
-          rev = "fdb3336941b9";
-          sha256 = "0adi26fj1rgcjis5xspbcrdzb98d3fd693pxv9311ffsxkpfsl9d";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom";
-          sha256 = "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6";
-          name = "ob-axiom";
-        };
-        packageRequires = [ axiom-environment emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/ob-axiom";
-          license = lib.licenses.free;
-        };
-      }) {};
     ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-blockdiag";
@@ -47890,22 +48123,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-crystal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ob-crystal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-crystal";
-        version = "20170811.57";
+        version = "20171101.347";
         src = fetchFromGitHub {
           owner = "brantou";
           repo = "ob-crystal";
-          rev = "4bfd36c922d28e8a204218bde0e889cd1097ec04";
-          sha256 = "00rlxm0gj2arcnjhy824id08gxpha73ikfipar780xm845ripm3j";
+          rev = "9d58b880b74e0ad83b37596bb44635e5d7ae5c3f";
+          sha256 = "11qly91h6cm0qdj2dx8lvmfgp7bakrvvwf106rqh4f98y1qv22xh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal";
           sha256 = "11mk2spwlddbrvcimhzw43b6d3gxzmi8br58bily1x4qkvl6zy4n";
           name = "ob-crystal";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/ob-crystal";
           license = lib.licenses.free;
@@ -48079,6 +48312,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-hy";
+        version = "20171101.344";
+        src = fetchFromGitHub {
+          owner = "brantou";
+          repo = "ob-hy";
+          rev = "a3512f274709dc4ab6c18d7955d361f8715505f0";
+          sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy";
+          sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7";
+          name = "ob-hy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-hy";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-ipython";
@@ -49006,12 +49260,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20171015.1228";
+        version = "20171030.2201";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a";
-          sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj";
+          rev = "906e29a702237f039f24c215fdb561a728a3df1b";
+          sha256 = "1l1rzl7y5j2wmlgx7ivivwvwvbn4h7pg5s7yqsk65n9kb59ha8s8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -49327,6 +49581,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    orca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "orca";
+        version = "20171030.1216";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "orca";
+          rev = "5e1744afb793dda744ddc6fe342144b5e90bea08";
+          sha256 = "0gqgs3rmdzm5vqk8azgzwannxjifvrf5fj40n543d0066c2dfsfi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f4d9cf89c58a9b36b7c2a42de2aecb3b60001908/recipes/orca";
+          sha256 = "012ndbrgm58r09snhvi476rw0lq4m913y0slc0cxb688p9wgz5w3";
+          name = "orca";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/orca";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
     melpaBuild {
         pname = "org-ac";
@@ -49607,8 +49882,8 @@
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0";
-          sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq";
+          rev = "8cec702f602b18da90b3d6207888a887b8e07750";
+          sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
@@ -50316,12 +50591,12 @@
     org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mru-clock";
-        version = "20170901.444";
+        version = "20171101.506";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-mru-clock";
-          rev = "cb239b5704b742029145e7f15e928351e4e8dd9d";
-          sha256 = "0h25w6i4qrbigcwpnwkz8wak5mh3kzh29nayzsf85jlq9vd2x5hq";
+          rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832";
+          sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -50596,12 +50871,12 @@
     org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
     melpaBuild {
         pname = "org-projectile";
-        version = "20171006.1230";
+        version = "20171022.950";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0";
-          sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq";
+          rev = "8cec702f602b18da90b3d6207888a887b8e07750";
+          sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
@@ -50621,8 +50896,8 @@
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0";
-          sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq";
+          rev = "8cec702f602b18da90b3d6207888a887b8e07750";
+          sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
@@ -50753,8 +51028,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "3c022af9adb6ff96edcc2f11ebf20cfd576df702";
-          sha256 = "0qsiclmg9vm1svgr8m4yj0dwwvrvga1qaa6bzdhkw71s0r931sl2";
+          rev = "8fb1275b4c0e2dd46593754e497940c49fd9da6b";
+          sha256 = "0jha5qlab3gsyl8iysf1kqn2f15afvqjvnl2nyzh47llqng8yskj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -51672,12 +51947,12 @@
     osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-dictionary";
-        version = "20170208.505";
+        version = "20171026.34";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "osx-dictionary.el";
-          rev = "ec16c40cc4db0140db1cf6ad1fb1198c7c344b2b";
-          sha256 = "0n09s09qaqwdrpd4dgxj16bh3lgc8nzdld49z8zkipf3cfh5v040";
+          rev = "b16630ecf69f87ac873486d8b9c8c03e6c9ea7fa";
+          sha256 = "06qsg8hlw1b725pzpsg5f194pxqcg1pjncsi8j0815yrlzfcg6sp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary";
@@ -52155,12 +52430,12 @@
     ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-hugo";
-        version = "20171019.936";
+        version = "20171029.1929";
         src = fetchFromGitHub {
           owner = "kaushalmodi";
           repo = "ox-hugo";
-          rev = "d0e8a5d7505ebdd55074a3ecd6ca467931b98454";
-          sha256 = "1r39bllndh44jjsj4j0h8sqmz8a3xkwlp6cj9d7jvp640s8wddim";
+          rev = "caa3aa99c6bef6d0dcaa4713a7934c7d410a5641";
+          sha256 = "0vadb0d7wgz37cdzhgciv0b0fd6wc4gwdz0ppdhk1s9y3hkcbkw6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -52304,14 +52579,14 @@
         pname = "ox-nikola";
         version = "20151114.316";
         src = fetchFromGitHub {
-          owner = "masayuko";
+          owner = "msnoigrs";
           repo = "ox-nikola";
           rev = "5bcbc1a38f6619f62294194f13ca0cd4ca14dd48";
           sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-nikola";
-          sha256 = "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4e3fa1b0728ad3058376800ec5e2e9e3847c1d2f/recipes/ox-nikola";
+          sha256 = "13k5wggz8bhnfgpsc09jnisk7xdb226d6imp7v6vmd1ax9m2xb0w";
           name = "ox-nikola";
         };
         packageRequires = [ emacs org ox-rst ];
@@ -52409,14 +52684,14 @@
         pname = "ox-rst";
         version = "20171004.1553";
         src = fetchFromGitHub {
-          owner = "masayuko";
+          owner = "msnoigrs";
           repo = "ox-rst";
           rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928";
           sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst";
-          sha256 = "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst";
+          sha256 = "0447q0gvasii57rp391la9prz0w228jnzgi59s785vzswdryww0n";
           name = "ox-rst";
         };
         packageRequires = [ emacs org ];
@@ -52470,12 +52745,12 @@
     ox-trac = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-trac";
-        version = "20151102.955";
+        version = "20171026.1123";
         src = fetchFromGitHub {
           owner = "JalapenoGremlin";
           repo = "ox-trac";
-          rev = "2f2f70eefb9679025ae5812e221f0c118da36012";
-          sha256 = "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db";
+          rev = "03cc31efb1aa06991918f1071e250a9d58f96cfb";
+          sha256 = "0knrmq0sc8s9c6j0967jmrp2hq8jcwg281qqk89y8j9rpbmhbaj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b73753ef9229d0fdfbe237acc63126f1786a494/recipes/ox-trac";
@@ -53858,8 +54133,8 @@
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "094b2931de775c734ad353c5d06cf5fc6a55f11d";
-          sha256 = "0g92rd68m1l377hw5rr1y14z7fcs1blmyc6vi5a9gybr19bcxb7w";
+          rev = "0f99f0c06514acf51445e7e4cb0f638fa0c75ee5";
+          sha256 = "1gc7n5r60ib65bnkgpac3bn71pxnm58sxajnwjfkwi9xzgw72acv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -54104,12 +54379,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20170908.648";
+        version = "20171014.111";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "fd57484756b7a7e34895bf55238413005ab35959";
-          sha256 = "1f7qcy5swiqx17835dvwb89x0ndhviyxi5bqk2gn14c1z8fmld5a";
+          rev = "ccf87da2c230c3a91e627105b0f034a954e6842a";
+          sha256 = "1dv3ghl9falw888bl1w0d5pzp0jz8qsbisd7kfd887bsyn7x7jqw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -54650,12 +54925,12 @@
     php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-plus--mode";
-        version = "20170215.657";
+        version = "20171027.921";
         src = fetchFromGitHub {
           owner = "echosa";
           repo = "phpplus-mode";
-          rev = "8224e6aabc2e3d046d717b4c87c643aa98a8e203";
-          sha256 = "041xv3c2gwcxlj9bnjx6hlrm2k7s7fyzqbp4c583is6jx1adjfn3";
+          rev = "523e7e50f9978ba74b8a324f9f896cd9b5dfd9de";
+          sha256 = "0xf79pxsrfr9bi3138hdq2ccrh391sci8lvmvzcs3vnzw0hrzbfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode";
@@ -55444,12 +55719,12 @@
     pocket-lib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, request }:
     melpaBuild {
         pname = "pocket-lib";
-        version = "20171008.2135";
+        version = "20171026.1610";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "pocket-lib.el";
-          rev = "9f2a5dad867ef11d6629073ae4c8a43df1c03470";
-          sha256 = "1y97zlnxp0lxh21x51bdkvd8yxg59sxbq94s06vkvkbq2pjz86pp";
+          rev = "52d4c3d9ca500acbf0a4cac4abfacc0641007abe";
+          sha256 = "1c59xzh2acrfmld0fg78h3kyzhgfcfcbk7nmvb584jr2qppkszgy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71f17ce28f4fc8c2c100848be8aec15526ef8697/recipes/pocket-lib";
@@ -55486,12 +55761,12 @@
     pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
     melpaBuild {
         pname = "pocket-reader";
-        version = "20171015.1705";
+        version = "20171023.737";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "pocket-reader.el";
-          rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd";
-          sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh";
+          rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574";
+          sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
@@ -55747,12 +56022,12 @@
     ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ponylang-mode";
-        version = "20170514.1419";
+        version = "20171028.1356";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
           repo = "ponylang-mode";
-          rev = "88833317195f5ee2880e33a907861c6c2d3851da";
-          sha256 = "0kzzf03m1jzkl9fxzivzh3536c0c9l7m9g5h7zycdz7nj5da38c0";
+          rev = "5e23459dc395eb77fa4c6cfa3d6c08b1b185a6df";
+          sha256 = "0iwdnv56200w53ba4f66vih7gha2nb36ajnvbqixc0byibwcsnc9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
@@ -56062,12 +56337,12 @@
     powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "powerline";
-        version = "20171010.713";
+        version = "20171023.750";
         src = fetchFromGitHub {
           owner = "milkypostman";
           repo = "powerline";
-          rev = "595a9c1b230f4fcc4d72e6ed9c67aed7b838452d";
-          sha256 = "0xpvsrr4klsw3fkclpkxcxrfwg2gk4fzc20n6di22cs5pysilp8a";
+          rev = "fda4fb96984607d4a6502b1d8c8898e56d10cf6c";
+          sha256 = "1lz3kr8w9z9xx5amqqvim85asjji13q84d4r1cb5x77wajmj1p21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline";
@@ -56377,12 +56652,12 @@
     processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "processing-mode";
-        version = "20150217.432";
+        version = "20171022.1602";
         src = fetchFromGitHub {
           owner = "ptrv";
           repo = "processing2-emacs";
-          rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33";
-          sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
+          rev = "448aba82970c98322629eaf2746e73be6c30c98e";
+          sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-mode";
@@ -56402,8 +56677,8 @@
         src = fetchFromGitHub {
           owner = "ptrv";
           repo = "processing2-emacs";
-          rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33";
-          sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
+          rev = "448aba82970c98322629eaf2746e73be6c30c98e";
+          sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-snippets";
@@ -56607,12 +56882,12 @@
     projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20171009.848";
+        version = "20171031.456";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "dd48cb8af4cf41d109fb6d46f0c3f2134f37fcfb";
-          sha256 = "0qgw3g4xq1qa6dvxyyhnb6536ay29jzf12829z9s689xqg0n7zsn";
+          rev = "7892f642ce7ab6ee816e5926ae02ea2014dac2a8";
+          sha256 = "17vclk40435qv2g0fjgyc0fndjghd2x20i43zvcff45yjqmyhw88";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -57003,22 +57278,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
+    proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "proportional";
-        version = "20170628.137";
+        version = "20171025.1637";
         src = fetchFromGitHub {
           owner = "ksjogo";
           repo = "proportional";
-          rev = "eb2bb2b3d1ca058365049271dc341b1180009f1a";
-          sha256 = "1lc3xvkvy5lcy5zralbnwqlxmar443yq735pd023z6di54xm3991";
+          rev = "f671ffe8fd803e2fc462e2e1844aeeab1a13918e";
+          sha256 = "02sbrcb9c27djk64xv41vii6pbw83b6iljrd66w4ad9hgz2pkxzk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0a7f061df4cce44e5fe98f6e1c31bec4a7338f/recipes/proportional";
           sha256 = "022lhbslzd67wyah8r0gl73vzxgjjwia08l3ssdd08jj3p56m3wx";
           name = "proportional";
         };
-        packageRequires = [ emacs use-package ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/proportional";
           license = lib.licenses.free;
@@ -57052,8 +57327,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "b189389e2f2ca01dd534a8e9ba3ac38ea45cdba6";
-          sha256 = "1yr4073qf6br07azrmhy9xk8zq9zlalbmldjsrkbf7k5r59217jg";
+          rev = "cbe250591fca9d2e776776be065a72c5550a5556";
+          sha256 = "0g8zp8ws7i9v3a719dvwkva0f9rap5s6jdpw2j8cj1kp94bvk9fl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -57090,12 +57365,12 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20170923.250";
+        version = "20171031.129";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "e577f84b938a1fb461a016540b06f5d5e399526a";
-          sha256 = "14q4bj7cfny1jwsvdjfsl88nhwh5al8hyvf4rxki9k2wim8lx2bv";
+          rev = "d28c33f65318a475133afc2f42e103db9251d2a2";
+          sha256 = "19f9aw675d6crhd9j9jvqya39ddsf4f6hcwb03525k307syvg62y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide";
@@ -57184,12 +57459,12 @@
     psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "psysh";
-        version = "20170610.2104";
+        version = "20171022.2229";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "psysh.el";
-          rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa";
-          sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7";
+          rev = "926af4ae0c068ed699fc939f4b3e642aaa6f7c9e";
+          sha256 = "0k6kb4xbfxcvd7dm3kb600mq56xyy086zi7nal04jkv9lc59bwn7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh";
@@ -57230,8 +57505,8 @@
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-pug-mode";
-          rev = "96718f802dad3acd5a3f770b1452b81e39f77d92";
-          sha256 = "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023";
+          rev = "9dcebdb10c50620a3a5c6d71361d53bf482a482e";
+          sha256 = "1rkbk8apd612ixksyssmmkrhswks6gbxl9kxhrbaxszfrrhqx86v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
@@ -57247,12 +57522,12 @@
     pulseaudio-control = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pulseaudio-control";
-        version = "20171019.2026";
+        version = "20171024.2339";
         src = fetchFromGitHub {
           owner = "flexibeast";
           repo = "pulseaudio-control";
-          rev = "30b47a785c5f5ee44ae98d522ab541c9ea310b35";
-          sha256 = "0ik06rvgz6gj86ijd6jjpivd37wv5lwszqvcvhskvg68in0ybfg4";
+          rev = "08c59e1dc45ec96edb62f34036e82cf5f14c0e8b";
+          sha256 = "10cgg1r00kz2fsnnryvzay5pf8s1pwb1dzlds1fbjdnyfvdgammv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control";
@@ -58064,12 +58339,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20171005.1620";
+        version = "20171031.431";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "93345f0531b03c5bb2bf34417e9c25fc6fcda6d9";
-          sha256 = "016igycxn7h3gjklr24a7yhp49y4h55f4hpd05haq9raj7vaa6qf";
+          rev = "06e1db1bb2f4d2da994387f2cbb1cfc6e5db242b";
+          sha256 = "019j22hmc1f1izc61l8hnasvs4vj9sb9pl9w3v63ck086h89jda1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -58397,6 +58672,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    quick-shell-keybind = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "quick-shell-keybind";
+        version = "20171022.2313";
+        src = fetchFromGitHub {
+          owner = "eyeinsky";
+          repo = "quick-shell-keybind";
+          rev = "5f4541a5a5554d108bf16b5fd1713e962161ca1b";
+          sha256 = "19hqywwf80q6ay886xmcjjpr4pghkw78hzdg0mrpkpkqn2vj06gk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e9bf4d78da24d88476545f97b2af0527dde73600/recipes/quick-shell-keybind";
+          sha256 = "1f66wk2m0yykcbq6qbalgscpq8s53qshyyqdnimlmdi0g0glif1b";
+          name = "quick-shell-keybind";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/quick-shell-keybind";
+          license = lib.licenses.free;
+        };
+      }) {};
     quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "quickref";
@@ -58610,12 +58906,12 @@
     rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rainbow-blocks";
-        version = "20140306.1033";
+        version = "20171025.738";
         src = fetchFromGitHub {
           owner = "istib";
           repo = "rainbow-blocks";
-          rev = "8335993563aadd4290c5fa09dd7a6a81691b0690";
-          sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
+          rev = "dd435d7bb34ff6f162a5f315df308b90b7e9f842";
+          sha256 = "06yfb3i7wzvqrhkb61zib9xvpb5i00s4frizkzff66im05k0n795";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks";
@@ -59267,12 +59563,12 @@
     reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "reason-mode";
-        version = "20171015.1140";
+        version = "20171027.2235";
         src = fetchFromGitHub {
           owner = "reasonml-editor";
           repo = "reason-mode";
-          rev = "ee67917db828af02c97e18b0747725a16c3a0708";
-          sha256 = "1vk00a06i2p344q5k3py38z967gsnhcix00m5k6z1vhlvd0r4m00";
+          rev = "a9de59cced37b44db72ee248107021a660561d11";
+          sha256 = "04g3598ykczxkmj5gjd4airfl41b821agy6r4h2bnq5fcfdj0jnx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode";
@@ -59477,12 +59773,12 @@
     redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redprl";
-        version = "20171008.409";
+        version = "20171030.1346";
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "164d0b65d05fd883fc9ac66dd62d7427660fea37";
-          sha256 = "1h09mlvrh7qx55s47135nkamv7frhcm3865xacpvifj72z46alg4";
+          rev = "b01bf5db718395eead17b679ed10c6b876117034";
+          sha256 = "0vnfjh0h0z9w28fb1sjncsjcc8f7h1ll0svm203cb5vw6v9d8nrs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -60190,12 +60486,12 @@
     review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "review-mode";
-        version = "20170804.545";
+        version = "20171029.650";
         src = fetchFromGitHub {
           owner = "kmuto";
           repo = "review-el";
-          rev = "e166efd9b8596a9abe14afae79b33eaa808c14ea";
-          sha256 = "0cnwfb3q9xfsrzg5sf64y4p00wdcw0iiz5iard00siva0q0s5k9x";
+          rev = "115cd06558c01889f89feaa659e0d7513a2ad21e";
+          sha256 = "0162gg3hf633zhr5jwj222lx143xvph001qmpmlbbqdxc0sgw5hv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode";
@@ -60442,12 +60738,12 @@
     rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "rjsx-mode";
-        version = "20171010.725";
+        version = "20171029.1156";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "4979f4fc53eb341dc1d76bb1762bd2c734dded40";
-          sha256 = "0kf5sll3npw949hxqga2ywadm1mxc2sm9h136dvnrliaqvi4s95g";
+          rev = "4c10dcd764ade8e3d5dc235c26ba9299576a513d";
+          sha256 = "034hrzcvbnsrr9cxy2wzggnsax708hd231hfkixwffzrrwdlhwz8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -60591,14 +60887,14 @@
         pname = "rpm-spec-mode";
         version = "20160710.436";
         src = fetchFromGitHub {
-          owner = "bjorlykke";
+          owner = "stigbjorlykke";
           repo = "rpm-spec-mode";
           rev = "c1c38050c48ea330c7cea632b8785d66daeefb2b";
           sha256 = "0427kcvf2ljhzwxskn3jzk0ncrl3f9zcz2sm83d9pmhh5jax2gch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f1ce736b8db53fea4935d195a0d07dc8141125a8/recipes/rpm-spec-mode";
-          sha256 = "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb7e188fffda3d4e42690511775e5e32a11e1b34/recipes/rpm-spec-mode";
+          sha256 = "1ygk0pdhq1hvgzd173h79lxb04b9lmvq4hi70qf9244bqbm0m182";
           name = "rpm-spec-mode";
         };
         packageRequires = [];
@@ -60652,12 +60948,12 @@
     rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "rspec-mode";
-        version = "20170312.56";
+        version = "20171025.1606";
         src = fetchFromGitHub {
           owner = "pezra";
           repo = "rspec-mode";
-          rev = "1f468e443e7f2d8419eec29e42074edc400f8c0c";
-          sha256 = "03wv1k3ppvdk2776bkbz8bhxw5n7h4b8zm3b2j2j6x7hrxfza5h4";
+          rev = "94a04f148922852b591957b0b3b22de5c4237448";
+          sha256 = "04qcicaklj9fhl0wbb8axi8zvd0az43cnrhf53vhgwsgnf7rjya2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode";
@@ -60673,12 +60969,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20171019.1334";
+        version = "20171027.1028";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8";
-          sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r";
+          rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
+          sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -61135,12 +61431,12 @@
     s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "s";
-        version = "20170922.900";
+        version = "20171101.219";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "s.el";
-          rev = "12f116d58ac03706496bd682c6449b452681874e";
-          sha256 = "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv";
+          rev = "71f2902fc7875b3df9ee089c85904a4e8a00d438";
+          sha256 = "0k6ny3ca4iwvhmzpdfs5v44l19djwpx8x7a1kfjgdafdh2x6d7ds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
@@ -61475,8 +61771,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "bc00974cdcbf0366123fe2dc38253b1ba345dee0";
-          sha256 = "0pd7w92z50xpr4vj2xnzm2bmz91728l0k1jr9my9hbpxss89xnvh";
+          rev = "11ef66e8aa8d97f0ed8786c46daa091b1d812867";
+          sha256 = "1p0xhsvpxk6sbw4fwq5yhnz8kgf5m7g5q3vxpx8qn7bsd3z0sg31";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -61680,12 +61976,12 @@
     scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
     melpaBuild {
         pname = "scpaste";
-        version = "20160613.1943";
+        version = "20171031.1337";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "scpaste";
-          rev = "eb415f7ca56d64c89cf99d5c6f8a442c4ec3912e";
-          sha256 = "1fycdsa93bfiij72cwyc0rp85bwv3lv4r169p9czsph5ns466b65";
+          rev = "68445166750a46c86dd7f2ffdca14d3c50e431de";
+          sha256 = "0q8cka12gx11wpjz1jk24kn5m1nlqa1xnadlxflhz2x5p9fkscvq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9007fb32097bc63731c3615dae9342fcef2558a2/recipes/scpaste";
@@ -62813,12 +63109,12 @@
     shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shimbun";
-        version = "20171003.2158";
+        version = "20171018.131";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "w3m";
-          rev = "284a4cdd394d2d52220c62c24ddbce00ea100471";
-          sha256 = "1fnxb3fn6a25sn41isf3frja5iwxi98cbs7rvp9mkzb4jq3bhb89";
+          rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e";
+          sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun";
@@ -63083,6 +63379,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sicp";
+        version = "20171028.1523";
+        src = fetchFromGitHub {
+          owner = "webframp";
+          repo = "sicp-info";
+          rev = "8e13f7ff4695a05471486d37a6c5f979a5b965fb";
+          sha256 = "15krfnj2qz4j2ns4a05a4wwaknhx77m4jhazg7zvz9xm4b4j1qm8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1363d7b6e95375ac63f07eed2b3947f4f81bc9ba/recipes/sicp";
+          sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz";
+          name = "sicp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sicp";
+          license = lib.licenses.free;
+        };
+      }) {};
     sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sift";
@@ -64261,12 +64578,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20171021.718";
+        version = "20171101.244";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "cdd10bc259fe7303e40efd8a6a05c7e43d12a242";
-          sha256 = "0ybbbqnbnp1w4lksgjxjf9iccrvi012ihlq3az1c6k6ck18cmadb";
+          rev = "9682ba930374a4d62b444950b008d2bca1cffba1";
+          sha256 = "1nsi3x9zizbxx95ka5cgl5rnsw5iz92acjcv6b4id0acaysq6mdm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -64597,12 +64914,12 @@
     snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "snakemake-mode";
-        version = "20171010.808";
+        version = "20171030.1016";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "95e8d8aa8312b54d6ea18b35667fa3005be1bc76";
-          sha256 = "1fbn6wqm515x8barbf8bjxkvxyv8p3szdz0h9zaam7hz7zbpdap2";
+          rev = "990d6d8e98b96b9afe5b9b340507b1aecd8de1ce";
+          sha256 = "1bd6kwzkk8vfhfc7m384y40lh6rdw90g6624c0hlfrs9zwihmvs3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -65297,12 +65614,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20170831.832";
+        version = "20171030.528";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "397a0d5b6da3f60ca52bebd5e698b0a764956cd2";
-          sha256 = "1z9w4cn5lanxl24ws4km816dfx4fszvgvrlb2ih3wsbc13710h1l";
+          rev = "e220a0c0c478fee0be3622442651981cdd82090c";
+          sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -65443,12 +65760,12 @@
     spice-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spice-mode";
-        version = "20160919.330";
+        version = "20171027.2343";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "spice-mode";
-          rev = "1dcaa4b4cd1527cf15bfc6dfc278c574359a5062";
-          sha256 = "0ngfyxpvwgyqh99vjr2msqan0hma1qlljkx971qjxcpn0y80dj23";
+          rev = "702bf2d5c3561be44771ea77b476532d32068504";
+          sha256 = "1wqcy9nmhpl3vyasvc79msgd25xbbzva9nbxkdrsbpg07p1is9ik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spice-mode";
@@ -65905,12 +66222,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20171018.303";
+        version = "20171031.2204";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "2226edb5fc91ab766177b82e578dbcc5c7e55554";
-          sha256 = "0b2jq0s56mbl051313wyn1fpk3j5n819y1q6dcv8z7sa5zxsq7hm";
+          rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23";
+          sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -66957,8 +67274,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe";
-          sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz";
+          rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c";
+          sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -67100,12 +67417,12 @@
     symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "symbol-overlay";
-        version = "20170825.2047";
+        version = "20171031.658";
         src = fetchFromGitHub {
           owner = "wolray";
           repo = "symbol-overlay";
-          rev = "6c7ec584b62b7922a5398a552a1bf60f8144306c";
-          sha256 = "0haflm6b8aqjbs54h3khax62rwlky3y8py4jq4m664r1nb91ni57";
+          rev = "6076319f57a7e8dbf2fe11250def5a3fa3c0c854";
+          sha256 = "11ny21rbczmkc7ni3kfw94dyc70bxwzn35f9gryxn1ppw48c7zsx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -68106,12 +68423,12 @@
     terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "terminal-here";
-        version = "20170805.251";
+        version = "20171022.552";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "terminal-here";
-          rev = "b17f82e894d5b0f77cea04a64c4f398124eb3290";
-          sha256 = "0aawmlzy1w76lajz5lxaix793j3bni3fyb4sws3v765m1rxhnc5c";
+          rev = "b3659e13d3d41503b4fc59dd2c7ea622631fc3ec";
+          sha256 = "1z3ngwgv8ybwq42lkpavk51a25zdkl6v9xdfi41njpxdpbfcmx8z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
@@ -68593,8 +68910,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "54ce558ba80905d124b82727d196f6d58964b74c";
-          sha256 = "060fqxwmqra2wxi22250lnkfgs98b0kps8wn0lmqjkqnh6pqy7qi";
+          rev = "a533ea1615e9df935e77b99440cf264c6b417e3e";
+          sha256 = "0nx6amk2jawd5nqkz54sx1x29a8nkpa7h9b4qgn0j7j5sdvfyrxr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -68631,12 +68948,12 @@
     tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tickscript-mode";
-        version = "20171020.1330";
+        version = "20171101.108";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "tickscript-mode";
-          rev = "67400136647342b714c5f693c358f2bd671fe49c";
-          sha256 = "0c3vap37rnr11cvwmgcamx4vl4z4bfmxj7w8hybxcrvs6wnjw20b";
+          rev = "45ce0b4f8f18ffa00a4fd2ab3823118f69b94653";
+          sha256 = "0w6gh6nb81c5jp4px6xx5d3wmwgkh6irzwgk42g0mkhjifzm83ip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
@@ -68913,12 +69230,12 @@
     tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tldr";
-        version = "20170702.1859";
+        version = "20171023.1929";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "tldr.el";
-          rev = "ebdeb08950823765bf58dc2aba3559a5ad1103f1";
-          sha256 = "1aigfmp4ra9qfwyk151y0cxmgd3n42rcjawklfm6ch2g49vx559q";
+          rev = "fe1bd5cee3d30741c816f3ccc118b94105ceba4c";
+          sha256 = "1hdkrgv03w968qf8fm7c35k5pahk9wfwz5vy8xz6568ci1af47h3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr";
@@ -69443,12 +69760,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20171005.1043";
+        version = "20171029.1210";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "c8be91596420ca8d79de44602d836aa6d1cbe2fc";
-          sha256 = "1nbm3m00s5ayicqhymw1y2y7qck5m4sajw467cp4gnsq8qw6ri53";
+          rev = "d78ae51fdc9292cc0b77dfb18279b38b6ccbf480";
+          sha256 = "01k0nppxvkd2cy13hjcvihgh6j9c4by92yxv4jv8zvaz35fqf92n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -69548,12 +69865,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20171021.615";
+        version = "20171101.340";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "3217aba17fd2c6b05b5dd7484548f587e319e583";
-          sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm";
+          rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258";
+          sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs";
@@ -69573,8 +69890,8 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "3217aba17fd2c6b05b5dd7484548f587e319e583";
-          sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm";
+          rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258";
+          sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -69594,8 +69911,8 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "3217aba17fd2c6b05b5dd7484548f587e319e583";
-          sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm";
+          rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258";
+          sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile";
@@ -69798,12 +70115,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20171016.910";
+        version = "20171101.231";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "64537bc753094b2adc2e3e97625fa9c0a01f9ae6";
-          sha256 = "03d0n49p6d77p221majmbh0gjyrmh2z4cb2l2vi5xxfwc1fsxzmp";
+          rev = "359d0e7a4f75dee8f57557b7cc133ae3a65f78a5";
+          sha256 = "0v8wzifrc99y4dzl1wdkil1df76d5ijl2pasx5qdig69mpf5gj1w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -70071,12 +70388,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20171017.1128";
+        version = "20171022.1029";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "30391a518a1d41d5c534a30850a50b0974132aec";
-          sha256 = "1msslh5zj1mi74fg8wc1kzpxjq0g6s9ms66332r2ykwqzsw1iz7c";
+          rev = "56a1ea861f80979d376716629abfce45a8e5e2c7";
+          sha256 = "1lbfia8n2zwg9j8f9y1shjg88zmgr3cz03dk3277yrvh9djs8kcx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -70816,12 +71133,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20171013.1548";
+        version = "20171030.1428";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "cb89901b52a9413b6c233d7fbb616a2d8f38b50a";
-          sha256 = "1fypvrmn1brrq2200kr8s8zbcc30z9nhfv3k8vs36iawab2g573k";
+          rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc";
+          sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -71383,12 +71700,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "20171021.1257";
+        version = "20171025.514";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "3c5b181a32df5d7defa58a7a19021fa16d3670f9";
-          sha256 = "17zakj614vrkyy2y3a1mdkqaa3p7r77zhg8wdaqapwiq36f5gcc1";
+          rev = "b6d07ba21e9073a0e008831bfb82fbddbd0b5e90";
+          sha256 = "1ypj9saprjaxx60fxjl9ab2lb4x9s8szkh3mj23iininx1bxp4wm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -71572,12 +71889,12 @@
     virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "virtualenvwrapper";
-        version = "20161002.1515";
+        version = "20171022.1831";
         src = fetchFromGitHub {
           owner = "porterjamesj";
           repo = "virtualenvwrapper.el";
-          rev = "15af07004dba640df8202e76bea0b5dc82567f72";
-          sha256 = "0ahlp3yfh1yxrlyyhjf9k4qssg2z3192dw4ab8lk62xnxq99bjln";
+          rev = "b4fd61aa5fddd47d33b147ffa1c873d8b20db724";
+          sha256 = "04qhxg2gghb9bbvabrjbwj89jl154hhk00s07mzgg93js75ipx6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper";
@@ -71845,12 +72162,12 @@
     vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
     melpaBuild {
         pname = "vue-mode";
-        version = "20171013.1728";
+        version = "20171029.1905";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "0a6b7c226c5c0a26f3402cfe40169cb00f5d792f";
-          sha256 = "1s08rc3d2k6rnnn4fir854ndwq2b2xxh1blv1f2055gdf4jw25rf";
+          rev = "a34f8a14fe6a680bb18cfa4519f7984d8071a4e3";
+          sha256 = "08c3sgd80aszfpc4zbh0rsn7717nwwjhr38lfbsbxmgmlvqalxzk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -71887,12 +72204,12 @@
     w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "w3m";
-        version = "20171003.2122";
+        version = "20171019.1734";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "w3m";
-          rev = "284a4cdd394d2d52220c62c24ddbce00ea100471";
-          sha256 = "1fnxb3fn6a25sn41isf3frja5iwxi98cbs7rvp9mkzb4jq3bhb89";
+          rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e";
+          sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m";
@@ -71991,12 +72308,12 @@
     wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "wand";
-        version = "20170412.1315";
+        version = "20171031.1103";
         src = fetchFromGitHub {
           owner = "cmpitg";
           repo = "wand";
-          rev = "3674f2edaa6ac30c314a885b229204f978ddce14";
-          sha256 = "1yylw7yn9k8li283d5r4x9i38wfdx24jmlzdivvffn0jkhjj6i4k";
+          rev = "3d0b459c4ae7e0240cb16bd9bd0a0a0dc39d8f99";
+          sha256 = "0wc1gmaz02bfbapwrmmc5r7rcfwqlfr52x3jqk6bhxpiav141yq4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand";
@@ -72390,12 +72707,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "20171021.1419";
+        version = "20171025.956";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "bf082078fdfcefa38a4397f56c0366cf14c05600";
-          sha256 = "104fzirvpp9c5h4gpb99j8i8j1imb3mr6zxh8gr42g38rg2y1nh6";
+          rev = "f047313c656e0ea85033bacc564d02ae6f4605ff";
+          sha256 = "00mawa0n415dcnrldqmgwwjcj2rv59wblrbzkc2g9i388nl41rp5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -73185,22 +73502,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "winum";
-        version = "20170430.1629";
+        version = "20171028.702";
         src = fetchFromGitHub {
           owner = "deb0ch";
           repo = "emacs-winum";
-          rev = "e950370d82cbb90ba291fc1c32de5d6f35068932";
-          sha256 = "1p4b9gdrifjndk0irv735f8spy541x78chibdnr1i3qil2ib8xms";
+          rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c";
+          sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
           sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
           name = "winum";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib dash ];
         meta = {
           homepage = "https://melpa.org/#/winum";
           license = lib.licenses.free;
@@ -73838,12 +74155,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20171021.39";
+        version = "20171026.422";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "2aa7ba860e72329a96395aeef1206e2adc637cf6";
-          sha256 = "0vjlc5cs56g1d1gzww7cmkyf8mzgr630xg1krlhz4bb73c538k1s";
+          rev = "6130b10b0f133344d5e6afa7c083d400c8e780ca";
+          sha256 = "08shy433x5papxdbr6q2xsccpg1h0vym9vv6zcaz8vzqw33kr0w7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
@@ -74510,12 +74827,12 @@
     yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yahtzee";
-        version = "20170617.20";
+        version = "20171022.712";
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "011bcb8e2f27b333b3300d7bcab3f52d70020e45";
-          sha256 = "1gkls80rbj1hnima1fnbxnrz42qjqc55shdpiphzmdyv9hmw8vvf";
+          rev = "5263fb8883d37d79a4ed34dd3216a8947d2ae4a0";
+          sha256 = "1qv8p3zpxkkp0ncq3cs8sq2bj4jrxs4s5jfc5hbs905a9z8bsnq9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -74804,12 +75121,12 @@
     yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "yasnippet-snippets";
-        version = "20171010.1224";
+        version = "20171031.617";
         src = fetchFromGitHub {
           owner = "AndreaCrotti";
           repo = "yasnippet-snippets";
-          rev = "07389c67234e67c8ae423779468f56d0bd65da5e";
-          sha256 = "105jdikzwggn1isnqmvj6hcmni4z387r2nfy2cwd11pan31vd4wi";
+          rev = "120d35010a29d028634a1e4c6ec9d00c1bea5515";
+          sha256 = "1bd89d9d1m6647kpdsczj6c28r3zkjpqjj7p4qndcrwc9h37r4dv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
@@ -74845,11 +75162,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20170916.1826";
+        version = "20171030.502";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "ca7cf34e959c";
-          sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma";
+          rev = "16763e5b7481";
+          sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
@@ -74907,12 +75224,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20171012.1610";
+        version = "20171027.1412";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "f31894da73c2b784bc9e0885ddfa6e1077782417";
-          sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck";
+          rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4";
+          sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -75068,8 +75385,8 @@
         src = fetchFromGitHub {
           owner = "rudolfochrist";
           repo = "zel";
-          rev = "23b12d107f123667ddd443b9f3e2047209e0055a";
-          sha256 = "1m8bw588r2a1034ynigrzgab857261nrjwnzag5i3rgwn27brfcz";
+          rev = "9dae2d212224d1deae1f62561fa8e4d689fd09f2";
+          sha256 = "1518wp3zjfdvzz5r22cjgn735c4yxr345qzj40b5agww4dsxmwmp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48132eb4c0fd01b9fc31236c5c4701f8f83a806/recipes/zel";
@@ -75399,12 +75716,12 @@
     zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zoom";
-        version = "20171018.1314";
+        version = "20171030.529";
         src = fetchFromGitHub {
           owner = "cyrus-and";
           repo = "zoom";
-          rev = "dc6747c754622ed88eeac896f18845681c90cae0";
-          sha256 = "1innar1xrjlh8pvq3gj903xrlpkr8qwjbr60k7zi7wd2r6lqd7h0";
+          rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40";
+          sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
-- 
GitLab


From 1167fde2b295026c7ab5e497fa621979d36df097 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 1 Nov 2017 16:11:50 +0100
Subject: [PATCH 423/877] docs: add note about makeFlags quoting

---
 doc/stdenv.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index a097762130a..ee110b77104 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -698,8 +698,14 @@ nothing.</para>
     <listitem><para>A list of strings passed as additional flags to
     <command>make</command>.  These flags are also used by the default
     install and check phase.  For setting make flags specific to the
-    build phase, use <varname>buildFlags</varname> (see
-    below).</para></listitem>
+    build phase, use <varname>buildFlags</varname> (see below).
+
+<programlisting>
+makeFlags = [ "PREFIX=$(out)" ];
+</programlisting>
+
+    <note><para>The flags are quoted in bash, but environment variables can
+    be specified by using the make syntax.</para></note></para></listitem>
   </varlistentry>
 
   <varlistentry>
-- 
GitLab


From 7e31aef88a03b32c31f2965bf532e07564ec5b2d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 1 Nov 2017 03:40:38 +0000
Subject: [PATCH 424/877] ocamlPackages.lwt: remove spurious dependency on
 oasis

---
 pkgs/development/ocaml-modules/lwt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index c3acdcf5bdb..53ba904f628 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
-, react, ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
+, react, ssl, libev, pkgconfig, ncurses, glib
 , ppx_tools, result, cppo
 , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
 , version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
@@ -27,7 +27,7 @@ buildOcaml rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ocaml_oasis which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ]
+  buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ]
   ++ stdenv.lib.optional ppxSupport ppx_tools;
 
   propagatedBuildInputs = [ result ]
-- 
GitLab


From 633b03c57f658d57a192eabb088b171b4542081e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 29 Oct 2017 17:15:43 +0100
Subject: [PATCH 425/877] docs: add section on common darwin issues

---
 doc/manual.xml         |  1 +
 doc/platform-notes.xml | 83 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 doc/platform-notes.xml

diff --git a/doc/manual.xml b/doc/manual.xml
index 75bd21557fd..eb0a24789d4 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -18,6 +18,7 @@
   <xi:include href="functions.xml" />
   <xi:include href="meta.xml" />
   <xi:include href="languages-frameworks/index.xml" />
+  <xi:include href="platform-notes.xml" />
   <xi:include href="package-notes.xml" />
   <xi:include href="overlays.xml" />
   <xi:include href="coding-conventions.xml" />
diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml
new file mode 100644
index 00000000000..f4f6ec60029
--- /dev/null
+++ b/doc/platform-notes.xml
@@ -0,0 +1,83 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-platform-nodes">
+
+<title>Platform Notes</title>
+
+<section xml:id="sec-darwin">
+
+<title>Darwin (macOS)</title>
+<para>Some common issues when packaging software for darwin:</para>
+
+<itemizedlist>
+
+  <listitem>
+    <para>
+      The darwin <literal>stdenv</literal> uses clang instead of gcc.
+      When referring to the compiler <varname>$CC</varname> or <command>cc</command>
+      will work in both cases.  Some builds hardcode gcc/g++ in their
+      build scripts, that can usually be fixed with using something
+      like <literal>makeFlags = [ "CC=cc" ];</literal> or by patching
+      the build scripts.
+    </para>
+
+    <programlisting>
+      stdenv.mkDerivation {
+        name = "libfoo-1.2.3";
+        # ...
+        buildPhase = ''
+          $CC -o hello hello.c
+        '';
+      }
+    </programlisting>
+  </listitem>
+
+  <listitem>
+    <para>
+      On darwin libraries are linked using absolute paths, libraries
+      are resolved by their <literal>install_name</literal> at link
+      time.  Sometimes packages won't set this correctly causing the
+      library lookups to fail at runtime.  This can be fixed by adding
+      extra linker flags or by running <command>install_name_tool -id</command>
+      during the <function>fixupPhase</function>.
+    </para>
+
+    <programlisting>
+      stdenv.mkDerivation {
+        name = "libfoo-1.2.3";
+        # ...
+        makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib";
+      }
+    </programlisting>
+  </listitem>
+
+  <listitem>
+    <para>
+      Some packages assume xcode is available and use <command>xcrun</command>
+      to resolve build tools like <command>clang</command>, etc.
+      This causes errors like <code>xcode-select: error: no developer tools were found at '/Applications/Xcode.app'</code>
+      while the build doesn't actually depend on xcode.
+    </para>
+
+    <programlisting>
+      stdenv.mkDerivation {
+        name = "libfoo-1.2.3";
+        # ...
+        prePatch = ''
+          substituteInPlace Makefile \
+              --replace '/usr/bin/xcrun clang' clang
+        '';
+      }
+    </programlisting>
+
+    <para>
+      The package <literal>xcbuild</literal> can be used to build projects
+      that really depend on Xcode, however projects that build some kind of
+      graphical interface won't work without using Xcode in an impure way.
+    </para>
+  </listitem>
+
+</itemizedlist>
+</section>
+
+</chapter>
-- 
GitLab


From b84c4206fca8b178cb779f6fc5d0f6419808d127 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Nov 2017 17:29:25 +0000
Subject: [PATCH 426/877] vaapiIntel: 1.7.3 -> 1.8.2

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

diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index df68b86519b..dcb44a408a8 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -3,11 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-intel-driver-1.7.3";
+  name = "intel-vaapi-driver-${version}";
+  version = "1.8.2";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
-    sha256 = "0dzryi9x873p9gikzcb9wzwqv2j3wssm0b85ws63vqjszpckgbbn";
+    sha256 = "00mpcvininwr5c4wyhp16s4bddg7vclxxjm2sfq5h7lifjcxyv46";
   };
 
   patchPhase = ''
-- 
GitLab


From 309373ea68839fa28d61fc84c982a4b5c08322cf Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Nov 2017 17:58:20 +0000
Subject: [PATCH 427/877] intel-ocl: r4.0-59481 -> 5.0-63503

---
 nixos/modules/hardware/opengl.nix            |  2 +-
 pkgs/os-specific/linux/intel-ocl/default.nix | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 486fe7c1cd8..c2c36f02a14 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -93,7 +93,7 @@ in
     hardware.opengl.extraPackages = mkOption {
       type = types.listOf types.package;
       default = [];
-      example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]";
+      example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]";
       description = ''
         Additional packages to add to OpenGL drivers. This can be used
         to add OpenCL drivers, VA-API/VDPAU drivers etc.
diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix
index 0d33954fd5d..d604c9ef6b7 100644
--- a/pkgs/os-specific/linux/intel-ocl/default.nix
+++ b/pkgs/os-specific/linux/intel-ocl/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "r4.0-59481";
   name = "intel-ocl-${version}";
+  version = "5.0-63503";
 
   src = fetchzip {
-    url = "https://software.intel.com/sites/default/files/managed/48/96/SRB4_linux64.zip";
-    sha256 = "1q69g28i6l7p13hnsk82g2qhdf2chwh4f0wvzac6xml67hna3v34";
+    url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip";
+    sha256 = "0qbp63l74s0i80ysh9ya8x7r79xkddbbz4378nms9i7a0kprg9p2";
     stripRoot = false;
   };
 
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
 
   postUnpack = ''
     # Extract the RPMs contained within the source ZIP.
-    rpmextract SRB4_linux64.zip/intel-opencl-${version}.x86_64.rpm
-    rpmextract SRB4_linux64.zip/intel-opencl-cpu-${version}.x86_64.rpm
+    rpmextract source/intel-opencl-r${version}.x86_64.rpm
+    rpmextract source/intel-opencl-cpu-r${version}.x86_64.rpm
   '';
 
   patchPhase = ''
-- 
GitLab


From 2ddcdcce2652016ac58826fa600d19db111178e5 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Wed, 1 Nov 2017 19:06:27 +0100
Subject: [PATCH 428/877] nixos/postfix: support alternate smtp ports when
 relaying (#30685)

* postfix: support alternate smtp ports when relaying

* fix missing ; after merge
---
 nixos/modules/services/mail/postfix.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 1fef9ac6ec9..867c0ea6761 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -60,11 +60,11 @@ let
     manpage_directory    = "${pkgs.postfix}/share/man";
     html_directory       = "${pkgs.postfix}/share/postfix/doc/html";
     shlib_directory      = false;
-    relayhost            = if cfg.lookupMX || cfg.relayHost == ""
-                             then cfg.relayHost
-                             else
-			       "[${cfg.relayHost}]"
-			       + optionalString (cfg.relayPort != null) ":${toString cfg.relayPort}";
+    relayhost            = if cfg.relayHost == "" then "" else
+                             if cfg.lookupMX
+                             then "${cfg.relayHost}:${toString cfg.relayPort}"
+                             else "[${cfg.relayHost}]:${toString cfg.relayPort}";
+
     mail_spool_directory = "/var/spool/mail/";
     setgid_group         = setgidGroup;
   }
@@ -461,13 +461,10 @@ in
       };
 
       relayPort = mkOption {
-        type = types.nullOr types.int;
-        default = null;
-        example = 587;
+        type = types.int;
+        default = 25;
         description = "
-          Specify an optional port for outbound mail relay. (Note:
-          only used if an explicit <option>relayHost</option> is
-          defined.)
+          SMTP port for relay mail relay.
         ";
       };
 
-- 
GitLab


From f5b773beecbb7ea64518570b3c9431afaf606238 Mon Sep 17 00:00:00 2001
From: Ryan Bernstein <ryanbernstein1@gmail.com>
Date: Wed, 1 Nov 2017 14:37:31 -0400
Subject: [PATCH 429/877] pythonPackages.pomegranate: 0.8.0 -> 0.8.1

Also now using GitHub instead of PiPy, because the PiPy version fails to build. Not sure why they aren't identical.
---
 .../python-modules/pomegranate/default.nix         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix
index 2884ac9ddc4..fa7eb03fd0b 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/pkgs/development/python-modules/pomegranate/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }:
 
 buildPythonPackage rec {
   pname = "pomegranate";
-  version = "0.8.0";
+  version = "0.8.1";
   name  = "${pname}-${version}";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6b03d05bffbe46c674800652cf273a8d338a2e40001b763cd6925aac0b578a43";
+  
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "jmschrei";
+    rev = "v${version}";
+    sha256 = "085nka5bh88bxbd5vl1azyv9cfpp6grz2ngclc85f9kgccac1djr";
   };
 
   propagatedBuildInputs = [ numpy scipy cython networkx joblib ];
-- 
GitLab


From 20fd713669da88005f5955d032ba5b306d6a8b78 Mon Sep 17 00:00:00 2001
From: Ryan Bernstein <ryanbernstein1@gmail.com>
Date: Wed, 1 Nov 2017 14:41:45 -0400
Subject: [PATCH 430/877] pythonPackages.pomegranate: Removed unnecessary
 dependency

---
 pkgs/development/python-modules/pomegranate/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix
index fa7eb03fd0b..77b373de259 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/pkgs/development/python-modules/pomegranate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose }:
 
 buildPythonPackage rec {
   pname = "pomegranate";
-- 
GitLab


From 088ce9f23ff6898d9146d78a154266206084d200 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Nov 2017 18:15:38 +0000
Subject: [PATCH 431/877] CODEOWNERS: fix path notation

This format uses the path matching algorithm as the .gitignore format.

The paths need to be prefixed with a / to become absolute, otherwise it
will match all of these files.

The paths will also match any of the sub-paths by default so it's not
necessary to use the `*` like in bash globbing.
---
 .github/CODEOWNERS | 96 +++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ab64ddb3e67..297b91976a8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,75 +8,75 @@
 # Mentioned users will get code review requests.
 
 # This file
-.github/CODEOWNERS @edolstra
+/.github/CODEOWNERS @edolstra
 
 # Boostraping and core infra
-pkgs/stdenv/    @edolstra
-pkgs/build-support/cc-wrapper/  @edolstra
+/pkgs/stdenv                    @edolstra
+/pkgs/build-support/cc-wrapper  @edolstra
 
 # Libraries
-lib/                       @edolstra @nbp
+/lib                        @edolstra @nbp
 
 # Nixpkgs Internals
-default.nix                @nbp
-pkgs/top-level/default.nix @nbp
-pkgs/top-level/impure.nix  @nbp
-pkgs/top-level/stage.nix   @nbp
+/default.nix                @nbp
+/pkgs/top-level/default.nix @nbp
+/pkgs/top-level/impure.nix  @nbp
+/pkgs/top-level/stage.nix   @nbp
 
 # NixOS Internals
-nixos/default.nix         @nbp
-nixos/lib/from-env.nix    @nbp
-nixos/lib/eval-config.nix @nbp
-nixos/doc/manual/configuration/abstractions.xml      @nbp
-nixos/doc/manual/configuration/config-file.xml       @nbp
-nixos/doc/manual/configuration/config-syntax.xml     @nbp
-nixos/doc/manual/configuration/modularity.xml        @nbp
-nixos/doc/manual/development/assertions.xml          @nbp
-nixos/doc/manual/development/meta-attributes.xml     @nbp
-nixos/doc/manual/development/option-declarations.xml @nbp
-nixos/doc/manual/development/option-def.xml          @nbp
-nixos/doc/manual/development/option-types.xml        @nbp
-nixos/doc/manual/development/replace-modules.xml     @nbp
-nixos/doc/manual/development/writing-modules.xml     @nbp
-nixos/doc/manual/man-nixos-option.xml                @nbp
-nixos/modules/installer/tools/nixos-option.sh        @nbp
+/nixos/default.nix          @nbp
+/nixos/lib/from-env.nix     @nbp
+/nixos/lib/eval-config.nix  @nbp
+/nixos/doc/manual/configuration/abstractions.xml      @nbp
+/nixos/doc/manual/configuration/config-file.xml       @nbp
+/nixos/doc/manual/configuration/config-syntax.xml     @nbp
+/nixos/doc/manual/configuration/modularity.xml        @nbp
+/nixos/doc/manual/development/assertions.xml          @nbp
+/nixos/doc/manual/development/meta-attributes.xml     @nbp
+/nixos/doc/manual/development/option-declarations.xml @nbp
+/nixos/doc/manual/development/option-def.xml          @nbp
+/nixos/doc/manual/development/option-types.xml        @nbp
+/nixos/doc/manual/development/replace-modules.xml     @nbp
+/nixos/doc/manual/development/writing-modules.xml     @nbp
+/nixos/doc/manual/man-nixos-option.xml                @nbp
+/nixos/modules/installer/tools/nixos-option.sh        @nbp
 
 # Python-related code and docs
-pkgs/top-level/python-packages.nix      @FRidh
-pkgs/development/interpreters/python/*  @FRidh
-pkgs/development/python-modules/*       @FRidh
-doc/languages-frameworks/python.md      @FRidh
+/pkgs/top-level/python-packages.nix     @FRidh
+/pkgs/development/interpreters/python   @FRidh
+/pkgs/development/python-modules        @FRidh
+/doc/languages-frameworks/python.md     @FRidh
 
 # Haskell
-pkgs/development/compilers/ghc                       @peti
-pkgs/development/haskell-modules                     @peti
-pkgs/development/haskell-modules/default.nix         @peti
-pkgs/development/haskell-modules/generic-builder.nix @peti
-pkgs/development/haskell-modules/hoogle.nix          @peti
+/pkgs/development/compilers/ghc                       @peti
+/pkgs/development/haskell-modules                     @peti
+/pkgs/development/haskell-modules/default.nix         @peti
+/pkgs/development/haskell-modules/generic-builder.nix @peti
+/pkgs/development/haskell-modules/hoogle.nix          @peti
 
 # R
-pkgs/applications/science/math/R @peti
-pkgs/development/r-modules       @peti
+/pkgs/applications/science/math/R   @peti
+/pkgs/development/r-modules         @peti
 
 # Ruby
-pkgs/development/interpreters/ruby/* @zimbatm
-pkgs/development/ruby-modules/*      @zimbatm
+/pkgs/development/interpreters/ruby @zimbatm
+/pkgs/development/ruby-modules      @zimbatm
 
 # Darwin-related
-/pkgs/stdenv/darwin/             @org/darwin-maintainers
-/pkgs/os-specific/darwin/        @org/darwin-maintainers
+/pkgs/stdenv/darwin         @NixOS/darwin-maintainers
+/pkgs/os-specific/darwin    @NixOS/darwin-maintainers
 
 # Beam-related (Erlang, Elixir, LFE, etc)
-pkgs/development/beam-modules/*	@gleber
-pkgs/development/interpreters/erlang/*	@gleber
-pkgs/development/interpreters/lfe/*	@gleber
-pkgs/development/interpreters/elixir/*	@gleber
-pkgs/development/tools/build-managers/rebar/*	@gleber
-pkgs/development/tools/build-managers/rebar3/*	@gleber
-pkgs/development/tools/erlang/*	@gleber
+/pkgs/development/beam-modules                  @gleber
+/pkgs/development/interpreters/erlang           @gleber
+/pkgs/development/interpreters/lfe              @gleber
+/pkgs/development/interpreters/elixir           @gleber
+/pkgs/development/tools/build-managers/rebar    @gleber
+/pkgs/development/tools/build-managers/rebar3   @gleber
+/pkgs/development/tools/erlang                  @gleber
 
 # Jetbrains
-pkgs/applications/editors/jetbrains @edwtjo
+/pkgs/applications/editors/jetbrains @edwtjo
 
 # Eclipse
-pkgs/applications/editors/eclipse @rycee
+/pkgs/applications/editors/eclipse @rycee
-- 
GitLab


From 755835c67a6f6d238fd287b930c5973b1a1839ff Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 1 Nov 2017 19:23:28 +0000
Subject: [PATCH 432/877] firefoxPackages: tor-browser: fix build

---
 .../networking/browsers/firefox/packages.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 56641c7ad9a..a1d5df5029c 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -54,8 +54,7 @@ rec {
       unpackPhase = ''
         # fetchFromGitHub produces ro sources, root dir gets a name that
         # is too long for shebangs. fixing
-        cp -a $src .
-        mv *-src tor-browser
+        cp -a $src tor-browser
         chmod -R +w tor-browser
         cd tor-browser
 
@@ -106,9 +105,10 @@ in rec {
     # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
     src = fetchFromGitHub {
       owner = "SLNOS";
-      repo  = "tor-browser";
-      rev   = "tor-browser-45.8.0esr-6.5-2";
-      sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j";
+      repo = "tor-browser";
+      # branch "tor-browser-45.8.0esr-6.5-2"
+      rev = "e4140ea01b9906934f0347e95f860cec207ea824";
+      sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60";
     };
   } // commonAttrs) {
     stdenv = overrideCC stdenv gcc5;
-- 
GitLab


From b902a88e80a1aecf403e66ea43ec24688702dcec Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 1 Nov 2017 19:33:54 +0000
Subject: [PATCH 433/877] buck: 2017.05.31.01 -> 2017.10.01.01

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

diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index cddb1a90765..5d486f47844 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "buck-${version}";
-  version = "v2017.05.31.01";
+  version = "v2017.10.01.01";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "buck";
-    rev = "0b8b3828a11afa79dc128832cb55b106f07e48aa";
-    sha256 = "1g3yg8qq91cdhsq7zmir7wxw3767l120f5zhq969gppdw9apqy0s";
+    rev = "2025fd74327477728b524eafdd4619a0170a24ea";
+    sha256 = "05nyyb6f0hv1h67zzvdq8297yl8zjhpbasx35lxnrsjz0m1h8ngw";
   };
 
   patches = [ ./pex-mtime.patch ];
-- 
GitLab


From ac2976d829b071e17e77383beddd3cb7f7566513 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 1 Nov 2017 20:03:58 +0000
Subject: [PATCH 434/877] bazel: 0.6.1 -> 0.7.0

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

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 8701db8d161..e15b212ebca 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  version = "0.6.1";
+  version = "0.7.0";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "19rb1lh6v2gi8xlxhdmhydp16i1bgmvb510i053rfy0jlmh1znns";
+    sha256 = "05n4zz2a29y4vr2svc7ya9fx7qxb9151a6gkycxk9qj3v32sk150";
   };
 
   sourceRoot = ".";
-- 
GitLab


From 8e541c08d6468e37f8e950b04994cc1782d9f99a Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polyhack.io>
Date: Mon, 31 Jul 2017 16:48:37 +1000
Subject: [PATCH 435/877] masterpdfeditor: init at 4.2.70

---
 .../misc/masterpdfeditor/default.nix          | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/misc/masterpdfeditor/default.nix

diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
new file mode 100644
index 00000000000..9eb2cea0895
--- /dev/null
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }:
+  let
+    version = "4.2.70";
+  in
+    stdenv.mkDerivation {
+      name = "masterpdfeditor-${version}";
+      src = fetchurl {
+        url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
+        sha256 = "0vl5gc1fzsmzl56vd9g3av48557if8a04vhhl5yna8by26h6xz0c";
+      };
+      libPath = stdenv.lib.makeLibraryPath [
+        stdenv.cc.cc
+        glibc
+        sane-backends
+        qtbase
+        qtsvg
+        libXext
+        libX11
+        libXdmcp
+        libXau
+        libxcb
+      ];
+      dontStrip = true;
+      installPhase = ''
+        mkdir -pv $out/bin
+        cp -v masterpdfeditor4 $out/bin/masterpdfeditor4
+        cp -v masterpdfeditor4.png $out/bin/masterpdfeditor4.png
+        cp -v -r stamps $out/bin/stamps
+        cp -v -r templates $out/bin/templates
+        cp -v -r lang $out/bin/lang
+        cp -v -r fonts $out/bin/fonts
+        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+                 --set-rpath $libPath \
+                 $out/bin/masterpdfeditor4
+      '';
+      meta = with stdenv.lib; {
+        description = "PDF Editor";
+        homepage = "https://code-industry.net/free-pdf-editor/";
+        license = licenses.unfreeRedistributable;
+        platforms = platforms.linux;
+        maintainers = maintainers.cmcdragonkai;
+      };
+    }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60fad0499da..f2237b69249 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13669,6 +13669,8 @@ with pkgs;
 
   adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { };
 
+  masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { };
+
   aeolus = callPackage ../applications/audio/aeolus { };
 
   aewan = callPackage ../applications/editors/aewan { };
-- 
GitLab


From fbf11263df6713ad4ca8ed76c948bd6afb5ce9ad Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 1 Nov 2017 21:13:11 +0100
Subject: [PATCH 436/877] masterpdfeditor: 4.2.70 -> 4.3.61

also add flokli as maintainer
---
 pkgs/applications/misc/masterpdfeditor/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 9eb2cea0895..12541e35655 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }:
   let
-    version = "4.2.70";
+    version = "4.3.61";
   in
     stdenv.mkDerivation {
       name = "masterpdfeditor-${version}";
       src = fetchurl {
         url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
-        sha256 = "0vl5gc1fzsmzl56vd9g3av48557if8a04vhhl5yna8by26h6xz0c";
+        sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm";
       };
       libPath = stdenv.lib.makeLibraryPath [
         stdenv.cc.cc
@@ -34,10 +34,10 @@
                  $out/bin/masterpdfeditor4
       '';
       meta = with stdenv.lib; {
-        description = "PDF Editor";
+        description = "Master PDF Editor";
         homepage = "https://code-industry.net/free-pdf-editor/";
         license = licenses.unfreeRedistributable;
         platforms = platforms.linux;
-        maintainers = maintainers.cmcdragonkai;
+        maintainers = with maintainers; [ cmcdragonkai flokli ];
       };
     }
-- 
GitLab


From aac7370a22a893484bf18c10143d2fac097a5e19 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Nov 2017 20:17:40 +0000
Subject: [PATCH 437/877] kops: 1.6.2 -> 1.7.1

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

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index e036fb2f38b..ff7cb245ae2 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "kops-${version}";
-  version = "1.6.2";
+  version = "1.7.1";
 
   goPackagePath = "k8s.io/kops";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = version;
     owner = "kubernetes";
     repo = "kops";
-    sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l";
+    sha256 = "0wii6w6hs9hjz3vvgqwa5ilwdi8a3qknmqsg3izazmgmnhl712wd";
   };
 
   buildInputs = [go-bindata];
@@ -39,7 +39,7 @@ buildGoPackage rec {
     description = "Easiest way to get a production Kubernetes up and running";
     homepage = https://github.com/kubernetes/kops;
     license = licenses.asl20;
-    maintainers = with maintainers; [offline];
+    maintainers = with maintainers; [offline zimbatm];
     platforms = platforms.unix;
   };
 }
-- 
GitLab


From 81baa25fd1360b88f2b6f976147b6f9ed33f0e02 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Nov 2017 20:25:50 +0000
Subject: [PATCH 438/877] gifsicle: 1.88 -> 1.90

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

diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix
index 4404a8b6440..7c5f9eaf5de 100644
--- a/pkgs/tools/graphics/gifsicle/default.nix
+++ b/pkgs/tools/graphics/gifsicle/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gifsicle-${version}";
-  version = "1.88";
+  version = "1.90";
 
   src = fetchurl {
     url = "http://www.lcdf.org/gifsicle/${name}.tar.gz";
-    sha256 = "4585d2e683d7f68eb8fcb15504732d71d7ede48ab5963e61915201f9e68305be";
+    sha256 = "0kc35g99fygzjj7qjcy87rdb8mbgmacr2mga9ihgln1dfnbb0wrd";
   };
 
   buildInputs = optional gifview [ xproto libXt libX11 ];
-- 
GitLab


From f4e38223f38248d7cf9b834b7474b2fd6342f81c Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Nov 2017 20:33:23 +0000
Subject: [PATCH 439/877] google-cloud-sdk: 171.0.0 -> 177.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index f1165f6172b..3622b981cc4 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -5,27 +5,28 @@ let
   pythonInputs = [ cffi cryptography pyopenssl crcmod google-compute-engine ];
   pythonPath = lib.makeSearchPath python.sitePackages pythonInputs;
 
+  sources = name: system: {
+    i686-linux = {
+      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
+      sha256 = "0aq938s1w9mzj60avmcc68kgll54pl7635vl2mi89f6r56n0xslp";
+    };
+
+    x86_64-darwin = {
+      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
+      sha256 = "13k2i1svry9q800s1jgf8jss0rzfxwk6qci3hsy1wrb9b2mwlz5g";
+    };
+
+    x86_64-linux = {
+      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
+      sha256 = "1kvaz8p1iflsi85wwi7lb6km6frj70xsricyz1ah0sw3q71zyqmc";
+    };
+  }.${system};
+
 in stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "171.0.0";
-
-  src =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
-        sha256 = "0scp9nhd46mrnd02bw7skm5fa04i7azf68g08js8kawvjgbwq0sb";
-      }
-    else if stdenv.system == "x86_64-darwin" then
-      fetchurl {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
-        sha256 = "0xvrqsg0vqws9n20lvipxilb45aln5p9iy0ldjfxx8vvi0s42298";
-      }
-    else
-      fetchurl {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
-        sha256 = "0b9rqhwd30hn5l82a2x10rz86jz1j03b19di7bc3bqn4x041qii5";
-      };
+  version = "177.0.0";
 
+  src = fetchurl (sources name stdenv.system);
 
   buildInputs = [ python makeWrapper ];
 
-- 
GitLab


From 314979fbb759a40c5d8b332dafcec8ce2645a531 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Nov 2017 20:35:18 +0000
Subject: [PATCH 440/877] caddy: 0.10.9 -> 0.10.10

---
 pkgs/servers/caddy/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 24f5cec8179..c24780095db 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.10.9";
+  version = "0.10.10";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,19 +12,9 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "1shry7dqcbb5d3hp9xz5l3jx9a6i18wssz3m28kpjf3cks427v55";
+    sha256 = "1x7f1yz5vnsy9n50ak0vjrm4w8fqc1qvhv8fmqnsc8cgbp7f3p8w";
   };
 
-  patches = [
-    # This header was added in 0.10.9 and was since reverted but no new release made
-    # remove this patch when updating to next release
-    (fetchpatch {
-      url = "https://github.com/mholt/caddy/commit/d267b62fe9fdd008f13774afc72d95335934d133.patch";
-      name = "revert-sponsors-header.patch";
-      sha256 = "192g23kzkrwgif7ii9c70mh1a25gwhm1l1mzyqm9i0d3jifsfc2j";
-    })
-  ];
-
   buildFlagsArray = ''
     -ldflags=
       -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version}
-- 
GitLab


From b2e6b560164aeaa06dff26b43c79157b886bbe1b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Nov 2017 21:58:48 +0100
Subject: [PATCH 441/877] expat: 2.2.4 -> 2.2.5

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

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 6533997de2f..569a82b750a 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchpatch, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.4";
+  name = "expat-2.2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/expat/${name}.tar.bz2";
-    sha256 = "17h1fb9zvqvf0sr78j211bngc6jpql5wzar8fg9b52jzjvdqbb83";
+    sha256 = "1xpd78sp7m34jqrw5x13bz7kgz0n6aj15wn4zj4gfx3ypbpk5p6r";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
-- 
GitLab


From a66f1d6047cefd2ea0eb73a1e58d5f93f85e9b50 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 1 Nov 2017 15:31:51 +0100
Subject: [PATCH 442/877] rdfind: 1.3.4 -> 1.3.5

homepage and fetch src over HTTPS
---
 pkgs/tools/filesystems/rdfind/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix
index 853654c0f79..b421a768b3d 100644
--- a/pkgs/tools/filesystems/rdfind/default.nix
+++ b/pkgs/tools/filesystems/rdfind/default.nix
@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "rdfind-${version}";
-  version = "1.3.4";
+  version = "1.3.5";
 
   src = fetchurl {
-    url = "http://rdfind.pauldreik.se/${name}.tar.gz";
-    sha256 = "0zfc5whh6j5xfbxr6wvznk62qs1mkd3r7jcq72wjgnck43vv7w55";
+    url = "https://rdfind.pauldreik.se/${name}.tar.gz";
+    sha256 = "0i63f2lwwkiq5m8shi3wwi59i1s25r6dx6flsgqxs1jvlcg0lvn3";
   };
 
   buildInputs = [ nettle ];
 
-  meta = {
-    homepage = http://rdfind.pauldreik.se/;
+  meta = with stdenv.lib; {
+    homepage = https://rdfind.pauldreik.se/;
     description = "Removes or hardlinks duplicate files very swiftly";
     license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ wmertens ];
-    platforms = with stdenv.lib.platforms; all;
+    maintainers = [ maintainers.wmertens ];
+    platforms = platforms.all;
   };
 }
-- 
GitLab


From 8162e580f5ec8897729e0e6a6199dd90b3c01895 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 1 Nov 2017 22:15:09 +0100
Subject: [PATCH 443/877] masterpdfeditor: add .desktop file and LICENSE

---
 pkgs/applications/misc/masterpdfeditor/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 12541e35655..2d2fd2c7bed 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -22,13 +22,23 @@
       ];
       dontStrip = true;
       installPhase = ''
-        mkdir -pv $out/bin
+        mkdir -p $out/bin $out/share/applications $out/share/pixmaps
+
+        substituteInPlace masterpdfeditor4.desktop \
+          --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \
+          --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \
+          --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps"
+
         cp -v masterpdfeditor4 $out/bin/masterpdfeditor4
-        cp -v masterpdfeditor4.png $out/bin/masterpdfeditor4.png
+        cp -v masterpdfeditor4.png $out/share/pixmaps/
+        cp -v masterpdfeditor4.desktop $out/share/applications
+
         cp -v -r stamps $out/bin/stamps
         cp -v -r templates $out/bin/templates
         cp -v -r lang $out/bin/lang
         cp -v -r fonts $out/bin/fonts
+        install -D license.txt $out/share/$name/LICENSE
+
         patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
                  --set-rpath $libPath \
                  $out/bin/masterpdfeditor4
-- 
GitLab


From e32352fd978a7d2804b9e2750797647a5d69a7f2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 1 Nov 2017 22:32:52 +0100
Subject: [PATCH 444/877] nixpkgs manual: unfree packages are untested

Resolves confusion mentioned in #31045.
---
 doc/configuration.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/configuration.xml b/doc/configuration.xml
index ac03b42714c..55c5ea809d3 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -55,6 +55,10 @@ configuration file located at
 </programlisting>
 </para>
 
+<para>Note that we are not able to test or build unfree software on Hydra
+due to policy. Most unfree licenses prohibit us from either executing or
+distributing the software.</para>
+
 <section xml:id="sec-allow-broken">
   <title>Installing broken packages</title>
 
-- 
GitLab


From e1d7f7ba82750c4e89f0ef8519518f0bf30c90c8 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 1 Nov 2017 21:37:19 +0000
Subject: [PATCH 445/877] cloc: fix sourceRoot

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

diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 534e3d950d3..e303b1dd7f2 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b";
   };
 
-  sourceRoot = "cloc-${version}-src/Unix";
+  sourceRoot = "source/Unix";
 
   buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ];
 
-- 
GitLab


From c733fdd1c9f6b61127edf9d403dbc96dfeabbbf0 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 1 Nov 2017 21:42:46 +0000
Subject: [PATCH 446/877] firefox-devedition-bin: 57.0b11 -> 57.0b13

---
 .../firefox-bin/devedition_sources.nix        | 762 +++++++++---------
 1 file changed, 381 insertions(+), 381 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 6b08c3798ba..db45ad95656 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,955 +1,955 @@
 {
-  version = "57.0b11";
+  version = "57.0b13";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ach/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ach/firefox-57.0b13.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "ba86d5610b286bf392c94e7dd5436500fedf033946c34bc56a53b1e9b4e934379e5ac82a989168a1d339b4de0819f273cee48d688899c34cb353f83376201183";
+      sha512 = "cf01dfc2fa0995b24457e9aea6faafcafee48c900794845c08ae452fe920f75841db9e67302a7b23b6bf956baf0c79eb8bd2d63ea4a45b3f515a4745552756e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/af/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/af/firefox-57.0b13.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "7cbf2ad3b2775b2edebb6b789896d9c2cf63c6a59272dafd1548c20b6ea592396b9f5b622f09305dce199146a23f98a16c8a8b6835115edded902114aa938be9";
+      sha512 = "76be18af3bd07ce72f6ee1522d6b7e86f82d6449f178f07cc465c20afb9c453fb16b37aa6f301b4e83f9e7bc9affd8e76a52685be7a45db7fcedb50c99584630";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/an/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/an/firefox-57.0b13.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "4befe56ebeadccc674cad25d5c58ba8d330b8ca79f7deda3a86314ddf289404b8e167f31e3717ab360c78163940a90361bdbcbf112ae4830eb15f0103ec40442";
+      sha512 = "3f544f11deed60cbf9cbd6bda27d68c7523ec087d71ff9eef74989b7185f5271d53e6ca7f6d463a64c11fda67692b609890dbfae73bacd164fb3cf7fbf327183";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ar/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ar/firefox-57.0b13.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "8aabaa49507ce8036b4c921c78697973e69cfeab9a1091bf830c085f9b8287e41b026bd237590f2e2a89255b4fa4db47e563f726f945d15ac4ae5b790335a2ac";
+      sha512 = "48515a3ef14a0caf407fa69eb42e27915bf5a8ebec1de7e4f53d85fbcbc756fb763ab9e596e6580900fbf52854da1dadfa7f8920b43dc9d1a6e36b07b989fd82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/as/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/as/firefox-57.0b13.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "68915c8a35cec3b9a2c9afb8f2c8e1cf5db0874c23195241fac7b75d317af0a23f53170d6f9169eeda3210202430c56e9fe47cb0fab434300236186d60d4e04f";
+      sha512 = "376e899b9ccfa0bdb2a77977bc302c01504fd309226e9d63e79d1b799503284c7cc0ff8636e63afc17fe2e611594965ac14334e0c65058e80fc471f3057d3d3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ast/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ast/firefox-57.0b13.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "f72a8fcc4cef1522f91e70158541a1328202a7dfeb467662deaf70ca62b049c942e664301f99314c3940b9cdb6bcdb663c3175c81d32c31a4a547954907813d2";
+      sha512 = "17fb3d94d037ab1be8912662c9cf79590ecdd2c17b227b38477f3aaf18b3fc6309c9a3dbdfeeaaec9134ed9d3de8a7810f905c68003db5efa6e733a8b22e8226";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/az/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/az/firefox-57.0b13.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "4246cf3fd34a9824dd61d488966902086b51b68b5895b491cd7c3db81e4cdc0de8f06f74ffc77bedb80e5069e594f49eda524145c2f66c2fa8fc86db8177bfe9";
+      sha512 = "ef29f2265b91bee270c77afe9a0034c07138157c5be1cd3ad5a68ecb94cacf98a7c52de1985ba9dd51ae4e92df08a916249ebad24df4ba672d757d9cf95ee135";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/be/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/be/firefox-57.0b13.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "9858669e11bbbe6f56bbddc2f3c94f0586a46fa5fbbde2a4439d6aeaff5bd28c9affaebdee4a2903ff1bd29392f10df0ca84a9695065c9dc60e8066627465d0a";
+      sha512 = "c002738e74b87b9423d8b6c8cc15fd6532adc4cb9558c0f059c2b0a1c821663c7cd8e741c5835d91daeadda8cba92938484bea5099e5b6d7c386590a69a513a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bg/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bg/firefox-57.0b13.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "8e01fe5f5c02e9af5cb06a2f29860e1b7157c44ab10f21060bebb9561c9810d8a779e3c54a585cfeb2ec3647d2312b55263ad3cf5408ea36bd380caefd0a8688";
+      sha512 = "b85df314c69649277e4a33e8374f21cb22565396685b742c6566b1c138daca254770c1d5e87f6af1f27ec65ac247b3eb888a14734cefd7a40755ff100b803531";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bn-BD/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bn-BD/firefox-57.0b13.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "adce1d58ebf4994ddb89db06c79411e7d2bd3b49a8e55f2bfc5a4a9968245973f1b01f30c74a84fb09310dd589076865f2d10b17b418d390ce5ed0898fbb5cc9";
+      sha512 = "54bd6f4fc5b2a2a24bafcf19f48c3e4d104449af06ab9d68a58f6d02e29edda65024f32363988034246f989578bd37d7c7d9bdb567d5869767f908072ce8bc00";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bn-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bn-IN/firefox-57.0b13.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "23910c2086cade899f596f22d0f9476f5cec5481b90467a90710711eadf54b04a1c1a6455ab741374df64076c633a70ea8b375e2aa280c14a193ab204a4d8609";
+      sha512 = "c4acb6c52ba7bdc1e34f7020293daa2a8d230e92c19c700d34df6dc7052fde2928d2e79d252e9f2aa7b148d61328e839c218e5df78104617cf15a0bad8450b4a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/br/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/br/firefox-57.0b13.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "31ec45b6ec424202a04287cb97ee24aa45968a41a1dab47cc7411b865dd8d3c9fd6882482d771cbc9e6c0196dec4323fd17ab5e095eb0ac436e2726896aa6a26";
+      sha512 = "ceac213b63c36e6e3fc388cd725c52a77f223dd6864bf29a26c143d9b0631af62eb26d0a90efe737b08f2342096dbd32692fce7df281b6804dfed9798dc0a6d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bs/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bs/firefox-57.0b13.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "cb90a2470143abcc536e9f737cd655e2f0c4157088837ce2194213baba6957e34f76a974133be81f201d2db649901f33e3143e4432b5f7d59401c1baa09b5d30";
+      sha512 = "179d662409f89bd47bbbee8903577048cbb114788ddc462b4fdb25c3a5ec1f7c5c52a218ec1b22039098761dc25f6021a14972d89522b798d9fa0104af7c5cad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ca/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ca/firefox-57.0b13.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "a395e2a36990025b74a7cf2d3f58339e9f98ececedf6371fbbaf8b97afe2ddd0471231c1577044b7b030586c7ab92512aa3a2a51e77532c17678932d4fb69615";
+      sha512 = "5b5b9558beb99619667c24a80341d74541f99a3cb9e3e958cbb53b7e7dc0e271071fd034fbcbcb909924a1712b6cb328c2de1c53f9d881a7f246fb2f92741f31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cak/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cak/firefox-57.0b13.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "2e04f7b530ffa28af838974d278a1aade3613df7a17a0b2e5ff8854972a1071f376a2bbc974ea529b392de11662028ad05a4341504e9194a02dd983d8d011991";
+      sha512 = "c5628b6333a0d4cf59994e70a1dddaa9143d498c929ed9237a6fccb87e5c19dd50c562cdcb4933d92f0b16acc7a881246c51baf1ebaf65b1ad897a208a20801d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cs/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cs/firefox-57.0b13.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "1e060e7c001b2bd4b722611b5f2ee7d9be5ec93581bf6fb4c5eefb4188a569716a1855fb175dcb489f12b630133374cd0879a0401027e043e04e0c2d060b4c72";
+      sha512 = "e5262f2be60ca5ad641483e773aee80669f63383990ea217a9a35a26865e58102b962c94ad9d4a3526055fd5dc6d0963485d7614a7dd10c74fc28888adcb6a54";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cy/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cy/firefox-57.0b13.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "770b1bb389a356c5e99e371f1a1c7389d45f461a5d18f73685de289dc48f2f1686f39d44b8435133925e21659bda9053bf88f5094a332f69166dda468da40d01";
+      sha512 = "5e77baf6c754a44ca730345ccdbe0bac033d8c547f033306ecf4ffcf3015a3f1c28d0d4542899f873e687dd90a4d6dd60bc970cef4c884598a1e919873e4e25d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/da/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/da/firefox-57.0b13.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "f659f860640b029f0f254154d7f8a21bf011d2025113e701a2894d35acce8f345513c2792b5ec0460921765a73efc5a2d6f5ae52a09d6b6a46d45cf72af769c1";
+      sha512 = "8903979b66612b7d8a856068a4ff1d4cd139ef96ca4fd1efe1abe1fa0af38a5965376b98522ef9ebefff28fee4ee6d3bc5d540e3db7f3047a6e0beda6b376f9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/de/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/de/firefox-57.0b13.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "123f3e65735317da980a57026cbf83b2ca30d8cf07dbf58f7cecab8edf805b05f0ceb2828176e8dd123cc3cfe33028357b53233add467c899d6878c1b2330c07";
+      sha512 = "dd2be7aa009dc3322a065ca242e35b73f35bb28f639146b189a3306689d018f4fa23f213cb075ff4306acaf07146e3b207bfe6a9ef8f8ba57e7a810e434da627";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/dsb/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/dsb/firefox-57.0b13.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "e4f54c55fa7b66ee1bdbfe1b17f839a81c8fde5c5e0c18c9b02f779716c901adb0c01b774a470b0c6bd7971577bd0c29429284fb35402fa6c4ddfc9069d97f27";
+      sha512 = "15ab166ef554ce8d157cca1b11379f0542a2db0dc810f4520f56fe78b365f618fdac4d511e0fbae5f80ebbcfe18c03d9dcc3e02c49dd350cac7c01197573eced";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/el/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/el/firefox-57.0b13.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "9fcc084e2ae0d0775d6357d9f3134cb1c60e9ee94be87d15ef90aafe7d74349684093c844c9ccbb648bc36066022762e859d21f179f074ba03ffb8ce7d7cc6c4";
+      sha512 = "4ec1569340e2490a445970f75992f21f48d13411199f65df788e9e43327de8fcbffc64d628dd589471b9f7b0b5873a54c3583b2d5171ab531c602a2b22dff95f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-GB/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-GB/firefox-57.0b13.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "44b834bb9461d69ddc74aea8bdab6ad0c9f9184c5ddee037441b648da869ef584029f6c49119d22f96b43960ed17b96e82e466e42c7660ff990519928eea1aa6";
+      sha512 = "1fa272fba658cea484b4f857c11daeb4abdd6e684040864d8eabf3d8671ed1019dc1dfc440d079e098fe7edae6258f39598b3d3da6301046d52460e31a409dad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-US/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-US/firefox-57.0b13.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "d9ecf0ff474a71910b1611c0c8dba01e99b588719024776f27ad468718db5e6c54459da1efd648b31e69f6c3cc2bf87e31b65d5dc7cb373b2f141cfada5a2312";
+      sha512 = "2106925dc8e912826332681de238dc5d72921bc9916488a242a0186a8550386e24a7eed6b67edd8126aadb42890b16c5572ff2ca6b1478720b00a5134267e27a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-ZA/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-ZA/firefox-57.0b13.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "811e666873a3211cbd31fafe3253328782053479caa3f117b27a64364b6d815e9c294f1e0ee08c3394cb9a87e7364a8b5dc2a934b394e119aef0c0ba70c713c8";
+      sha512 = "7c33f60a0126c8058127499c178af6cc3398fc63ca0b1d2fec0ddb469da437349e063c61d1cd573fa157eb24f447099d82a189ef4026be865585883e9e6e41f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/eo/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/eo/firefox-57.0b13.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "13513b8f3d288009c16d06dc3cd0505ff66ed3df9d90706c8f48986be9122b3e46b0f2e1d38b2a715f6b043a15575ea05405b8d1564891291afb6bf79d90ce91";
+      sha512 = "ef54f0c7c7fa9ae8aa760f4dd5c65734dbea6bc88f09dfdb814dbd16f86d1444f81f72584c3729d922c8f85bf4b9d0e2816d1ff4dc2325d92b8df1ff76221407";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-AR/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-AR/firefox-57.0b13.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "d9435c6fd5b6653173c2e32b6c8f88a4673eb4427821d5d0b01fcdd7f21bf93e42b02336325e4d6c295afe09a62d184d8b875eae4eb5337680ac9ed97dd17d3d";
+      sha512 = "f19457ed569da5316d167691b59d8ad134e0b10394716612843e4f56adfc027631e8d927324c8ce04188e0e952c115967e63782e6fea8d461dd716458835aa26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-CL/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-CL/firefox-57.0b13.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "13623e646ccd100e3c9dbf373de2a039e5fab955c1c0fd1d35f0c20eea6e32aa519eb4a9fe57682c953bf79a7d5a766f4aca45b17c5b00eea403add4ec28a70a";
+      sha512 = "eed518d08ddfcd9be98d9905005b566821f1912816618c5ee1d3b76ee1972bc97e22e0fece4d35b64631db339916802d4c8e9c8416359fca0e77faea6127d53a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-ES/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-ES/firefox-57.0b13.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "e1fb2a54cad6acd6ed7937dbb6c606b58261efa73a821ee2bb846d8cb32c2a89a57c52c2e5dfde8cf6571b0d23f6ec516444f9ef563e18c92b1ed60402f69d35";
+      sha512 = "c26995c5de7f426baa55df935ad527b7a5c7490cdf2c3772ed680818e43ad102dec9aee510e17fc67fafa5c099216b3d23ffc7ac1f2021551e77047421ace60b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-MX/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-MX/firefox-57.0b13.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "a1b2cacb14ce0f78aa41de552a53dacf04162a69f852cc11930e58ab8dcd5168e860b59310d761a63f2ff8edfec91b7b340316a708e6d2aa61b6321c82df5901";
+      sha512 = "fb4df0e91cb7c1a7c6fceeab29cf90dfda6d977123367944ce59bde0ffca551c0c4853451735bace50f260ca5fafdfca5ee109ef0600efec5eceb20ff067a315";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/et/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/et/firefox-57.0b13.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "6e4ffc6431cf650380344aac96be846a48e0aadae8d089d21784ba9a9944a3a1c9aa4f0d374d59023355d12cec2b38396aba0caf527088e58f6593bf5fd59bed";
+      sha512 = "e7784770c0f40e3ce90b2e3ed200e7aa1143d62e47069c681646d5f406b299e50c45a4986880a7ed789ae3f6228307a07cc17e1c66d27b4b7864447af16ef956";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/eu/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/eu/firefox-57.0b13.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "29fa095b868337dfe531538bcd4b24d16346f19277be1c6ce3e579f9cd696b5134662b58afa0d9089da37f6b312d54d19575c68b0f57a8782d2c6e46f1487d25";
+      sha512 = "987b47288aec5c78ea75d8afc5d0c0850783034342de05c7ee6ebdc951ae73a6185dea25e5959d3932938915d539610c10d8943e2b1f094ee8f97c20d9add806";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fa/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fa/firefox-57.0b13.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "9f6a5daa3485a1d1194a43da4d8c0d8e740cd36d10effd8dd5360297253ed2c37cd2749ee9e1d4e7446f3c84b8c985ad30128d84abdb4518e442dfc274afe770";
+      sha512 = "7ad730d4e8312d861cb0882b45dfcd4656cebccab5d89dd49e78533cf6de5c525b48dcfa3ec700cf14eea579be4ed2806e1673d73f7f32a6c078fa397cb9687a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ff/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ff/firefox-57.0b13.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "a7d8f16d8edc997eb55823b8327bb057bc97bf480bff88c7c67085f601a81744b7a61f0e6364304774950f87686a5bd192937de33feb338a0de1c336d6b9773f";
+      sha512 = "e1374f015fc8c5827ddc87d4d0c7c6ac7eecfef247c8f2e88c484c392160ef023695b11f8b02a526d266442cb54297769a647490257d54d7bc251cc6e03d7e03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fi/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fi/firefox-57.0b13.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "e43a7e74de01d5e6145cb2b1f2757ad9692801701884079ce678768b98777a972e5ca65e037f3b1cc20ddfd7206d7582674104c4601780c02c71afa077e93a37";
+      sha512 = "f6cee8f460a52106d1b06f65b9ce17555aa18a9c5baa707bab16bf1cb458dbe6effa7278379d5d8e13394412f95a3472d793551ffd6788612a166216edc1c814";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fr/firefox-57.0b13.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "ab407a6f84324cc7bf302cfcdbf683f006cb9170a5d23932287392d626f3473a7b717bcfe87e09f8f7a7f7a7563dc61731474c8b4fba5e89df2d34b2b4ca1cfe";
+      sha512 = "a1b252852b88523945962152a93cd0367ff5110642681bfddaf7d1659a232eed751f86378f29d4c01d08462e1d2369e23ce18f38b2580e39316741216b440f31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fy-NL/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fy-NL/firefox-57.0b13.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "7f418fa811acddd2dd6b0a7c3c24b47359c1e80485d80812d8e11d6843914fdcb0314b1acc0e2e1a7a6df703df155849f468d2217fe5f99729b7c4e4a1b0f082";
+      sha512 = "dfe5bdbdb642e21094be85c05aac9aaf24af22917d7d5f294f304ce2c5e53328eeb4d850e927b199b8f96ff573af4b22700890361edd14339581b5f3aaa4e9de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ga-IE/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ga-IE/firefox-57.0b13.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ed03c7411b9cd7df2cce532481d2336cc296889ee25c23a387f47f920bdc21b477571ae313b6bb3c9967a48bfa025869110b398f1c4249732611fabc8c96110b";
+      sha512 = "aaf0169774f0aa05b458d69bcb340796d6ee242f69dfd69dfeaaaf0647635e9e81a5658c3641c62623dd6a57dabbc42ffa3bbcb31b12c6efbf132c95c86043c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gd/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gd/firefox-57.0b13.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "421c17f1401a02793d8b5d888b7994be9638d3a62f39794f887b6e328a89a8311696ba272eaeab85a9200f9027312aa293796c48749eed8f62a60482e3513b91";
+      sha512 = "161d0be36d2d590215eba19230bc660d19e6c6d2659d0fb14075bbb42b9033612cbbfd086f07ad237960fa732d1a3b2b8e9a759d24d808c8d250f2e282db234b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gl/firefox-57.0b13.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "970a6175e192046a9bb701bea9a80c83d09d73a7440bde2d94e740ab985808e8934c6b3df1121777b84282becfa4362c5595f977ba2650c235e235f9077e3776";
+      sha512 = "30bfcf0e3cef19fd751242eb523fd52c4ea96c829416348e36be3f3e48e9cc9d6be6e05c63461881a7289966b64f2abcae4ad004ab0ad32c91e99459bffc7df4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gn/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gn/firefox-57.0b13.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "0cde258644b323b23e1810b8ea5dcf13dccd14292898d780cd24a1d2488f604d3dda4abf50a9840ca665d02bdb2b6bdb0186f0a434e0a350a71939c7fc7513ca";
+      sha512 = "8500db008a57146706f1f6617d12a58ec238382551e45c31e140c2da499ee890fa48245518b87d53457488850a4103a204bf97d9a3edd8c92b802402b885863c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gu-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gu-IN/firefox-57.0b13.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "ca20b858dc312f43844d3aaaef8de8f677bbb4409a8412d3d9ba77e0f98805aceeb0513307dafe6425fb9cc8d935f24732558fd68ad3f6d408094fe1db3a46a0";
+      sha512 = "0a1ff4f35272bbc744f7a33317fc517d78fbca08b63edb91a0859d7c0c5a0bb5944ac574ab4c347f60f7dda4e8ad881e1a41696161336379ab3a40f7dd62c59d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/he/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/he/firefox-57.0b13.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "176d427cde28a1f69c90aecba0fb6459fc102d2a10d1be91ec7114643356ed60eab8cb2701802dc3641445bd8b5595ac454dd3b310a8e59f99f6467dd39bf050";
+      sha512 = "56eff40d5dd8affe55b8e920d0778489186824a0b056d8413c3196ec66d4d4bceecdd5ee0a3c72d7a99ca93e9fce85b0ee51e3f79aac1ed968790293f0fe6959";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hi-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hi-IN/firefox-57.0b13.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "01bb047e7f5d259da175ec008a562d1a09ac3a327d481bc9604cb754ffd52cca861113b87a5fb6420858cf5a3be262933c8d4d35ec3be4e6c7b6ca98019afa52";
+      sha512 = "f61d90b6aedd17f3afd25fd11bfb730320fd5e9eb0a7cbf24f3b0c6a5665c01b40cce8b88f753f7680c01548c1d71c4bb3a94ee16c4a87e22010269e4e03d7bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hr/firefox-57.0b13.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "d4779d34de6248f911bd52f13fb2b701e3d0d30327d79090175d665e684e9267d7a529635e855c0d4d98c04b668347d6c92fac8e027aa05eb66403757064cec4";
+      sha512 = "d92b842aab0e1f4247842ca3fb9000f76ed2396b3e8bdb2f68de5b71956306bf30a58c20ed49a2c66b8551d89e65a21e9d50a69e78909aff4ac4ddab1af2c29e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hsb/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hsb/firefox-57.0b13.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "c497e1fe9840623adcc29caf6240c84666fde14da86567f20b43901c6f519e52b11f774feaf3990ce3e192da5966ad399cff6bb2618bafb355ec2746040a05bb";
+      sha512 = "2be15782b4f478742ca0e2f00c6986a3efa10d63dd15f3f3ab249efa79aac8c0827c5f65ad38db55ec4789bb8e967cb9c397b8b5184d8ba91d5bb76b0e046648";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hu/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hu/firefox-57.0b13.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "b3e49356510e4e4cc3eee442b87ee8fb757ac9c6285e5ec89824a9a32ce8af72ffba96874813e2162cc0673f08e206b1b9cbe32d0fa4e7ef87ffafe41bdc7b67";
+      sha512 = "ffeafdf7b9792ce3d23f221d6b63671ac4a424f64e85996c7889f6257458d0902560b8b9133f133269191a1fc6b6d42fb0e2f1395aa1300e41c9096a6c8610c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hy-AM/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hy-AM/firefox-57.0b13.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "fc998684acfefbf64c8da70bb01cd76943132701b635763509eb264d04630f34089a306106a70c60638e4747ef08058f7e0a44400fdbd0048e9ab64cf7b8a84c";
+      sha512 = "c6508a8049d2fd753c4ebca241db2a5a14a67843aa7203ae142144f7c1989aa28212224c3d09436710eb9049a8f6febb575bf6d7e301c1a7c568491e3d35b71a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/id/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/id/firefox-57.0b13.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "9ab41fb2057d749fe86c9c578bdaca62218e83209cbc5803a8072e26a21bf3496c6f7267c7a01680ef3d7c1f6da5a402920a3bb5e83f76fde9465d9b2635deb7";
+      sha512 = "f217a62dfb40b9956ac0cba5ba96598ca04765135626fc29d12f5e2d547cb74ceeb77f7b02d41f56c2db50f0cf2b5ef46b16ee0b8d6f03fa90f97fa30939c23e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/is/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/is/firefox-57.0b13.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "6f6cd48c5122337109e55ba2ac7fe4ac0a0ad0424732414adc7ff3b95f5d5e07cfb603aad0463f006316526b3a07b7270426c8d31b43b530ba27313b609820bf";
+      sha512 = "4861ee96ad8136ac16b47c1721a6e08a13de3b4fa4fbc25dc093e61137cc4137ff598c4c76364cdbc79a922e340318cfc735c0abfc54bf28b6b76ad5f30a4155";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/it/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/it/firefox-57.0b13.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "c409812a276eb9491e7e764c215eb0093db7e4863ae3da01fb878c838ebd0d379210924a7cae9b9a58c88eae43c317c54618005e1ab4f9e7c28ef10281d8dbbd";
+      sha512 = "7057172854e90d7b555b65ecc3c73cd254db1e5bbc679ebe84e840885017fc37af67fa1cc29960f7fc0b98fa6eea86e428662b3cf60df5f3c12149e36b368688";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ja/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ja/firefox-57.0b13.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "0325da2fa80de439d878b03635e934ec9445e8f6b48db620ae5de273181578a41b4b94db105f0b0e2567a12039fc2c25d46eb50fa95db4745bce9633d874348b";
+      sha512 = "ce05d81cec4ebe23214c7f8cfcaa0571a78631c31b489a2a256ad2d4b71be9247fb05b9a1bdb4069ead050ca0a2ebbd5423035e544f362de9a6590633b407e1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ka/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ka/firefox-57.0b13.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "fb664987b2cfb2806acfed73664425ac73bed0646fd5c55dd40b64f3883c666c40fe7a3e26d3887641055385e1561ab47dc5517ff536fe2f132a6ae0ef0cef19";
+      sha512 = "9fe9261290cfb4c39e6a6e2bca646232aa71c78b3953636a8c353da45bf8498250231809c5b2496a2bcbcc3aed82dac22b0dc41bd2195d259bc653c9126f16a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kab/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kab/firefox-57.0b13.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "a0035b46bf35bc0d79fa2f9f065d0a80447438a56bb7f8653a56ff137a351abcacb0934d7402b70e4eb18da330aa43704d31530fddcaed115b3ab4666fc66468";
+      sha512 = "6c4644299a5e45b50c9039daf6e6440917556a7c77bbdcbc63075b29e6b477df71fe5110de8cdeecfc160c9d13b1848541ecf777e3d5b3504da04ae2ee86083d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kk/firefox-57.0b13.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "3a9cbb1fcefaa47f49b7f98a612e019c07b5b838d54709a6f8b70e530665a06cbf7344ba09939e0ab89cb1cfc195a31ef60fc1524fb7d2a0dd88b87776a784b8";
+      sha512 = "afe910f21c844f1af11e8655ffcbd00d009db44751884463322b17cb2aac576155be821fad093f2b1d6169f63af9a8674e4a1389e7502d2263343dc776c3c2e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/km/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/km/firefox-57.0b13.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "a681711346e29e9bfd8ac25b0a3b625c1e7eb7a08d502e66bc592fc4188878af0063974cf6dd60cbc9724ab489596561caabe80a91ae89ee0618a5a37c30ddfd";
+      sha512 = "4b090f71b3b8c37e6944de298736a03a046ee1705ce6a30a35d75a66caa51503093f6e6287110756ee380a1524c56516e905dcf65f9af3f2f16b7c32a177a8f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kn/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kn/firefox-57.0b13.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "7034448aafc92ada6ec4ffd974c9c15b8bcd2104ede74f58853c5e988cf4f4a10147d75e4c96730302a8bcb4a3403304ed6b379d369c2d1ebef7e37ca947e911";
+      sha512 = "7776e3a75daaf0334f7a121fad252f8ec132ec35e32d8dd19e6c3880a802215ddfa2b147efdd21946817ef506f80c69e92dda3ba66f065776029ca39dbeaf64b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ko/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ko/firefox-57.0b13.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "14bec92a098c0398f75fcd2caadfd0c817bc5d1293b6cbbd667b76ae6cf4f9585aaafe85741ea297e6d994146586da348b7f576bac8af043f8d1918bccb85fcb";
+      sha512 = "dffc3101063aa5c945b5eefd7bf487841676ba1d6021f22129f74520b5cda357c9134c7d99eb01886c70386a7bd8608fa2042c389a154b535dbd2dab471d0c47";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lij/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lij/firefox-57.0b13.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "7972f52851eec48e16037fa3fedaa2745be72dff2d147d6eadb1167ad664d7cb2620227d5acd0954a1036c7f55ea8b25f5a1da5cf0bd9e13a81b567208330eda";
+      sha512 = "4e80affa66e0cccadc62289a68ee6ea7a4484e86432af7eab481c26c278a23ceaa37adc97af571cabb0380611fbeaa4841b679454f13c35f39de7a6d1178e058";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lt/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lt/firefox-57.0b13.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "cbcd1637e7e9abfa847f9a44c59702adf887da8e109a280eb2e2f41e5624d2c64d3e8c6fd0d7855497ddd89b38f6485464cc6cdf10934d5752ee57f919db0aa8";
+      sha512 = "3701dfe9d3489e30f12546860ae0816d7b740345ff668b93e639f73da15ae362543c9bc6308d62b4b176836a348bea37147c7168c0e92c422b626419c079e06b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lv/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lv/firefox-57.0b13.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "323b8973ee237d34790c9febc46030ae1386a7038524c67f77c19344b55350a5b921694679761de5049d9b39710e6dc16c829423c969856cc619902cdec9ba4b";
+      sha512 = "bd32cceceb51dc5170c383c024b506eafc213b377bcd9d06ba38b4922fcf5360cf78b896af331dc04323f530b7ea4b39215bf57e41dae9510b928b40fd24c91c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mai/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mai/firefox-57.0b13.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "0456dea7409fc7f646b89a86adcbd9769e4191fb9fd2491d9e0a09a05d7a8181ade50ad84c98522c9958437ed53dab24aded457333b5b694ebc5884ec324ad8b";
+      sha512 = "5670c0b03d5e999c04ca1136e67d565b546a9b2750c18c639a79ed7c51afe6e2e1bf349fc2d512639194f352558c1af8db114d0b58f0370e3014907ce1d42eb7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mk/firefox-57.0b13.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "3363dbd1913eff92a40325d61189130ceebec1994e762efc044cbb02539185697b2f4eaeb2627f77920efd84efe6da8f6e6bcb379283422d8dd276b3ac5598e1";
+      sha512 = "c8cdc24f00b91db14231b3cc870ad13050907b44222fb4d84268252b572ca70c5a4818240e2c09f4e2a67517e2b3827f079fe06a075216c6017aab100841416a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ml/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ml/firefox-57.0b13.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "a5aa74b8c2cc081fa62d98a4476550f3c570e58da3c6bbb01216da2c290e85adccbcea5410ff48c814ee362b7194ab5f3b0ac1d00bd531726771caa2cd449c6c";
+      sha512 = "1dac139667d0c94413cd9b3262674bce3e0d72f9deaf9b9ae0c847b8073257ffe41cc1694fc6a12316811817b23c1b19747ee3031f397a1fe3d7a6f47f26642d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mr/firefox-57.0b13.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "3ba3d0a66c560e00bf4531b0dd9c2d0e1bce29f0fc890cc93511fd00298ab06f1268cfbc8ab2d759dffcabd8fae22ddf516e69b1de2b5c18ae8ea9a0313ee35b";
+      sha512 = "fc37de2c1e80b25953dbabb745231efa8fe8ecca2c70f8ae8f1508c92cd8b087649513a2e6e0d19f3fefc627ff0eea863f2bf686cc79fbfe9cbe9419085c1508";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ms/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ms/firefox-57.0b13.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "5f1275956930a50b91b6ce8641f3616ecdfd12c7ce291b50e616d9dbc92da92863cc26eb3422ffc0210963ca17d3fc621456b0acae41a5891a307c9d32dcb569";
+      sha512 = "f610c6b7e44eb3ecdc5b28f181511f232e368c031e94ea63cd2ef34defb17f89b66397ef63e0c625cff4d67c04f208cf965bc41580b8f570b79d3e79e01f9a15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/my/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/my/firefox-57.0b13.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "5ca368da2411fb199f737c0718876f4f8c44de2f2f738e689c40e55398e29b1ab3cea61e9af463341ef36baa96793b2767f30d268162ac598e5d075719db9f76";
+      sha512 = "ab3089727c9887b9867f0069c8eb9ef47e3f3d37b8381e5bfc32a1822ff34b3496cc1c81ff44de096717455059e1b5f7cd4f40c87f1b0168b4b9c14cabe3b4f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nb-NO/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nb-NO/firefox-57.0b13.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "dfde18c2ea0071db8353e36b7b6578701429b7f7c6130f7986443d8d922876e7f6b532c57c987de789167e3e6eca66b523329dddd120f458bf05a703e49aabee";
+      sha512 = "13faa2d26f5f20c0e571d6afc7f5e3f81f5dede9c3923ce96427f9256bfacefef886525bec56d6ea59d5f39f466f50f7718afd0850e3cbd1a0949f0beca585d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nl/firefox-57.0b13.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "9253d483ffc866737a3c5cc2dd22deb6269c31c1c413459860ff7f0f0a2716899fb788ca1b754354e4498ec6ce9488086083071bf13772eaab247131bb33851c";
+      sha512 = "65c584e15f82c99417051a3ae14abd09b1a871a6371fbd6bf47300b4985ce34894a8dc34a9f50dbd106d7e0a3f196c870ff7fc28afab1ba4f5e7ccad3d281602";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nn-NO/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nn-NO/firefox-57.0b13.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "5bf67fd3411a246cbae4eb039e6d8c228df712f6ac8c01fc106feca2f64b77e6088ef9c06e059ae4ccd03477aeea40010c4b3a953216f980973b84934284bf9b";
+      sha512 = "8abe9743e39fabf29eab41c9c02001389852805a548c645acf53a4cf4bef1c1d4103b528a3efca0614e5ef858cf358d26deb4c61a72b29bf93827f133def2685";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/or/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/or/firefox-57.0b13.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "a2e23e8e70733939dd39162864a1fc67a2870eff5b20e9de9ca028d4d619841fa2800fa7e8621c2e7f6cd16056fb58650c249e9214cb6f25fa5348b39a2de4d5";
+      sha512 = "8895fed23449529006c8f1c821fcd3d95de74fc368e8ade0a41abc39a16510ccdef3a45b9df87ea88598d3e46dbbf404fee545fd1c0f07498028ce55914b68c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pa-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pa-IN/firefox-57.0b13.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "a87d34b6f50ab7001696b5c64577aab9cf0363f064a601cd527bab7a8181f9e5fd54bf4ed33552959ff0ef8dd8682ebd7b54d7d5de2b63150c852616897f1e57";
+      sha512 = "c7367e682f0a37d99d5de03b5b7824596b74f8c79a2860e58b10cc1bce2e6f41e676cc39ec664817ea91a34c79aaf5a997cf7700d6484d5fb5271067e871943b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pl/firefox-57.0b13.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "3c748f22568a34d99a72e7630182d731ba9e46b7659334e4c5105d586d76fc13cc96cd3da7e1bf928be6b71c8e523ddd325abd7f06407845b894273a67716929";
+      sha512 = "5b542121130b2df20c0d6789729254955d0192832c87a28d4e9d976313da09654ea9ab415f2bd9aacfc796b2aacba2321f13854cf68c3ddd9ff910939edb027e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pt-BR/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pt-BR/firefox-57.0b13.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "a2239a7783497818a2c5f3b810c213ca2152fff3ee1cd2d8e57bfcb08f781cd8c588936182645c5eb9281bb41f80be493b119382f59e7fc83808e848a4d9b582";
+      sha512 = "dcd06cc70ff67138b5b9431c84e4b771449920e5973753db1f203f72f8636c69fb91c217b04ab95773efe4f324a7c63baf32a58978534bbce6fec47e967d25e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pt-PT/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pt-PT/firefox-57.0b13.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "1e1ca4b80c9defa67221f642c7a79ce8b6ae350b9221269f89b252b6e150ec081780f0c6043ae015216a4986dcee4a515cc26b562c73d6ed2a274f0966f0b279";
+      sha512 = "85caa2576bc8258cc3f5f5077b6a9ba816624d772b54c7c62a0f2c82e7e75bd0abd29677e36d709cb55eebecc9d28bdd673dc29d07329602b788c7d7d3a4a57e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/rm/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/rm/firefox-57.0b13.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "6a598e71a3da18d23bbeba744d6e8bc6b85263fef93d72edfcec66f3bd6b80b48d328e9b3cca90573352ed3a8407a98d0a2e1c61a9a56258b55df0984f21cf2b";
+      sha512 = "82942a52ad073ccfc0f58e7b84b26b5394adb2bdf5f520ff946478a7299f2156e97e1ec5c8686dcd1d4b7e47ebd43eaefbb8fe2f68b0584f79ade7724981bfd2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ro/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ro/firefox-57.0b13.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "3ac6ef4b82630b697b239dc972522aaa8d58829be15be41bfc91fec2b7b3fa36a4a24c2b6a0208a13ff2d0d190be3c72cebedf037f4023666c76704f1b2ea0f7";
+      sha512 = "b45fa5a738d92fb5cedd06b42c5ae4599008f6abc05149e8f47bedd024470421cf8c5d3a56a111b590894c0941d5cef96476aaf0457a1f3e2a5112143572a8e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ru/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ru/firefox-57.0b13.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "4c8122918cc65958504a6b014e3729321f8d440f79605ea22d90dc3c49f4134220c2b4463fe08737854b62a76d8e67461b3c1a41ea9999c78eed95a99bb2c524";
+      sha512 = "0f7655a3f0f290a14027305916b7c4a73a2292e6140677cca137bbd9417473a9c286807f8279dc3e6d723af2c142bdd958f68c748a48fa42b8d0dcc5f88d9407";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/si/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/si/firefox-57.0b13.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "e915c9acd651036a196f3845e34707a9622e5b49e2ef5614d5426849bfd809c9ab65fa0d80aa9865b7dc3bd9cfe906109b590173c545e84bb2b04d5edd2e943d";
+      sha512 = "da2243a741a095132dda129af616e88fe4daca07e5a3d4ba65f18b9bd407636a3a312494a49cc1d48cf777650e44613dc69b49538d87616ca061264ba20e2447";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sk/firefox-57.0b13.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "ab7c52be7a4b0bfbaf8a52b7189407218df48c73aba5d5ddb569f6ebdf67d12c8da014e300045a51d535279571241985a21901c1c9cde9c32eb9cdbf3956ba95";
+      sha512 = "3b09eb8284944e6bf490e071b64d3c373fc76f42d056635d4b3179068fba0064582ddd6deed1273fe429eacaeb3f786695824786f09d9ed1b35c4719f5dc97df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sl/firefox-57.0b13.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "b9cde14b2886aa10b09cc862ac4882eaeae69ae5295625a9db046baf66ef16a76655c23b82d85eb95bed3985d13527c6eb210d006d5808dac0917b3e2a1b94ef";
+      sha512 = "47cb5682058b1240bf31f2358ee72598956227c3dc344c58d82ce61bae24ec68a6f5c06adf1f39e7f824ac365fffd52dd20e4cf93489b1f7de79fa88faa4d923";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/son/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/son/firefox-57.0b13.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "2ba989588f9c294718c6b2cad196a0b4631d3f189a5877ef817ac1b4b2af767531bab7ba1691dae21ceb29fbf63128cc38805db6412ce07af21d179c40ddafc5";
+      sha512 = "738b5f57c0e7a36e5063ae7daf7dc51212098dcff77b26617a69e87392b26430414985a90ac81ed108f64d7b593e3a9e50d6dbd2eba79e4807309ef64ec351ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sq/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sq/firefox-57.0b13.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "07e478a5f07184d5730665b52a3cc162569553d7fc43b37579d4a33bde5b70f8ebf2deab9f6b144b961222fbced4f1fe204865dad46222c94b850ed3600e3a0d";
+      sha512 = "7dfb54a4760e58880b2c0acef221c6822deb795f2dbf8e7d9e4d4949c750d1caea87ddbdf7ddce4d39388b318d470aa56d6bdfcbcb2a4f85f21ad0d2a6e76f82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sr/firefox-57.0b13.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "255f62d5f88214320dc1febe610f547b2bba08817e8eb7ec0c23dbcf5d900f47307aafe63193f93f1a3c1dabff3b7f49130df1cdde940dfdcec521553c4733a9";
+      sha512 = "7ff4cfcba96156775744f6332c8ecd931f4e33613ffb78b04ecef0f7cd26fc8131c8de34b5eee250b2860d8c5696899a9e87e1d6d1e34de1730845595d6062a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sv-SE/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sv-SE/firefox-57.0b13.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "4fb0f74ed4b7d221dd75c8e767b0f021c8bdda27388392c2b55cafc3ae48757b0bcc506061d59bf430fc2841ccd3aae0cb92627de00809bdd8fd536c860def24";
+      sha512 = "7deb0438f37aff6fe17426fec316b2392823d6d6fbe98309921f305479475e8f8262f0f9566e9fa5d03ac90df65bbc6bf85f7082ea84836de7df016a85f81519";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ta/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ta/firefox-57.0b13.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "02214d133855b544246c930ac834c4076ba32a2f490deaf9e53cb8ed61ea6d9cf77d04b2ecc41d25eb1cd8dc87515725cb7446e85876b66ffc954d1cc8dc88ee";
+      sha512 = "e30979bbaf5e66ba05800c23beb050c77658099aeb65819848fe282b00fd73b98e58cfb518f1db3e30132dd3ff5b3478c82db0177b7035952b6474157d9083df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/te/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/te/firefox-57.0b13.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "94d8bdd506216e56ab6b866b9f9a8158101b961e32e691217e16eddb748533fc39d312415e005f05656b877590487d5a5c340d4cb66f5fc9f7c97d9959206ea9";
+      sha512 = "3bc7727c833709281e998b9201f2bf8e6e327d746ca080c73eb1f95239a30ca55c349040ff5789cadb03454e7ef836ebc3f1f1e47a86a19f3db1aa290a213a54";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/th/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/th/firefox-57.0b13.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "305bfebb6a51ce94561a25e19acf82ca4efc3093a8de97ac352dce248140c9eb50212ca11cda550118f6bef6829ef3d6614c4696e09c662cd28b05b6d592f4a2";
+      sha512 = "3ef644ae9d627f2fb46e5d1870f6b9dd71d9c8fce6ec74e027c67b3dfeec0015bd5b59e10e3b255387c86c25d7cf55ac7379d30589ab70548040452921a7f52a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/tr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/tr/firefox-57.0b13.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "37effb1cc8d59c6b6d556c1c99eef05f5bee3a31e9afe9e606790d1f901c40a20d34099d62ec610a495e9fa7a84060de5203349af4899f9da92f705fd59e9942";
+      sha512 = "6b67d6386251e7bbac5fee1f0df49d34ac03856b0a22f717e62c1d246c218594b164863edba9f387c4acc3a3e6fd41dad80fac6816fcde672635b8e3f84265ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/uk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/uk/firefox-57.0b13.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "2e7fc820dc9af6da8bc9af01d18c17138676e89d5e5d7e11e1bec938aee7db5d1ae16fa8b4aa03fba85adb4c9a31447fda87369b1b6b4ad7af4d265604ab9c13";
+      sha512 = "89c5585413f09f5aab57532aa261d56f5df5b4f466608aea0957856036d5e1cf59763c7864e41bb9feb1313149ed5dff973193dd8c91b77e80ec3ccc9132cbd7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ur/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ur/firefox-57.0b13.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "1698260ed76ecace3f65063e0e076a37fe4d780743c63512994826138cf43e60a9617c36d514d5b3a349938e7ef7b9e670d7a819cdebdc10ac5ffd00aaed5ca8";
+      sha512 = "e3cf517fb7f5894d14833a7febadc14caaabc05211deafc5c0e69604131fc5b566a2898f91117cd556c7d551392fbe0cf35ba4fee357ad53a40a756600371024";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/uz/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/uz/firefox-57.0b13.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "99da803303a3269bc510fa82e278448e38ea20b73f6dad40682ac4037b23cc6869d2b6bf4f7f07ecc1b18ff3b759ba2ba4e13555a61cc9282bd29651571ec1df";
+      sha512 = "d290e74c418d37cca154f56fbafa4ac9e07ec9e035d513f6b652567f72512c350212748aca15c3baff9b2137309261287cfc947f2cfdf81715e59b83fe6c2b5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/vi/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/vi/firefox-57.0b13.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "dc967eb9b8f5f53a233212d5c9f05a7304bff7d2d9b8175e4f197eb54ec3c28ff6d8b634033651b20fc98a68e2d585338e6c3b50b9f22e4bfdf9b55096740d9f";
+      sha512 = "d83f34b3d40faad14a8e9a91e07cb24f2ddfff65923788e258a9fe2455fa812b1b7d35dfc07c628f41b3bbd6b9ffc81dc0d313bacf33c36f5bb85106dc3fbc52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/xh/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/xh/firefox-57.0b13.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "7a47ebc63b02734c2ecf53ea98fa246a3d6612c203c9393cf8958230c583e0150b5da9fa3b315131d21576d6028565ab15eaed509848da850b7dbea65f580637";
+      sha512 = "326fdc7d0082257b970a3b38aa7d25e57e558a204da939f061eb6bd43cdeb17c2d65b9f6ff38524c14d5225e3703949a4e6f01dafd926336d404742eb289b156";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/zh-CN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/zh-CN/firefox-57.0b13.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "e6c7864bec03ae6ec3f5293373ef5b5ad04f1430cba8433b7e6d4d40ed4c40eb78ae48fd85e954c16a8dc5ad7c95d509cc3892832002ffef3b99dec161b4795c";
+      sha512 = "04048407183c8607d6ca06b446e6da8b1cbe253b58561cb9635843479a1963474c26db589828c5586da8b76387b34696e3b256da9f978db51a96fbf3f1157bdf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/zh-TW/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/zh-TW/firefox-57.0b13.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "18cc76259b7f9b50d1dad72d76d4e9fbd140df85101a480a078840f22f8f778b90debe246e953591a7c531a64050569cc1162be30c8dd0054602d46b1e3f7ec1";
+      sha512 = "aa9ae37761cd9096029e5f83a81eddc0e21964fa637f3af41d4928675f02c2d4f0b7558dd79c374c6cfaaf74e464837e5d0bcb1c5eb55c68aab24d501b163ebf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ach/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ach/firefox-57.0b13.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "731d0a857e84a66729efc652c0b562d683f12b847df3aacafba14b6b8c9f17a3b6f7c60c40dd68d85ce81c9bd876dddb98e677fd532cc4801769683530948761";
+      sha512 = "83e9e88b26a4c5e84560e4248a2c465f0d73a0044c34b219ade4207702abda9355eba16222fee6c825118f70e36298d802cc8bb6e8806ff4fa099f8ac2d8173f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/af/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/af/firefox-57.0b13.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "ab2bfa2e51c36e254b9a410fa1b0ad1a5d4f2fe39b3b09c403a923ffaadcf339e71eefdf22dfa67af7a9b4c0ee543c9f507e49f9ec1ff424ec8f741950617ea9";
+      sha512 = "d08c73098a6b95efc5ba120fe2d9e5c3ba1493333339e48e74346f82a4bd89bf65b1d3aa94f99f511d8716cc665cf5b4021da84aefc6ceb0a9b8fc5c21435447";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/an/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/an/firefox-57.0b13.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "61bb9e3e5d8341316888c8c8ac5df92791256181e7873db98e9ac4ccb40524552569c7b028105124c549a3ae2a62c056b310d89a2489a931be6a41d5ffbc291a";
+      sha512 = "c6b460a4b52586795c0d8a9ac51e7990b8a8b0245e91056b0b1ac8290643fae32116fb3769961981da81a7ceff4979b04c923d9bda01a49f93aa08172897a101";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ar/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ar/firefox-57.0b13.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "132fb475429664ae4df2d5d2dc08274c7b8e253fdddec3e6ee2f0d11b5662b11553642dfc3ce69dfb2c1658efd16ed8568c0cab9ad626acf223979306e7132b0";
+      sha512 = "346fe20b1b98c2ea7be7852252a844ccd87b2bc4c6097818198c79af5efcaf905f25157b8249be116afced8955bae9912c08d9decb7eca31050720adfb7856a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/as/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/as/firefox-57.0b13.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "86658f39915ab733cee46f19929101c50168f8ce78cb6e61a9d7814830a2eb7c8b7936db858c63beee7e06a94be9043b80975382cc2ae8623198afe8b65226df";
+      sha512 = "d7f92e268a5ab4b3eb6f6d42f775a35237a529feb19656b895fb33398749024b029a66e639db30c342a753501dfb8c97868a9726cac33419c3d58865fdd24895";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ast/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ast/firefox-57.0b13.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "1cd4a682a831772b32b603edb6277b07b3f0de78b33246c2deec2c75a023060f24de2cd6c5ee05b6eaffa20b617fc8f7a6f413f502bd99c39086b689ac817444";
+      sha512 = "a54e7fcf922ee97824d21fdaa2183fa45709f6989f41a96f913c664fc43d0d45be071c4458b026f8a22a10eb18f2b618778ca560b95dd52a43ff4897680e4eba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/az/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/az/firefox-57.0b13.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "45e91932826645df3265152fa3c80fd74ac729f97fdea29059a2e778ea04af1cadb8a0a7df8a8935ee9e70af480762d256888c4fad1be43101eebd95672dcbab";
+      sha512 = "8299a0f1a33289485dc92a66600720289645e341eaf862678f6f0ea194c7f11b17a171ffb1f6d582a2810742f97085673bb8fbe58ce21b94e41b46bd1aa60e0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/be/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/be/firefox-57.0b13.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "a3a7dbc02eb8b3d64c67638a71e53a98a30092e03eac97c382aee8f2aa1cf099493c65aec5ba96aece30deb50bb5cee2f35f1ebbadbf38c93e8f9f9917b79406";
+      sha512 = "6ff4d7d353c4c4273a59d09d1c642bee5245c79e62c9e6a5818785f0c22d02ed03613e93353d59793e214bee1fe34de73271a1ec84d9f74853fd821582bd8ca5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bg/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bg/firefox-57.0b13.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "7b52a3bf5a2be9f4de6f609ca11a7f7e9c219a9cb84d503e892e1b51868dfa10e650f6d75aeddbd0edf8fa54b48aa3d3c4852e0e4615efdac78912709b162591";
+      sha512 = "b13a4e6ffbaae528136cfbdbe17f9ad8811cf2fd23d5764d583f63fb3ac2a76fc7ebfd51d8ec649e0f9e33fd618a5108b0cddd32fd25ac98bf83418086b9e364";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bn-BD/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bn-BD/firefox-57.0b13.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "84c687130785782f9b900249db6d108e160c36dcc90eb2fc10ea9661cc91b19c8da262189e72b3259f987c05dee4e2e83c870cb2b3e3fc21178a4dbc19598981";
+      sha512 = "678021fce64a2725b8968d3090fe10caad1aac6a883a44c1a3fd7e2a5dcea9e9764f36249a299e9348bdaefe2bd9bdcfc3ae2d2bd864c5e66b022c8f61dc8947";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bn-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bn-IN/firefox-57.0b13.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "3d269322796c2384ddb03ccb07ebc0fc6ca04409d1fadd6c11a1ee436092139929f414ff9c46883379e9c92441189da386723b8ef7dad5f6599b1b522a3984a9";
+      sha512 = "801fefcae2eb5d6959fac142d2ce77c6522b842b63f0a2493652ffe682b4d261a91278cea7777cd4d32575765206a4f7ce81e2fd73afe6466e418c40d99a7400";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/br/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/br/firefox-57.0b13.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "95f77bc8d74e8b6fba6ae6ee59f12cfada50572aae4aba4e3b519290dca20c6ca45111b5b7e58f5fa2a96cba4d35af4ef20dda4b908e607f00ab7c2d7ffe7834";
+      sha512 = "dd1e074400bf491b833e7ed1dc97d211371be17ff5ca1b3d8221965b5ed67e79594b94eef3a8a778f4fef679debdb106e5c18db4d75989d4e4e9e6c794f05631";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bs/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bs/firefox-57.0b13.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "0f171ae78a2f5c3939827afd61dae0c96fe3e062a77be6e2de172e5e7b3110e953bc282ae353d1629daf9996798db65a163e4d74e6a727a734753708545a2d0c";
+      sha512 = "444c9c97b8aaaadfa6b725709c6f49580f22e004f3d9de2c5b50f0f6c60e1496743c12ecce2b0482f3ff56408cbca14753e58b17337db016f7d217a5d62a3940";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ca/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ca/firefox-57.0b13.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "31243cdce440f556b8588b53c29c8a9140b43c9259c6c16c520773b5a5aaee1944a8f29b427d443701924075547d39f8eeb4eb61b683bd467a911cb59d549e91";
+      sha512 = "e59c7ff93df39d6e6365e751ed9fb42170bb17f05cf88d8fd96decef6e7bd69fa60d7efda8ae3100e169bc401f3cbc26c94b67137e960f6684c8f219b934acc1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cak/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cak/firefox-57.0b13.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c8d4bc2e74ba30cdf18b09911c464b026781933d234ab8421c2b41e19753191ffff7fb73a5b77283d372b2e6496edf818e8f9ad4e06faec184370c7b31c9b3d8";
+      sha512 = "d0e0fcbc207ea7cd1d69d80add30bcd6f31e0931129328d17760c6681d12d6442c0c1006121ea8a7199756208868d892250be6405ee4d43ba23750fc9b3d7789";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cs/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cs/firefox-57.0b13.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "2b64d4d1e94ad36439fa95ea97915ae920fd4f2c0e749efa7d1367a9298a6e8ef96a177b0c435a96120644f8baddb76492827164add7caca100c80f7d11d3a9d";
+      sha512 = "9e7a35fdd318037a638eede7ae11c4c28b63e8c3893ccc38b50d25bcab229002a0f912e50719a358ebe6f30205f61187a3fe4ed3d93f04545542888bda18c279";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cy/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cy/firefox-57.0b13.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "70accb1975ffeb4fb3de11171c603e2fc5be7f9873a0d584f906e324d7b64a885efa5ec46739575abf97ede95d40299f1d30f5facf36c3073284d79485a701b9";
+      sha512 = "1a1edc73f902139e8696c2c6609c763664f61bc654b33d822b60a31140f7f52afafe3878516d705d90196f72aa38fca57e3a085d5d03651f1a8f344235e2f92f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/da/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/da/firefox-57.0b13.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "54d63d2248d253e70fd5d69f8507878cd35bac533b77378cc700df3be14e90d551f9cdb2c5e5ccef570cc8d0a27a827c45166ab5ee8a50376d03c447583a5583";
+      sha512 = "6a5833ecde7edea045ab18325a55ffe19f55d0a18af879caaeeac3b00b7412e2f6b9330959068632f3d87b932f544a993c7d836a69f0ab0be310c07c46851b90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/de/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/de/firefox-57.0b13.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "faedb51772813930a29e639bc11d713e484e79fd220ccb0c72b0071d74eeee238f92a337cb8a00c3ea86f1892baa5211e1dfa7a1d102c2869de1743963c176d6";
+      sha512 = "c0e0954430d656565ce99d91c15ba7cc74da840034c4f70fb9ccb38ece341c86c500b27a3d1b57e8f5da4bb6484703dc98c6b8ad3d95972a9316a0c549de9814";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/dsb/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/dsb/firefox-57.0b13.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "9f409b32ff72b5039481cfe88db1245f1ad626b0f1f8a500d16c24e5b8deacf2188d5a436259e0920667059d090700c4db1997bdf875938da26863a3096fdd95";
+      sha512 = "e5ddd864a5ff73edbf2152828b036095ef1197595cf5ab751cd8037d3fff11c9e119293d4adb427488c20e0bfa13c064c76d4720c709d4ce31eedd74395e8dd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/el/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/el/firefox-57.0b13.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "069b856c0b4e5b232572bd838ff9fde813c72d14bd731a08ab7acb579f32eed3beb6402ff0669a1789b9e3a486fb76ccae593ac94975828d13350b3a24baa696";
+      sha512 = "bde94744268cbceac403a4f166d7cd9d182c18cc8321af72d0197de00737b6f31f7d1a5513d1702d7f29df3d4eb7208d2a5086d6e0bb7a2d9b7fb33088f82f31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-GB/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-GB/firefox-57.0b13.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "fcb89801772ec01f7863016d82c0f5aa430b90231c7c46fbbc0185246cacbcebf033227fdb90a2395f3c21012bdcddf1e745c1fe3c857add303ee475c2320f9b";
+      sha512 = "48d4fb95963853cee8398c168f51da141ed7e5d18c224d15c35f184669997248078756e6da0f619ed287df034c7d9836f75188c5c8ad17b4af9d1dc022336eff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-US/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-US/firefox-57.0b13.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "ee3c3048b6644cbeb32ab784834b7f9c8c900d3a68da5d531fe4d7808876013f0990b2329cee04dbc1ca8b5cf3b4b10c39e19659b09d298961f1706024427a78";
+      sha512 = "22555ce1e9f574e5e2e9b1164071ebf2362bdba7c182b6989b8da5e7fb736c7c6444faa44d52d91041d1862c2ad8c0881868e63c424b84d88ef39136e087f87e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-ZA/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-ZA/firefox-57.0b13.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "c31db87c3714bf29e19a25e4791e7d60c140598b7c64d3e47a413bb8ac95ecdfb67e97d6c5491b76ee355ed46bd907b736109bc64930629dbed4adb91ab07aed";
+      sha512 = "2589efe14b8762492d668def0b4149755ec9ace70f581a1fae669249cfdd44d5bfe60a718fbe300bb92a3ba631ec8b0515357587c8d095013916320f8f1a90b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/eo/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/eo/firefox-57.0b13.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "e84d9ecdbd2f03bb0d6673da736c618dc6b5dc7844384f3e1bb73041d8f7d1b85ac5f8b2cdc9c6a316a931ad34830a3a1873b6f0c517c97eee5d6fd1507b8df2";
+      sha512 = "1a614091e1638edfcce4d755d4529594bbbc8785ad33af360b9003c76dc64dcd227f71a28e4fcc13b5b2a7afd2858bd9ff6287e7b97b48bee5025ef1de400870";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-AR/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-AR/firefox-57.0b13.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "d3f4b7711f81707a195e00ad532a5383a9d47d86681e882bdbb5d2d1145035b0d901abee5908daa607d3b6df27fb8eabfb163b6c800a4cae15b2211fd18d8209";
+      sha512 = "508812c53be4877f130dbcf0aa712c6410774370b54571210f3c52e1d92fa0477d43f2f24aa95198059c318e91ba7a8fcbfe476cad03a8256eb37eb88ca9f460";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-CL/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-CL/firefox-57.0b13.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "c2d32c0666c7aeb41006720d7d10e55fb8f4f3e0e053ef43f8ef06c2644b79d51a47417cb4d84a7028cdb83d4d74bfee982dcce9e7399ab292f00665f31c7c18";
+      sha512 = "bd7c5493a92fb7d6ee5680895ab24bede3f8dbdbe176166599fa918a981d11fbd124f4fab4b2bcd5f88df5c1cdac48c85a2fcde0fb87ea361ca2baed2db9270c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-ES/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-ES/firefox-57.0b13.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "b3a0e567aaf8defed6cceef8832bc188a4cc47599be7a02b6a63cdea2fabfa5380433b75d48d62d9f4fe8818160239455e7374e6a3958d4853208e4cc7b16e07";
+      sha512 = "cde05cd2e4127258cfa26c76c018f2dcf8214a75a8c4cfac5b4dfabb51ffc43f21828e9a89fcd326cda5cd0c6fbd09649259b81212e13e4d15e32d0c1b87c267";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-MX/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-MX/firefox-57.0b13.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a073552f46c031259bc4f3b05af5a9692ec4b4266d993468900ab912bea88ae0767a2c1e4ec16ccfb33293081f83aae7ce71dc0472efe6340ea62ec65513ea18";
+      sha512 = "75b8750f830a6353587a9eb555bb2e207b9d7e37894b6b2334be1dd27025d69adefdbd7ae1bff6c7fed823acf2684352e1bfeaae8a5ce5f0721838a82067a6be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/et/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/et/firefox-57.0b13.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "b24a6b6a3246685d41a303c56ccbefc4596e6a09a9690f8fb0e522c3d25e3fd2fd087bc99647d4e3035057fd4245e00eee9abf639f06612dc4b7928c4092fad0";
+      sha512 = "f33bc9d8e107eb70ab039257540e9a3f96826e597771ad86ec416773a1755b1e5551f8a14664e8507e29eb08d0e3abc8e1eb9e00c4320ba82b32c9b7eae7a68d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/eu/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/eu/firefox-57.0b13.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "36cd0b76748edac4a2af813fe1ae06de166501eb765521cd1abf4b05bc55b0460b74e09a45d7e39910b1cf6dc6750848e64e288f27a23466dcb76ed4107da637";
+      sha512 = "94c844674a045f2ef4d2dab12b070e49f6a79e4d86856b29965962df420b4dd57db5f21dab66b7a54317dc908c9b29c9bb3ab74a0b4b8eaf806e2fc2bc45a821";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fa/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fa/firefox-57.0b13.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "66108dc33aa1eaa305ccec598c6539795b06fad7ffc29f5da3576f770f8669345d3856f589bd6fce6eff3c446713b69913d1914946c0fa74d1c9f9dc3322964e";
+      sha512 = "487d78630469eaa93bfc24b1b3a9d027b57b62c74904d9440e3cb173a86182e17758f98013b3089a173da0f671e2a44f334c61835f1e6f143d3d83704e36f3b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ff/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ff/firefox-57.0b13.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "8c8c3cc9224bc4b1aaeba0037c09185ac8e7ca6702e73df125d4103c3bd4e8ed95509c922d81afb25c8704bac08003b44d637d00962c000a56a5370539b780be";
+      sha512 = "b6465926764e311aca0a74f6d6fb19396f0475bba5d2c43dd3af124e7d6dd1b0c018fd541d2c4f5916d8bf03db6a93344b558fcc392adf222893716bef95275d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fi/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fi/firefox-57.0b13.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "74642dfdb24453ff4e25ca74abc772ad30bb6072cd81c1e597df1b689b59e64bcf8fb36fcb366be6b3eb5378c5d682460ebd27ffd9ee069f5649a2657138c2cf";
+      sha512 = "76f0748b9337bbd7232b0d1a056378f4149b1539bec8c43cc99b14d8036c8b737d71467b8d46fe51a4dbe0cc1fe3a061d749fe3937ad5df045da374ee72d4581";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fr/firefox-57.0b13.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "e0e555d2e7f31a49124a2e5cdb28dca04ac1d67400ba897df52716dc705f478e0ba6928ec8cadf5e82431c754a1559fa838649f0cc5cab15994d75d86d64a12d";
+      sha512 = "84ae5e6b2d6a89bfe20646064f97ecab399cc916ba1c9a17a4787c6e01cffe159fcd563a595f0362c20132dd4dcb143334145a05c7cd6e065678b73f6b5c0017";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fy-NL/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fy-NL/firefox-57.0b13.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "c6a508bb5fc7e8350a0200da8aa189805d2af1c98bf623327404811205dfbae9365a3e4acb167d5867b48f2c28b9d1ec98edb6e7b9204d31fd0364b763e249e7";
+      sha512 = "e1e8a0d6f1e96b7e4f6e8c315b04130c36717f9cf5a47d3fff06dd1b69ab424674161862296b93fa294a980afe75cdf04ec115e06272cb67cfd74809747a2bb8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ga-IE/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ga-IE/firefox-57.0b13.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "76235f086a5159d51579d772f223b694660a7c64b3701165f2f11317ab35969a3dbc8f77ced8cbd97cb0219545e10f5165e8786de0fba2a4ff0eaa87a1ee9253";
+      sha512 = "3cfa2704c00b21d15445489735753014a481ad5b8eaef25a2c6ca35122aab9313b5cc9885d685c3ff206ed895e14dfdb7518ae5476e86bb35e6b81f06e54aad6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gd/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gd/firefox-57.0b13.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "1f0cb2ee88a34caa16865cf9e86744eb5a71c7133bc6735293bcbb5f4ef9aca7f9a3b4f8d1ec353728c3a7332c2804278ea58dcfd02a12328e5b3937e3761f39";
+      sha512 = "b7e4e20f35ffe7275f8009194bd8325c3c8f6c02e185e7a337c85d03232909a44f1d4a41b598d466f560339c0e64cc3babeea2ec2efee0ffed015a791fbe265f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gl/firefox-57.0b13.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "3980aa2a37547a8e8c3d4f083cec9f69539ae0388dc342847b09b789f35ba7fc9cb83c5bd3e94eef1d56a7788dbafa0d9fd6aef305043d9a83b24598ddb750d7";
+      sha512 = "9759d271de728720319dcd30507525a1693d00e6f443a5921eb221da1f0e2c122fe1da36c881b0e4032cd5ef074438da5933e8c10b42370f114dbe572204589e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gn/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gn/firefox-57.0b13.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "1859234d55f1e5a11be57e4fda90608c40842025b37cd047f5c924071006dadb3933752ce72fd7287c941caf707b14f66159af5a48e34677c017fdce6f1e9a78";
+      sha512 = "9d4ee42485ef63e7747538362a4b5baabb4ecfa706b4c8b0c3fd440c48a6d15c4f8a1cf5e2b8ec71672dc529b50c7a6645986a867491e4f14e0cda127db5bc13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gu-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gu-IN/firefox-57.0b13.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "e8da8d37f6a86522592084e267bb0ab3a2b26159aae08af59369091aed28b071bd3c1413ed80c3c3be4a41ed91ce3ca38a4aa4a4bddbfe924649aa382027bd32";
+      sha512 = "45c21939311dc0414716ab272fe72c063b8adad201f2dc7893347a66c5e9abe7f1b215a4d75bd3ed3801b823679fb27f5cfb5fb6691785126ae516f237133ac8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/he/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/he/firefox-57.0b13.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "6165ba93179ebc019ccaecda1ebe7b68bddacb583ccb417bbc50346ca5fd68f8d882c3723361f8334cf9159567c01adb620ea8dcbf01b7ed03da7d5efedba198";
+      sha512 = "f17386cf6652a794303dfb24dc439031630239a9e7b82afcab0bd49bc3e018c4ee4f499f3c1557c68d38f74c37b8775a49fc72318a08fdfc2ee8f593426540a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hi-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hi-IN/firefox-57.0b13.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "230bf538f7498e9536d3057a6321f41d54b366f1d0debf79360a6ea6fdeeda97895ffd5e4c77c2874c97b5a642e6c5a3d2193270417198a0cb383ea349e01a62";
+      sha512 = "c7311b1a5d69439b93fc0865394895e3d1776fd940d21838d4681659dd2aa222cf1aa041821f5f385cdf904de13e8ee16e000a582495f9eac91c0542317eec1a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hr/firefox-57.0b13.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "617c8e4cd572f896b3c0094e74482e8fee5e0e924cc18f06f16e87f217b712de7665c38069be59f22d1b269951157634e11def128e0c5164a119bd23981ba9bd";
+      sha512 = "70eff0fd9ec9c9c70ddc4afd3b95e427a945b35dad26dc29b166d784efacf9960738cbb0c62c700cfdcb48b38824d34ce46eef1ce0f55fdf63932beb1a69b04e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hsb/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hsb/firefox-57.0b13.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "da7f1f00ed6b741129dac9a82b5116652e2d0f406d9ea535ece8907e1aea60c9393195882bf59557041c14ebb604456bbdd5514800d7b6a66700558bd256ff6b";
+      sha512 = "973817d6011a72c676b14f9f5b333ae53fd38af8a06c5434eff0debd88f3beea8d209331870620dc3457cf0bb0f24462d2f9fadb302416e0e9ce84928ddc4d23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hu/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hu/firefox-57.0b13.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d6b2f966aec0e7c529d86916bebdd06a21850f32a436837c9efc4da5bd18ddbfc937697f758796b8e68ff79281b35186620e29bc93dbc885d6f9b135d028519c";
+      sha512 = "836aec8829d07baced10aea1b461a4b503bd3887541c6e030cd802ee1a04d6533f7f899c268077a3f79e8ada8fe2606780c506a24f0388e3292e6935afc04048";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hy-AM/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hy-AM/firefox-57.0b13.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "cc9df9dab12511549daeb011c50c20c563eff9df7ff3ad0b351fa6362cdc35817f9b5c1c204c1e484a82022d6eb4dbb196c78b43a1429a8bcd92bb22e9c757d0";
+      sha512 = "9a411df379d0f900fcabe91515409934da6d51092a4a44df7f7e003f1761504b399e353fc93f69022b91d72c44198d35ad9d7e2cf9be30c549503043bcee9b12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/id/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/id/firefox-57.0b13.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "1d3027f632f4a7d74adb54da6c15d51af85a6713dbf91c3a01272cee6a4692c4fd130eb66757230ab7e9dd9da7dbeff7c889bb98681fc6cb193b1094d69f31ba";
+      sha512 = "e91a619f10a6b9948bef49a5c21545f3881430d8f6c7b5f0eae112c9b8716519a88c635c37cd89586d8ff4669e31f4b549b4eed6cebf5a13a48df9ccd37e3988";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/is/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/is/firefox-57.0b13.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "45ca6f394b47890157680d7d0ee58b8ed75de1623491e38b0d31b79fc2940e7fef00cc2a5e7ab7ee7931261c6575122cd7ace209f94a4574e189b1acc0814755";
+      sha512 = "aacbee57162998c21c870d541bd453130292211a19aec1d2b3ed0695f143eafff132cd4700f9a381e405e46ee1ec5865017c447771fee7bcd9c0c8586601c1ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/it/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/it/firefox-57.0b13.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "38b002021a2f68dcecbaa745944fec1af41b440615a04eb8ecac30923dba0514db70f505670db35d22fef794f682de03d16fb2e03888cb4e045e3d997ecddbf4";
+      sha512 = "4388a33307067545cbc6c292a5aee825a53d7e38aba4847c347aa4ba3f30df2b2ac15430fd4a28a7fb490efc7c6a6d555d58d61fe753e0f8368d80a2a8034f25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ja/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ja/firefox-57.0b13.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "201681b0e830834add6bc3dffe883388fb9ca8e1d5995405224057ac3a2dd044f74c800c48c42bb1f77f493bcbc92c0e10a751b3d5871309455efac26e4c4ef0";
+      sha512 = "f37f851f573e9ae734ad819f5ba22ff97a9081c10f63950ebc52cfd97202b295e035129fb7f4afcccbfface1de188f1ec8dee7bee14bb3f0f779f9cbc00667df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ka/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ka/firefox-57.0b13.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "9298bdf3fac725ec59d4d358be141696c4bcb2079e4689da191ef2b52569cffdeee7e6f3454922b784d3ab02a0339eeab4969140457cd4b6e2533c72c740bd71";
+      sha512 = "f06b7589ad1e2d96273be1470032d29816295ee48f05f9da685e210e0ecf35187dfde82cd5a6596ee0a0ecc8143c169eb2e7423c4f9026e3b06851b6ced6e3c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kab/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kab/firefox-57.0b13.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "65ed8e7902b0a0342f03f95fa0a51fafa5f902b3ba870e3d1fd783b366a0af257a47588981290cd9a0ec369f43aa3e72021122ab9fd8cd46c4eaa69ab726b194";
+      sha512 = "c4ca6d1a50378309bff211138924f7b3ce22705592186c14d5b17501f2c49f04a29b4edb23746efcbc2947e0de0db88d0349c85e5a3b7e993649eace1975965b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kk/firefox-57.0b13.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "fb3dff8ae89e8b59a74474eddc21dfe5f5e69e7f087731f93d775c092895b38f69b39f66a7298a8b3417ab87bc01b144a5fbe6ea3f7385b395c3a82e2e5df026";
+      sha512 = "78379ec69c88d1ec8c03feae66d4f4ea3b48de0c324084f8f68a331bba16cef5a66f388d5c0fad4cdeb3ec9b1ade21dcd67e4b5fb026319718daaa8a151d1e5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/km/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/km/firefox-57.0b13.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "3dcd608f361056ae87882d5a28171af8ce24a16184952f0f5abe148cc341e056fa2b9abd583b835026992e60f316952b9d61b9b7920b5e65b50e3b9905517e60";
+      sha512 = "ebcd7d6259f83f7ac9528e1eaabe7f75600ea96c49ab0f55c77688949096d7503973a262761ec0828f233654d0aa2271f338a756335f27b73a6174aee05e6f9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kn/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kn/firefox-57.0b13.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "7215efc6c893389fc0137b5bf21a9a7b215fdda0fc556d1f1a1f84169797a4495aff29bb9777978699134aa59653c4e53d57e06ab785c07acb293c37d4cd7962";
+      sha512 = "dc9f84b8d3efb12710c1a245bdf26c54f421fb6b993ed4219f28bbece45c37aa5c118206cc9c4e2e2805a667d90b7993462e57778c0eaf8193c71dd3111285be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ko/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ko/firefox-57.0b13.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "144eddbbc7fd3d3cf213cf411ac94707e2fb50cc10e981df169fbedc4c971084fc0e153ffbbc9242184f906bb4d0a412d1447e7b5e5d7136bf10633bf825bbff";
+      sha512 = "377b555ea022b2a963fc2fa9bd44002485f575710925aa5d7056b2c343e476f599060e50e708322c535a8dda3cb50255519a833c031e2aecb5d4fb1f1c3ae65b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lij/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lij/firefox-57.0b13.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "7a90a94c35a0e1f00e3e55d34227cfa614469017355285cf053fae404807523b3e1a3146d8710b46de7c1296f9cee08bfe0eb0de9a215895ce3bfa99c06dbba5";
+      sha512 = "56985bc727c6c7baafab85cfbc8e3fd83f4770a446aa2e6a894983948af99a36f522898bc35a17c1e91edad7eb3a80eb736a9bc75a0cfbc1cda49f617d649edd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lt/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lt/firefox-57.0b13.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "71d61ebc3961011dfe60e5915176d3c361f9809b1953afdad5eca2a3e9b543958eb7bd64ad3f2d64c788ec2478d32fd3da5a172afa4790b06cec7996c4a2c5b8";
+      sha512 = "fb3644bf073c9c418ea3db482780d6a409e7761e31cb82641d6021dc90ae81f3f955cdfc3f773e4293a29dfc43e93db3d0feff8124f1dcee23a80e3006cb48ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lv/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lv/firefox-57.0b13.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "66af0c13de2bc1c24c2635106bcc482b53f872e937ed9e6ecfbbad3b6b59a0c12d05f18cfa7136d96ffe3991faad3649a45acb8a8e9d92e8ef6e3f0392d3d151";
+      sha512 = "5a273bc8d85095663c6d66915e31c2cec48274db8445a3127b5fe23e1a6b59e0cf398a0631b23d7e8e29c2bdb40ea4b1f98d2d09c34f1f609e2b35f106263785";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mai/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mai/firefox-57.0b13.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "fddbd82c7de07c143c4cbb5005a88f595e38c0b6261adb534d8b0fed42233974e09d394a65359155652cf8be5ecf5a47af588f4e8f65ce649efecaca6394be72";
+      sha512 = "13503b7879ae1c10e151ae85ef0f657dca6bced41bdca7b2ddaf3445c56e712c2b5c084f5490d41c5459ec9c5167c62ed517ca9083dd86cb3523d00a84ced8d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mk/firefox-57.0b13.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "10f027a08ce2fee653503dcac38f7d9afd9f888d1f904e63252dd1514dca8c471bf071f4ffaff37a9bad50c59eb833b8e5490a840593db3def2ca362cafc85ff";
+      sha512 = "8071102677b25f92dddfe1b5ad16aadd9bccf4a794b9df4655f75777d7d55fdb0c1a5e4ab292c222e61302f1cefc15b649ac17fe58680708bea2223e0c5f0a66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ml/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ml/firefox-57.0b13.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "09f79b235b65c0ecde67f6207459660dad444c28c336e8a6df3cf958fc3eed4bb35f18adcfa61d48298a9c43076577d0edc49963a6b00fc221f69f30f5c69245";
+      sha512 = "962cabdb6a3baa3fe6e25885eb27c5f119c37ca27fe75547a704b3409375d7dc61fdc4a1e4e12f0f0e6405f7be08dd628fd53eccf8431645c549bdac6ff6e6cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mr/firefox-57.0b13.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "86e1c01e504cde26a044fc2a288e3419785e93d46a6cf9deb2c49cb18e87149a486cf9bc06129c83f1387b7d7c62018930fdac77d4fce98da4fe5b5c78d061c0";
+      sha512 = "0758144703046081bf3bf600de84c7a71275d73c3b6f9f27e2797937250b8ad288f41081fbf6f0c31e4d0bd61e1a8c449b546839e2a1da0ecda4097e7de6482b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ms/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ms/firefox-57.0b13.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "24a7cc19585c510737ccca398f31ac3181df6601f8400187861791a564b13154b825b78427229a9ec97c7441be38f36d4d15510d1b6720b7a29d9e71b7eecf1a";
+      sha512 = "015433073ad4703c7636eed2e41645d1505b9ead82a8ea5c6e1e639e28db87d0f5afb1aab0e7bb852b2c5b5be7182bfa6bf7bf62a2cfd29d4948b1243d29ff2b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/my/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/my/firefox-57.0b13.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "1c3a160af7c960cbd2fe31407acbb93a1e31702460572315dd6c45f6dd6c2efdf419789c638551055e01bd8ed9652a8b4cb76c96b0f509348eeaf7fc548b9b68";
+      sha512 = "603b30c61668fdcb0ee54e0881fe4bddd6a6787062060d28fb0a5b632e178b8396c868c637bb08e0e1b03e51d53e878407505f484d864175e357c9aac790dd9c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nb-NO/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nb-NO/firefox-57.0b13.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "74ed8467b0678c9478c24c15fddcf22b839e0256f5e0f15379d5df8eaea59e928a42637517f6b4ef77b2136bacac8ef1477fc0b97390c20c7c09418ee9ec06b1";
+      sha512 = "6c761e7827f210386ccbf210246e2a68a200ed98c3c14b18a9a4b9ceb99383cf59ec2873c0c5fd749a8ccb71575691fbfd0ecff62f9a044b3e4d2c272232a15f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nl/firefox-57.0b13.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "30cb204b285d9f8ee321fada6fd7eb2b490ff8fc1735ed61631e1136648c78a58b06d7e0487543e8f7e99f77d03fba43667a7ca9b9d7e2860b21c1d2f6baaf71";
+      sha512 = "2847d4ceb5c572c090eb030a3c5ccc03a2a43f43002f4e308695905f7ed164bef73d1342800b7c0d0932d5b84246d68c8d5ef1b84b09690558d5b2b7453312cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nn-NO/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nn-NO/firefox-57.0b13.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "870f52b1388b881a306f13b2ce7483ec1b07e603c5b1e9b5ecdd55263015e3b892d4343b3683e514bf58fd567466ce6d2b7da34a105ca805cb72455a17f0a48d";
+      sha512 = "892eca2b59ae33326c1699afc273c0726b4fc26cea9adf7787310833bb50fac07bb2af18fbdf283f29ea1ac737e654a86bd844e97a0df408c7eb77c931ac4d85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/or/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/or/firefox-57.0b13.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "6441180343f8ae93b2544981bbfae7b29abfd47d59a8688e3da4f257da5c8cc95d225762c1633442908a4e3a0ebb29159491ef8cf583433913dbefdb39630273";
+      sha512 = "0c4e996d5d73b1b13ca6fef1ae79a7f4c180cca8c6b5d1666c7172f80767624f5f64f70c2b5597ca22496e161379b37fbfbd20cc94998488eb6ebdbc1c2a9b5b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pa-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pa-IN/firefox-57.0b13.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "e9cc4097cb504ae0de523318afa8a5cd9fa7a1cb3348641cfe0538e039a4dc681d53bdb3976116f171018804c641450f3645af1d0d4502b3358bf4a3beb259d0";
+      sha512 = "eb30dba1b3ee43ff2e6e86bb896b36e775ad6a803062aaa5c3ec68e3d579a0ce2ead6527b0dc1a5b4233f3be707c03af03063ef3495019eea04e331df544dae0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pl/firefox-57.0b13.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "5a5003b3e04cffe5d76a9badf8f0a8c15c2d00b26be6486b871129c9111b4b53e7aa9cb2b83cf88de9c2928e17c09e548b89bc140889da7134f3195a91983f89";
+      sha512 = "d951353704501d27d6fb93da04ecdf8d06a2a6664167976fe018f39f82cf70ec7e59554043e7b4fb7a4b423331bac829f07a9f4d05c3dbe7d66eba3db09284a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pt-BR/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pt-BR/firefox-57.0b13.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "9478a60bf2d3e2ec7a67a1e49c786664767ddbcb284775ad08750b0bb39a049183ba8e3feb04ec19d6e6aea6666cf280e2d90a7648c15bda1e05f5bc22f8da82";
+      sha512 = "5e8cfd1c70bc72c58c7a7a06d30d9bb701c0c574de4bfffbffd96ac6009c712c0f8b14227c77dd109d16587f906b01c94f18c7d55f08a479cacb4bc479859db7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pt-PT/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pt-PT/firefox-57.0b13.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "b9703a29b083beb649654e526d0438a388fac253b6d0093c366742504652f88d68993f2641cb62e5c90972b9c7dcfa7d6a2e28ea32bb52d5a6ffceea34d650fd";
+      sha512 = "1035994860329ab318146f1faade952abfc48a50c828efdf73b3a103e7ef331acc82aad1a589b591384f33de1e3f0976eb62b61accb2507069e4055fd7bd5441";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/rm/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/rm/firefox-57.0b13.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "13ea09d2b80c421852b84ec8a2a7513ac5b9d51c0920ebb282a47087e384d15d8b7e7cb01638b4857fc26ac6ac54509f368f85d7b1ec3cd70f0b3e21fea6ebbd";
+      sha512 = "3430038ecd626b4056cb95815ca36ab1d9385e4783259cf973dd1ed7fcce12a3c0e1a18555a579d94f1021d1073089c3d9be40ccd003e00057c498e98ce7bcbb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ro/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ro/firefox-57.0b13.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "af210682a5380c324b542244cb74f1a0b39b659d93ad166b01026f55995fd281124cd8a2f5b3bceef85f2f5545972a0199ff9460a7f881fb807842596057f17a";
+      sha512 = "488907bf47fdc4a02e2fdcf11c0c4517aacae0421eac41ca75b573c5401ea729e9dbbdce4a176dfca871ab919ca1a07a1db9e61a82f0516902fc80f6a070b9b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ru/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ru/firefox-57.0b13.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "ba01c0e7a5595fb8dc7a3534640dc87c1baf45e70d45a490605d4f81b897f7633d322be060a575dd75cb89a7e319efbfe15461e7b43893c1956de536d4c05288";
+      sha512 = "4bf91ef098ced14a89efefb99a8162a328c583ad0e2276ff3539b9ace7540bf7fadbf057acd9cf604b3fed0359bc208186cc42d8801304bc9dde85c4a12f38af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/si/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/si/firefox-57.0b13.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "42f647309456efa6195cf045c7ba2dae3bcd824884b2a645d6372ea8eb8cd9678076bfd555795acc463bcac550973b317a12500f8fd494ed7ea007c540c2d085";
+      sha512 = "e214d7fd32c669f0a5367aad50ea9ea9c0f642c4af862251c52f1f1c95cb17a895edaecc2f69b6899ce95cd023480978936007ff26493cba9971624af422a5fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sk/firefox-57.0b13.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "ef08e41d68cd1496efbbdae6575e3c0529440b1b2d80b421aef1dd7abd2b383b31fc5091d6949f52d5b9146505d14033779188154705ed2882c1243e893713f5";
+      sha512 = "17206bb3d59a74ec7acf2ea205e2d02db7257484257c8cf63341b99b7cbf9434968d3c16df7ba96438c44e970e53498883ac2744dfecb7993c21fc34dc4d9f2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sl/firefox-57.0b13.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "0e4aa9a51305c5f03e1e2ab953e600d922493e851d18c83927303b78cb178e0e0759e314fe6889fc7216f4af9dd82afc0288ceaeaaccf562ccc949be05525b86";
+      sha512 = "d04a0b97ad4f3385e48e7a248d280ac5c46a1d63261ab2a4b3e6b7769d82c70bf523acbb040bc3d341669f6b51a724970fe8e358ccb3e88c9656182dff0d3317";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/son/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/son/firefox-57.0b13.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "3fcd85bcd3e85bf0114678a86776b8e7fb8bf0828b27f6e321af17f3b79f0235ee7269e36f7d3262c60f92946866084596d5dbf475cd15c459be3b7b014ccea4";
+      sha512 = "ae95b4d44e9a0287d6696745edd2d9e6b03eeb7bdaf1959334ec4dd28a84154ec075ab25bdd319f92f2173f8d806f95b875d2050ceda125acf8e98e81e6ba47c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sq/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sq/firefox-57.0b13.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "a5b6c3c7918839aedbf87e3eda194dff5bf7e0c3f107b3c71763e731448eccd7aa1671ba43df45bbfa5e29e07d243f5309b1e18858c4dd21278093f37f722804";
+      sha512 = "713dd79c91fc01940c9b102ebbf83d5a9ffb62e77c42d971eeeddc9dcff1b2947268bab5c99285de5826fe3a5ffd55d9ccbd62c809bcbf2a266f019e35451cb3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sr/firefox-57.0b13.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "9cf631abedc27fb87bbc1fd3c65e748ebdc77169d4529d7cf6bc67266cae322635e1c2d7bdbc42b59c572af2105f5f0604b7eed899eedaec9c251ebfbf0c7507";
+      sha512 = "c7ba73cc0df99cb28f5f5bc6a8dd237a3c9d5b67d7c63444ff8b63ed34f0e0e390d233a3f886999d5531ceb9be5b2272b3b282008499c5f09278c9a9043636a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sv-SE/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sv-SE/firefox-57.0b13.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "71cb182020a6152af64ce709cf391ee70c18669081599101c34b69ef81bd3eca62024938d6c3fa121289a7e5588b2253ec536b35e7d5ed7d94190e247893b1f3";
+      sha512 = "58663250980e784ed5481a31c09b4ee9002004d4026d6743f89c739beceb9a135c587a61a391dd3cb68d53ac34427d0ff00cfb8b6a235eb29d6da4d026ea3504";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ta/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ta/firefox-57.0b13.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "f6298909d8fdd4335d891de594c7f27fe0f181f90c4493c32fdbaa7f8d5ae5190de328b5e8904f99b413b244d14d956d887ab33c19355942d810d56d0700c604";
+      sha512 = "89fc06a036be7359494eb098def2a7118e0e46449ad7545b148a4194fca4ee446aed7172567a7bc746a202e48aa67a5fd18321f93920c761851a103402dbb008";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/te/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/te/firefox-57.0b13.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "b24f0feacf4a484e6413ada972b1570a76c78f87dbb829f085dadf3a922d87d31d1a50c092bb45508a67267eedf3caca09d0efe10d9c329d2e46671730a30c5b";
+      sha512 = "1c74315d96536cb03e842823e70246bf9597489ea0586db6c474a5a905031e034034a62ea549b202dfd5464684a52d3364d1423f34a5e720b6449981fc8bbe53";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/th/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/th/firefox-57.0b13.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "d063097273e2f4345baf63d9502b3485bae78664d855e0ae1f33ebcbc18d49f4f5af0537bb141796cdc2c3fa35d90a6937303f4a4f54f6277f88456c3779017b";
+      sha512 = "4f23ed4c12757f6d472c358af4dcf1366992a8c391bbeaf1f86f735ad2fc1638d516b76b22b118179062ba260154048c179b88bc3178488cfa20be4bcadcafc7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/tr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/tr/firefox-57.0b13.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "c44e4b90c37484ee2050f219c5ea1f37d42ca9a3f683d8aed95cf94c412138c795011960af06d1b51ac7a44fb99f373ed28f0dfb9a8f81edc7e2675defdeca80";
+      sha512 = "3b45d8d29d6f7f8a08e4fac95ee28b12d482fcd2812ba357252d85bc2bf49dbf640190b3174fdc0e63b9b5d95e87ab3086efb1b1fb717323e971080e0bc5b570";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/uk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/uk/firefox-57.0b13.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a1fbc8ed8441138e6e70e925598f1a620218d6102386b67f84b32e87b8203fb229a20ab6ac631018a196451be9db93e1cf303e2a4aea9b9c065545b6aafe9083";
+      sha512 = "a17831cff53566f313f691ae35f6b7032cd7c11b5501b4e84b70b64323d0dd9988ff422d8b7bbf67436af8c8ec631f9c68e7338c8c6d3d470094034a5766f3ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ur/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ur/firefox-57.0b13.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "7500eed932e4f892ab0e96e9e43fb0301616204859eea955c7700b7b804f87bd1cdb8ea490330b989c3e191d3d837a777830d02daacb4486cd38b565d4579282";
+      sha512 = "e0eeb311d9cb0789cd17979057c1f4baa2065dcfa30f33058b2a866b239bb44690263ac408cdcbff8d4f7fce312bcd51dab60b84479917f2c615689ed0e1714d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/uz/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/uz/firefox-57.0b13.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "2de4ced396b54c9a683dfac862eea893800980bc61d21dcc5a5aba727936f8d7c0c72941068a1e088061fc4a78b8437b10e97f4e41478048fbd702db64a1461a";
+      sha512 = "3d6399921209541e003e8fd83e3eebb39d30682090b0f306fbbae6705cacc7fd1db50426f00084bc1c6b239b57da5587479ffda6bf0b848cf4c458f821936a9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/vi/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/vi/firefox-57.0b13.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "f3fb64b828d8319354630afb4e8239830d471edc4b76e074d8ad30d0802d0d0529abc265183c2b60223fadfedc8189715065d980d15489afa7c297c7ab5c7863";
+      sha512 = "3a3d751644d605c92f973b680b4a093fdb8c476aa4eb4473e9350a03128668cfd9c96dc5a1f49dda2647342704e02326ecdda5c02e0b4bd80d73d03d4d5642de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/xh/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/xh/firefox-57.0b13.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "447b17edec8fb04b8460b9ce2b5a00aca48ef162288944746bb9a3fe52c1365a01ac51f13d853c27b5071c7d92db7beb6dc73a12dfcafbf9bd1f65a0d3b41214";
+      sha512 = "8aca9406db4ec188f0c123a298f4bc89d8b5adf6a1471202dcac40e2abd7fb16c807458a52c2a5e9e31703a67dc792153d7c745219da9ab2c7144bb3f853a7c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/zh-CN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/zh-CN/firefox-57.0b13.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "918d2ce4543eefe6c304e51988b1af5e6de3fadbf04585ae45d5344555620619327b858755201f5b300e2e11b7696ccc6d2fff81f965b2f58615426585b128f0";
+      sha512 = "ff87569273037e5de47a5c1ff61fc31933f8a4a9147ce8f54b8c9e16413e3546f7ffacf4ef8127363082ae173d4234783e54a7ece55a8afec1a51a57527d4e43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/zh-TW/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/zh-TW/firefox-57.0b13.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "a2fff5569721bbe2455b320f057595c2c26986d26654be00a90f4ce269124a6c7328664287e73472df8fc13c44fd5e42614e992904dd86cb6caa3b0d05145ca0";
+      sha512 = "063d9e0f85a04655f41e3e8cf9c875d6ec19d936c9c9aa04eb151dbd3de34493f7bfac557ae5f4f4dcb42037aad787e7e98ee42bf7fdf89c7833a21e5f827404";
     }
     ];
 }
-- 
GitLab


From bddb71a1383d306261d3df00eae9f04baf04554c Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Wed, 1 Nov 2017 22:43:38 +0100
Subject: [PATCH 447/877] audacious: drop unneeded libmcs input

---
 pkgs/applications/audio/audacious/default.nix | 4 ++--
 pkgs/applications/audio/audacious/qt-5.nix    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 6d4b18e29b0..8242d035e5b 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
-, libmowgli, libmcs, dbus_glib, libxml2, xorg, gnome3, alsaLib
+, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib
 , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
 , libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
 , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gettext glib gtk3 libmowgli libmcs dbus_glib libxml2
+    gettext glib gtk3 libmowgli dbus_glib libxml2
     xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
     libpulseaudio fluidsynth libmad libogg libvorbis libcdio082
     libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index da143c7d946..803b0115fbd 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -3,7 +3,7 @@
   gettext, pkgconfig,
   qtbase,
   alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
-  libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug,
+  libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug,
   libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
   libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
   wavpack
@@ -39,7 +39,7 @@ mkDerivation {
 
     # Plugin dependencies
     alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb
-    libcdio082 libcue libjack2 libmad libmcs libmms libmodplug libmowgli
+    libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli
     libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
     libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
   ];
-- 
GitLab


From 29798e84a6fae4f60006c7e3dbe65eec2f79795d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 1 Nov 2017 16:20:46 -0500
Subject: [PATCH 448/877] ark: fix wrapProgram invocation

---
 pkgs/applications/kde/ark/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 013e2e63f59..fb631414838 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -27,7 +27,7 @@ mkDerivation {
         lib.makeBinPath
         ([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar);
     in ''
-      wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}"
+      wrapProgram "$out/bin/ark" --prefix PATH : "${PATH}"
     '';
   meta = {
     license = with lib.licenses;
-- 
GitLab


From bfd57788b64c3c43f3b7e5974bff927cfa54e383 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 1 Nov 2017 23:01:37 +0100
Subject: [PATCH 449/877] tzdata; 2016j -> 2017c

Notable recent changes:

 - Northern Cyprus resumed EU rules starting 2017-10-29.
 - Namibia will switch from +01 with DST to +02 all year, affecting
   UT offsets starting 2018-04-01.
 - Sudan will switch from +03 to +02 on 2017-11-01.
 - Tonga will not observe DST on 2017-11-05.
 - Turks & Caicos will switch from -04 all year to -05 with US DST,
   affecting UT offset starting 2018-11-04.
---
 pkgs/data/misc/tzdata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 843055a2c45..ef2bae8dbaf 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
-  version = "2016j";
+  version = "2017c";
 
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "1j4xycpwhs57qnkcxwh3np8wnf3km69n3cf4w6p2yv2z247lxvpm";
+        sha256 = "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1dxhrk4z0n2di8p0yd6q00pa6bwyz5xqbrfbasiz8785ni7zrvxr";
+        sha256 = "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41";
       })
     ];
 
-- 
GitLab


From 1c42c2f4181beb0f980e506ed20d23d81f92479d Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 1 Nov 2017 21:24:09 +0000
Subject: [PATCH 450/877] alembic: fix build

---
 pkgs/development/libraries/alembic/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 4ab09f5bb1d..bd540cdd500 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec
 
   buildInputs = [ unzip cmake openexr hdf5 ];
 
-  sourceRoot = "${name}-src";
-
   enableParallelBuilding = true;
 
   buildPhase = ''
-- 
GitLab


From e2e8d5905552f7db44e6bd22516a56d46ffc97f3 Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Wed, 1 Nov 2017 22:48:05 +0100
Subject: [PATCH 451/877] libmcs: 0.7.2 -> deprecated

---
 pkgs/development/libraries/libmcs/default.nix | 19 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 21 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmcs/default.nix

diff --git a/pkgs/development/libraries/libmcs/default.nix b/pkgs/development/libraries/libmcs/default.nix
deleted file mode 100644
index a457adfed80..00000000000
--- a/pkgs/development/libraries/libmcs/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libmowgli }:
-
-stdenv.mkDerivation rec {
-  name = "libmcs-0.7.2";
-  
-  src = fetchurl {
-    url = "http://distfiles.atheme.org/${name}.tbz2";
-    sha256 = "1knmgxrg2kxdlin8qyf6351943ldg8myllwf860af58x1wncxc74";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libmowgli ];
-  
-  meta = {
-    description = "A library and set of userland tools which abstract the storage of configuration settings away from userland applications";
-    homepage = http://www.atheme.org/projects/mcs.shtml;
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa4488b9317..8fd266caa5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9384,8 +9384,6 @@ with pkgs;
 
   libmatroska = callPackage ../development/libraries/libmatroska { };
 
-  libmcs = callPackage ../development/libraries/libmcs { };
-
   libmd = callPackage ../development/libraries/libmd { };
 
   libmemcached = callPackage ../development/libraries/libmemcached { };
-- 
GitLab


From e4913c2d303cb58cc8d31abf0854d3b332fa62de Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 1 Nov 2017 23:58:54 +0100
Subject: [PATCH 452/877] masterpdfeditor: fix platform (amd64 only)

---
 pkgs/applications/misc/masterpdfeditor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 2d2fd2c7bed..764d400820d 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -47,7 +47,7 @@
         description = "Master PDF Editor";
         homepage = "https://code-industry.net/free-pdf-editor/";
         license = licenses.unfreeRedistributable;
-        platforms = platforms.linux;
+        platforms = with platforms; [ "x86_64-linux" ];
         maintainers = with maintainers; [ cmcdragonkai flokli ];
       };
     }
-- 
GitLab


From e71dc0c2fcedbe47065bfd16d1b437336c30ef01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:47:42 -0200
Subject: [PATCH 453/877] liblxqt: 0.11.1 -> 0.12.0

---
 pkgs/desktops/lxqt/base/liblxqt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix
index 9363dba8669..bb5a9be6d84 100644
--- a/pkgs/desktops/lxqt/base/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "liblxqt";
-  version = "0.11.1";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0dcsgj0qr4589wsibs6fdza4ncqavrhykd05d25rs78pa94lvvh5";
+    sha256 = "1852vfbkbpw49i8ad682jhqmnskmc9a90qwpalipgak7m64azg3j";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 70fb53f657170b256e87b82fa4eab9c176629911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:50:28 -0200
Subject: [PATCH 454/877] libqtxdg: 2.0.0 -> 3.1.0

---
 pkgs/desktops/lxqt/base/libqtxdg/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix
index 47d3fb2e91c..966566db7c8 100644
--- a/pkgs/desktops/lxqt/base/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix
@@ -2,24 +2,28 @@
 
 stdenv.mkDerivation rec {
   name = "libqtxdg-${version}";
-  version = "2.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "libqtxdg";
     rev = version;
-    sha256 = "1s5jw4q6gcivk7mc95ir9q2nry4yyhfwy039ddf5ymh79nynv8vy";
+    sha256 = "03kdrx5sgrl93yband87n30i0k2mv6dknwdw2adz45j5z9rhd3z6";
   };
 
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ qt5.qtbase qt5.qtsvg ];
 
+  preConfigure = ''
+    cmakeFlags+=" -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix"
+  '';
+
   meta = with stdenv.lib; {
     description = "Qt implementation of freedesktop.org xdg specs";
     homepage = https://github.com/lxde/libqtxdg;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }
-- 
GitLab


From 05de6f3dd2ae4f4f699899a478ab696e75b23e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:51:28 -0200
Subject: [PATCH 455/877] libsysstat: 0.3.3 -> 0.4.0

---
 pkgs/desktops/lxqt/base/libsysstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix
index 2776a53fa83..b5013f5ac1a 100644
--- a/pkgs/desktops/lxqt/base/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libsysstat-${version}";
-  version = "0.3.3";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "libsysstat";
     rev = version;
-    sha256 = "1rkbh6jj69wsf8a7w7cq8psqw08vqf9rq5pdnv4xxqb036r4bi31";
+    sha256 = "0yl20dj553z1ijkfxl9n45qvkzxyl9rqw12vb4v6zj3ch6hzbzsx";
   };
 
   nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
-- 
GitLab


From 6e37bd54ce6acf9535208da4c2ebed12ef9dde73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:52:41 -0200
Subject: [PATCH 456/877] lxqt-build-tools: 0.3.2 -> 0.4.0

---
 pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
index f8db33bc5a4..8d369f46433 100644
--- a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "lxqt-build-tools-${version}";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxqt-build-tools";
     rev = version;
-    sha256 = "1awd70ifbbi67pklhldjw968c1fw1lcif9nh4qbrjqmlg1gn3kmv";
+    sha256 = "0i3pzgyd80n73dnqs8f6axinaji7biflgqsi33baxn4r1hy58ym1";
   };
 
-  nativeBuildInputs = [ cmake qt5.qtbase ];
+  nativeBuildInputs = [ cmake pkgconfig pcre qt5.qtbase ];
+
+  preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';
 
   meta = with stdenv.lib; {
     description = "Various packaging tools and scripts for LXQt applications";
-- 
GitLab


From 0054183cc6b857ea08865162bbcfeecca29e9dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:53:34 -0200
Subject: [PATCH 457/877] libfm-qt: 0.11.1 -> 0.12.0

---
 pkgs/desktops/lxqt/core/libfm-qt/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
index 78c0a926b9c..612fbeafe19 100644
--- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
@@ -1,19 +1,19 @@
 {
   stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
-  xorg, libfm, menu-cache,
+  pcre, libexif, xorg, libfm, menu-cache,
   qtx11extras, qttools
 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "libfm-qt";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0k2g6bkz7bvawqkjzykbxi18wqsnhbxklqy6aqqkclpzcw45vk5v";
+    sha256 = "0932yl098pc5rwgy9irrc3ys47jx64m3wm702dvs8yy15alv6x4i";
   };
 
   nativeBuildInputs = [
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    pcre
+    libexif
+    xorg.libpthreadstubs
+    xorg.libxcb
+    xorg.libXdmcp
     qtx11extras
     qttools
     libfm
-- 
GitLab


From fb997f817fb2f514d3c9570b065b8bf6518bac75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:54:09 -0200
Subject: [PATCH 458/877] lxqt-about: 0.11.1 -> 0.12.0

---
 pkgs/desktops/lxqt/core/lxqt-about/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
index ac81391af1d..645d634a26f 100644
--- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-about";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1pa68pr0iwvh34lippagc8kxdfd0l2071m0vh7dnvfqbnwly29dk";
+    sha256 = "13knjxbnq0mh9jgkllarf6rjxkvj2c93l0srnlrqp3939gcpwxh3";
   };
 
   nativeBuildInputs = [
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
-  postPatch = standardPatch;
-
   meta = with stdenv.lib; {
     description = "Dialogue window providing information about LXQt and the system it's running on";
     homepage = https://github.com/lxde/lxqt-about;
-- 
GitLab


From 7f3576f2ddbf3be599e94643f253f8159d330970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:54:39 -0200
Subject: [PATCH 459/877] lxqt-admin: 0.11.1 -> 0.12.0

---
 pkgs/desktops/lxqt/core/lxqt-admin/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
index 23b142f352f..54731b22686 100644
--- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-admin";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "12c1wdciqgiifsk5aslw3990pk9ylk9jhgwnrxvh798rr48hhflr";
+    sha256 = "0dg3gm5m19dc4jarh8xcn0mcnpgxzz7nhy5dzm8chddaa6pdm7vi";
   };
 
   nativeBuildInputs = [
@@ -29,8 +29,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
-  postPatch = standardPatch;
-
   meta = with stdenv.lib; {
     description = "LXQt system administration tool";
     homepage = https://github.com/lxde/lxqt-admin;
-- 
GitLab


From e54f761cd99051424f90b103ccd4c54010f614bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:54:59 -0200
Subject: [PATCH 460/877] lxqt-config: 0.11.1 -> 0.12.0

---
 .../lxqt/core/lxqt-config/default.nix         | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
index 20e785ec5fd..191fe0796e8 100644
--- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-config";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx";
+    sha256 = "1ccxkdfhgf40jxiy0132yr9b28skvs9yr8j75w663hnqi6ccn377";
   };
 
   nativeBuildInputs = [
@@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
-  postPatch = standardPatch;
+  postPatch = ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+  '';
 
   meta = with stdenv.lib; {
     description = "Tools to configure LXQt and the underlying operating system";
@@ -46,12 +49,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ romildo ];
   };
 
-  patches = [
-    # Fixes a FTBFS with CMake v3.8
-    (fetchpatch {
-       url = https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch;
-       sha256 = "17k26xj97ks9gvcjhiwc5y39fciria4xyxrzcz67zj0flqm3cmrf";
-     })
-  ];
-
 }
-- 
GitLab


From 2f0a5d14e5d7aa237e386fae8fe1c5c2b6817119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:55:19 -0200
Subject: [PATCH 461/877] lxqt-globalkeys: 0.11.1 -> 0.12.0

---
 .../lxqt/core/lxqt-globalkeys/default.nix         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
index 73248da1ef8..9e74eee5ec1 100644
--- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-globalkeys";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h";
+    sha256 = "14icyik9x47wi3gfkmkyhag26a2ivyc42f4f8qwdgbr3dcg10b9a";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,12 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
-  postPatch = standardPatch;
+  postPatch = ''
+    for dir in autostart xdg; do
+      substituteInPlace $dir/CMakeLists.txt \
+        --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+    done
+  '';
 
   meta = with stdenv.lib; {
     description = "Daemon used to register global keyboard shortcuts";
-- 
GitLab


From 902ec14a9b08e65635b332969c54ad178bd690c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:55:55 -0200
Subject: [PATCH 462/877] lxqt-l10n: 0.11.2 -> 0.12.0

---
 pkgs/desktops/lxqt/core/lxqt-l10n/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
index b836b9776e6..10b767aedac 100644
--- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lxqt-l10n-${version}";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxqt-l10n";
     rev = version;
-    sha256 = "1vk4q98kraq0lba50n9z6jwiapc7nz2b143b4ldlmrz4wscd867h";
+    sha256 = "025zg5y9f286p74rab4yxyz4cqlh4hqjq43xxpi76ma2fy2s03a4";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 95ace38efdf6426c48e9038847f5ec95c463c95b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:56:20 -0200
Subject: [PATCH 463/877] lxqt-notificationd: 0.11.1 -> 0.12.0

---
 .../lxqt/core/lxqt-notificationd/default.nix       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
index 8aea9a6458b..061a8522a6f 100644
--- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, qtx11extras }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-notificationd";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1n39zjczzhqn73vfyjngybmk9w8j1z3vjkaq80rf2hk89vwsm0wc";
+    sha256 = "0pmpdqgnb2dfxw5lirh89j8hnrwwcn2zc64byg4zi0xdvq6qms43";
   };
 
   nativeBuildInputs = [
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
     lxqt-build-tools
   ];
 
+  postPatch = ''
+    substituteInPlace autostart/CMakeLists.txt \
+      --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+  '';
+
   buildInputs = [
     qtbase
     qttools
@@ -24,7 +29,6 @@ stdenv.mkDerivation rec {
     kwindowsystem
     liblxqt
     libqtxdg
-    lxqt-common
     qtx11extras
   ];
 
-- 
GitLab


From 530f8e820b5beeedd21003b96aed531e1dffa8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:56:40 -0200
Subject: [PATCH 464/877] lxqt-openssh-askpass: 0.11.1 -> 0.12.0

---
 pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
index a52ce02cd14..bcc00a0add5 100644
--- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-openssh-askpass";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "030pzys86s7rpgl35kl4b3y7gmv9982j3blmg8927nq4pw61gfj9";
+    sha256 = "16xcw4yll6i9vij16kdb10s4aq2s57x4yjlwv6d8r75y5gq9iiw6";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 9a907dcd6b7f9c97f652bf30f7ce3cdfbb2b861e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:57:11 -0200
Subject: [PATCH 465/877] lxqt-panel: 0.11.1 -> 0.12.0

---
 .../desktops/lxqt/core/lxqt-panel/default.nix | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
index d2faf9c0eee..1a357f1d0fe 100644
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -1,22 +1,22 @@
 {
-  stdenv, fetchFromGitHub, fetchurl, standardPatch,
+  stdenv, fetchFromGitHub, fetchurl,
   cmake, pkgconfig, lxqt-build-tools,
   qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
-  kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat,
+  kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat,
   xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
-  lxmenu-data
+  lxmenu-data, pcre
 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-panel";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y";
+    sha256 = "01xmnb17jpydyfvxwaa6kymzdasnyd94z62gjah8y4pzsmykcr4x";
   };
 
   nativeBuildInputs = [
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
     kguiaddons
     liblxqt
     libqtxdg
-    lxqt-common
     lxqt-globalkeys
     libsysstat
     xorg.libpthreadstubs
@@ -47,18 +46,19 @@ stdenv.mkDerivation rec {
     alsaLib
     menu-cache
     lxmenu-data
-  ];
-
-  patches = [
-    (fetchurl {
-       url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch;
-       sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr";
-    })
+    pcre
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
-  postPatch = standardPatch;
+  postPatch = ''
+    for dir in  autostart menu; do
+      substituteInPlace $dir/CMakeLists.txt \
+        --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+    done
+    substituteInPlace panel/CMakeLists.txt \
+      --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg"
+  '';
 
   meta = with stdenv.lib; {
     description = "The LXQt desktop panel";
-- 
GitLab


From 644938aee91e0683bcc12eec4a98848b63cfd790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:57:37 -0200
Subject: [PATCH 466/877] lxqt-policykit: 0.11.1 -> 0.12.0

---
 pkgs/desktops/lxqt/core/lxqt-policykit/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
index bdcc0a4d606..fca6a9ff1f6 100644
--- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
@@ -1,19 +1,19 @@
 {
   stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
   qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt,
-  libqtxdg,
+  libqtxdg, pcre
 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-policykit";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0sf8wj152z1xid1i2x5g1zpgh7lwq8f0rbrk3r9shyksxqcj2d8p";
+    sha256 = "1hxz5bxxi118g255aqb3da767va0wd25y671lk2w9r1641j8zf2d";
   };
 
   nativeBuildInputs = [
@@ -31,10 +31,16 @@ stdenv.mkDerivation rec {
     kwindowsystem
     liblxqt
     libqtxdg
+    pcre
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
+  postPatch = ''
+    substituteInPlace autostart/CMakeLists.txt \
+      --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+  '';
+
   meta = with stdenv.lib; {
     description = "The LXQt PolicyKit agent";
     homepage = https://github.com/lxde/lxqt-policykit;
-- 
GitLab


From f50e270076fd2cdd9f07d343408e499b223fe5c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:57:57 -0200
Subject: [PATCH 467/877] lxqt-powermanagement: 0.11.1 -> 0.12.0

---
 .../lxqt/core/lxqt-powermanagement/default.nix        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
index d3793a9d928..e5012abed6a 100644
--- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-powermanagement";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0rcjq20ap6kc3m1f2glb8c62qhsx8qh0rkzlj3rykdj6n4hc0x79";
+    sha256 = "1fxklxmvjaykdpf0nj6cpgwx4yf52087g25k1zdak9n0l9n7hm8d";
   };
 
   nativeBuildInputs = [
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
+  postPatch = ''
+    substituteInPlace autostart/CMakeLists.txt \
+      --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+  '';
+
   meta = with stdenv.lib; {
     description = "Power management module for LXQt";
     homepage = https://github.com/lxde/lxqt-powermanagement;
-- 
GitLab


From 2312b0ef475fddb91e09defc8a51b2c871513ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:58:19 -0200
Subject: [PATCH 468/877] lxqt-qtplugin: 0.11.1 -> 0.12.0

---
 .../lxqt/core/lxqt-qtplugin/default.nix        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
index d5b8987bbb8..c5fae1e9ecb 100644
--- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
@@ -1,19 +1,19 @@
 {
-  stdenv, fetchFromGitHub, standardPatch,
+  stdenv, fetchFromGitHub,
   cmake, lxqt-build-tools,
-  qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg,
+  qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt
 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-qtplugin";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "12hyw7rk3zx51n6g2bazlqv70xap0lygm9v21ibxgy1aw0j6iy02";
+    sha256 = "1i1rga0pg764ccwhq7acdsckxpl1apxwj4lv4gygxxmpkrg62zkv";
   };
 
   nativeBuildInputs = [
@@ -28,11 +28,13 @@ stdenv.mkDerivation rec {
     qtsvg
     libdbusmenu
     libqtxdg
+    libfm-qt
   ];
 
-  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
-  postPatch = standardPatch;
+  postPatch = ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
+  '';
 
   meta = with stdenv.lib; {
     description = "LXQt Qt platform integration plugin";
-- 
GitLab


From 1288876ab09a9b1ac90554cdc866ec64b69c5595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:58:43 -0200
Subject: [PATCH 469/877] lxqt-runner: 0.11.1 -> 0.12.0

---
 pkgs/desktops/lxqt/core/lxqt-runner/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
index 8e2332dad5c..0c1f08b34d7 100644
--- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, qtx11extras,
-menu-cache, muparser }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras,
+menu-cache, muparser, pcre }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-runner";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1nsxm0fplwrzz3vccd5fm82lpl4fqss6kv558zj44vzpsl13l954";
+    sha256 = "1354vdaskhch1n8v3kdy15nszgqb1092csr84nbhymzgrhrq1093";
   };
 
   nativeBuildInputs = [
@@ -27,14 +27,19 @@ stdenv.mkDerivation rec {
     kwindowsystem
     liblxqt
     libqtxdg
-    lxqt-common
     lxqt-globalkeys
     menu-cache
     muparser
+    pcre
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
+  postPatch = ''
+    substituteInPlace autostart/CMakeLists.txt \
+      --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+  '';
+
   meta = with stdenv.lib; {
     description = "Tool used to launch programs quickly by typing their names";
     homepage = https://github.com/lxde/lxqt-runner;
-- 
GitLab


From 9b07f61e8d1b379f9a0f6f94b5d7732440abd7a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:59:05 -0200
Subject: [PATCH 470/877] lxqt-session: 0.11.1 -> 0.12.0

---
 pkgs/desktops/lxqt/core/lxqt-session/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
index ba0bb69ce92..d3733950ed0 100644
--- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-session";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv";
+    sha256 = "03gi9svxqsfjhk5ifbaalq9i44ggx8afwms1hb312czqn82wrszb";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
     kwindowsystem
     liblxqt
     libqtxdg
-    lxqt-common
     xorg.libpthreadstubs
     xorg.libXdmcp
     xdg-user-dirs
@@ -34,6 +33,13 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
+  postPatch = ''
+    for dir in autostart config; do
+      substituteInPlace $dir/CMakeLists.txt \
+        --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "An alternative session manager ported from the original razor-session";
     homepage = https://github.com/lxde/lxqt-session;
-- 
GitLab


From f451d92e6e15f0cfe8929bdd0205da38b88c664b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 1 Nov 2017 23:59:37 -0200
Subject: [PATCH 471/877] lxqt-sudo: 0.11.1 -> 0.12.0

---
 pkgs/desktops/lxqt/core/lxqt-sudo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
index 1e235af3c90..8700a768abd 100644
--- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-sudo";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0imy4cs51im81rd0wa03wy418cdv9gqqgmwkc7v58cip7h665pyk";
+    sha256 = "0ql436yb51qwbnj5gbzvqi4rqx4zkmja5rdjs6yavb1x8ggn1jv6";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 9258056a10c5f1942b6298d4f19a1229c6f4a5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:00:22 -0200
Subject: [PATCH 472/877] pavucontrol-qt: 0.2.0 -> 0.3.0

---
 pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
index b8421d06202..918894d2208 100644
--- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio, pcre }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "pavucontrol-qt";
-  version = "0.2.0";
+  version = "0.3.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0k7sg4dxr48nk15gpqlnkjr9gbh7r5gs0s0ydifcmw281khrzlzj";
+    sha256 = "1pfqdzsbygvq77npsizydps25d9g6vgw177yqvmz3cg3a68dad27";
   };
 
   nativeBuildInputs = [
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     qt5.qttools
     qt5.qtx11extras
     libpulseaudio
+    pcre
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-- 
GitLab


From 6ccc34c2ad78dfb022784c244a5cac567dda7d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:00:50 -0200
Subject: [PATCH 473/877] pcmanfm-qt: 0.11.3 -> 0.12.0

---
 pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
index 7c115c2ca27..d9e2a651c3a 100644
--- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "pcmanfm-qt";
-  version = "0.11.3";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "04vhfhjmz1a4rhkpb6y35hwg565047rp53rcxf4pdn0i9f6zhr4f";
+    sha256 = "050h5w1wph35l5m69qbxzvc96y7y0bg1m7flqdadrp688pbnzcxb";
   };
 
   nativeBuildInputs = [
@@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
+  postPatch = ''
+    for dir in autostart config; do
+      substituteInPlace $dir/CMakeLists.txt \
+        --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
     homepage = https://github.com/lxde/pcmanfm-qt;
-- 
GitLab


From 3eeed44419f3ed0e423b4b667be691f1bf64e8f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:01:22 -0200
Subject: [PATCH 474/877] qtermwidget: 0.7.1 -> 0.8.0

---
 pkgs/desktops/lxqt/core/qtermwidget/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
index 66620e195ec..f882088d07b 100644
--- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, fetchFromGitHub, cmake, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qtermwidget";
-  version = "0.7.1";
+  version = "0.8.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz";
+    sha256 = "14yjz6b1l2yd7sfsxjv26yg5153fpyq23443kswkgkd9jh32gxj4";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
 
-  buildInputs = [ qt5.qtbase ];
+  buildInputs = [ qt5.qtbase qt5.qttools];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
   meta = with stdenv.lib; {
     description = "A terminal emulator widget for Qt 5";
-- 
GitLab


From 6556e696ffe47f7399688ca8efd83d19bf76b505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:01:57 -0200
Subject: [PATCH 475/877] compton-conf: 0.2.1 -> 0.3.0

---
 pkgs/desktops/lxqt/optional/compton-conf/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
index 6e1ea128853..253f8112f5b 100644
--- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "compton-conf";
-  version = "0.2.1";
+  version = "0.3.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1hmirhsz010h6a6k7my1krh5nw5ds4x00c5fq6apamrdd8d4zrmq";
+    sha256 = "1p1y7g5psczx1dgh6gd1h5iga8rylvczkwlfirzrh0rfl45dajgb";
   };
 
   nativeBuildInputs = [
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
+  preConfigure = ''
+    substituteInPlace autostart/CMakeLists.txt \
+      --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
+    '';
+
   meta = with stdenv.lib; {
     description = "GUI configuration tool for compton X composite manager";
     homepage = https://github.com/lxde/compton-conf;
-- 
GitLab


From db19d1b4000e222f509534a4286490c98e2e23ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:02:29 -0200
Subject: [PATCH 476/877] lximage-qt: 0.5.1 -> 0.6.0

---
 pkgs/desktops/lxqt/optional/lximage-qt/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
index 3308f0e412b..80921cac891 100644
--- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
@@ -3,16 +3,15 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lximage-qt";
-  version = "0.5.1";
+  version = "0.6.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0hyiarjjxjwvzinlfnfxbqx40dhgydd3ccv3xqwvj7yni1nfx7pb";
+    sha256 = "0zmrpfgmlq005zikyvhqbpip6mz6pfcf9aqjpncyc5vlggmh28ym";
   };
 
-
   nativeBuildInputs = [
     cmake
     pkgconfig
-- 
GitLab


From 4efa48edf0f03518095fa917823034d583074510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:02:50 -0200
Subject: [PATCH 477/877] obconf-qt: 0.11.1 -> 0.12.0

---
 pkgs/desktops/lxqt/optional/obconf-qt/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
index 36490b726e0..e3cb02e8b8a 100644
--- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, openbox, hicolor_icon_theme }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor_icon_theme }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "obconf-qt";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1w94g8jk2j9qrkwg3i6qwgai2sj1m657bbk2zlk9bc3qvzmwxwrc";
+    sha256 = "1vwza1516z7f18s5vfnhzsiyxs6afb1hgr3yqkr7qhplmq5wjma5";
   };
 
   nativeBuildInputs = [
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    pcre
     qt5.qtbase
     qt5.qttools
     qt5.qtx11extras
-- 
GitLab


From 08c6d0e18e605d4419f33ad6469c492696806b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:06:09 -0200
Subject: [PATCH 478/877] qlipper: use src attribute instead  of srcs

---
 pkgs/desktops/lxqt/optional/qlipper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix
index 376b8fb0190..04b0cd3e6ac 100644
--- a/pkgs/desktops/lxqt/optional/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   pname = "qlipper";
   version = "5.0.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "pvanek";
     repo = pname;
     rev = version;
-- 
GitLab


From f20eb21735422db38a2bdad23fe0e22f79e47ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:06:56 -0200
Subject: [PATCH 479/877] qps: 1.10.16 -> 1.10.17

---
 pkgs/desktops/lxqt/optional/qps/default.nix | 31 ++++-----------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/optional/qps/default.nix
index d39341eb05d..e27388fa168 100644
--- a/pkgs/desktops/lxqt/optional/qps/default.nix
+++ b/pkgs/desktops/lxqt/optional/qps/default.nix
@@ -1,39 +1,20 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, makeDesktopItem }:
+{ stdenv, fetchFromGitHub, cmake, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qps";
-  version = "1.10.16";
+  version = "1.10.17";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "QtDesktop";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "1s6hvqfv9hv1cl5pfsmghqn1zqhibr4plq3glzgd8s7swwdnsvjj";
-  };
-
-  desktopItem = makeDesktopItem {
-    name = "qps";
-    exec = "qps";
-    icon = "qps";
-    comment = "Visual process manager - Qt version of ps/top";
-    desktopName = "qps";
-    genericName = meta.description;
-    categories = "System;";
+    rev = version;
+    sha256 = "1d5r6w9wsxjdrzq2hllrj2n1d9azy6g05hg0w0s6pikrmn1yl0a3";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ qt5.qtbase qt5.qtx11extras ];
-
-  installPhase = ''
-    mkdir -p $out/{bin,share/{man/man1,doc,icons}}
-    cp -a src/qps $out/bin/
-    cp -a ../README.md $out/share/doc/
-    cp -a ../qps.1 $out/share/man/man1/
-    cp -a ../icon/icon.xpm $out/share/icons/qps.xpm
-    ln -sv "${desktopItem}/share/applications" $out/share/
-  '';
+  buildInputs = [ qt5.qtbase qt5.qtx11extras qt5.qttools ];
 
   meta = with stdenv.lib; {
     description = "The Qt process manager";
-- 
GitLab


From 546c7e874a744eba62dc51e6953f40c315a00783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:07:15 -0200
Subject: [PATCH 480/877] qterminal: 0.7.1 -> 0.8.0

---
 pkgs/desktops/lxqt/optional/qterminal/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix
index ff59a2d893c..88c4740760f 100644
--- a/pkgs/desktops/lxqt/optional/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qterminal";
-  version = "0.7.1";
+  version = "0.8.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "14pfwii8axyswrkwvfmc2i0a07fjnhpyk3hh06qkbj2w3r00xhyb";
+    sha256 = "1899a5zc5kx7mxiyrncigqjia1k98qg526qynf4754nr9ifghxdw";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 8d7341e10b602ab12d95176d70c794268edbfe46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:09:14 -0200
Subject: [PATCH 481/877] screengrab: small fixes

---
 pkgs/desktops/lxqt/optional/screengrab/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix
index 4bd040c00a8..3c4bebf39fd 100644
--- a/pkgs/desktops/lxqt/optional/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "screengrab-${version}";
   version = "1.97";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "QtDesktop";
     repo = "screengrab";
     rev = version;
@@ -24,10 +24,6 @@ stdenv.mkDerivation rec {
     xorg.libXdmcp
   ];
 
-  cmakeFlags = [ "-DSG_USE_SYSTEM_QXT=ON" "-DCMAKE_INSTALL_LIBDIR=lib" ];
-
-  NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
-
   meta = with stdenv.lib; {
     description = "Crossplatform tool for fast making screenshots";
     homepage = https://github.com/lxde/screengrab;
-- 
GitLab


From 94e02ae507d7ea8b4fe9a4f2e4376627a5b26856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:12:29 -0200
Subject: [PATCH 482/877] lxqt-themes: init at 0.12.0

---
 .../lxqt/core/lxqt-themes/default.nix         | 34 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-themes/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix
new file mode 100644
index 00000000000..6251667430b
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, lxqt }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-themes";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "0f7bipkxkl741lpb2cziw9wlqy05514nqqrppsz5g4y8bmzw910n";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    lxqt.lxqt-build-tools
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics"
+    substituteInPlace themes/CMakeLists.txt \
+      --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Themes, graphics and icons for LXQt";
+    homepage = https://github.com/lxde/lxqt-themes;
+    license = licenses.lgpl21;
+    platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 735ba79b405..9aab17d39f8 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -45,6 +45,7 @@ let
     lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { };
     lxqt-session = callPackage ./core/lxqt-session { };
     lxqt-sudo = callPackage ./core/lxqt-sudo { };
+    lxqt-themes = callPackage ./core/lxqt-themes { };
     pavucontrol-qt = callPackage ./core/pavucontrol-qt { };
     qtermwidget = callPackage ./core/qtermwidget { };
 
@@ -95,6 +96,7 @@ let
       lxqt-qtplugin
       lxqt-session
       lxqt-sudo
+      lxqt-themes
       pavucontrol-qt
 
       ### CORE 2
-- 
GitLab


From b6d27b72716f7ab221242a5cfd7e1179fd24de26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:14:46 -0200
Subject: [PATCH 483/877] lxqt: remove lxqt-common

---
 nixos/modules/services/x11/desktop-managers/lxqt.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index 89ad2882363..fb907618d35 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -41,7 +41,7 @@ in
       name = "lxqt";
       bgSupport = true;
       start = ''
-        exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt
+        exec ${pkgs.lxqt.lxqt-session}/bin/startlxqt
       '';
     };
 
-- 
GitLab


From 7059004883f8718dc99171f6e49460083d4cec18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:15:35 -0200
Subject: [PATCH 484/877] lxqt: remove lxqt-common

---
 .../lxqt/core/lxqt-common/default.nix         | 40 -------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 pkgs/desktops/lxqt/core/lxqt-common/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix
deleted file mode 100644
index cc114c31dfd..00000000000
--- a/pkgs/desktops/lxqt/core/lxqt-common/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, lxqt, hicolor_icon_theme, xmessage }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  pname = "lxqt-common";
-  version = "0.11.2";
-
-  src = fetchFromGitHub {
-    owner = "lxde";
-    repo = pname;
-    rev = version;
-    sha256 = "07ih2w9ksbxqwy36xvgb9b31740nhkm7ap70wvv8q6x0wyhn71gn";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    lxqt.lxqt-build-tools
-  ];
-
-  buildInputs = [
-    qt5.qtsvg
-    hicolor_icon_theme
-    xmessage
-  ];
-
-  postPatch = lxqt.standardPatch
-  + ''
-    substituteInPlace ./startlxqt.in \
-      --replace  "cp " "cp --no-preserve=mode " \
-      --replace xmessage "${xmessage}"/bin/xmessage
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Common files for LXQt";
-    homepage = https://github.com/lxde/lxqt-common;
-    license = licenses.lgpl21;
-    platforms = with platforms; unix;
-    maintainers = with maintainers; [ romildo ];
-  };
-}
-- 
GitLab


From d7366454c41c810acab657386e43324e66b62b49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:16:38 -0200
Subject: [PATCH 485/877] lxqt: remove lxqt-common

---
 pkgs/desktops/lxqt/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 9aab17d39f8..35fe60e2f6c 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -34,7 +34,6 @@ let
     libfm-qt = callPackage ./core/libfm-qt { };
     lxqt-about = callPackage ./core/lxqt-about { };
     lxqt-admin = callPackage ./core/lxqt-admin { };
-    lxqt-common = callPackage ./core/lxqt-common { };
     lxqt-config = callPackage ./core/lxqt-config { };
     lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
     lxqt-l10n = callPackage ./core/lxqt-l10n { };
@@ -85,7 +84,6 @@ let
       libfm-qt
       lxqt-about
       lxqt-admin
-      lxqt-common
       lxqt-config
       lxqt-globalkeys
       lxqt-l10n
-- 
GitLab


From d3763a7164e7c8b1b269add0d0ed1e8f316bbdc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 00:20:11 -0200
Subject: [PATCH 486/877] lxqt: remove the attribute standardPatch

---
 pkgs/desktops/lxqt/default.nix | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 35fe60e2f6c..16e864890f1 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -6,24 +6,6 @@ let
     # For compiling information, see:
     # - https://github.com/lxde/lxqt/wiki/Building-from-source
 
-    standardPatch = ''
-      for file in $(find . -name CMakeLists.txt); do
-        substituteInPlace $file \
-          --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" \
-          --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
-          --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" \
-          --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" \
-          --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" \
-          --replace "\''${LXQT_TRANSLATIONS_DIR}" share/lxqt/translations
-        echo ============================
-        echo $file
-        grep --color=always DESTINATION $file || true
-        grep --color=always share/lxqt/translations $file || true
-        grep --color=always platform $file || true
-      done
-      echo --------------------------------------------------------
-    '';
-
     ### BASE
     libqtxdg = callPackage ./base/libqtxdg { };
     lxqt-build-tools = callPackage ./base/lxqt-build-tools { };
-- 
GitLab


From ef97adf60c3797422f76aafaec3b06eedf4e0c54 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Thu, 2 Nov 2017 10:22:51 +0800
Subject: [PATCH 487/877] fpm: 1.6.2 -> 1.9.3

---
 pkgs/tools/package-management/fpm/Gemfile     |  1 -
 .../tools/package-management/fpm/Gemfile.lock | 33 +++++------
 pkgs/tools/package-management/fpm/gemset.nix  | 59 ++++++++++---------
 pkgs/tools/package-management/fpm/update      | 10 ++++
 4 files changed, 55 insertions(+), 48 deletions(-)
 create mode 100755 pkgs/tools/package-management/fpm/update

diff --git a/pkgs/tools/package-management/fpm/Gemfile b/pkgs/tools/package-management/fpm/Gemfile
index ea498ca7835..17ed0a0cb2a 100644
--- a/pkgs/tools/package-management/fpm/Gemfile
+++ b/pkgs/tools/package-management/fpm/Gemfile
@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar'
 gem 'fpm'
diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock
index 16d7a8250ec..e0c12dcce31 100644
--- a/pkgs/tools/package-management/fpm/Gemfile.lock
+++ b/pkgs/tools/package-management/fpm/Gemfile.lock
@@ -1,22 +1,16 @@
-GIT
-  remote: git://github.com/peterhoeg/archive-tar-minitar.git
-  revision: dae32ca550a87dba32597115ae18805db4782ebe
-  specs:
-    archive-tar-minitar (0.5.2.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
     arr-pm (0.0.10)
       cabin (> 0)
-    backports (3.6.8)
-    cabin (0.8.1)
-    childprocess (0.5.9)
+    backports (3.10.3)
+    cabin (0.9.0)
+    childprocess (0.8.0)
       ffi (~> 1.0, >= 1.0.11)
-    clamp (1.0.0)
-    ffi (1.9.14)
-    fpm (1.6.2)
-      archive-tar-minitar
+    clamp (1.0.1)
+    dotenv (2.2.1)
+    ffi (1.9.18)
+    fpm (1.9.3)
       arr-pm (~> 0.0.10)
       backports (>= 2.6.2)
       cabin (>= 0.6.0)
@@ -24,29 +18,30 @@ GEM
       clamp (~> 1.0.0)
       ffi
       json (>= 1.7.7, < 2.0)
-      pleaserun (~> 0.0.24)
+      pleaserun (~> 0.0.29)
       ruby-xz
+      stud
     insist (1.0.0)
     io-like (0.3.0)
-    json (1.8.3)
+    json (1.8.6)
     mustache (0.99.8)
-    pleaserun (0.0.24)
+    pleaserun (0.0.30)
       cabin (> 0)
       clamp
+      dotenv
       insist
       mustache (= 0.99.8)
       stud
     ruby-xz (0.2.3)
       ffi (~> 1.9)
       io-like (~> 0.3)
-    stud (0.0.22)
+    stud (0.0.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  archive-tar-minitar (>= 0.5.2.1)!
   fpm
 
 BUNDLED WITH
-   1.14.3
+   1.14.6
diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix
index 4243651dd25..26450bc3612 100644
--- a/pkgs/tools/package-management/fpm/gemset.nix
+++ b/pkgs/tools/package-management/fpm/gemset.nix
@@ -1,15 +1,6 @@
 {
-  archive-tar-minitar = {
-    source = {
-      fetchSubmodules = false;
-      rev = "dae32ca550a87dba32597115ae18805db4782ebe";
-      sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd";
-      type = "git";
-      url = "git://github.com/peterhoeg/archive-tar-minitar.git";
-    };
-    version = "0.5.2.1";
-  };
   arr-pm = {
+    dependencies = ["cabin"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg";
@@ -20,50 +11,60 @@
   backports = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k";
+      sha256 = "1agsk23kfr194s690jnrpijh9pf3hq4a9yy66j1wzzj2x19ss9y0";
       type = "gem";
     };
-    version = "3.6.8";
+    version = "3.10.3";
   };
   cabin = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06b5ri2629ad9xjc419xswz17zli90v8x640k2sd6v2yb90zkr1b";
+      sha256 = "0b3b8j3iqnagjfn1261b9ncaac9g44zrx1kcg81yg4z9i513kici";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.9.0";
   };
   childprocess = {
+    dependencies = ["ffi"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1is253wm9k2s325nfryjnzdqv9flq8bm4y2076mhdrncxamrh7r2";
+      sha256 = "081hxbgrqjxha0jz0p0wkncdqawdvlsxb3awsx195g0pgkpqrcms";
       type = "gem";
     };
-    version = "0.5.9";
+    version = "0.8.0";
   };
   clamp = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vy6ghz9l84qazlza30z0dwwrlifc5c7akgrl1v72ivmmjga45hw";
+      sha256 = "0jb6l4scp69xifhicb5sffdixqkw8wgkk9k2q57kh2y36x1px9az";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.1";
+  };
+  dotenv = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv";
+      type = "gem";
+    };
+    version = "2.2.1";
   };
   ffi = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nkcrmxqr0vb1y4rwliclwlj2ajsi4ddpdx2gvzjy0xbkk5iqzfp";
+      sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
       type = "gem";
     };
-    version = "1.9.14";
+    version = "1.9.18";
   };
   fpm = {
+    dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ids20mcs6w8nf4bpjj749ayc7h637kqx0pdw5d5a0yzik34daaj";
+      sha256 = "0yvp9cifzfrxv3pr1kvcvvnyrcz8vxf6yd43hg5blaick50sbm23";
       type = "gem";
     };
-    version = "1.6.2";
+    version = "1.9.3";
   };
   insist = {
     source = {
@@ -84,10 +85,10 @@
   json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
       type = "gem";
     };
-    version = "1.8.3";
+    version = "1.8.6";
   };
   mustache = {
     source = {
@@ -98,14 +99,16 @@
     version = "0.99.8";
   };
   pleaserun = {
+    dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s26216ip6skzbdl48z8wbrzqbvwq1q4s6sm8r209zvvlp0rinkw";
+      sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p";
       type = "gem";
     };
-    version = "0.0.24";
+    version = "0.0.30";
   };
   ruby-xz = {
+    dependencies = ["ffi" "io-like"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw";
@@ -116,9 +119,9 @@
   stud = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1raavxgn5k4bxap5wqdl7zmfw5k4ndl8aagnajlfg4f0bmm8yni7";
+      sha256 = "0qpb57cbpm9rwgsygqxifca0zma87drnlacv49cqs2n5iyi6z8kb";
       type = "gem";
     };
-    version = "0.0.22";
+    version = "0.0.23";
   };
 }
\ No newline at end of file
diff --git a/pkgs/tools/package-management/fpm/update b/pkgs/tools/package-management/fpm/update
new file mode 100755
index 00000000000..22d1e52e297
--- /dev/null
+++ b/pkgs/tools/package-management/fpm/update
@@ -0,0 +1,10 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p bash ruby bundler bundix
+
+rm Gemfile.lock
+bundler install
+bundix
+
+if [ "clean" == "$1" ]; then
+  rm -r ~/.gem
+fi
-- 
GitLab


From cb59cfc5135a63d3f4ea6f01ab55b30105d84470 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Thu, 2 Nov 2017 12:00:57 +0800
Subject: [PATCH 488/877] firefox-beta-bin: 57.0b11 -> 57.0b13

---
 .../browsers/firefox-bin/beta_sources.nix     | 762 +++++++++---------
 1 file changed, 381 insertions(+), 381 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index b66d3192fb3..23316dc3aeb 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,955 +1,955 @@
 {
-  version = "57.0b11";
+  version = "57.0b13";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ach/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ach/firefox-57.0b13.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "298e523e55916ea7c6fb31ad383aaa6eeb582440aca98519d6abc3e44201b60f3e382be7947dd434b47e13f7e2d2c88b62009bbb4298a7085d0512307d37b4ea";
+      sha512 = "051daa6d23e8d9559135f89a871372ae69ebb46c143265f72d85a55c5edbdc927fd2be25869815cce3ecb4bc5a4245f6bd3cfec2317e727c632437f377552793";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/af/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/af/firefox-57.0b13.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "00e31d736101e3cd5c8f1b999f9b4342369bce56c061271e952022459e80ea8b77ca356cdf28ff0255bf09984caa059ee0e62a2dc0f2cb31f1156224e7eaa4ff";
+      sha512 = "b9b936333fc86f3ebf34dfc05d5277a6a2552b427fa26a1e29c9fed93fbcd76c533c3543b3356ac61da808eb5154d83d40888c19a37003dce88c4da64fdec7f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/an/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/an/firefox-57.0b13.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "7dec20660dbd4bf0a88742b58f4282d10b8f8778aa8b8b2b7847485039fe266b2ae4dcdc76ff1a37a516d2f0c16a2db2c2fbbab1e79d6eb8a79c63561da2539c";
+      sha512 = "ed028a38d5360890f57617f8e0d9e02c578f7e786e78de8f2b8a3b96d0915d3369dc398da71d387761f56f6371d3047c63f0d39131e7dc7cdaa9cd6c8dd22abc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ar/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ar/firefox-57.0b13.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "05e8c1271f5e3f297e927bd08ef3308d57067d18116b98010c3cb2025e7b0a9ca608d046cd592a4afa3949b9a3244127a44ad90e89ce4b651397e95f5bd4a29e";
+      sha512 = "ede95e488ee234430c3694a14c75ab116a29b91d9a1ec4b0676f687ce5a175122758815dbec69e2aaab0ab8ac91181fd4e0fdac545dddc0b1e3b4e7c81ccb648";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/as/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/as/firefox-57.0b13.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "fc2986315e7514e51be8ab082be42be9b7f7f878c0c1d7cbdf36f3d7b5dccf59a39ea44329c3aa9afdd7118a29706308118c89937dfdd3d8f6109f8722c5646d";
+      sha512 = "9e27132b8b1d0665cc88951ff24b316142bede88677dfbf6bd43ab147db8dd2b7ec44e830d152a2af48805e2a2de1b8858f4ceb0e8ff96d65c7cb769c0463d92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ast/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ast/firefox-57.0b13.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "8dc4d3aa8935b61f90b21a059a97a6ffbaa90f13aeeb204b7eb28dd0ea33b899934ab162b7ba8ea00cd3c341d0f61de30ae2b3af052cd420246a891a2d902563";
+      sha512 = "4e458e8dc02a226e40314bbce9771330a378536c7176e5f2e9ccfd0f0998d61ce33b234228226156abcd87aac88c01c740ccd7b0590863f6f1da44bea3b43af6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/az/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/az/firefox-57.0b13.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "9fb126c09f39b6c943fcc30636b19e3b566cb5fd78b1ce68ae78b1c94d68198bfd391bdab6474ce7d616ddb114b5ff7bf54caabed94e2e3dc4557c95832e1c8f";
+      sha512 = "90a283a92da98ebc422f78deb01793888f9df97bdbb17f5e0f9045ac5f61eb2e4ae9ae706026f043535c2399fa476509af9d358093a92cdc344883e40bc4ed03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/be/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/be/firefox-57.0b13.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "ba5250a70bf92c555f87fe2376c6c415678e5d065ae7c0fdcfe613a53119173a7231f5c711dc1451cb6fdd77a94c5077c98019f0441f0f0ecb97ec16aed8bffc";
+      sha512 = "b16136b9d37ab3a563b9c90be7520430a89c204bab6d9e616939ce88f4d56c395a7670911361f746b9ac62e802e4b791b60ea1e77335c56fe80a0bd27c00fb14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bg/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bg/firefox-57.0b13.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "aa38dca42bb1ed7472e10db04e4346918c7d495c24d484a9182c8b1651d1ae2f68188d12f133581a6b1a7463f559320283ab0877b2c51a1b93edb195706a1ed0";
+      sha512 = "7ad46009c3101e05b0285862f61067e68c50a202c4889efd138438721487ad21ae68228b9fa82162730fe41be297206831d5b4f8587c3243397427192f4351ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bn-BD/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bn-BD/firefox-57.0b13.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "11ba74486259041c06dc0c806c6b21332fbddfc525eaadd9a6eb37b1a8498bf25bd34b42155f642c8daa840040dbaeebb0721b541239656df4fe518d1cba3aab";
+      sha512 = "24650ce5b04485512f7af58b0c0428f9aa442d28d614a2dfc2e427e33b35e442d0310ce3212a0750bbc0e5ab79aab848218c140edc49b7be456fc2f7f33b01a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bn-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bn-IN/firefox-57.0b13.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "25ae74c773a9d525497c9d0c7d3e14cafe490fc8dbcd363f7daa102bbddafe06c4999f84847545da5c8dd974528613a5c6e1468b323f60eb0e3ba79e360b88a2";
+      sha512 = "9c48ad3e4081edf3c1b973f161fb9741f2f37a125ba5e63599698100c26f529c727fcb828696ac3b1f54fa299502cb4c537f15be6c696eaf51452c1cd0eac61f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/br/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/br/firefox-57.0b13.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "4f3dc389261f384238fc622d5ab1059cca0a5a4eb02daad0233bac7addd118bfc2c4c95a5bf5b7cf66053b049bc3150358593eafeb5026be47d676db212aeece";
+      sha512 = "022d5dc1a4e4906375ca2b425d86636ba6cb91b5bc60459938e9e77341c886c4aa7285f4b52e7be221149519bd3bf72d1b4540a7c62cc347e2beac9de3d6c953";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bs/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bs/firefox-57.0b13.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "91b13a19dacd457db11f78955bad518c2e590433ee1951e2951566f6609293da7195940de7daf97004021ae5229e887bc3c52832be21ae514c6a4afff3a365ef";
+      sha512 = "9e4e388f43404eb98e68349ae95bf40631fbf33670d4a9200f60d9ab25f8dc2501d4fe1aaf6f95d9ade80d790b1ba53b78ead54f2cac45d7a2c2d85e505a1455";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ca/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ca/firefox-57.0b13.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "037eb9153e9f05a0c9cb2d80f39ae08ad8d425f349753ae2113e6a98a96950c6ddf3784fe2859383a5ed8a7450de02e6c2d344e20b851923c91576ad0d2de9b2";
+      sha512 = "3c7e6f9c11ddf88900af2eccf8a22524f6cf74e5ac27464f8b4ad19849ac30220bc6eac03d79e22c349eba9e170ec379071b258d6bc80e9178dd1ddfe0aec965";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cak/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cak/firefox-57.0b13.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "990d5f8637d4386e698cfa070118ef1e39d77065a54ff8293460caecf319707402e1f043c3ae9a46a7a58e2ddeabc312708cde361709835453a22d7826a46d1c";
+      sha512 = "e5f9e7bf7145f2b33a0c59de6c576f82bb857ebe85335f218cd03ba005816c3e8e8fff03d5b6534885d796ea523696423c70035e62bb6a32bae4e4b7c1d79c71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cs/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cs/firefox-57.0b13.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "50422d5a16c205e10c1657eacad657403836ebeb5c1de656e12c4ad7b65776f0377faf55c6ea5b586be8f8694ee5952c289257d119aa3fae1860d5565f89643f";
+      sha512 = "7e527e7bd04cd6107ec92d27f0705ebcf8da8117c84e61e13c2026dadd2ac3a888c9e3bb86f51026f19b10d06365bb41d48bc4fcbb08d09a88b3bb01e9637967";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cy/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cy/firefox-57.0b13.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "a78d86f637729089f5cf86778032c8093f07b03974a32444b1866f25a286b7e903630f3e836ef12a4c9df6025037885b0140a39680ffa6e6473f023fa3153155";
+      sha512 = "287df6655c9793da325681baa13fc4c0b9a5975f0b13be38d8875838a762b2f435839ef5893c6b6a3439c225994fc64060f69edf349d2a9d4fd2d225e95fd1c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/da/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/da/firefox-57.0b13.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "50eaa3e29c322af80df70c3a52df53698c984187b8f8db86cf922fb38d61bea65dda2ecb6d6889a2f1a07c5f8b0d6026590d37c71df74068df0403f91998a584";
+      sha512 = "8d03dae91a9cfe20091a2222eeb0bd41f3b3541c5ef6520a17a32187974daf8584e1d69017cfb99d2d18224ffb287f586bdf1ed678981a6b6a3d16ba9ba4a2e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/de/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/de/firefox-57.0b13.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "213227706f35dca646f3938044387aa42097d131cb6a2f361ec5d114f2c78b37b2298d9de3b289cd504c6559f37758324cdd7e59e5535caf3f8b8c8d71e701f4";
+      sha512 = "ef084c0d0efcb77cdef1ffc0cb994ae6c6a9484c36282c7d9914b2d3e8599c8f2e9623cfef1e890a7d4c4feb6fba1c091937877ae8ea1d654a9bc824b5c8bf12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/dsb/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/dsb/firefox-57.0b13.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "67406fe340fdd8107a36755bc75b05560540421cb1000b47d89a6492c38c0904dda5ba17686ec01e1f77a0f8b6a52878042a9f0d999766847eed54fcea0ee470";
+      sha512 = "e08b193db4230efae96862a6a9b62200c42b03667c3d5a905938375391d99eca37716cbea561341ae76547be0b5ee94475f9ca9faec64fc178be92236a4ac91b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/el/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/el/firefox-57.0b13.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "60a67bb618aba13377c10e3d798fc370e633070c30d50e7180244667449308ceea4571e7a997c80af80ad027e27074f6b3fc670e5253f6159ed10653f8abd798";
+      sha512 = "db49f80f7c08322307dc5cd225d2dc10a3179ce4ce25723264679c1c78454fe1c701ebf218a34704946a1e7d042349d0fedfae5b70b1c68b5100ad7cd4ae4900";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-GB/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-GB/firefox-57.0b13.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "4bed5620eb52e080379044e3785a318e131387181748414367b02a5b6dd2a4dcf43b55a794d9add241b5a438a79ecf1cfc15eeeb82d6c188baf18914d722542f";
+      sha512 = "b2cc8bc706e89390b500e6e8e3bd548417af1b0500aec7ed1c0ad79245941e20343cbcce80b03a2c885c7134c069e9f3d459739e6ea2a62c217a9f4ddb8851a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-US/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-US/firefox-57.0b13.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "85d751cfc31fbc330292aebc1fe8e7563d726a91242708b85104dde6a8043726e647628ee084b71c3f922eb0d40cbd7e1381a9a1b47aaf641edbd7401f3ec24a";
+      sha512 = "621828144f0421ac2a3d5af1cf62a337d23409d26032d4c2518e99b0d04caebe1efc67c50f2b692612facfd5927cb0b51d9acceeecf9fc4c2129e6a899c9ddb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-ZA/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-ZA/firefox-57.0b13.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "ebf2cc4e016e3623e2cda742d468fb0ebf0b6ff05c90d32e9eb5bad131fbbe12c46e667a21d1f446eca897ee65a8ec7ebd59b56951cf12e5ee44ce89e7bc147e";
+      sha512 = "4dc4822fbc6d3027b9ba0b93b126e5223675c69c9e36c22e85681ca02c97fcfb9f9ef7dfa281dabec32b93ef8cb619ccb74ca18a3ebaf55f64c5547f5cb97c08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/eo/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/eo/firefox-57.0b13.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "e3719652420eb97abe0097aed9736370dd55c572e7745f862d4b031fc84e84611f0c08bf8a2b7fc830a6759ff73183b02269dd7cd1b9eee5076e7d26155c77f3";
+      sha512 = "8eafe225337ad597afdb9a90caef3a252f9f467b6d0988f63d92ea35f5d284431c1ad1a29350d9cdd83f5108649d4cf05de50706025f8b2e2db55955bbc8f964";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-AR/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-AR/firefox-57.0b13.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "4cc08c7b8b242d671ec85dc46761f546479d2e207628d68de4186ac48b619013ba39005ce3b67ea08eee6df8ac46effececc83c8fe5cb2f184d9d56d36f98f41";
+      sha512 = "f9837bc84534f1d35aac94c0775fee981b9c7e5031bdd2c78b5609406a73cefa5797282aaf122e2eb772fae7baa0dc0714413c1b6d7255145fef540c31b89183";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-CL/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-CL/firefox-57.0b13.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "5c6f753e119198ef1633a1a7039199f00c891d43ee5b49b95a4a1e8d5d20ada55ae03ef30e380fa50de4b777d4ad9dd5aa8bde9d0186265a6af9d7c277858ebf";
+      sha512 = "e7fd613944dfdeafeee8877b77cb78844b1bfd1d5469dcfdbd90b6a0ea08c98f4fd9423dd18ae1333b90b5717f800a446f8d237de34a8131cf89db602b72a846";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-ES/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-ES/firefox-57.0b13.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "702ec0d89777a6a9c4a54a9542a0d2e89b352643eb5854db83600a7a93ca41b5d811de21d1de1f33c976b9ce5b19492d2fed12be1f570aa66dd09d21aebdcc5f";
+      sha512 = "b571a99b0e11c8b4fc202cc720f2f0850b54978bb98ca9a6fff2cfdb6c853c74ccb8f9b49cb14649cefeca5768ee408e6ab8028bf005be0def9c519ca8d14108";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-MX/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-MX/firefox-57.0b13.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "2066be080187a297a2156d9953de0b9c38ff4c18e509f56884f596e37ef21e4a832bd0644f4e2df872d22a6fe3925b72b0548187d64e88974cfd50f9f1c18c54";
+      sha512 = "fa46b9751f8548ea3724867a2d41cf9aa62a7416fa06ab63a4f59e24c45a5bddb84f982049d1cdb4d0ef3318aef46fb25f494cfc3be203165ba125234c9619ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/et/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/et/firefox-57.0b13.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "0ec67c6a1186fb686f67075dbe1f07b34f2a0f45d3631b7f6b3a144b7d6ac89bc7d34bf98088826cbd908aa05a38a410fbe32135203595e604483f465d4f8af1";
+      sha512 = "21b6cb415d45f53f8c5bd63a463be60ed05f55604d55dcfd0587fe023653d4736f1945f1f5d96bd97718b8ef492fb2901fe883ed522db4d9edc805af0c118013";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/eu/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/eu/firefox-57.0b13.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "2da25d33b6fff7bb463b65a866ec5bc89a39886e66022dc9b0ce7752d962cf3852158f1ef79bf4df0d7587729e295637b9c27c99840e3f2dc0ebaf6cbdc7a3c0";
+      sha512 = "9e341110f6c2d52182faa95f032090b2904d734efb7f4472f87ba77b6604287ebe21c7b1502f71e107e285578cb6c0da6dd95b45fd27bc28a16c14735725d22b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fa/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fa/firefox-57.0b13.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "d3e17c82f7020af45b50215f39d78826a5072dd94be5bf3cdd61ed7f67a45593765efd7f65b071ec3b00be86f90ed65f15bd6a5bc2a4906c2eed9b0cac23ee6c";
+      sha512 = "15085dcd3803767b4161fb6b3e55af4c29dfc573ff2ed24dad02eaf001e657e3ec8466e827df472cbb89a442e33641ad422f11b7d663f1944a0f5d2fb94bb305";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ff/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ff/firefox-57.0b13.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "2a17680f7a595a35aff6f2a6a25eb9aeb8497ed7ab2cd2cf95e1894ea29cf99fd3c222144e3a0feee660cf0fc31d21c54d572483544267c8bc5312f0b31b9c3f";
+      sha512 = "ccb9d489fb9211c9cabe344c65ba165f0aaa4e1217e4c60860c96e7d938532d1602a4c6d885ab5c934c744957a060cdcfa4203c8d93bdefb4f25bf938a4cc1a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fi/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fi/firefox-57.0b13.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "a54e8c300ff17a0b2f1124b5c637fc2b07f47761b5df71e219a8bb77b21f67542b19ab6051bca5c542cd30bd3517817fb5f44250990d683a997a6f9d925f6b93";
+      sha512 = "306668c5cd48f4c0c81e2a160a6703c43ab93d79cec7c9b754425faac9441edd5cddc1bd67d743e577a5c7aa2db39dfb2b5a290e983713c8de780e6596a720d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fr/firefox-57.0b13.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "50a58b205bd0d7ecddeeb4011ac9c499b35b32659f567cf27954561dac91b6bbc2a79e37e19b1fec07aa7459dc114d4cb8641847118fe50efd7d6c98e66a6203";
+      sha512 = "099fcd14b1cc7429c7cc4330aa7a397c32acd28006732d272a89c2a6f5c7b1a0a0529734e24fad308c26fdef6418aac2d1b386d7e7dec8ea19a12490cfe53e50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fy-NL/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fy-NL/firefox-57.0b13.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "22025a263c986be90ab5dc05138c2a8b58108bd39de83fe8266969cc1742358c2cd0730315904a1a35adcab94bd499e8d688d65920c346c28f76b650395838d4";
+      sha512 = "688f6d9ccb1a130181e154ed75ffa71069348f82bc20ac649e5aabf69b31a65ba022b3a28d2149a63941bb6287dc8e14946e2f7d9d5ce8f89432c2a32f5095a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ga-IE/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ga-IE/firefox-57.0b13.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "a1fd88907a14be9eda4e392762dcdcb009701baeac908a4cce664c8dce3c6957cc889add929b26fb48e592001c2e6e1f34ced9bbe137b0ceb7d230dbbc102f3f";
+      sha512 = "fdebffe1190222cd5b3955e54aa49286166366d910f1b4471ee36372abb7d515b22a48fbf2799abed4943b2a3203c983d0906cac6b5652f507c58778e8d98ff4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gd/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gd/firefox-57.0b13.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "eb8331550bb43251a5d66c5f108568de1fed964a8360cccb9426b6d163f47764d34c79224026c058aefb2a526475c6b406fc1717a588a61c65d73098f217df8b";
+      sha512 = "5a957ebc86c7e305afb0e0f9e91f2c73b52b7ed2b65ca8c372cbc0666a86e809494e7deaf5ac4caaedd60400e8a82dd9e3773ec3aee04daebffc7c91a2586b08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gl/firefox-57.0b13.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "e7326fbe2c6b9e10a3fae76d27ec0de8856f9aef95a31db1ae5481ea43d895ccb220337b68deaf8a76fd110d6d1f74209dd27e8726ced57a635befb8e27c0e7b";
+      sha512 = "024ae0ddc5fe5590ef8ed4153e298b5a05dba17fd5a4d6ec78777969841cbd284908d7c19c36f6290efbc5ce1248c3f24c0cf4418f524166c1407199a6b5de90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gn/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gn/firefox-57.0b13.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "cb81a34ee5f87636b5519c9804f65d714c5ea4406a05c465c5ee2bc29381e8235a1788111dacc78066e420f2583f004b3dc4841df9aeef848dc7a48accb3c9c5";
+      sha512 = "e6b36e68cb07c4563b350e4af1fe511ddd69ec05fe027809f5561a788b2fcd95c88bc8eb8d67618bb1769f10d11a75898374a433185de49e09554eb948b2aab3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gu-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gu-IN/firefox-57.0b13.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "e26a80e9aa0e72892d79d0cbbee8473208342d3bd966cb034fbabfa6c3e844490184089ead6dddcd2f655c1577b66da239a24a636a651a8ad7951478e3dced9f";
+      sha512 = "c8e3f732c6e91893f07821a2cd9d18e3c5effe7551434cc311455366faa5891afdd25b6d83b5e4c314f3d4f5c01e499c5d4823b332a120bc07c979dae8f171fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/he/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/he/firefox-57.0b13.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "13814b3b670a92013c08dbc8e37169fe758e378db0ac464f9b1d061ef5ba48063a1bc9284686317f4fb5b791a133b773bfda4db2ca25a154da258b81e2ba7bc7";
+      sha512 = "a7192f190a83f5d3d1f300a072eea4396397fe02623daf9bfcd6a73ad2b8e89884723d9596f0be2d3da655fd937469f08d65e39037e3b7168edd28c8c23c10d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hi-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hi-IN/firefox-57.0b13.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "51f0fd4d50751559e0590340da3f3561f3526792965aa9cd86ba2b83866ac3342b5b4b225da2f2a2724b937c7ea00ea16881f27c8bee3deacebaeabdcc446c3d";
+      sha512 = "30a355f58c9419472ede2713101721509a8c86c6c363693c256553cd64800572cf0eb000c8b2bcdfa788ea8876cbf6b7e8a86282ae1726eff4bde93dc8b33a1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hr/firefox-57.0b13.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "fe9febf45bb0b79c131868a16a4139a7e885923eadd8ec07f0aa5262e66c06c5c188d4e6b8b4d6164bb32195f27330abc199b79a8d2a524fe4699f9c02ed66be";
+      sha512 = "fff70e068a744e89e28ede72398d60b83decbc908c6776b23d8e532b4630a9526411a62572882a596241a7b6b6550766f3ccf99a5d044d7fc14afa52772ee270";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hsb/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hsb/firefox-57.0b13.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "fbfaa755ed9ea1f86f1f27216fa6925957b3fc48ae847534ad289361722e8c70e28beb83b9b30a447c0acc06703fd2642c652a88ec8ddd215dc3538ea0baa819";
+      sha512 = "aec6950ed6cd9b357bdb63e5edbcab7b42e76a72e44ec370380d2b5717db585da8060620eba7290880020b1e6325f134f001163f2ce7719c50b83e6a5a2fbc91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hu/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hu/firefox-57.0b13.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "b51b7ef5f2b0ed15796abffc299bf633af897393b17d12b2cd6dce5bcd6fb9165c2ee001b44eb89b91e68e616b2265b1fa307d90e68e35c34f425254a0135dab";
+      sha512 = "912b23344f96d37bdf66775ad933ac769e19818ccd178a6ad97b815228670c053111dd623fb98de382e2c2d414414fd9fc276f4aee5a00a439dfe235452fb16a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hy-AM/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hy-AM/firefox-57.0b13.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "b2f781a77542c754185bd4f3aa040eb0d0aabbd773f27a422db87c8cb0cb60d1173c5e32e02886f608e03f2ef8ff84dc8a3cab7d55305fc36d9b11b96ec11485";
+      sha512 = "04b2e8ae9de10cdc2aff751c5954f190ec749fea27ab265343b73d762e6e9ef6d96a7136cd9354988ac791ba7bf32661b5658fb490f1d80907505923bd7a70d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/id/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/id/firefox-57.0b13.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "6e251aa02c0ec21272cf8bc4bbccc9e8d3b1d512a0a1bc90ea90e4d3844fd90c03989b102d9129348ced8734a40576b2dd294e8a85422e215b01b025e48180d7";
+      sha512 = "834087d98921683d0ae7216b6264c7dd7b77568b59e4739a7464f065328d3efa8256f03e9343177673ef5257db142466e3803936ec30a8f6902999a71c0ad163";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/is/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/is/firefox-57.0b13.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "5fe16a677f6413b0229c67b46e7831fadc0a9ef04395ea7c928d1149fc262cb9f28bf3c40b7d57eec09fd821a37286177a19f1a608a062b84ab9d82897560994";
+      sha512 = "2a8f3b35f7c1f8adc40504c3460139ae7959ca9657f899fab9e73eaeff5d983996a33d284d058599406d4d46ca941cd9969a7e6152650f6ecf6165329bf2f350";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/it/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/it/firefox-57.0b13.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "f0ed83b63ea8df081f9110b5e8a5f848e9b4e89ff5ad7ee685f9792fa4438cdceae34b0e1bf265454f966f6a6f9d00bf47d665e6553c3c786bf48f4fbceefe4f";
+      sha512 = "6b04fbe6ad821a68d7bb968836d047fa08308a571fef1d5ef82d4719841a7b517362f706f4251d4d60fb084c06af9ebc671a8c131e5a403a21ad9190d84c5789";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ja/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ja/firefox-57.0b13.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "8e9d0e446bd4b46b267001f1d24563ff5eb064bcb72be2ff30f42834d91658664e96683d680ec03fb62b8ae3f5e6d68b4a18800d6f4fe1b93692b1e4ab7258e0";
+      sha512 = "9dfae62887b03ab6a963547c1f4c4332bbc4469bce62318fbdc439130c65677e9e0328942b49b37d251aee45b56f474aa5e1ef487244ec61561217f1e7f2bcc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ka/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ka/firefox-57.0b13.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "b557a2da452b41685e4ef61dbacd8a4563c4016b16946e197eeb60f39523dce87942f38659047a284ba2f8dc78ebd4ce5d377a86d54366e0f0c49176e29b3255";
+      sha512 = "8f1ae26d22d02bd3a1aa21cbcd750e6003f13fdd1aadc85114485cccf59f300b962a729016c3dd1611b8f32333422318ca806b7dac1a790c11749c909908840e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kab/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kab/firefox-57.0b13.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "cab2e7df696e67a290aadeba8553e65880156f33b4cc57feedc971517496e8a8beb2ada6f8dcf4fd963a034cae4bcdc03bd970c6a9b27af720f64ce1aa9bf8b8";
+      sha512 = "28a00d36928bb60a2c65eb9e3866b8ec1fbe76973fcdcad78a6f00aa601e4990c1ea96c37984171577400dd511937011957e51e4996fa64db0600c0c3cadb810";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kk/firefox-57.0b13.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "ea92799a2896013796459e8b8e3f5cbb8e2da528eda74091d22c93fad5791d8669d8f092842090ed5ccfb9ee39e7c09b44502c752d29a956b5e9cbc793ff74d2";
+      sha512 = "76361b378b4b2bd2a1e31caa344491868188155caa57317f46c9f89b9a77df5ea65f2d4f8ddd2e8cc574e602fc163c4d671de932938ffbb64a1e68a7fb51bd51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/km/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/km/firefox-57.0b13.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "76f3d509693148cc94949a786697a6bd3bdda894bc4692715e33397e24aba446d94f9e364e159c4504bc0317adba5388ccdf3698f1226cb0bfa6bee2f00fb4e0";
+      sha512 = "abd176c702ab4f1e829e23a4fc4bedba45724ad119d84cd18a6d7d2c8487aed690702709312f5806f2fbe82076215e55e3e4de3cc8cb56b33079d4ab7e2921c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kn/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kn/firefox-57.0b13.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "3de7da4fa42a74b0187dec9b28cea76e3ca1bf80827f374bdf895461477a67478761c2059572da14c1e5660586a07239ed22d066e548c5271ab563713a3e0ef4";
+      sha512 = "62056efe59a3acb2fdd04eaa343372b7b2e1f974485ca7f122d6cd9d7d67159f2a4361aa01c68cd11a93cc56d807068842b735b74e596b5d218c952f5e318658";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ko/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ko/firefox-57.0b13.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "fbe8b5a9a196a08f56408f57eaab71e3bb7ffec53bc05c4db0bfde4478267975aac5b876923c915a0a182d54fc1bc99f6361117fe659cc9e998e98f3a9aa122e";
+      sha512 = "d1772efaaa2e2f42bb01d5ac39187accf59a235327d5d159866c5b80d7d54a867aa496d63fbf23737d52b976f0be8c35bf5f6045f0d69eb5d5af5e67b6202eef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lij/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lij/firefox-57.0b13.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "031ec2684ac7aee9a02e7aba789707b8aa6937fea27e191612b7cac6b0aa7bdf996c3f3cac1379d7ccce0a53701238f4379d691f29e2d4ad4c5b27a518d1d2b7";
+      sha512 = "a45f3f8181906382f3df68abfba8682fb43db58fd7b6846eb3b64eb67e6d57971cb83ed6c74785e19807be06dbfcb7b003c67b800292cffcbb1b42c812bb034e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lt/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lt/firefox-57.0b13.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ab056e37c0159b7b62e4d20e6fac5de190c3e7b53919bfc29cadad90c664c800e233abae58d1e7c1b8ded76af6da7603ea187da6510bac904bc2d32f9f37feda";
+      sha512 = "101d43ee97cb635073ea9bea836ac0aaec514fb5b4eb9b821df0f48d527b89745907f557a96339c19ebd152639d9a4bd745396bcc97c94e69579b177f9c1d7ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lv/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lv/firefox-57.0b13.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "c4a498bd7832c9ee93d0d98730c962176775b347e95241e0e307a97e8d53fc21dd943143e880f994d81d4fe15a7d24a480a07ed41efc10d1f816549c5b37ebac";
+      sha512 = "74afad1dea785fefa379c7eee2efd0f38673a632b9232102a02e8fa7591f89b0c58447362205b23638b54fbdfce90a813c111344ab4569f57b21bf3e3894b4c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mai/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mai/firefox-57.0b13.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "81f85952c2966471f4c74fe7092b7b614f33130ca19c74842084aecc6b53f8dc975d05ff0d9e7a8d692096e1f9cf2a49576bb9d4625904ae1074c5e0476e4bf1";
+      sha512 = "4b87cc59533c6b9d3f131ba533314f5c622efba35084a8ca6b67c4c63b55833a8a3ad9a72ac1371dea86e39691a6670a3d38952120ef8e3af712a72fbf69caa4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mk/firefox-57.0b13.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "c9ddf832f7da91e15ce16fa46777e2458ade47c68dbc0c5a368e5e2b8a26682487449e51ee46057724c422ced2715754a4b5f459f6598e342ac0d553f2fba267";
+      sha512 = "dd85e3305ef45f319211492163215f2f4140091d33422cf9bd01540493b13c9fb923a0c64aacb2639682a79cf6163fbb6e559aa29fd6dbe28f22c7cc0a1398ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ml/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ml/firefox-57.0b13.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "55b8c4e2152fadd17d21ae060532ad078dc83f92c383058d1ea979dfaafbea58f9c7c7d5852688f619c6332a8ffaa37e2bbea47517f4bee71af5696a21593611";
+      sha512 = "19487b16d24a71463b1227a450648ad0f7a0dc08b6a0ba69b99d87387bb2c011f7139031eb09127bcef5c5e28be90b8bed4de449af4b2180e900cef4c7e26218";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mr/firefox-57.0b13.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "713455cb6defd82c93ef80d92803923bc5049014b2409f1903056e0c04c2316a5606c9fcd13e96c9aed79224e24ee491e24ab31366a22c5ea74b55c556cca2a0";
+      sha512 = "7a71d953b192d2453698318f7fcfec7e4a1a08f893094891b446add05a0a570df3db76a1054c296d723855e4190dc2b2cf84c953fa97486a8bcdeeaaed707bf9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ms/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ms/firefox-57.0b13.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "53402320cf458dd250bcbd967381df5d5901fd62fb34943b18f86137f338e96d5b7175698d57ed3169ba138fe303c21365baaa56cd40dbe05717a82bb14d4c26";
+      sha512 = "8970064b77ede1f1b52a974bfc7bf543a203943a3aad2f42952669e48e1ddb092ac47d41704364802129501a5e0106e5158d6650a4ae7a84ff07916ff61af07c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/my/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/my/firefox-57.0b13.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "92b06c4aff57149610269474dcf242e58e0a9676a04a01e843bdb71cffbd24f222d0f65bc73751cc0807c6efd84149e7d241687c66413f76f75031edadce60d2";
+      sha512 = "3681f7a89ff3f099c5a387c9bc32880e3935a68edaf004d97ce492a271491e40b06d28e9afe732163f94d0f882a777ce8655ec0d9aa61b5a3be53792661857dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nb-NO/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nb-NO/firefox-57.0b13.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "52d82c8194062ec95b06f8956b52f7ef47df60436c40f3ae00358cec47034ebbc61fb2f0cb27a93dc96afd3aea5e3c7e8ebb92268f7fab01ae21d78d45f15994";
+      sha512 = "10d807437bb0f40095486c6495be4460bd9f10747243576503faa78b3212b71a893b4dcc1bdbeac2cef0ffceda288687033d05db9e76576e6ed049ebcd0a547c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nl/firefox-57.0b13.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "75689e5e642b82e97f734b3997984d805794b9ee07a44314a6cdbfa36f7caef3840f02daa13cd1338ed8bb435aea59c14b634e269211cba3b31babbf594f8f27";
+      sha512 = "31fb0e57141696f5ee310fff881e811e23c9c1d182c898cb8be142db54ac268dcfcb8a0e865ff5759984ced5e0cc9b87f64b6b27f5ae82c04b3011c7460694a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nn-NO/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nn-NO/firefox-57.0b13.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "5000b5497707614d74210aa372697c38db2997fa1fdced45e885de3838abdddde402e4282f32517e2b75f25b8d21d03149ec9621affe2e84f3dc34aac5ade534";
+      sha512 = "386d209088359eddfe3d68eb2466b491139e9f372a424e8509e531ebed8901fc098eaedfb11a2d606f22a940a2520b2da7ae9c6ad8a1e6dc24e5b4efce39b63c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/or/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/or/firefox-57.0b13.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "123b0de9d2fea6509566df36fd2c2d0e540fada2b226e824c914cfd02ad964b37c34c3d1846aae0fe13e8bed1b01b267cb396a25f9bab1db9a6b0db420addf11";
+      sha512 = "8bc59e0d4ac62b1409616512ba15ff15bce172e27f161407bfd11668399692a53d362e0198b6c0b137d979609b6b534ed63e1875747111af0faed895133f4b4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pa-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pa-IN/firefox-57.0b13.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "38618f7df36e1044bbcc32d50e6158e47a0e98cb171d03082a1874b990722d535f2dc4c8df5177475ae8c33bad9407ad480925158e6f74077a977c5abeb4b4ea";
+      sha512 = "b25496c3795ec349989b6fac8cbf055974dbee73287e9550b9266ef475a979f7589c8b318a9c05f4c324e69333b943382f2ebfedd0cc8c8b6d77f823537cef0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pl/firefox-57.0b13.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "54b384c63c0c017898ab5df66ccf5176c6d69c1a55c3470d3f16fb2e654854da802d4c15206f7419e26572871b09c700e6caa8cb1d85ecfccc364796d8595824";
+      sha512 = "762e795c44733f161b2849a7057afd2b47021312324565c39d51a3b06634761518284eac7d34927c7e650c1e43179cb88b80396ca91592603ce737988c197533";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pt-BR/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pt-BR/firefox-57.0b13.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "11c908bd35ded6e5dbf4df7c518534fe321cddcc1de9ae55db4ec1557ed9df5228e085c5947117ecb50fffd7af3365455e8ba6c98dfb587c8edfb53fa7a330a1";
+      sha512 = "a278133a771f43cf8fd48ca4fc06e324ef3d9187518ba1405c371004b94e608c3cff839dbda184b6c23c6818f8cc55b192bc9118f19e8fbafd6af0b2f0d6b611";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pt-PT/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pt-PT/firefox-57.0b13.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "54d9dcdcda3cc5cbacdb4bf6d5e697a0f1ed257ac8650573655485342db89fdb7ec6b98675d7255b600f76284a510b11e53c6bc9a2896d2f3656f2420f252ebc";
+      sha512 = "f56e9591b8eb311484d814723a9d7eeb66914cae8d9b74cbe12f8824eba898f5fdf072e3cf0384deef3087826225bddc31c9a92e11906a05f6505524a6e9c7e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/rm/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/rm/firefox-57.0b13.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "9f5565b6692fdb5fc7c9004261f4b1bf2b6b51e75fd6397018f2c5eb8699cfe93eed15e9564ab89ea3f643898ea55c98245ff8da713e479477356de645c87da7";
+      sha512 = "b0021b2b2c26aff1ef7bc043b64ba39e4152ed3ecb981cb8876d4c15af9e157b30cf9cf92481f76a4071f9407312a8a02a20cfe7223a4f20ad9cea46ffad3343";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ro/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ro/firefox-57.0b13.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "402afbb1552668d7efe27faa3895ef8f2edac40a389d5694de04a0b74f01087659503e46cc9c49c57c35dee3f8079943efc2d655b3f8eb3fff3281d4ea6972aa";
+      sha512 = "dca26a56abe6f6000e755a5df7d62245bea47964ef47bd0c5ad0283eb6b04c235e225e66bb54c979460188ef9a1c870d9d53b2c185e6dee2a37a36880cfca6e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ru/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ru/firefox-57.0b13.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "fea3a0c0192a5c74cc47c8355f7b78500cf20a0c1deccb2adc3e3639404f07cbd9edfce9960a1e84a41887e1175e2643af6d2c6027f3aabcc840226f2940c153";
+      sha512 = "26eb37a11bd7b484617d29432c67eb62c84f4a7aa1575234d284e39a23edf1f679532f818f7f4c64273d70bb400e52f327498ccc8226304e0e859fc7daa38dec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/si/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/si/firefox-57.0b13.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "b57c8c5327d6393b841f0d4b1b327a5816560a7ad2744182bf99cab8a333b3fb833c14cc0587d1111529876e89b9de24005084967b327c3376543e0284223ebd";
+      sha512 = "a7eba6aa32b73a64b7b21447d7ebbfc25ac21c9cc353d06fa9eb1e6b5e43f2673f125abdc662e8296a8254c96e97e8684a8408d712bb201eb1b9ee494aebcc23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sk/firefox-57.0b13.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "221ee97c377002033a46564d8707308ab9c730eccb9dea3c93fa03d9f952cccab745298a8cc6ca4eba11fd171c92ffc159ce8fc004e9cb4710ff3553781635d6";
+      sha512 = "da4a7e40f4063f11434616a1130640b663d1c73aeac6a8638a281174df890f0dec105fd8e5e0200dadf8898bce7adccfca5b059f35773abf4c642ea1d25ffbf6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sl/firefox-57.0b13.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "c9264bccf0c5c9c02c674349e641330e3a2a55807fd44d964c1bb50622597958278ce22c64e10ba5bdb3623d14d283ce91d61385bf0e58bd784e46f5e81b10ea";
+      sha512 = "6d00fcd3f71520a5924772f0b04f091a3abaea2b481bc2f2eca793330a8a9600a7eab38c7b1a9bc575cfa40c74fad56c6f3847ec8edbfed3364a8b7522e23c1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/son/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/son/firefox-57.0b13.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "e0c93706e7ebf5e054beee0827fedf620b10b3c41140bb999e722cd5dbf8c9227d478ee689fdc88d77bf85b9e41414dbdf33017ac26b3d026ffea3d3cfe94415";
+      sha512 = "0484c6de79a605e94192369aad55850b6897ecdc44912204fac58a23ecbedb8991ea3f670c3794d1cb1f311578db41ec518ae030e16e5266b2d802120bf151b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sq/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sq/firefox-57.0b13.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "faad9344981f9b9a4f978a53156825bc49c88084ebeb0cf14a950a11f7d0468e3fa00a3306f48d58c18c8ae0622299b3abd428390863101678cc4ad146094451";
+      sha512 = "c5704bbea312df025d1e439563b358ae5115c0e91b82755c8a895194a04a5ca349da96aac99db11627912c5440a9e675c8bcc14456fb14bd4461c373781c2151";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sr/firefox-57.0b13.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "cb8926a04f9c5563821ede2bca7e409ebe14c4f00c90c0edc5afa6668f9eac9e2225412cd8ec8cdbc530bc0c4988e5ab82d6a659cc19c127fb5db70d1fa898fa";
+      sha512 = "27a3bff0a5ddbcd0905fc9ba69ea733d6a6c14da78d1bac0448b6804b8cfa8668890f2a1e617b17e1a642b59795c11b82d1ac4192863f23dc82adbafe2078714";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sv-SE/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sv-SE/firefox-57.0b13.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "e20c6b93249abb71c3550623603c2a20e1ef4eff5530c1b3971f1190f00ac60539a54d17cbe8964fa91d7edc377e16c54970901077526f3964521c3aff0dea68";
+      sha512 = "e762be3b52075b4050719634f9e68ae86faf55295803535c046b2abf05ad6f695a0695311705b2293f79c1c8ce69d69b39609f27be6d0af9b625c0d9368449a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ta/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ta/firefox-57.0b13.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "1cd968168f9b496046c0a10fc75bb0265deb964644098afe118f0d56f8bdc5dd038f23f78e94fe8f5585ab27f2bfbf85beb9771ca93ab9049e8d7947dd99d83d";
+      sha512 = "cc0570a17d2325faadc7b1ae313241935588dcb1de8d6a1224a583fec6511a34d2a7ac786bce894f1a4b8b0b92d2d4392d8b4f7d0a0db9d31378191cf1ac8dc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/te/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/te/firefox-57.0b13.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "b7270f188b747ef0a833c29e9155bc58d1bbf38b9e97bc8a073df70b026751bf303b424ceb295746b3529775b8eaf0d9e3112970b5fad9673adbe435af9cf16a";
+      sha512 = "3f6c7e8612cd483e209c95ff594ebcb0fcab2b03d3687c6a2cd8832bf512b85257e0ee5af2aa1426c6b3471c6d00910447cee91d5b45d5a5aefed0beeaad781b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/th/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/th/firefox-57.0b13.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "9dd0b419c71e6f8229973ce0738bd69247488786c1be9818930d24ba9506f40eef6fb9e4ab56b38136149755b217e8353eb07d3bbf11a673d34c485d4672b967";
+      sha512 = "2576defc0da691c1a3a58387cef996e031683de1d0a1a0f928692b5982b61e53cf01953d473539e8afb5173d674d9e1ce82fa785307525a65e9af062924ff0c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/tr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/tr/firefox-57.0b13.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "de7b9bd2cc817662a7975ff95bc34773f940d2b2a491b85df4bc3d19dc02dee75cb6305e9fc2441e3dd3d9ab746ae2de6d8984187f7276f988354a447a6096be";
+      sha512 = "bf5b69d5d47c21bcf32ed5e9277d59d09cbdefc73f750b957feaf0f8aceb184425ea6d87e731aeee01bdd74ac42243eab0d781261d63db26bb57ffc3f530bb8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/uk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/uk/firefox-57.0b13.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "13ee663e62cd68b92083b001b2a3753e4c5a6c15aa5e1187c01e6cad8692a6f53b6e25cbb0d294a62a3986421bcfdafc8bb82dc167118c213e9f4939bc991ad7";
+      sha512 = "eeae9bc7f51c8827c07bc140883c672455088aa9cbb5c4473399f612847ded8e95f61b6c0a295c598c2a943e641812fa75173f26cb46922fd0d962af7ebf9d53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ur/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ur/firefox-57.0b13.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "d913ddbf3e10f048226f3fdb5e8524e2599b236379e6def3786789b767e9359ef2d47e2ea025a508467d7c47101b922150866984d91dfc41d525876b72ed4549";
+      sha512 = "36d2c5bcad4aadb2aa381e2a8f0d69256268d337088639a031af86fe4958529e0f32cf11c5703c39999dd247023134ea80201c351963639160875547e4728b00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/uz/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/uz/firefox-57.0b13.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "107db43aa14f63c0b7ff4fa4bfd43b0343b657c3791fe29b07812af2c810bbc5343eeb90cd43028259c40dc79b0a763cd770b1f4954bdbadffa598bf0885ce83";
+      sha512 = "a245b8eeb1cf93dd51e85425c129e0a88c3b9d312bbd502a5125f603259f3ee97eef76489a5f9939f09d3bf1b134deb3391689a54d607bca125138761378602a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/vi/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/vi/firefox-57.0b13.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "851f0e5fd8d057a3d55807ad8cd215dc378dcbe71b4c416bd8b88d0f0cfdd9d4febd7e93dd562affa0890d6aef9818970773f95ed76fa136c034459eecd977d4";
+      sha512 = "b1e2fde3c1d08870153a83e921231aa2fb34238b450aa6ce7b79b180b5902ae7bbb2a2dc689a119cd0d8b3d9f9907223c08894634810c48b629d74c2521683e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/xh/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/xh/firefox-57.0b13.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "195e35390839059a49e6c4ae03c1d6d4f085f7cff5b1c7963455bf73904303946c0926158a0bff4024c03be96b9570eb0e18c19ffb42081609f5812cbcc2e941";
+      sha512 = "36345b203efe934147e96548c25ac4cfa21b7eb4cd0a849c7e35ed8e99d36687ac3ac5657a42fad30113192b364b6577dbcf47b854244f02659cb89ac4553519";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/zh-CN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/zh-CN/firefox-57.0b13.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "2ceb83e0e1182c756ccf30ca95f252ed8e81d293f2c33cc2d325bc091fccae183bf3e75dec67bf6f497b257d4037d8715b12b540bac95427289ea0baa2bdabcb";
+      sha512 = "b5a8464db5ffe2eba9e33de952e4a44077f0af332ceefe562805a5f285a42c5bdeedf4ccb3bb4598b9eca7875ed1f2144a2b54b652250c8a5dd98b0a76535243";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/zh-TW/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/zh-TW/firefox-57.0b13.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "44597eb5fa3eb073a04a5fa36d92055ae9bff41049e4c8c3762ce2166d8af5974bb232ae244830d32d51a56e132cee3afee55f23704d389be78bc48063aef1b4";
+      sha512 = "5967f8d5d89ea780dc7475ed50709a7b269f08eaae74c200df97e2b914e01466af1e3cf58fda4eb44f417e384dea03906d7855d612df3dcca7aeec58040ad30a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ach/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ach/firefox-57.0b13.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9809327388821a5aaea4e8c4d85b61608f677c2af3842108b27d3786dacfb36ea82eb29458a7acf9337eea51f6f850c4ac0398dc67fb503d5fcc3cbbbfecfef3";
+      sha512 = "d32fbe4ed3824f2ece3987ceec2ab408032eb5d352a035b2db3c279a5c368a125ec234e3ab24728d4251838a2b60c13d3db3028cf48e3d2b2ed4c5b54ea47238";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/af/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/af/firefox-57.0b13.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "7bbb60c0bc784c4e58b2537b47e7b4b7ebcbf0a4fd63ab6db8ee0ddc1948ba9117c08baed37e5743ea90d28395dbf4df0bc512aa8bafcd810ac4e2b11ea220c1";
+      sha512 = "fc5222c5df35584fbb18099913f8389f2c8b2f25b41f0e753d3e5f5ec78b5294fe5c88da0ac477e0363f31d7af96ec121b89325a0765cacec0e7ae3e03762d09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/an/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/an/firefox-57.0b13.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "d2dcadaee4456e112edaaca783c91e9c78246aa742835a3d4cd074c612bbe1b85b28ecac222550eb920f09a96249e36bcb49a274c28352a6896d8beebbcbfbd4";
+      sha512 = "e97bd96f4d22d6893d4f89bb9e2b53eac8a68d30b46352cf296ff36ee02d60d3982c02c84c97c803b0216f86d3c7998101f91745b109e29d8c7d0c61e324a8a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ar/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ar/firefox-57.0b13.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c993eda8d34a3b5f656a7d4cf616f820bb2230a734df6c2f0b4270d5403e8d6d23bd4bf003ae9b115acd1f7925d46b89c3cccc9345ddc7f9d73a269e3c243431";
+      sha512 = "55741f17e8698e02731b431c8b20a2d702255e37171f027ed779243056aaca35fd863a80109679c5fb920d0a2026bdc3db6759f1b3fdfaacf237e4b20bc7e9cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/as/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/as/firefox-57.0b13.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "5112aa43ee870c3fd8f13378a4159977cf4dae3b1792ef983325a0d1f0134f377e6e4c473b27406f2722c138309a1af175f4bc9ff4e37f08696abf4b8f001fc2";
+      sha512 = "0e14c33b6f328cf931a7f9c42d5fe1d7fbcb8736381232c69920a45111410da3d09c1f5667e7206628d70a7caf1404c304bf9f4ec8a5ccc3342103b3ebcf3757";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ast/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ast/firefox-57.0b13.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "cb7fa643c742ac1062f34acb1498a7e903dde4c8b685ba48b997cf0247aa70157ce2317b5e25660748294757f0d0fde7d08dddd6581726c8f33db1cef3767878";
+      sha512 = "a2d51ee57a7cef66d862c593bb1e52311593a21ae0a25d2b9c14a64065906de26770c61665dbb0d55930241302940d697c982e050750fc04a5c89ae1ca1b419e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/az/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/az/firefox-57.0b13.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "267fe9b5398ec432e684efed10624819eee7a1729c8480a4acd616cf4dc988295c069a62f6e3f2936a9e822f45fc459d8aee2d94549fc77d3f2fdc6a23aa9ec6";
+      sha512 = "b9fa717fe7d861152d2117f1d69a7ae264f18c7e1bcd4e71df7404277db6376a93021e070edf73fffe1b00b3f7031d8c555df645efe63571d8831922d0212d05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/be/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/be/firefox-57.0b13.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "35977b89eed0a7e7401bad75eb20e7acd07ea52ac252ffb73a464f7d7c7f44fdb9dd6bfd1418324cf8834165825ebde256704e7822734077a68c0a3ceecb8b56";
+      sha512 = "670dc2d6d9d35947d181dfa1c11bb84cc65aebd268cdea059997fef685619757d3d7c6025a12d00fc5364f258a64fe1b08a69357a2d31fff7bfbd0ca07cdbd4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bg/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bg/firefox-57.0b13.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "dabb67aad05867acd8fc5226f1adc91168f70d68926a7d9e8407feb8795a9fa56121234c639b03cf10cd2ad44f638b6f96003e48977ecd07b8f267c9da10b943";
+      sha512 = "99deb263d7111123582ef53bbb1919497a6ce6c73cc160b4e26f5adc22f46e383208ae25acb5b4bf6dbac4d9a4f801ce70e170b0e6e5c9a03593eb2db8edb601";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bn-BD/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bn-BD/firefox-57.0b13.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "f6185c2eceae26618c3ddbb09f87cf120f300d8c3642d36b257fc8c6c0fbe7a0d0f0e409b53bf3fceb2158497be91b9dd70e3605a5177d858a115cb4cb065683";
+      sha512 = "34132da469314d9fe9295b835ec2b8b79816611eda646c04f7e064bbee5cfb2cc42f92e14a2eac60239c44205be4f3239eefbd1cad6700520ca3fd4bcc1d127a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bn-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bn-IN/firefox-57.0b13.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "50730081c97abb504f76f2e4c5bfc42258473b5b1cd4393a09be927156e626ede088f7ee6242ecaf9b641345cb4f28fb9f0a5276bd781882aa047adb4d1281c2";
+      sha512 = "9cd206c11d28b866004174532a253ad49c06f2c6cf9b2004b15bb14bf597e776cadfebec4b3935a323b98dcfd3590bf5a3b289a9f7952a8a438a7e90884cc0af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/br/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/br/firefox-57.0b13.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "6a1cbf642c85abe216854a45d371dd8463c37a3d30a9cc0e7b88aef19baf4695def56c9ff61110868c1359c7b6b082ea9862ab4026fda70ddef05c304f805fe9";
+      sha512 = "f30fe67e71b5c3c0e3f352653395094a31cbc52574a9dfbf5d5ccafcca528ca0a5b164cc75d5dc7d248eab74f0470cf8547fced782c979fb1e9ba4e177ca2b6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bs/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bs/firefox-57.0b13.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "f62dfafbccb28abda10bdda208ff161e5db06eaf4bb3291c4a2149c990ac28a80ff4eaa28bd300c296e349c762c1baade01f5881b8e079e0e690a9c3fdc302b8";
+      sha512 = "b2a546259e46cb58d44a61fa78e53632fdf0708921d80f329924180eb1a01dbcafe1372c8818280c0b40aafc7d4e6fa59d3f34b7e6a514f2adb1796d4274c093";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ca/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ca/firefox-57.0b13.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "990e3c75c387050c728bb6fb2dff2040e53b0ecdd73fba6ed27c6c66206597fd2ac099d561ba8a9cae1875ff38628a562143dd5802c7ab67221e2837de4ee0e9";
+      sha512 = "0f256326b5338228098ec31b8182e2d5d85418c9ace5fae1ef5cde37704d2f333172e4db7497f36157fa530148585dc70c0bc1b677b9888ebf0ae850b4aba2af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cak/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cak/firefox-57.0b13.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "698fac4d2a06a5057cb81a57608eea45752e6ab787ce8264e5d3e0a1c11469d1e0b2c97a5ae34ccdce7e6221f6367dc4682154c6b013105750c854c1340252f7";
+      sha512 = "effb3d74d649b7adacdfbbd568b561f55ef277a9b7ffebbc27cad5ea0533a73918effa9997b9565d33635d8bb39658900f251cd071799fb15adffbd8022b4515";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cs/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cs/firefox-57.0b13.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "ae2e138b886fc3c2350437a57fff8f29a5018b78dc2b31a45dc981ffdf233d6ad11be5df8602cd7de4ff9df6868701b296ee42d1e41922da1db7aa5f1c1dfabb";
+      sha512 = "494dc250f77d7933006121720aa6526534c7b90c17dcbdee6bad4e0a6f5224de661d3744862d5ce519a9ae4f36095af76d9b86d873d4db97991b1d27ff5ded8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cy/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cy/firefox-57.0b13.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "fff159c8d07c544a8cb66b4cb52ffed3f8975d362c0b69ee83a26490eda68bebdfce45ff71147198a2ee94841deb9115a6a2ced6ff7a583d09c6dad8edc87d99";
+      sha512 = "910254333d2f47f4d2162cab76f84f2b9f1808d559d1eab0d1ac0c1673406869b3092eabe7f4107758dede9394b383ae98ccacfba768772d550630f34efe5c62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/da/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/da/firefox-57.0b13.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "32d5bfb5293e1d5346d189638b1e0269fc0d6aa2ebf3e7ca2f018533744d96868eed09797e8222102a6afe66d0b7e2f6ffcae5e72fcd2f249fc66f8af30e5bbe";
+      sha512 = "f9fff4a380c84543212c610aed98fb0fdc4a0d2693bd87c3dc3188d7eda73615d028c7ff7c15db12425855105a1b5230a7f62d2eae84a893f07a4b8cdd47538c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/de/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/de/firefox-57.0b13.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "63b9b1ef0c83c91406c165034f0429c9c2ecac617d4f69dce40b9d12fd5f0583fb88148f6d14858e21a71ec0f59cc22c18abc296d0c561624d584fe6e6967b18";
+      sha512 = "2e772ae4b2f5246c96e30811a322bceac788325c40463470152b495492e60e3084e0ce55473aab56c9be584992b6761e364902352616e70050b4b0e9467b1a79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/dsb/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/dsb/firefox-57.0b13.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "c902b5bfbefeeeccd7b49dfdcff94f3219ab42398ff2e73aa166846b7265b896838754719f1e84d0662660bd03ec14737183e60e653721840cc53b4bbd6d6658";
+      sha512 = "8c6b05440d039b4ea3666b718f8cb59f91804ac2899e9d2e0a32a7622f800126e3b3bf9360a8e830cb70408cd7e4bc18f4eeb639dab403718ca6226576d262db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/el/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/el/firefox-57.0b13.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "85b2c08615e034ed9f1aba837bd73564e877f3385e3c3989ce864b1848f79f72e30a5bf06d6b32358a7f296137207a785fb343874fcf551f6f0b98515a52fb14";
+      sha512 = "9589eb08e3d128e1c22b639945790aea4ce2524eb3c16d581c615f18b3f1247240085fb3b6d9cf3b283029060a86c0747def43c3d89a1548d907edd50d0867e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-GB/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-GB/firefox-57.0b13.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "d14d1d17020b8a79dc580f7f526403e17cf0337fdd567b464097bb3796e752a669208b2a94a0fa4d1834816153230be67ce815bf440e1acb9220c951fe84cfa2";
+      sha512 = "b1848e886919f8698fb8ab7272e49fad3ae1f5d98ce92b3b82c6117f79df56a8ee6bc2ea2cdc8987701b9a0fb4c2b1e1a58a9faceddb0366372a40139a1c7664";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-US/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-US/firefox-57.0b13.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "fdaef350da4b8eda52c70c613f8c5e6a5c80522d5afc8f6bdd9590c91bfce43d2d2034ea095b377b47f8da65d950fe4c203c2cdfa9bd880d3f6253fcd0b252a4";
+      sha512 = "327081605198481bb18bcc45a88c4388ec9091c6c10bc6a27ae58e133470651d50edb106f95499de4e38d7ce78eff68bf38f430371e4c490962e2cdd3ea55635";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-ZA/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-ZA/firefox-57.0b13.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "c4ce10a2ad4d8ac8cff1e87a408caba7c1736f84ad2e228b45b7f9d0f87e5c9f6a4adb0a0ade89fa88c54c38a68189f7e203370890eaf69b6bd033b90afda8c7";
+      sha512 = "bb1432ab9e9f2e11fc2270501f25e3181aed4a782fb0337ea676e75c4db487a48bb1e3e44f0ea703c84c4dbe8d5c4e9a102c8cd1d45ff673bef7a5b884dfe707";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/eo/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/eo/firefox-57.0b13.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "37f75ab35b3ecb080dfd7c3b5edb65df950d260edb0156bb09887e8f30f1ef1d66016f6b07eaed0288be1c5c92dcd5c18b88fb0a9e742ced375ecf661a3ff5b1";
+      sha512 = "8ff8c209c3aeacff538d2f265f8a6eb7621d27df237c33b9265d9246674d61f7905369fb2b7636920cdacaeb3d44be11dfc136de940658309f3285e62179f8ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-AR/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-AR/firefox-57.0b13.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "8f2603e1d4942e6c6d4f7bb5823473a0e44f820805301aa2b0faefca6540f4a8078d43b6b9427e581d9720f6ee47ce4af82113c113753fa7131d6971ec10441e";
+      sha512 = "4eea00d279524be9a682ae46cf602572e0e1469d1dc10e37b1b0a58868386930ddecfe0dc43f0d185ed9bedb29fb85eefaf87d83ffd00ce51db04d37e5fa78ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-CL/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-CL/firefox-57.0b13.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "9a6845eeecb831cbc3d804377ef11ccebe513307a72f4b542968d1851e54679ce202e5c6e5b1b2efc767451a0202737837f564f146862791c53d9880e42a2565";
+      sha512 = "c130ca1390f9859ec6d276f77889cd804a38e32551c898a17158b1b7b629f7f72a39afafbde38029438c465e3a0ca82cc80dd73905d84c0aabad8ebb35f2512c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-ES/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-ES/firefox-57.0b13.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "4d94719060001c3e4fdabb0a08e977079a3ac05d5a5f006d724dc0d6a7bd31646f5603be8236b6cb0ceba10eef64697044cc104bcb10b4308b28fe4883e89167";
+      sha512 = "6b515f16a2555f56c1cd8d4487efe2d4ba8107f3122b0dd81df9168768808d08314565a0a7bcfbbf4451d2a4e84559e84fcc730caa1641e801c6daae0ad517ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-MX/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-MX/firefox-57.0b13.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "38d46eaf7b40f753b9fd6fdffda3b21c5f4ea9a554488277cf55f97e230911606c98fb4e5b6b188621db24c552236aa67b1ebc880630c74f6c57777c6c0aabc1";
+      sha512 = "a3fa5b35773656152eb16efb6486d8e33ca29e0094de24e389e94a6e7fea761569c3ad48984f8bad255c8ee97f54bb5521444993f0a8ba7a3c922da66c1295f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/et/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/et/firefox-57.0b13.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "3babcc9f0bf78b491d11d96be70a62b409729180e3ebb0fc97ea0eecfa3caaa2db1f6956f8becd97066d8b7216101804d2fccd249ccea335b92bbbfe12b99d89";
+      sha512 = "7a0a165105f5b1ff3f997fd400bc8d5a1bf976c1f4910d4c91be9827a5094dcbc03e8426e644766b4b255dacf861e88cb3c2b75131a9fbd89e2c0eca69718b36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/eu/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/eu/firefox-57.0b13.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f2b1b2befbafdfcd2467822b7834c5a03ec380c2876d6641addffc5852453232c350273d310e734e7071d2dbe35c94779eea858ecda49411b6a8520629394c62";
+      sha512 = "7cd08c560ae83926226cc69a10691918b7c89cc10282cedcc57955b362546554e76b36af217a3187b11abe8472838f4cfb1a32095bb537b43f33920b37b5965a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fa/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fa/firefox-57.0b13.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "05d1bc4004261475c6b806fd2327d2d1f0a1246769cf9de0755ac0cffad99c270064699b5d05cbc9353c5ce77be9810546f59b0d47a0f88c96d6296d4e51a358";
+      sha512 = "02b19d0f74413a92c998be3540f5f8d25ae2857e1eb9b4171083bdf392e5dc5ab0c6b58de54e75f221f731806fb8a6df070146564a3b294acaef76fcc8e633b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ff/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ff/firefox-57.0b13.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "448fc135f815bf79fbb62e2b4ca799bfae3891f9d1197ec8febb441f2a13dee8405add2c54a12d2eb11fad6eb291d7cacbdc31fd5af1978a253a5672444fd30e";
+      sha512 = "df7485cad8f46fd93ac6a013e5f362a19b1b603240ce50044169ffa4a4267102910c1d6bbce9a5d3675911acaf64dcf0ee3638090c0236ab664e9af5b4b567a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fi/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fi/firefox-57.0b13.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "06f995e53b88f32fadbed3d0b3b22c11117515b2e926b6ce7e9763ec6fa29bea6a05292ad8325368badd4a0a6b3f5ec8c49a147a7f864c238c814c4f53d99082";
+      sha512 = "26971b0778b87e3b0a617197356626bc3120b2214b406e01f5fe865430abfeb6dff471496548883e3e2355d32b1630fc85f501eb9934a9b6fd23270d47df5984";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fr/firefox-57.0b13.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "dfd06c21d7dd83309f9d6d11fea295bfb1f942e9bfd19a5a1c45b63466eada5ed75b88fab5d4730b13db0522b3a977eb85164cb0c4121242a975462dd9518acf";
+      sha512 = "324c4cb614a8c50d9d7eabe6e2e3aa420398db7074a7d043c4a44c5785a640988c9d531aab92f51adfaebcbcb1e274f825024b09e302334241a16c622ed97f7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fy-NL/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fy-NL/firefox-57.0b13.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "ab381fb599161dd7df10db3a1c93f1e71d96ef1364a59518e1413c17f7a26b524c02ce54a33f8ea54a02829e519f8e8c475b9579b69bea62f44c76e909079e3d";
+      sha512 = "e5d8d67c5c549240264b7a02ff6c5f54295f04a26553a5a19d3b58f94bd3531c04d5402084fd6f40d63f9aebe2df7d8b50415d8575774f71df5a180e50d39728";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ga-IE/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ga-IE/firefox-57.0b13.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "9054ad0c2184063e6c42ac23004c9c63438368c03fdd7bf9bc0610d1a2d4a47b9bc4cf4762a0cafc633ae397c38ff64e050409c5d6fa0ca1ac869d918dae547d";
+      sha512 = "01c0998e8a32e6da0127680d17e71c173c21eaab66603ee6fee0ddf8698a16501d290b1ef9d375d4cf678606cb4a73c679434e22b309a592523d11ebcdfd9fab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gd/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gd/firefox-57.0b13.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "3844132a9433fbcb107f380200d9b57756820a9a3495c805622b7f3952c59feb8b3599c774d844f57bd38aabe01eeb45cc35d8e06073350f884ddd0a0a18d3fe";
+      sha512 = "88eb2f45c0242400d62310e0efd492b27b6439750d01f0f567dcfa48398c0b2572c842c6155e370b0400b40c2dd88b7f2696daa4e42d0dd5440b4175a409517c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gl/firefox-57.0b13.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "2d864cda23c59108866f6e8f473bf98d8c328f24202130d9168ca0588f43a9cc49c8df1ee4872601608cd27422d7243666b5a1dd006ae5ba101773b7334cdc15";
+      sha512 = "d8c9f478d1859240b411ba6a819153d6d260216aa3bd4acdd043b0bd6e65630f02fe4b7f8dd549aef81190ac8358620487d5f2fb796797d220df70b3a597cbbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gn/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gn/firefox-57.0b13.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "fb23767c66deed8f0ef97fa5b8044654740b8952bd7b76da9d6074e22c91301fffd3006c5f9c09ee7e7b3ee3001e70b31a6c09a096e3dc73fcb867f15251a553";
+      sha512 = "572a00d95247c758bc81b0cb61c2fa659ee5412ee3ee948640549d6e737fd0ef622ac4e16715fcb269980461bea32ccbd2249448ae8b340ef26c322f5c504090";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gu-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gu-IN/firefox-57.0b13.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "7e146f4b6c3eb1c96be1d95ce8502aa62b1483befbd7aaf9fb945fdee4e8b8f62088841057bb81d9d5f8d2163b25bf17797d5af5eb6d6f32ee77b0b7b84aecd8";
+      sha512 = "34a4760f8748b6e6cd1856f5e99f04e320dbcd1cc3021e185abcd23c12e881e2eba31ef9253bda6677c767d5e7fe5aa0dc22f1145852dc58a7e24278a0c6dda2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/he/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/he/firefox-57.0b13.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "3ecc278918acc5f65c0552f9108bd167a9ed3f55b39b4f3ec41175bf9a1cb1d84e32b57ab208e6c6816cfd66b33b5d2846d5a776a79510c7186e0d5ce6bd25bc";
+      sha512 = "57a0b28a0f68d88298d25c62efa70898aa911c11f0733798739f40e546288856306e062033d24abb80964345c0f0224e2c5f3a15b01d89c4ed3584b1e931d91f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hi-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hi-IN/firefox-57.0b13.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "7aac53bb08c527b1c199bfffc5edc25e8d49082dc7df453439775afc07722bb126f95955aec799909818cfdc949efd5a9f987942a4655440c0ac26691a0bfd9b";
+      sha512 = "dc1db5ed5ca72c48729ef8d2a25cf608072fa7112e02b001943242ec027157e197828e85697561febc15740f52f9ecc6d666d5c83201ec8101a24ff66e8eb4dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hr/firefox-57.0b13.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "ea03e4f1370fcf59c9022c7f4019484ebaea8e295e2c3ff3ad8f44aad9336ba809cda22fc0f98df2f5ed7ec536ed9ba349d5ee57bea3c4626ba5fcf41fe83be0";
+      sha512 = "5488074d04fb6f592abde28e1ddd8e2d949a8744849f51192fbe0441a551b358ef8cf1cb78f69b5340c07b266d11783e2e722ad5574f255186c6bdf9762aed7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hsb/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hsb/firefox-57.0b13.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "71ee5338b776daa0e9b33834079c94e3e9582b50d7b0e92f64e25546167838852ab606c2c2f9abb1f3480755a653b091e60c97babee00e66d4140600ae4d2612";
+      sha512 = "4bffd78e28363aca1d2b63e56ed44703bbbcb701b4d6e1c353f36939b86c3d7045b5104d7f3da920a8a6cd3b69d021b5d19f9727c5fddb8a86c594d15fae80e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hu/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hu/firefox-57.0b13.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "defae5f9c7164bb5150af1fdd6c0b262fc88c63b9c7ed09753af5a361815ffce9ed43d0d79bad65bdf2e0de775d17660ff0c31a39134f9ebd2b6f60ca4a02d23";
+      sha512 = "6a5ee323244358ed68c96de80f9ce1741217cb002e33a8c93e8386773ab27f11b7bb58747daa4138e5b91b2bb4543e1dbfd14b90731cf5bf357376f4dbdd3a44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hy-AM/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hy-AM/firefox-57.0b13.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "924efdc4e8584d89b60d98117a229c4c9a619b42f0a713b0fbf9fab2ed63b5761a9b5051e7cfa825459cb3d499eb4679363b13a76dee2973ef6b843c7ee9fd9b";
+      sha512 = "28e0cfb93884fd78cc2f126f8c08714545c2550ae40de29e0dc1f3186fdc437592c6365eaa92135dcd1983009be7a5021001d2a7e703bfe6bc81f695ae662619";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/id/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/id/firefox-57.0b13.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "508c42fff4f6ba5e39cf757a1a306c7404e3c133308d6bf4d734f4d2c53fe79998724f861843d2ad76af2dc5482f108ddfa11026b8351a8786d814eacbbf839a";
+      sha512 = "00136a82e957274eb9316778ff0f9aae66df21d6ecc64f67757816104aaf5cd6d83c0d9c0224214cd2d1c5a68c7bab75d439cb049035ed2a071255a415b337b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/is/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/is/firefox-57.0b13.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "9930f784440abd54b53fbe94f7eeb0e26ff2b1e2b16ba30fe1a7d298195db58fc32a25624444df89176072a9344088cbff188b73b9d7fa8e8b571b4390a481b3";
+      sha512 = "6f22f0efac6858498c755fdcb848553a0e40bb80bc8dd6717d986e84ee5bb8cf7c608592eaeb6653f6454147cf73bfe57b5e62b581c2217b8546fd27fa9e5c79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/it/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/it/firefox-57.0b13.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "4bd98c6c17a3cc3f883e7c2cf8a76a5423aeba67c6c22a50befaa8d4efe0e8dab495598e17789dbe078c75aec7e612ce959ef8f82254ccfab460b273456ca50c";
+      sha512 = "6321ade81a09236ab3b3ddd024b3e5ad6404fd712ff6f23f72901018157f9a845c492ecccd1148cedc1911365c70c286a7d947cfc4afa534b274080e7bc6909a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ja/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ja/firefox-57.0b13.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f034c703ab191fb39fd61859df9ec14040764a8e22502277d11447add96ab3b060931efc4f7dc1277519c47315c40793a7a7b8da161892b13fd433aae4f723dd";
+      sha512 = "b652eb0aa3dfd71dd4d72e45fbf2713fed947b866f1fdf172a473d80cf3005706558a32d7a04b38766517f6ff571166ac5fdc1c8a5b89cacdeb91f9ebe98674f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ka/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ka/firefox-57.0b13.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "8ed142d84d31914f638daec87ad64cf1aab76e110bc7bc147630df019f1a6cfec8cfffdafa139cdde91a06b65966741aefaeaf3d16c63aeb94c4f2945e04ba8d";
+      sha512 = "38ca6189c55363040db09d55d6b6d525eb91aa4858a660fed3b400ebe5e4cbe723efd9735b77705a1caf811ad0f0a9a117701ce8414ef6109157357193c1a655";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kab/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kab/firefox-57.0b13.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "435e8dedbc0014ac19a37d0450537d7b9c2d4e7de993644991c58640edbfeeba17c6a59ab5eedaf1318bb8c71cefb5d30adf01528bcbd8e043e0eefa63296be3";
+      sha512 = "bf581810fd19d073fb80dd3ea93b6b856614e4821d095800faacc3c17d63c53d7d65aed4b168a3cdcc29a155073af78d26f5967f29102ec4b1e29325c3686b67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kk/firefox-57.0b13.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "3b059e976cc10eb97b10ac4bd9e4dd2b8cbc24b805e23ec125d42ab731c5cc6f97bed8ecf222b1ed3e2c84a422a677cb938239110a38d6e34efa2a9f2472bbfe";
+      sha512 = "aabff3d68e37a9b41f9345d8968608082c24e50e859a693d4642a52e534c5b8b7a5233469a1930fc54ecaf7b15aca486ad66b8cf3100fa62e474b4ff261b37cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/km/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/km/firefox-57.0b13.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "aacd4ce2f5a8152916b2a9b8f532cdd09c382e0e365de297082e5bc16f6c19136430504bd74e51422db530c66a13af45721c01b5cce3a7b4fa31e08beb852539";
+      sha512 = "e5bb4825d777bc6001d7d95140d03ac6c44c96eb602141be48c36ac82863dfd5bcfb25b529d61f80b8a939e692bf833886fbbc48c45ecc7e024952ddc5dee570";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kn/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kn/firefox-57.0b13.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "10993f98c96e83b8010957af8467c4434070ed5b3c52311aa67596621f415d6ef5d7946a6fa5112ad7fdbaea00675bb07f6845c6553774e1a9666716505778ef";
+      sha512 = "1f5f4d4fe4b729ae2f08432a5d074354121c876c4cb0e7344e37b8d02e2aad38a0b16547d2987418acb98ecda10805dfd012448332c8f8e5d1f772cbf21554eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ko/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ko/firefox-57.0b13.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "c31ea13732f5b2d14f7089d71923287be8fc99bc60db396757f1a8a2936d9ca5aa5f1e2c447cfde0f90683038868dae95eabd55ca16df17742b2f7bbbc89e7be";
+      sha512 = "19ef2c157469a3225c7ffb875e66f41a9d2828635b26f6dfa0062cb92c0841c53f2eecf77ba9b043e3e2f448b8a08de55c7f74fc6fdd3f7b4554d13ecfa746bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lij/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lij/firefox-57.0b13.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "b7febb474eb13034eaf9ec555202153562b8dc34cebd0c03d680757c19b2b8fc5f7060e66b115d0080cd3510a56033597409222eb56024ba136d9ab50cfb246e";
+      sha512 = "4e5e6103793dd20efb49bb85dac4dbd208c0d164e69c5856bf9fba96350c3682d894af857d239e23f3c3e802f7300b5b915486421414fb6f9b8af86ee50e247e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lt/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lt/firefox-57.0b13.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "d07c56a82054d1238a8a5678b65efbb88b7807aaefb327eaeaa393218ae280ef4e134d4a3ac28694458470611610e3bde2be68f3df325a496d9f922d985681fd";
+      sha512 = "d01f311ee9f36aec032a5c4eca34a86ebcb54960fd29b03af00f2b289c2b4a38e232242d1e48847e2385e7ccabcc1c928ecb1e57f9001d181c350762d59ecc72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lv/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lv/firefox-57.0b13.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "fd8adc196bded44b80d6875a0cfc270cd8672a19b8911753a7b62545823262c34381c3e1d72d21af695c273242093b4df45188bf6b07f83ba5a73aa7a8e5e528";
+      sha512 = "d23ce47ecf7c790f38a9bd605150f403776b4e469be590a57b9de624fc10bfac2a3572470ff496899c2bd6ebd1799e9f4687b4e77e4714ab8228c26998760b21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mai/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mai/firefox-57.0b13.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "c31e747aa29393f12b4d32131b4a9134f57fcc88235258dabcec99583494832cf61079b8980171be2ea952121f3c5568c42e006e2bb9b1c0e6f6fd05d2204dc9";
+      sha512 = "7d8baaa2d79f6e50afe9b915d461a4ca25ba777dbb0497d2fe0b1ed92eb30061061b3a29514351841f86366b91da0979b5bf270e290c477397f3201f1b517398";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mk/firefox-57.0b13.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "3e304e2a82640adfb7d15705ccf740de623995385618a351651005da3bc23edaed3707209594bc2b70a244f0ba86accb80c319ef4f55ba156f5487e694fe37ee";
+      sha512 = "b1f35402ed051ba91294dbacb52aa451efd48300fe982d638d206c75c3b0f7871fede1d7467ac8d6ea4308c4967b0334873d72c4c731c69f343b92d56fa7bbd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ml/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ml/firefox-57.0b13.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "d229529966b0890b78d53e221d2e809d003248e2e42dce182f3f761434da72362181edaa0db9ae255878d01118ccb38921af715a412408e60373a0a76f02b104";
+      sha512 = "32ea1f66ab87b299de4256cc25c6a67c0754e9fc8569f9c9693aee850c034bce1e77cfa6f8115015f085f74bddee99a7cf487cff09277f011dc51f9deb07b97c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mr/firefox-57.0b13.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "d8e81fd44be727b8b72cfd5c4852df33f812b6c3fbf09c07a461c00b53bb41fa63a1e2cf9c17dc90ebbd630ef18541d4aea4d9cddf471fc52d9ba10952ec5ad5";
+      sha512 = "3cf3fc88a84de5dce220f89928f05b8f8b1d8ecef2f83d01a880f07d5a935886fc30341eafd941f31213301773f463fb4f4681cfb5e8311665f61c8f28a5c0d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ms/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ms/firefox-57.0b13.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "e025f2b6a8724eabe4128d9e3567f0817c833a6fb2855b541e6a12208992c2586970b5adc422156bc00fc403714bfdaab762505308931584ed9ab8f9352e1183";
+      sha512 = "a3b9dca6a332f939e6ac7b51956f34e893e1ab5e62e9c8e3afceeb6233d7d378b44fdd9f6dc46eecd73aa738df46534956545293604faccefc34591a7ee6e12c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/my/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/my/firefox-57.0b13.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "6518b67cc4ffe848a0e79fce56af5f9ba60f3338bad5dc65644d6064b51e1730182f4d6038c4deb64be852fac673229b75cf1fd0d1d7c37db62c830d018824fb";
+      sha512 = "9daa4560c3c4424bfbce4f23bc414979dcc96359af3cb7c29f2a9c262aac81d96493cbf9f938b8b25ed0720801d0f87a11a7e5cfa83ba78e86e2fa0d2495fc45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nb-NO/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nb-NO/firefox-57.0b13.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "177f3638d429bc4b5d97796de91c39c3a5712ca3fe5f93d5e1801937d16b80faab94cdd75dd99ec7c6451f55a5a9282195a0deef8f5500833b83dc3ab46ab20c";
+      sha512 = "d5ab3676fbc7c3d3bea1af43bff89c3290af5846eefb7bc51d6f946c8c2c7968332de918d5fb11c475e873e7e1a032213e75a00407092e51baa5f0d0a64fcf9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nl/firefox-57.0b13.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "192f7cdededf9424631e96bd88d15fe66b7654cbf09701f361e0083b38106636df68f183aaf3b9a4894e432cf828f429ab5a62ee0b521956eed14e470c909aa1";
+      sha512 = "6f1e8bb355f6ca1e8ced4b9b69de26d8cec4adcf2957a7422b98421fba4c3d7c3fe91596fc9ea06e15137f8bdff27153b9d068b7707c7f56b5357a7aa2ec6ffd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nn-NO/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nn-NO/firefox-57.0b13.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "e1d9ad0238f5fbbbb95d08e01f95a9ba71ec35ed47d0609a49a9f76e9f9008f21932a12b9a342b9ad02fde563dcbe7779d43b9bfbfcfbe7f17c4f59d324808e4";
+      sha512 = "b9c27a5c824efc48e85fba2823d9288990fcec545fac3b1ef6c4617a624ad685b01d96d23ad8bd5eb1e7787849afc630560e08cb7fc617cf2e25c9cb9f2c1ffc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/or/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/or/firefox-57.0b13.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "12012e659184136db31cad4448226eb4e70760b9234632c9fa1b71a54b0ca06608de7ffc62ecd018671fcb9ee7c3357ff18b7b5459b395a39eda59d1a44bbaf7";
+      sha512 = "50c0e9956bb17f6df5d342e0f43a4439510e80d4001f504d566d2856e885aeef2b54b57761943771f8a4ba6648209080290fbd6d556934e14565bee023c257ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pa-IN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pa-IN/firefox-57.0b13.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "cc154c9b0d53ccfd515dacfcde3a55a75c16f542080770927533b9efba8bedb7f46adf0a54772f60ff8395c1e83d0ff602687d7b04998e9d9e0f6c3da2e95142";
+      sha512 = "e01f2c4a9cb3f7e6adfcc3e58a5fb5485ab41ae01e302c93404e7b5a7bb1b30f351e364846853a2c6ac0ecddacc03806fea945338c050928c6e8eb6dd0a80600";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pl/firefox-57.0b13.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ffa0cd7b26d4fd48cbbb9b56b60937190dc271cc6f002fd4da11929945d064d4aa59788a756ea4226b15e1856434094e151fb92a96f3ca9d14141fc1bf98d037";
+      sha512 = "1bfbc1b9a401e0d9b912f5c91f1eb22b0b968d8bc75ddafa28390071431d17c4251b2624673aa068f59a451b7a9bab165690b5c87ba1dc952242287980c63dc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pt-BR/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pt-BR/firefox-57.0b13.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "6e227b96787f07b9e04632d54ad33ffe17931e787d1e0212a3419bace1cf8fb062178adf6a2ae8d11a851d3de2eae983b086850e8df775c0a33d518dc0306b51";
+      sha512 = "75b83b22962b42160d5956db90e55f23c2f12335569f908b1ad1acce48704e9012b4d2c8b3575854e7a36ba9dee49f4b96391a4b6958fe80545501dd91609084";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pt-PT/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pt-PT/firefox-57.0b13.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "fad503b60076143c5941ea7c280212570896aebe39e594e4af4b2c258b387a5489a63be17730e4c31628b96661d8deef7aad6ebd31eafd3bb52f841e4a344a39";
+      sha512 = "4d9eca88e092531b87d8ddabda513f9a42a762f7af2511dbec25eb88fe791fa94bac3b08c7521227ddec2b049a4a55cd7d862144696702073bc13906b1f39f83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/rm/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/rm/firefox-57.0b13.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "737c4cd8234d87f96b1970f1ddead34eb4b109e201f794942bf2ae0603cafefce7b38f2900bea2d08d058766e8d1851d96052ed5f23fa46e351179c9ddae1c91";
+      sha512 = "44b3eaa4cde855738c221e7c1a3acc80d862f5159c13d946d67e47b382dfb4a5a6d360be961a03f605aae3e1c89e2a8a0d16f586646cdd1a3dec13f777b32577";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ro/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ro/firefox-57.0b13.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "506c842023cd3fd3bc0a6a57abf7b2b822253b0ef4bf2d3f511bb3ce5407d310cc976803f6959b8678899b38ffcda582da21a887d8608fe8d42c46ac70cbf133";
+      sha512 = "a9dc8a1b4f0b236f2660be71df78c41e055b0547d8ce9bc258798fd4483fe888040d2c04a0ab0bab4c95a712d22370d957513b5ed08f1e332803d7067bc37aee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ru/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ru/firefox-57.0b13.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "94213fe894d4d6222b321aa6d9d37f3cf32f257c0e021f8d6f122c4e8c458f9845ab5abbfcab1b043b4d8aa72f83307081685a63ce7569194fc15e2ea655cd27";
+      sha512 = "d2c42dee48f21e847de67efe353088ee949fc0af99ef510f5b76128933fd5432b2e0cced59ce0a0157e396b92beb645d78d758823582cc5dbb63718bf85d9b20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/si/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/si/firefox-57.0b13.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "2174dc7cc1a8e8cf96550199d70e279c85a91671fe1b1a71161aa73acffc8a0c818dee6d0f2c3490384eff4de5175eb6c04cbe04ae92c60da72f5bb987bf60fd";
+      sha512 = "57be5923936b02cce924fa05994a6a887906104175e305043ea5a51e90cd35cc48c190ddbe2d060d64965b32c65296967dfc53a1e700d7defa078d02907069ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sk/firefox-57.0b13.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "f9a30f631ea892c1362eb17652213cdb603eddbb0a687f4ccaffe70949b8692e637a35c4d90e27f5f823da59ba01de45f810bce1ac33a0243a5c96f470f13ffd";
+      sha512 = "12a74e9df967e6a058fbf53baa842bf199190dcc3e5c81eb49da29267760034ea41abdd5b1610f4e06cb30e462cde4c74430d58ab7efe7ed755d19919550827c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sl/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sl/firefox-57.0b13.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "abb5746927a53331da0604e4259a97b8d836c489a3c777ebcefb9d3c724503772474a2551c7347c8466e007fd248ca4b96c8e334272c958089abedd60f810a50";
+      sha512 = "9053a6dd752ee19f8dc49a2bc41c1d91b6a0f77bca71cbdbbe46b645388320a12be4db14714c62c2306b1bab78059826a8fecdf0897ec52ce0fa8e743e25b83c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/son/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/son/firefox-57.0b13.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "a88ec432a39c197d4b312b8eade6b5b1c27e2909dcf27c309844fddf6a21255a1bfe7f666f3287c6662a0985c75810eaf67bbac20a0b871bdb583da30beebf96";
+      sha512 = "b8f6bbe404306f17ae982238d573302165c366beff14917e64dda7c07b6a2f4e1f9b2042a97b3cbfab02f5e7fb860287cbaa30536494506ded1ee51818d3093a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sq/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sq/firefox-57.0b13.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "32054a108dd8beef5dc9dedfdcddc4b37ec854ce32f65f6f69e1a4506e45931909391182ea61a9eefc4e3bd354027fd6cfda0d71d996906397d833a27b07cc55";
+      sha512 = "6dd4c84f38d7c1d0ebff77737fec3ec669532fa9be785414a9f125cbf184c88185bfd4541818d696b93237d4acb0654d7c6f38e9a0ab7ea35a10369ccde1bcb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sr/firefox-57.0b13.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "adc284dba815ef84d2b99b90730d15ebb2a8974601cddbf38053356c8e7464f13d0e1fd764c8dc34e0cba0ca1bae427c2e1ec31bf0553f834d0213426295917b";
+      sha512 = "984be4970c5224077e6e97c3137df1d62ccebb7fe78e3506ce4ae78e17d7961653feb276712735293d2ebf22a8ce8b0b91b28edc80b2413fea24dbf059eb1ad6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sv-SE/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sv-SE/firefox-57.0b13.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "51f3a397e95f39fc2da2349b25d625114d02bb0444e56fa09c8246d57a93575ba9cb83479681c73ae1b257269ad9100949829aced4c1567b167dfb5ea680bee4";
+      sha512 = "d0fd4b307598fd42d76414f4f097d0ea3e2243ab8de536870be23687eb6ea64f226a54b3fee176451bcd9e1305c6aa4c60daeb72b3341102f670d4905f4efe27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ta/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ta/firefox-57.0b13.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "a1a5a458d540be0a5359c15f2a70770b39bf983d1f19a469c8caf1f7c2d61688a2650bfcdfd2d41321788b63d5a900ca1cc36fac4a62b67087182d9c1c3fa84c";
+      sha512 = "6b59fe4cde16c02c5b4867d48e6af4814794bf4a4f3b41e24cfb6e85d1e81f31446193c831b2ce50f30114260fda5e0a20ebe15fa23e1b962f07d66394f5d654";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/te/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/te/firefox-57.0b13.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "a948071e0f1ad4e29483a87765a307a1cc4d2af629125025e71439875144535bf0d6d69be5100a8ec6f5be6b8b9a7c7d10e851486ae41ea5c8517dea932c54e2";
+      sha512 = "a65e6b4d28f91764aadde1dd954d1e888a5bb24f356deba73c68fcc98d8be669a8f5147233af89881dbf20e40ba987326d15d5fcb857598e6718fdac4c5a59ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/th/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/th/firefox-57.0b13.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "1340d951f126571e3d3fbdfb91e478ae914aeba9251da35b253a67f62b4148f0e5b9452495a7bf23e918c9fb3ab88db37f4f0fd11f28330957dc23bc65cbfe5b";
+      sha512 = "bc6d32c9054072fe931b703aec3c2a6a60d25dccd6e853eca5e716903a4694618e4cae79c9aafa52a2bd34133b6314b5eeecb92e56082c84dc10c47dd46be085";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/tr/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/tr/firefox-57.0b13.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "37e37e3679ffb5ebf93e3e7410c5bc9e1f85fe8bbecc83a7a33dd5b1c7d7f7150ffff3d91fc200f4c378a253627d5dd8ec90f46692b01f72cbf9f48bea84742d";
+      sha512 = "31e923c48adbb9e2b87ab6d5bf9ceb951426ad8c523b8def49900875d2a66220c2800ca25ddd4fc0f8a007ca4c95f7a69311228b34c5a8429bb26ce9b0f43871";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/uk/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/uk/firefox-57.0b13.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "067353b9d466bcff799f6c1ae46a91ffe9150a6c429a117464cf1289433fa2fed6a0f0a6e773f8b27d3618ffae233c7ebd56841f97d3c82b97ed24f038c7e4ea";
+      sha512 = "5036b3bf40bbfb13eb99aec17d90e9a7a60bb39eab1bcd21fa62b1d12b47f4b9eca7980c762f67ff5406ddcb20777a6553fcb02e611b276f1cdd483c8b67c162";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ur/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ur/firefox-57.0b13.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "a868433b2b18ca92bd6a6b765ec0fe072a44043a12f75ec4bbc16f4dac29577698b1fd7618e5c0876ff14742656263c0bffc2ae5ba0826a55df70c139275f9f0";
+      sha512 = "3605b5370f7158ffa54f5c5def6806885cc609b385b363e5a5c6442ff9262fd666e35b3f2256ad68b8f03a9e95282f3792ab83f49f0efb1e422b6dde56a85713";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/uz/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/uz/firefox-57.0b13.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "33603cb219121d06a97cc5c62865bdb9ad4f9acd0de6c14ef86acc16d818faf3e21b24f9f497dafd20639b81edbe7affa1fedd7a2aaf99a1a9d137b02e2b77d9";
+      sha512 = "a15e00c34a831eb8b251f60a9e17f7cdb65ed097fe0182a576c5809ecd208938d38c99a711750f0fb7835565adfefb15acbabe3b66c2f03eff36bf05527b47d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/vi/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/vi/firefox-57.0b13.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "a841c65cade257e6b5708b3de3c6109004f54a295e6b6fea97e6b3959cb70620844f8a4029dcf908d6fbba1ae71d038cd2adc0724180e22959edadc549bf8d12";
+      sha512 = "fa4e9de86197c3a95cd0d048e16de89bafd9d4733d3f2c96d221aa5c3839b980ab92efde0d18347251edf718f8d37a3fb8c5afcbaf254f697e320420cb91cc96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/xh/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/xh/firefox-57.0b13.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "9d8338b04f2d8f43a096049b11b8d359a1a09a22a2074bb0fb4364e8a551976810cef148405fb45800a4d751d2321e4d9492a79549d076a8dad3db33d22dafb1";
+      sha512 = "19b4a96abda10b29ab9aada2d9ba70e259ba0a3082796def317e1869f27b6326fe03f9d909f6753f494caef08f0f24e41f5b8be16c5c84ccaf06cf354b926cf5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/zh-CN/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/zh-CN/firefox-57.0b13.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "d3f4dab15e4293cff13be4da142169c18b2d672c9af141287c388a31fd1aec4305ce178af1dad6a21fbeef571445cc15ee15c38464bccefb4eae80dbb03177b1";
+      sha512 = "dd7e4c7bf1af9975f043bcc2be140b6c667f6dd74c2acc5d31963f6963fa5e0d7dc672fcfaca7ebfe99fd14cbd78725d24dc9c490c9ed1e211bd9e154e51c311";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/zh-TW/firefox-57.0b11.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/zh-TW/firefox-57.0b13.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "4b82c8291dda948e1f63dcce2c8803c1ed1db862e585612c0c2de96e14c7442c2a845cf896c5fb9492cb4424c05f14ca5a546b30c6491f557c511f936153cac2";
+      sha512 = "82b442aeb21b5b0fa7d48519ef5a1d3a6b57f2e013cc4e7a18b050cdd6632ec69e8383e58d0608515397a460a2bf339e03f3e11f780698d5b8e3cd4f3aa8f5fc";
     }
     ];
 }
-- 
GitLab


From caa8284e096bcda78f64c230df6b8f6c05990935 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 1 Nov 2017 16:17:44 +0300
Subject: [PATCH 489/877] rambox, franz: install xdg_utils for url opening

xorg installs this, but wayland doesn't
---
 .../networking/instant-messengers/franz/default.nix        | 7 +++++--
 .../networking/instant-messengers/rambox/default.nix       | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index a238009cd11..c2e6528e637 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeDesktopItem
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper
 , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
-, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }:
+, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
 
 let
   bits = if stdenv.system == "x86_64-linux" then "x64"
@@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
   # don't remove runtime deps
   dontPatchELF = true;
 
+  buildInputs = [ makeWrapper ];
+
   unpackPhase = ''
     tar xzf $src
   '';
@@ -59,6 +61,7 @@ in stdenv.mkDerivation rec {
 
   postFixup = ''
     paxmark m $out/opt/franz/Franz
+    wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 38d489de02a..55e78c0ec63 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, dpkg
+{ stdenv, fetchurl, dpkg, makeWrapper
 , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
-, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }:
+, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
 
 let
   bits = if stdenv.system == "x86_64-linux" then "x64"
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
   # don't remove runtime deps
   dontPatchELF = true;
 
-  buildInputs = [ dpkg ];
+  buildInputs = [ dpkg makeWrapper ];
 
   unpackPhase = "dpkg-deb -x $src .";
 
@@ -50,6 +50,7 @@ in stdenv.mkDerivation rec {
 
   postFixup = ''
     paxmark m $out/opt/Rambox/rambox
+    wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 85f5d5ce16f81635e05869eda702a9333a96f9fd Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 1 Nov 2017 17:09:54 +0300
Subject: [PATCH 490/877] rambox: 0.5.12 -> 0.5.13

---
 .../networking/instant-messengers/rambox/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 55e78c0ec63..7c8367d7f7f 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -6,7 +6,7 @@ let
   bits = if stdenv.system == "x86_64-linux" then "x64"
          else "ia32";
 
-  version = "0.5.12";
+  version = "0.5.13";
 
   runtimeDeps = [
     udev libnotify
@@ -23,8 +23,8 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb";
     sha256 = if bits == "x64" then
-      "1jlvpq7wryz4vf6xlsb9c38jrhjiv18rdf2ndlv76png60wl8418" else
-      "063j3gcpp18wdvspy7d43cgv7i5v8c42hn2zpp083jixw9ddsqwa";
+      "0bn562fr1wsnn3xsd4q2rrxi6c56vckrkfmjl2dqb30hpmj2vn0d" else
+      "180ndvkil5mk5idwnn7spfygnhhll6pjc342pfzgmzk46a723qs4";
   };
 
   # don't remove runtime deps
-- 
GitLab


From b3b438a8fde43811c54c59ea905511cb1d49c9da Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 17 Oct 2017 13:38:18 +0300
Subject: [PATCH 491/877] mailnag: use setup.py

---
 .../networking/mailreaders/mailnag/default.nix            | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 281bc690bad..e04a5dd469b 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -6,7 +6,9 @@
 , withNetworkManager ? true
 }:
 
-pythonPackages.buildPythonApplication rec {
+let
+  inherit (pythonPackages) python;
+in pythonPackages.buildPythonApplication rec {
   name = "mailnag-${version}";
   version = "1.2.1";
 
@@ -31,6 +33,10 @@ pythonPackages.buildPythonApplication rec {
     pygobject3 dbus-python pyxdg
   ];
 
+  buildPhase = "";
+
+  installPhase = "${python}/bin/python setup.py install --prefix=$out";
+
   doCheck = false;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 5c06711c80d560ee2c090f1373c9757398a52163 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 19 Oct 2017 22:00:17 +0300
Subject: [PATCH 492/877] mailnag: gnomekeyring by default

---
 .../networking/mailreaders/mailnag/default.nix             | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index e04a5dd469b..b1ca80fc7e4 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -2,8 +2,8 @@
 , gdk_pixbuf, libnotify, gst_all_1
 , libgnome_keyring3, networkmanager
 , wrapGAppsHook, gnome3
-, withGnomeKeyring ? false
-, withNetworkManager ? true
+# otherwise passwords are stored unencrypted
+, withGnomeKeyring ? true
 }:
 
 let
@@ -22,8 +22,7 @@ in pythonPackages.buildPythonApplication rec {
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gst_all_1.gst-plugins-bad
     gnome3.defaultIconTheme
-  ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3
-    ++ stdenv.lib.optional withNetworkManager networkmanager;
+  ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3;
 
   nativeBuildInputs = [
     wrapGAppsHook
-- 
GitLab


From cf7d701108910120b68332d0b026133defa09c98 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 2 Nov 2017 13:24:32 +0800
Subject: [PATCH 493/877] unetbootin: 655 -> 657 and make it build again

---
 pkgs/tools/cd-dvd/unetbootin/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 4d6ddd546db..0da3ff45a8c 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -3,16 +3,16 @@
 
 stdenv.mkDerivation rec {
   name = "unetbootin-${version}";
-  version = "655";
+  version = "657";
 
   src = fetchFromGitHub {
     owner  = "unetbootin";
     repo   = "unetbootin";
     rev    = version;
-    sha256 = "1gis75vy172k7lgh8bwgap74s259y9x1wg3rkqhhqncl2vv0w1py";
+    sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy";
   };
 
-  sourceRoot = "${name}-src/src/unetbootin";
+  sourceRoot = "source/src/unetbootin";
 
   buildInputs = [ qt4 ];
   nativeBuildInputs = [ makeWrapper qmake4Hook ];
@@ -42,18 +42,17 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp unetbootin $out/bin
+    runHook preInstall
 
-    mkdir -p $out/share/unetbootin
-    cp unetbootin_*.qm  $out/share/unetbootin
-
-    mkdir -p $out/share/applications
-    cp unetbootin.desktop $out/share/applications
+    install -Dm755 -t $out/bin                unetbootin
+    install -Dm644 -t $out/share/unetbootin   unetbootin_*.qm
+    install -Dm644 -t $out/share/applications unetbootin.desktop
 
     wrapProgram $out/bin/unetbootin \
       --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \
       --set QT_X11_NO_MITSHM 1
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 0fd585fa62099f666082c67fb87ff99624f3c2aa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 2 Nov 2017 13:28:53 +0800
Subject: [PATCH 494/877] puddletag: fix the due to sourceRoot changes

---
 pkgs/applications/audio/puddletag/default.nix | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index c140e1a46e5..f5f580b3664 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,20 +1,17 @@
 { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
 
-let
-  pname = "puddletag";
-
-in python2Packages.buildPythonApplication rec {
-  name = "${pname}-${version}";
+python2Packages.buildPythonApplication rec {
+  name = "puddletag-${version}";
   version = "1.2.0";
 
   src = fetchFromGitHub {
-    owner = "keithgg";
-    repo = pname;
-    rev = "v${version}";
+    owner  = "keithgg";
+    repo   = "puddletag";
+    rev    = "v${version}";
     sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz";
   };
 
-  sourceRoot = "${pname}-v${version}-src/source";
+  sourceRoot = "source/source";
 
   disabled = python2Packages.isPy3k; # work to support python 3 has not begun
 
@@ -29,17 +26,21 @@ in python2Packages.buildPythonApplication rec {
   dontStrip = true;  # we are not generating any binaries
 
   installPhase = ''
+    runHook preInstall
+
     siteDir=$(toPythonPath $out)
     mkdir -p $siteDir
     PYTHONPATH=$PYTHONPATH:$siteDir
     ${python2Packages.python.interpreter} setup.py install --prefix $out
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://puddletag.net;
+    homepage    = https://puddletag.net;
     description = "An audio tag editor similar to the Windows program, Mp3tag";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    license     = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.linux;
   };
 }
-- 
GitLab


From 7c83413a7daac386ec32867ac2f8743daaee60e6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 2 Nov 2017 13:46:43 +0800
Subject: [PATCH 495/877] virtmanager-qt: 0.43.72 -> 0.45.75

---
 .../virtualization/virt-manager/qt.nix             | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index fe885d86456..00d68a7d311 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -1,17 +1,17 @@
 { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
 , qtbase, qtmultimedia, qtsvg
-, lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol
+, lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol
 }:
 
 mkDerivation rec {
   name = "virt-manager-qt-${version}";
-  version = "0.43.72";
+  version = "0.45.75";
 
   src = fetchFromGitHub {
     owner  = "F1ash";
     repo   = "qt-virt-manager";
     rev    = "${version}";
-    sha256 = "0m8aqs58wnk404z2hav5j4yjsy8f0vfsm771pm0gprsfbx4sm3qg";
+    sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n";
   };
 
   cmakeFlags = [
@@ -20,20 +20,22 @@ mkDerivation rec {
 
   buildInputs = [
     qtbase qtmultimedia qtsvg lxqt.qtermwidget
-    libvirt libvncserver pixman spice_gtk spice_protocol
+    libvirt libvncserver pcre pixman spice_gtk spice_protocol
   ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
-    homepage = http://f1ash.github.io/qt-virt-manager;
+    homepage    = https://f1ash.github.io/qt-virt-manager;
     description = "Desktop user interface for managing virtual machines (QT)";
     longDescription = ''
       The virt-manager application is a desktop user interface for managing
       virtual machines through libvirt. It primarily targets KVM VMs, but also
       manages Xen and LXC (linux containers).
     '';
-    license = licenses.gpl2;
+    license     = licenses.gpl2;
     maintainers = with maintainers; [ peterhoeg ];
   };
 }
-- 
GitLab


From 7b9d338c674e3163f4f75d4f3d33f72754d462f3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 2 Nov 2017 14:11:06 +0800
Subject: [PATCH 496/877] pypi2nix: fix build

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

diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 5bcbacff4b9..70c292365ab 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
       if [ -e git-export ]; then
         mv git-export/src/pypi2nix      $out/pkgs/pypi2nix
       else
-        mv pypi2nix*/src/pypi2nix       $out/pkgs/pypi2nix
+        mv source/src/pypi2nix          $out/pkgs/pypi2nix
       fi
     fi
   '';
-- 
GitLab


From 1c431f4664d219368710c2db1d1b81e6e556978f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Nov 2017 09:08:42 +0100
Subject: [PATCH 497/877] stack2nix: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7bb62e1ccd0..f7df3ec3158 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -976,4 +976,6 @@ self: super: {
   # Build with gi overloading feature disabled.
   ltk = super.ltk.overrideScope (self: super: { haskell-gi-overloading = self.haskell-gi-overloading_0_0; });
 
+  # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4
+  stack2nix = doJailbreak super.stack2nix;
 }
-- 
GitLab


From 8796e3b6803b4128fc2c47d5e585519ba62384f0 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 08:19:58 +0000
Subject: [PATCH 498/877] python.pkgs.joblib: disable tests properly

---
 pkgs/development/python-modules/joblib/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 0efd110d1de..eedbed250a1 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -6,6 +6,7 @@
 , numpydoc
 , isPy3k
 , stdenv
+, pytest
 }:
 
 
@@ -18,14 +19,10 @@ buildPythonPackage rec {
     sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085";
   };
 
-  checkInputs = [ nose sphinx numpydoc ];
+  checkInputs = [ sphinx numpydoc pytest ];
 
-  # Failing test on Python 3.x and Darwin
-  postPatch = '''' + lib.optionalString (isPy3k || stdenv.isDarwin) ''
-    sed -i -e '70,84d' joblib/test/test_format_stack.py
-    # test_nested_parallel_warnings: ValueError: Non-zero return code: -9.
-    # Not sure why but it's nix-specific. Try removing for new joblib releases.
-    rm joblib/test/test_parallel.py
+  checkPhase = ''
+    py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test
   '';
 
   meta = {
@@ -33,4 +30,4 @@ buildPythonPackage rec {
     homepage = http://pythonhosted.org/joblib/;
     license = lib.licenses.bsd3;
   };
-}
\ No newline at end of file
+}
-- 
GitLab


From d0d9ed6fa0c1f980baa13dee0f9a2ba65bd40f21 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 2 Nov 2017 09:30:15 +0100
Subject: [PATCH 499/877] tokei: fix build

See #30088.
---
 pkgs/development/tools/misc/tokei/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index b44548c8ffd..2759b18e35c 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -13,13 +13,12 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0y0rkxhkv31v5sa0425dwskd80i6srwbqhqkrw1g1kbmbs9y0vxz";
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -p target/release/tokei $out/bin/
+  buildPhase = ''
+    # do not pass --frozen since Cargo.lock has the wrong tokei version
+    cargo build --release
   '';
 
   meta = with stdenv.lib; {
-    broken = true;
     description = "Count code, quickly";
     homepage = https://github.com/Aaronepower/tokei;
     license = licenses.mit;
-- 
GitLab


From 9ac793f860622b40ac8856a89abec202abad51e3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 1 Nov 2017 21:43:48 +0800
Subject: [PATCH 500/877] plasma: 5.11.1 -> 5.11.2

---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 352 ++++++++++++++++----------------
 2 files changed, 177 insertions(+), 177 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index f4d39604726..cb0f50727d7 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.1/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.2/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 900c6c0b2c4..5873f747060 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,355 +3,355 @@
 
 {
   bluedevil = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/bluedevil-5.11.1.tar.xz";
-      sha256 = "0p1y3p87xg7rjj35n81jg4v4yr2k7bf80qzfnwslbvwrpnzs982q";
-      name = "bluedevil-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/bluedevil-5.11.2.tar.xz";
+      sha256 = "0gwvmy8zn3wcdvcgc5j84gy1y7cxysy7bvnppg34rh6l5qc7vvjq";
+      name = "bluedevil-5.11.2.tar.xz";
     };
   };
   breeze = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/breeze-5.11.1.tar.xz";
-      sha256 = "0yqbr7j0iqnmczbfv454f1l5x3787vzfchgkrd995d6za2d0w2lp";
-      name = "breeze-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/breeze-5.11.2.tar.xz";
+      sha256 = "1wv5dp657gw4vyiv9zf6r8qbs67sp5g0x0kf1vmr1bp0gkw0ai81";
+      name = "breeze-5.11.2.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/breeze-grub-5.11.1.tar.xz";
-      sha256 = "0pcri1z4min5m6wb6ncyjavwd9nszyis3cqdyw6mqb4av55z0xl0";
-      name = "breeze-grub-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/breeze-grub-5.11.2.tar.xz";
+      sha256 = "04m74iy0rijccmvqd7c9n4p6nk3flmb3zaf5qk8hv31qscg5qjaj";
+      name = "breeze-grub-5.11.2.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/breeze-gtk-5.11.1.tar.xz";
-      sha256 = "0qb3ykf1mdw1iparsaxnypc4z41lfal6idksz9va25p3vclh02gr";
-      name = "breeze-gtk-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/breeze-gtk-5.11.2.tar.xz";
+      sha256 = "0c3vshnkgp6c38rwr1x34hn244r78qkc7fj0ax2cibydv3l852d4";
+      name = "breeze-gtk-5.11.2.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/breeze-plymouth-5.11.1.tar.xz";
-      sha256 = "1z175176583aqdvv6gwy7mdkndr50x1c8xdihrrcvdhvqy9qc7hr";
-      name = "breeze-plymouth-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/breeze-plymouth-5.11.2.tar.xz";
+      sha256 = "1v43z59y0zzwsrwa0y255i2q8krvr9yafdciyr63v4pb2564v4sd";
+      name = "breeze-plymouth-5.11.2.tar.xz";
     };
   };
   discover = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/discover-5.11.1.tar.xz";
-      sha256 = "0zr53nw9lix80wlf7wa7irng2vvy80wccjs439ib8r1yh3ggiq4c";
-      name = "discover-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/discover-5.11.2.tar.xz";
+      sha256 = "0j31x26s446xvi6dxr83v15xbr6ysifiwvdzil8yfsynifhjk5n3";
+      name = "discover-5.11.2.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/drkonqi-5.11.1.tar.xz";
-      sha256 = "0kq06sz39m8qg19b4cjqfwnx19j3s29hddhls8wywswwxlz4aq35";
-      name = "drkonqi-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/drkonqi-5.11.2.tar.xz";
+      sha256 = "1mgcp8zk4md0cyx6z6zz9s64jx9yshlnmsf1jxzhqwg8lyhyb77b";
+      name = "drkonqi-5.11.2.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kactivitymanagerd-5.11.1.tar.xz";
-      sha256 = "1j36mbngga492xxhm1ndw1bnq1qn480qpvzi94wyax9y3r4szmhg";
-      name = "kactivitymanagerd-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kactivitymanagerd-5.11.2.tar.xz";
+      sha256 = "165nybhn7pwgr6fds6frwcp3qsnxpmkz3842h0ni0flkkcl74n52";
+      name = "kactivitymanagerd-5.11.2.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kde-cli-tools-5.11.1.tar.xz";
-      sha256 = "0di7ypyhda4gpadhi0lbji4nyi9xk1y844kxfb586wpzkim5w82c";
-      name = "kde-cli-tools-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kde-cli-tools-5.11.2.tar.xz";
+      sha256 = "18pl9v2dxayzwzk4rw674ka3j45dj864604hgg0874kkr3kgsgka";
+      name = "kde-cli-tools-5.11.2.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kdecoration-5.11.1.tar.xz";
-      sha256 = "1jpvdscmy5ymyvj22784swvf6181f7ggr875djhx57c7i4shb3ph";
-      name = "kdecoration-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kdecoration-5.11.2.tar.xz";
+      sha256 = "0qkh3p1zzvk0yvlpbvwfgmb2wvj0gd3j2sbz10vplf66fm3ck2va";
+      name = "kdecoration-5.11.2.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kde-gtk-config-5.11.1.tar.xz";
-      sha256 = "1afbwdrjdv9a2qwyxysgnslavan20cmhrz88kmnf9imxlll0i7al";
-      name = "kde-gtk-config-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kde-gtk-config-5.11.2.tar.xz";
+      sha256 = "0vhmpma2ssp7nqdy8yd12d42y2a2fnsyyz9msi4s7n1w5qga0g5p";
+      name = "kde-gtk-config-5.11.2.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kdeplasma-addons-5.11.1.tar.xz";
-      sha256 = "09dwmd1aiiivkvdbyv97fili067sd8mw9dpknawair4mh7qb0zln";
-      name = "kdeplasma-addons-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kdeplasma-addons-5.11.2.tar.xz";
+      sha256 = "0x1lgvcnrc9vcy9fqvc60ilmcm8pbym76fq784qmgnmzm0br3bq6";
+      name = "kdeplasma-addons-5.11.2.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kgamma5-5.11.1.tar.xz";
-      sha256 = "1m9maxzn5y3zijmj2fkwsfwhinprhz97v9fi312dmwyvfhq3qvyd";
-      name = "kgamma5-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kgamma5-5.11.2.tar.xz";
+      sha256 = "0k6j6nl26bhdavfr4y0ph17fywprzxjnamh67vibk39xg6vwa56d";
+      name = "kgamma5-5.11.2.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/khotkeys-5.11.1.tar.xz";
-      sha256 = "0d1p1sia9qvdls38m29jijsf1ya8zvza557flmhcajb5ldn243l5";
-      name = "khotkeys-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/khotkeys-5.11.2.tar.xz";
+      sha256 = "1w1a06v2cgq48z0b1rz6px1g14hm7f5jxzxf7sa26yszsyhwqglm";
+      name = "khotkeys-5.11.2.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kinfocenter-5.11.1.tar.xz";
-      sha256 = "0ivhf460y83qv4qdphdvskx2nlfqzy453xfnq7ldyzp2yacdmcc8";
-      name = "kinfocenter-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kinfocenter-5.11.2.tar.xz";
+      sha256 = "1131gnqapnin8i4bm3skzhfsqgcaynaxn9xgfwxnj64z41cc8z8l";
+      name = "kinfocenter-5.11.2.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kmenuedit-5.11.1.tar.xz";
-      sha256 = "081lqh5ck854pha1f99w6w4j032spl3v28ild61fmhvhzkvx48a6";
-      name = "kmenuedit-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kmenuedit-5.11.2.tar.xz";
+      sha256 = "03412s6wc9h2422lx57rg65zln9ywjk5gbs5mqjr6fi46a1zp5lg";
+      name = "kmenuedit-5.11.2.tar.xz";
     };
   };
   kscreen = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kscreen-5.11.1.tar.xz";
-      sha256 = "1skdg59qacxxkiyz3gc1nn4y4lflbynpcb4mpsliqb2n2xdhvg8r";
-      name = "kscreen-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kscreen-5.11.2.tar.xz";
+      sha256 = "0bs09zfq1cs1ajgvz4p7l5naa3g3vzp72v9q7qkncx8yqiffxlnc";
+      name = "kscreen-5.11.2.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kscreenlocker-5.11.1.tar.xz";
-      sha256 = "0jgq2w7zi1i4wdlfmfz1jh1kbkcn2lxkdg9ds5brisc3f6r4n3vg";
-      name = "kscreenlocker-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kscreenlocker-5.11.2.tar.xz";
+      sha256 = "1k32nzhv9d4g5ijkx8bl22hp5j1g22frriwq14xjw47ga8vkqmxw";
+      name = "kscreenlocker-5.11.2.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/ksshaskpass-5.11.1.tar.xz";
-      sha256 = "00ghycjmagc8mjwsgny9bkr45ppnad6aay44ha6fn5gyx973xcmx";
-      name = "ksshaskpass-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/ksshaskpass-5.11.2.tar.xz";
+      sha256 = "1z3vm8kwyi9pf51bhpqf3phbjkbrqfj4iiqzzs0aqm0l5db5il0r";
+      name = "ksshaskpass-5.11.2.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/ksysguard-5.11.1.tar.xz";
-      sha256 = "11z29w95ji815gwaggs0n9bw8f040z4fd87ci2wmqcpyrjs7a6z1";
-      name = "ksysguard-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/ksysguard-5.11.2.tar.xz";
+      sha256 = "0vy2ivsn0cg70n1cxwa2385fwh350xngc1429zjfcs0jj8lcj21l";
+      name = "ksysguard-5.11.2.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kwallet-pam-5.11.1.tar.xz";
-      sha256 = "0zipldqjg3mazm2j7vrxkc0pqp7x7mmdq7cg1vlb1xlj8ld2vl7y";
-      name = "kwallet-pam-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kwallet-pam-5.11.2.tar.xz";
+      sha256 = "1jr4zvf9c5npi9mcgil5byx4bwh6kaa205329p5z8i15n1zf250f";
+      name = "kwallet-pam-5.11.2.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kwayland-integration-5.11.1.tar.xz";
-      sha256 = "1h1lcvzbcf628hs5hj3ykpzy086ylvf5bz63gr0clhyckjxrbbkh";
-      name = "kwayland-integration-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kwayland-integration-5.11.2.tar.xz";
+      sha256 = "1dzlf9638d36h8z5a7rjbb0xl2wjqg04j37gn4jnjclm57bwlrjm";
+      name = "kwayland-integration-5.11.2.tar.xz";
     };
   };
   kwin = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kwin-5.11.1.tar.xz";
-      sha256 = "1anc8pblpsb8g7lvnq43ji6fgpwxsnmypc3gkip26lb4j7gqfhqm";
-      name = "kwin-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kwin-5.11.2.tar.xz";
+      sha256 = "1wvq4pll1adncj88qd7isc0ip7hx2c72ah0vvmvxmkwxa4r5a89b";
+      name = "kwin-5.11.2.tar.xz";
     };
   };
   kwrited = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/kwrited-5.11.1.tar.xz";
-      sha256 = "11y2dpjs0g01nah1924dzf39y1smzlswc6nx1cwgfky3raaz3cj0";
-      name = "kwrited-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/kwrited-5.11.2.tar.xz";
+      sha256 = "17i33yvpvpj6q42c58adb99xs1yb7yfchs626vw5nmllv7r7496l";
+      name = "kwrited-5.11.2.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/libkscreen-5.11.1.tar.xz";
-      sha256 = "0drv6f8gzilirwp7p31qrng7cdp7b23ar5v1d5bkdrr1q29z8wdv";
-      name = "libkscreen-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/libkscreen-5.11.2.tar.xz";
+      sha256 = "18bf7mzzri7fj8iw60wqbs6w46lin8lninpqpcs5fwz6m81lcxsg";
+      name = "libkscreen-5.11.2.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/libksysguard-5.11.1.tar.xz";
-      sha256 = "1m8514jv2487fbypxys65qb0a55psqvyzkw5l81ka4ydnrhl2hhm";
-      name = "libksysguard-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/libksysguard-5.11.2.tar.xz";
+      sha256 = "12d0r4rilydbqdgkm256khvkb9m0hya3p27xqvv3hg77wgxzdl3f";
+      name = "libksysguard-5.11.2.tar.xz";
     };
   };
   milou = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/milou-5.11.1.tar.xz";
-      sha256 = "1v7rbjw8i1pdvl60xh8s0srrp17jks360zk42rp3hq9srsffd8cp";
-      name = "milou-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/milou-5.11.2.tar.xz";
+      sha256 = "0kxf2q0pk7kyfirrspgpwlnj18v8q2770rrmrv0jcfsgv4jhl2gj";
+      name = "milou-5.11.2.tar.xz";
     };
   };
   oxygen = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/oxygen-5.11.1.tar.xz";
-      sha256 = "0b3yl4q5cbcj6d07xrmifpvwysaa870gf56a7l38zjba6z04819z";
-      name = "oxygen-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/oxygen-5.11.2.tar.xz";
+      sha256 = "18nkw02q7lzdhalmbwsb5i704szs19zc5a0z73smanf20cfq7a91";
+      name = "oxygen-5.11.2.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/plasma-desktop-5.11.1.tar.xz";
-      sha256 = "1r7chviykyq2650k513qcp665pv8vpdczvbrvqfhbpn4yy47crps";
-      name = "plasma-desktop-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/plasma-desktop-5.11.2.tar.xz";
+      sha256 = "0dz57qywlircjjybxzb3mqxwaid86zdfwjgfwcb6fhm8rxhbhrzq";
+      name = "plasma-desktop-5.11.2.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/plasma-integration-5.11.1.tar.xz";
-      sha256 = "0jpshilcpklyx7cbpn0cf96md2h6pwd86bk8lphzm64zv3c655ly";
-      name = "plasma-integration-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/plasma-integration-5.11.2.tar.xz";
+      sha256 = "15vjmmrlk9dw0if0z3xam171f8z3qkjcllj3zyc0zxdwi2zw6i2l";
+      name = "plasma-integration-5.11.2.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/plasma-nm-5.11.1.tar.xz";
-      sha256 = "0479cqy7503krish11djg7rc4g7kdlbj3gapsbgvlq9x6j7ixz1p";
-      name = "plasma-nm-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/plasma-nm-5.11.2.tar.xz";
+      sha256 = "1h3ajq3fdv8fn0r51cpkhihacpjvpgzpfyg2m9aydh7ajygf0njq";
+      name = "plasma-nm-5.11.2.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/plasma-pa-5.11.1.tar.xz";
-      sha256 = "0g565v4dwcn6jppn1p2dvljg5r39xmgjzgf8rcipw70kcwc1nx4c";
-      name = "plasma-pa-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/plasma-pa-5.11.2.tar.xz";
+      sha256 = "1ckk4ckhy5y3b6cm7gahwkqvf8bxndk0srij3ggqdasxzdc4fjn8";
+      name = "plasma-pa-5.11.2.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/plasma-sdk-5.11.1.tar.xz";
-      sha256 = "0ss148yig5zzprkk2ydq3np34gr0bnbh1gn18hgb5z33iglbdl3n";
-      name = "plasma-sdk-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/plasma-sdk-5.11.2.tar.xz";
+      sha256 = "10ayy3r36ysq3a79nlpqspfff0s28iq2xyp5767qpmzfrjby4bcx";
+      name = "plasma-sdk-5.11.2.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/plasma-tests-5.11.1.tar.xz";
-      sha256 = "03r5dczb9iqigg2s7h0k6zgb616358lqvl2h0k0bg2hxggnh8lpk";
-      name = "plasma-tests-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/plasma-tests-5.11.2.tar.xz";
+      sha256 = "06k1cmmbyp4rslhmj6b1ngq6pg0hv9hmc3yi135vjgppj5x523mm";
+      name = "plasma-tests-5.11.2.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/plasma-vault-5.11.1.tar.xz";
-      sha256 = "09wbjk0bsbjyh5n1d5gywdvaimajqr50sd23dbfdbnpi3br0gk10";
-      name = "plasma-vault-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/plasma-vault-5.11.2.tar.xz";
+      sha256 = "1lxp40lmb03aicw9lz742i1lrigkki76yy7p5h9gnb4djzv5h0m6";
+      name = "plasma-vault-5.11.2.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-5.11.1.tar.xz";
-      sha256 = "1fy4bdxrz8mn29nc2qjxjnpxzjy9mynwwdjxj0jr61w0ljd40wiy";
-      name = "plasma-workspace-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-5.11.2.tar.xz";
+      sha256 = "12i7raf4qqinr3wd4kzz96pkng19c7mdjqz28m8jwb3c1gdlps2w";
+      name = "plasma-workspace-5.11.2.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-wallpapers-5.11.1.tar.xz";
-      sha256 = "0dcfrad2543fxapizmlikv52m9nmdg45gddvh9chc83kangsydlc";
-      name = "plasma-workspace-wallpapers-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-wallpapers-5.11.2.tar.xz";
+      sha256 = "01a4cz7d15mrb96yhfvck61vbqdnw208mgssrllrmcfdn7hwalv1";
+      name = "plasma-workspace-wallpapers-5.11.2.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/plymouth-kcm-5.11.1.tar.xz";
-      sha256 = "0w3yhazbx79s9k1yc3lj16hanc3wrqphhk9zjl9q1vxsn2rzas8h";
-      name = "plymouth-kcm-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/plymouth-kcm-5.11.2.tar.xz";
+      sha256 = "1dig5msins4grby4lvrrby0adjci8yplq1nw52xq571qvvcixjf4";
+      name = "plymouth-kcm-5.11.2.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.11.1";
+    version = "1-5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/polkit-kde-agent-1-5.11.1.tar.xz";
-      sha256 = "04ycjqx9hnk3ab8qxk5gqz7b4r7im3bwap613qcgxjqr5cagp66w";
-      name = "polkit-kde-agent-1-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/polkit-kde-agent-1-5.11.2.tar.xz";
+      sha256 = "0qbr8c3fn6yp6ixfcfg4190q2wdj1xlm6791nn23bynd0nrxmxb3";
+      name = "polkit-kde-agent-1-5.11.2.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/powerdevil-5.11.1.tar.xz";
-      sha256 = "02rf8iz2spcc78xs88dknl6a7slwgfgh4ra8lhwk69d210cxgahq";
-      name = "powerdevil-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/powerdevil-5.11.2.tar.xz";
+      sha256 = "10ah28rqdn8xhz578yhcnampbfq7vh89gm0jzjx9ryxiv6rch2cw";
+      name = "powerdevil-5.11.2.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/sddm-kcm-5.11.1.tar.xz";
-      sha256 = "0sac2cknq7m26v8a59q1aakn6xjzmspnslfs6k633a8yz8w4lh19";
-      name = "sddm-kcm-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/sddm-kcm-5.11.2.tar.xz";
+      sha256 = "159qwvzk7g4ygg2sdb6k84vq0k1yadrgwzgq6sfbfhffim1w6dr1";
+      name = "sddm-kcm-5.11.2.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/systemsettings-5.11.1.tar.xz";
-      sha256 = "0bnygmb3g573b7a8g0qg3ddj65miw29v3p25sh0ic9ij5bx6f4rw";
-      name = "systemsettings-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/systemsettings-5.11.2.tar.xz";
+      sha256 = "11gcrd1i28hifjysvnj97fcy619h660j4bgszj9lmr8w554j0cri";
+      name = "systemsettings-5.11.2.tar.xz";
     };
   };
   user-manager = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/user-manager-5.11.1.tar.xz";
-      sha256 = "1iz5wm8d3ljn97msbh1bc7v8zmmgxrfr5mwfzh0ssdldba4wqlpm";
-      name = "user-manager-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/user-manager-5.11.2.tar.xz";
+      sha256 = "1pyyhhi276s8503q65n25rqwcddcbzy6l2vl844dnmmpd1m0gi4r";
+      name = "user-manager-5.11.2.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.11.1";
+    version = "5.11.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.11.1/xdg-desktop-portal-kde-5.11.1.tar.xz";
-      sha256 = "0w822jlg0h7qim70zamm7q5x2b614qmiggz9wr8yxq80lajizxnf";
-      name = "xdg-desktop-portal-kde-5.11.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.11.2/xdg-desktop-portal-kde-5.11.2.tar.xz";
+      sha256 = "0yjidwqk25c7grj42facqfl84ai7h4fin0zlf8y9jdksv26hskl0";
+      name = "xdg-desktop-portal-kde-5.11.2.tar.xz";
     };
   };
 }
-- 
GitLab


From faa9afbdfd492ed262e67383fa69d5cddeb0e415 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 2 Nov 2017 10:48:03 +0100
Subject: [PATCH 501/877] masterpdfeditor: move assets into
 $out/opt/masterpdfeditor, symlink from $out/bin

---
 .../applications/misc/masterpdfeditor/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 764d400820d..76d23f1a8f0 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -22,26 +22,25 @@
       ];
       dontStrip = true;
       installPhase = ''
-        mkdir -p $out/bin $out/share/applications $out/share/pixmaps
+        p=$out/opt/masterpdfeditor
+        mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps
 
         substituteInPlace masterpdfeditor4.desktop \
           --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \
           --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \
           --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps"
-
-        cp -v masterpdfeditor4 $out/bin/masterpdfeditor4
         cp -v masterpdfeditor4.png $out/share/pixmaps/
         cp -v masterpdfeditor4.desktop $out/share/applications
 
-        cp -v -r stamps $out/bin/stamps
-        cp -v -r templates $out/bin/templates
-        cp -v -r lang $out/bin/lang
-        cp -v -r fonts $out/bin/fonts
+        cp -v masterpdfeditor4 $p/
+        ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4
+        cp -v -r stamps templates lang fonts $p
+
         install -D license.txt $out/share/$name/LICENSE
 
         patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
                  --set-rpath $libPath \
-                 $out/bin/masterpdfeditor4
+                 $p/masterpdfeditor4
       '';
       meta = with stdenv.lib; {
         description = "Master PDF Editor";
-- 
GitLab


From 5826097522a22d8e1db72441aac26d68bf31966d Mon Sep 17 00:00:00 2001
From: Evan Wallace <mankarse.git@alethrea.net>
Date: Thu, 2 Nov 2017 09:53:09 +0000
Subject: [PATCH 502/877] utox: Fixed test configuration Moved 'check' to
 nativeBuildInputs, as it is only used by the tests

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

diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 7506949f153..9c4d88761b8 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libtoxcore dbus libvpx libX11 openal freetype
     libv4l libXrender fontconfig libXext libXft filter-audio
-    libsodium libopus check
+    libsodium libopus
   ];
 
   nativeBuildInputs = [
-    cmake git pkgconfig
+    cmake git pkgconfig check
   ];
 
   cmakeFlags = [
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
+  checkTarget = "test";
+
   meta = with stdenv.lib; {
     description = "Lightweight Tox client";
     homepage = https://github.com/uTox/uTox;
-- 
GitLab


From ccbcf15c8ee86bd1c2e4eae39d225fab63b376f5 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Wed, 1 Nov 2017 01:25:13 +0100
Subject: [PATCH 503/877] nodejs: refactor generic build function

This removes some duplicated and dead code across the different versions of
nodejs.
---
 pkgs/development/web/nodejs/nodejs.nix | 29 +++++++++++++------
 pkgs/development/web/nodejs/v4.nix     | 23 +++++----------
 pkgs/development/web/nodejs/v6.nix     | 22 +++++---------
 pkgs/development/web/nodejs/v8.nix     | 24 +++++-----------
 pkgs/development/web/nodejs/v9.nix     | 24 +++++-----------
 pkgs/top-level/all-packages.nix        | 40 ++++++--------------------
 6 files changed, 56 insertions(+), 106 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index d7917c52c99..eafaf956ee0 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool, fetchpatch
-, callPackage
+{ stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser
+, pkgconfig, which
 , darwin ? null
-, enableNpm ? true
 }:
 
 with stdenv.lib;
 
+{ enableNpm ? true, version, sha256, patches }:
+
 let
 
   inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
 
+
+
+  baseName = if enableNpm then "nodejs" else "nodejs-slim";
+
   sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs (!stdenv.isDarwin) { inherit http-parser; });
 
   sharedConfigureFlags = concatMap (name: [
@@ -25,12 +29,20 @@ let
   extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ];
 in
 
-  rec {
+  stdenv.mkDerivation {
+    inherit version;
+
+    name = "${baseName}-${version}";
+
+    src = fetchurl {
+      url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
+      inherit sha256;
+    };
 
     buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
     ++ [ python2 which zlib libuv openssl ]
     ++ optionals stdenv.isLinux [ utillinux http-parser ]
-    ++ optionals stdenv.isDarwin [ pkgconfig libtool ];
+    ++ optionals stdenv.isDarwin [ pkgconfig darwin.cctools ];
 
     configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags;
 
@@ -40,10 +52,9 @@ in
 
     passthru.interpreterName = "nodejs";
 
-
     setupHook = ./setup-hook.sh;
 
-    patches = optionals stdenv.isDarwin [ ./no-xcode.patch ];
+    inherit patches;
 
     preBuild = optionalString stdenv.isDarwin ''
       sed -i -e "s|tr1/type_traits|type_traits|g" \
@@ -59,7 +70,7 @@ in
       paxmark m $out/bin/node
       PATH=$out/bin:$PATH patchShebangs $out
 
-      ${optionalString enableNpm '' 
+      ${optionalString enableNpm ''
         mkdir -p $out/share/bash-completion/completions/
         $out/bin/npm completion > $out/share/bash-completion/completions/npm
       ''}
diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index d3ad4d11e4c..08fd91aaf8d 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -1,20 +1,11 @@
-{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool, fetchpatch
-, callPackage
-, darwin ? null
-, enableNpm ? true
-}@args:
+{ stdenv, callPackage, lib, enableNpm ? true }:
 
 let
-  nodejs = import ./nodejs.nix args;
-  baseName = if enableNpm then "nodejs" else "nodejs-slim";
+  buildNodejs = callPackage ./nodejs.nix {};
 in
-  stdenv.mkDerivation (nodejs // rec {
+  buildNodejs {
+    inherit enableNpm;
     version = "4.8.5";
-    name = "${baseName}-${version}";
-    src = fetchurl {
-      url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
-      sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4";
-    };
-
-  })
+    sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4";
+    patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
+  }
diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index e516d9b99b6..c703377d5a0 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -1,19 +1,11 @@
-{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool, fetchpatch
-, callPackage
-, darwin ? null
-, enableNpm ? true
-}@args:
+{ stdenv, callPackage, lib, enableNpm ? true }:
 
 let
-  nodejs = import ./nodejs.nix args;
-  baseName = if enableNpm then "nodejs" else "nodejs-slim";
+  buildNodejs = callPackage ./nodejs.nix {};
 in
-  stdenv.mkDerivation (nodejs // rec {
+  buildNodejs {
+    inherit enableNpm;
     version = "6.11.5";
-    name = "${baseName}-${version}";
-    src = fetchurl {
-      url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w";
-    };
-  })
+    sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w";
+    patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
+  }
diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index c47a65bb4e1..1735d1cf9cf 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -1,21 +1,11 @@
-{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool, fetchpatch
-, callPackage
-, darwin ? null
-, enableNpm ? true
-}@args:
+{ stdenv, callPackage, lib, enableNpm ? true }:
 
 let
-  nodejs = import ./nodejs.nix args;
-  baseName = if enableNpm then "nodejs" else "nodejs-slim";
+  buildNodejs = callPackage ./nodejs.nix {};
 in
-  stdenv.mkDerivation (nodejs // rec {
+  buildNodejs {
+    inherit enableNpm;
     version = "8.9.0";
-    name = "${baseName}-${version}";
-    src = fetchurl {
-      url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "128ir6rkdz1xj55hbflw0sh7snrrvjwgvxmgnka7cyhjkvw5i0mf";
-    };
-
-    patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
-  })
+    sha256 = "128ir6rkdz1xj55hbflw0sh7snrrvjwgvxmgnka7cyhjkvw5i0mf";
+    patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
+  }
diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix
index 7b99275eedc..aa51421253f 100644
--- a/pkgs/development/web/nodejs/v9.nix
+++ b/pkgs/development/web/nodejs/v9.nix
@@ -1,21 +1,11 @@
-{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool, fetchpatch
-, callPackage
-, darwin ? null
-, enableNpm ? true
-}@args:
+{ stdenv, callPackage, lib, enableNpm ? true }:
 
 let
-  nodejs = import ./nodejs.nix args;
-  baseName = if enableNpm then "nodejs" else "nodejs-slim";
+  buildNodejs = callPackage ./nodejs.nix {};
 in
-  stdenv.mkDerivation (nodejs // rec {
+  buildNodejs {
+    inherit enableNpm;
     version = "9.0.0";
-    name = "${baseName}-${version}";
-    src = fetchurl {
-      url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "19az7mxcb3d1aj0f7gvhriyyghn1rwn0425924pa84d6j1mbsljv";
-    };
-
-    patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
-  })
+    sha256 = "19az7mxcb3d1aj0f7gvhriyyghn1rwn0425924pa84d6j1mbsljv";
+    patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9dc3f0c7a88..fe2e0df71bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3028,41 +3028,17 @@ with pkgs;
 
   nodejs-slim = nodejs-slim-6_x;
 
-  nodejs-4_x = callPackage ../development/web/nodejs/v4.nix {
-    libtool = darwin.cctools;
-  };
-
-  nodejs-slim-4_x = callPackage ../development/web/nodejs/v4.nix {
-    libtool = darwin.cctools;
-    enableNpm = false;
-  };
-
-  nodejs-6_x = callPackage ../development/web/nodejs/v6.nix {
-    libtool = darwin.cctools;
-  };
-
-  nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix {
-    libtool = darwin.cctools;
-    enableNpm = false;
-  };
+  nodejs-4_x = callPackage ../development/web/nodejs/v4.nix {};
+  nodejs-slim-4_x = callPackage ../development/web/nodejs/v4.nix { enableNpm = false; };
 
-  nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {
-    libtool = darwin.cctools;
-  };
-
-  nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix {
-    libtool = darwin.cctools;
-    enableNpm = false;
-  };
+  nodejs-6_x = callPackage ../development/web/nodejs/v6.nix {};
+  nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix { enableNpm = false; };
 
-  nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {
-    libtool = darwin.cctools;
-  };
+  nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {};
+  nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; };
 
-  nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix {
-    libtool = darwin.cctools;
-    enableNpm = false;
-  };
+  nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {};
+  nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { enableNpm = false; };
 
   nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix {
     nodejs = pkgs.nodejs-6_x;
-- 
GitLab


From 538acd9060df09045558c67cf98792a3902c5f3c Mon Sep 17 00:00:00 2001
From: Pierre-Etienne Meunier <pierre-etienne.meunier@inria.fr>
Date: Thu, 2 Nov 2017 11:10:47 +0100
Subject: [PATCH 504/877] ACME module: add server option (#31122)

---
 nixos/modules/security/acme.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index a40c5ef9ebe..fb011019f7f 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -139,6 +139,20 @@ in
         '';
       };
 
+      production = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          If set to true, use Let's Encrypt's production environment
+          instead of the staging environment. The main benefit of the
+          staging environment is to get much higher rate limits.
+
+          See
+          <literal>https://letsencrypt.org/docs/staging-environment</literal>
+          for more detail.
+        '';
+      };
+
       certs = mkOption {
         default = { };
         type = with types; attrsOf (submodule certOpts);
@@ -177,7 +191,9 @@ in
                 cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
                           ++ optionals (data.email != null) [ "--email" data.email ]
                           ++ concatMap (p: [ "-f" p ]) data.plugins
-                          ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains);
+                          ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)
+                          ++ (if cfg.production then []
+                              else ["--server" "https://acme-staging.api.letsencrypt.org/directory"]);
                 acmeService = {
                   description = "Renew ACME Certificate for ${cert}";
                   after = [ "network.target" "network-online.target" ];
-- 
GitLab


From c37c896ee00087b1e7d120938c213ed8c7840c26 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Nov 2017 11:28:14 +0100
Subject: [PATCH 505/877] linux: 4.13.10 -> 4.13.11

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix
index 8d4df067c83..bb40bbcb72e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.13.10";
+  version = "4.13.11";
   extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0c33v0y4hyklhz7i00sjrj2cpn6zlwc7qjj7w2zzxmnr9yn90c6x";
+    sha256 = "1vzl2i72c8iidhdc8a490npsbk7q7iphjqil4i9609disqw75gx4";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 6021ca25dbec863a52ed31c179814e0ff73ff4cf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Nov 2017 11:28:27 +0100
Subject: [PATCH 506/877] linux: 4.4.95 -> 4.4.96

---
 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 a695fe34cd6..3a49c348687 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.95";
+  version = "4.4.96";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "07vkxhh435gilxsh9ag6zvf2r9k5l9ffqp72900c50nsfjrdgdrx";
+    sha256 = "1asvcqip5w9nkg4c5jllbjygski9cnw7qn6ci7p6zwnd2mfks794";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 68b5ec06b90406e81a2ff059f02fc25bf63b82af Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Nov 2017 11:28:40 +0100
Subject: [PATCH 507/877] linux: 4.9.59 -> 4.9.60

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 72959dd7a9e..7431694e362 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.59";
+  version = "4.9.60";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "16rj4wg8psh3d47x8disk275nzzv26drvp03hi0r44mxw0lmd53k";
+    sha256 = "015dzkrhadmr3kadz0m3yhjikkmga8dv90f6s5ji5i2ja5f6qchf";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 22beeeab7684994aab938a849455686ea2f2509c Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Sat, 14 Oct 2017 15:45:35 +0200
Subject: [PATCH 508/877] criu: 2.0 -> 2.12.1

---
 pkgs/os-specific/linux/criu/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 6f14e713139..23d1c4821b8 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -1,26 +1,27 @@
 { stdenv, fetchurl, protobuf, protobufc, asciidoc
-, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, pkgconfig
+, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig
 , python }:
 
 stdenv.mkDerivation rec {
   name    = "criu-${version}";
-  version = "2.0";
+  version = "2.12.1";
 
   src = fetchurl {
     url    = "http://download.openvz.org/criu/${name}.tar.bz2";
-    sha256 = "1zqqshslcf503lqip89azp1zz0i8kb7v19b3dyp52izpak62c1z8";
+    sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k";
   };
 
   enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig docbook_xsl ];
-  buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap python ];
+  buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ];
 
   patchPhase = ''
     chmod +w ./scripts/gen-offsets.sh
     substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
     substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""
+    substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
     substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3"
-    substituteInPlace ./Makefile --replace "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" ""
+    substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0"
     ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
 
     # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
@@ -31,7 +32,9 @@ stdenv.mkDerivation rec {
 
   makeFlags = "PREFIX=$(out)";
 
-  hardeningDisable = [ "stackprotector" ];
+  hardeningDisable = [ "stackprotector" "fortify" ];
+  # dropping fortify here as well as package uses it by default:
+  # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
 
   installPhase = ''
     mkdir -p $out/etc/logrotate.d
-- 
GitLab


From 1fc6f4695ce03cba4d48c42ab4874d90d86ea3a8 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Thu, 2 Nov 2017 05:09:47 -0700
Subject: [PATCH 509/877] iwona (font): init at 0_995 (#31067)

* iwona: init at 0_995

* iwona: nitpicks
---
 pkgs/data/fonts/iwona/default.nix | 30 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/data/fonts/iwona/default.nix

diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix
new file mode 100644
index 00000000000..3649aad99f4
--- /dev/null
+++ b/pkgs/data/fonts/iwona/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "iwona-${version}";
+  version = "0_995";
+
+  src = fetchzip {
+    url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip";
+    sha256 = "1wj5bxbxpz5a8p3rhw708cyjc0lgqji8g0iv6brmmbrrkpb3jq2s";
+  };
+
+  installPhase = ''
+    install -m 444 -D -t $out/share/fonts/opentype/ *.otf
+  '';
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa";
+
+  meta = with stdenv.lib; {
+    description = "A two-element sans-serif typeface, created by Małgorzata Budyta";
+    homepage = http://jmn.pl/en/kurier-i-iwona/;
+    # "[...] GUST Font License (GFL), which is a free license, legally
+    # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or
+    # later." - GUST website
+    license = licenses.lppl13c;
+    maintainers = with maintainers; [ siddharthist ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8832afb256..c7f9ebf611e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13319,6 +13319,8 @@ with pkgs;
   ipafont = callPackage ../data/fonts/ipafont {};
   ipaexfont = callPackage ../data/fonts/ipaexfont {};
 
+  iwona = callPackage ../data/fonts/iwona { };
+
   junicode = callPackage ../data/fonts/junicode { };
 
   kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {};
-- 
GitLab


From 7dce131b8625e4cb51f1e4ebcb28f88e21458c14 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 7 Sep 2017 03:29:36 +0200
Subject: [PATCH 510/877] kernelmptcp: 0.91.3 -> 0.92.1

---
 pkgs/os-specific/linux/kernel/linux-mptcp.nix | 10 +++++-----
 pkgs/os-specific/linux/kernel/patches.nix     |  9 ---------
 pkgs/top-level/all-packages.nix               |  3 ++-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index dc4d10a0412..4c237cb24b4 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -1,18 +1,18 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  mptcpVersion = "0.91.3";
-  modDirVersion = "4.1.38";
+  mptcpVersion = "0.92.1";
+  modDirVersion = "4.4.83";
   version = "${modDirVersion}-mptcp_v${mptcpVersion}";
 
   extraMeta = {
-    branch = "4.1";
-    maintainers = [ stdenv.lib.maintainers.layus ];
+    branch = "4.4";
+    maintainers = with stdenv.lib.maintainers; [ teto layus ];
   };
 
   src = fetchurl {
     url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz";
-    sha256 = "0vqjnkzcbbvyq24w3cryfmw7hhws1xqkkxqcv71szkbqqs6mcr14";
+    sha256 = "1afjqmxq9p5gyr6r607bx3mqpnx451kfpwlffzxwgdwnf93alngz";
   };
 
   extraConfig = ''
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 93d7acdd8e7..c1288108b4f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -58,15 +58,6 @@ rec {
 
   cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;
 
-  DCCP_double_free_vulnerability_CVE-2017-6074 = rec
-    { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch";
-      patch = fetchpatch {
-        inherit name;
-        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4";
-        sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
-      };
-    };
-
   tag_hardened = rec {
     name = "tag-hardened";
     patch = ./tag-hardened.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7f9ebf611e..420c84b9b2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12394,11 +12394,12 @@ with pkgs;
     };
   };
 
+  # linux mptcp is based on the 4.4 kernel
   linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.p9_fixes
-        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
+        kernelPatches.cpu-cgroup-v2."4.4"
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
-- 
GitLab


From d9f9c0d0d11dbe3f3c9535d816c38b7c0898bb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 2 Nov 2017 10:15:48 -0200
Subject: [PATCH 511/877] qtermwidget: keep version 0.7.1, needed by
 virt-manager-qt

---
 .../virtualization/virt-manager/qt.nix        |  3 ++-
 pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix | 26 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  2 ++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix

diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index fe885d86456..2e0503f5a37 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -19,7 +19,8 @@ mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase qtmultimedia qtsvg lxqt.qtermwidget
+    # virt-manager-qt currently does not compile with qtermwidget-0.8.0
+    qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1
     libvirt libvncserver pixman spice_gtk spice_protocol
   ];
 
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix
new file mode 100644
index 00000000000..6bd6e2833f5
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}_0_7_1-${version}";
+  pname = "qtermwidget";
+  version = "0.7.1";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ qt5.qtbase ];
+
+  meta = with stdenv.lib; {
+    description = "A terminal emulator widget for Qt 5";
+    homepage = https://github.com/lxde/qtermwidget;
+    license = licenses.gpl2;
+    platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 16e864890f1..79896c7b90c 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -29,6 +29,8 @@ let
     lxqt-themes = callPackage ./core/lxqt-themes { };
     pavucontrol-qt = callPackage ./core/pavucontrol-qt { };
     qtermwidget = callPackage ./core/qtermwidget { };
+    # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0
+    qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { };
 
     ### CORE 2
     lxqt-panel = callPackage ./core/lxqt-panel { };
-- 
GitLab


From 7f921735e76076196a93fa55c234a6f1d01534a9 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Fri, 22 Sep 2017 03:39:00 -0700
Subject: [PATCH 512/877] strongswan: allow configuring enabled plugins

---
 .../services/networking/strongswan.nix        | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix
index b0eb0460b9b..3a3f64221c4 100644
--- a/nixos/modules/services/networking/strongswan.nix
+++ b/nixos/modules/services/networking/strongswan.nix
@@ -32,8 +32,10 @@ let
       ${caConf}
     '';
 
-  strongswanConf = {setup, connections, ca, secrets}: toFile "strongswan.conf" ''
+  strongswanConf = {setup, connections, ca, secrets, managePlugins, enabledPlugins}: toFile "strongswan.conf" ''
     charon {
+      ${if managePlugins then "load_modular = no" else ""}
+      ${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""}
       plugins {
         stroke {
           secrets_file = ${ipsecSecrets secrets}
@@ -112,6 +114,25 @@ in
         file.
       '';
     };
+
+    managePlugins = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        If set to true, this option will disable automatic plugin loading and
+        then tell strongSwan to enable the plugins specified in the
+        <option>enabledPlugins</option> option.
+      '';
+    };
+
+    enabledPlugins = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        A list of additional plugins to enable if
+        <option>managePlugins</option> is true.
+      '';
+    };
   };
 
   config = with cfg; mkIf enable {
@@ -122,7 +143,7 @@ in
       wants = [ "keys.target" ];
       after = [ "network-online.target" "keys.target" ];
       environment = {
-        STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets; };
+        STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets managePlugins enabledPlugins; };
       };
       serviceConfig = {
         ExecStart  = "${pkgs.strongswan}/sbin/ipsec start --nofork";
-- 
GitLab


From 8904ce343a67071dd080260d356fea556de7d0f2 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 2 Nov 2017 12:54:20 +0000
Subject: [PATCH 513/877] fix source root locations.

These have changed following commit
https://github.com/NixOS/nixpkgs/commit/c3255fe8ec326d2c8fe9462d49ed83aa64d3e68f.

See also:

- https://github.com/NixOS/nixpkgs/pull/31004
- https://github.com/NixOS/nixpkgs/pull/31106
---
 pkgs/applications/audio/puddletag/default.nix                | 4 +++-
 pkgs/applications/graphics/nomacs/default.nix                | 4 +++-
 pkgs/applications/graphics/screencloud/default.nix           | 4 +++-
 .../pidgin-plugins/pidgin-skypeweb/default.nix               | 4 +++-
 pkgs/applications/science/misc/golly/default.nix             | 4 +++-
 pkgs/development/compilers/dmd/2.067.1.nix                   | 3 +++
 pkgs/development/compilers/dmd/default.nix                   | 3 +++
 pkgs/development/compilers/ldc/default.nix                   | 4 ++++
 pkgs/development/libraries/bobcat/default.nix                | 4 +++-
 pkgs/development/libraries/cxxtest/default.nix               | 4 +++-
 pkgs/development/libraries/openvdb/default.nix               | 4 +++-
 pkgs/development/libraries/partio/default.nix                | 2 --
 pkgs/development/libraries/ptex/default.nix                  | 2 --
 pkgs/development/tools/build-managers/icmake/default.nix     | 5 ++++-
 pkgs/development/tools/misc/yodl/default.nix                 | 4 +++-
 pkgs/development/tools/parsing/flexc++/default.nix           | 4 +++-
 pkgs/os-specific/linux/jool/cli.nix                          | 4 +++-
 .../http/apache-modules/tomcat-connectors/default.nix        | 4 +++-
 pkgs/tools/cd-dvd/unetbootin/default.nix                     | 4 +++-
 pkgs/tools/compression/zstdmt/default.nix                    | 4 +++-
 pkgs/tools/inputmethods/zinnia/default.nix                   | 4 +++-
 pkgs/tools/misc/cloc/default.nix                             | 4 +++-
 pkgs/tools/networking/reaver-wps/default.nix                 | 5 ++++-
 pkgs/tools/text/zimreader/default.nix                        | 4 +++-
 pkgs/tools/text/zimwriterfs/default.nix                      | 4 +++-
 25 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index f5f580b3664..00f58750408 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -11,7 +11,9 @@ python2Packages.buildPythonApplication rec {
     sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz";
   };
 
-  sourceRoot = "source/source";
+  setSourceRoot = ''
+    sourceRoot=$(echo */source)
+  '';
 
   disabled = python2Packages.isPy3k; # work to support python 3 has not begun
 
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 669e46c6a84..ac0060ec7f8 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  sourceRoot = "${name}-src/ImageLounge";
+  setSourceRoot = ''
+    sourceRoot=$(echo */ImageLounge)
+  '';
 
   patches = [./fix-appdata-install.patch];
 
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
index 6f2b0e34cbb..cffe485711f 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/pkgs/applications/graphics/screencloud/default.nix
@@ -43,7 +43,9 @@ stdenv.mkDerivation rec {
     "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}"
   ];
 
-  sourceRoot = "screencloud-v${version}-src/screencloud";
+  setSourceRoot = ''
+    sourceRoot=$(echo */screencloud)
+  '';
 
   preConfigure = ''
     # This needs to be set in preConfigure instead of cmakeFlags in order to
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
index 53d1f30bee6..7ab9b194791 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2";
   };
 
-  sourceRoot = "skype4pidgin-${version}-src/skypeweb";
+  setSourceRoot = ''
+    sourceRoot=$(echo */skypeweb)
+  '';
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ pidgin json_glib ];
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index 8902bacf11c..94e7c0efaae 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
     inherit (s) url sha256;
   };
 
-  sourceRoot="${name}-src/gui-wx/configure";
+  setSourceRoot = ''
+    sourceRoot=$(echo */gui-wx/configure)
+  '';
 
   # Link against Python explicitly as it is needed for scripts
   makeFlags=[
diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix
index 6fab56e4e7d..6a3cddbd2e5 100644
--- a/pkgs/development/compilers/dmd/2.067.1.nix
+++ b/pkgs/development/compilers/dmd/2.067.1.nix
@@ -17,18 +17,21 @@ stdenv.mkDerivation rec {
     repo = "dmd";
     rev = "v${version}";
     sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz";
+    name = "dmd-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "dlang";
     repo = "druntime";
     rev = "v${version}";
     sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02";
+    name = "druntime-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "dlang";
     repo = "phobos";
     rev = "v${version}";
     sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1";
+    name = "phobos-v${version}-src";
   })
   ];
 
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 27f70b8d6c7..938dd04904b 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -14,18 +14,21 @@ stdenv.mkDerivation rec {
     repo = "dmd";
     rev = "v${version}";
     sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5";
+    name = "dmd-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "dlang";
     repo = "druntime";
     rev = "v${version}";
     sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j";
+    name = "druntime-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "dlang";
     repo = "phobos";
     rev = "v${version}";
     sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04";
+    name = "phobos-v${version}-src";
   })
   ];
 
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index 4be27531888..5c283dd4380 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -11,24 +11,28 @@ stdenv.mkDerivation rec {
     repo = "ldc";
     rev = "v${version}";
     sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl";
+    name = "ldc-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "ldc-developers";
     repo = "druntime";
     rev = "ldc-v${version}";
     sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30";
+    name = "druntime-ldc-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "ldc-developers";
     repo = "phobos";
     rev = "ldc-v${version}";
     sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g";
+    name = "phobos-ldc-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "ldc-developers";
     repo = "dmd-testsuite";
     rev = "ldc-v${version}";
     sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj";
+    name = "dmd-testsuite-ldc-v${version}-src";
   })
   ];
 
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index c5a6f55681a..9805930c7bf 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ libmilter libX11 openssl readline utillinux ];
   nativeBuildInputs = [ icmake yodl ];
 
-  sourceRoot = "bobcat-${version}-src/bobcat";
+  setSourceRoot = ''
+    sourceRoot=$(echo */bobcat)
+  '';
 
   postPatch = ''
     substituteInPlace INSTALL.im --replace /usr $out
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index c620777dc5b..aa0708daaa7 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -13,7 +13,9 @@ in python2Packages.buildPythonApplication rec {
     sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17";
   };
 
-  sourceRoot = "${name}-src/python";
+  setSourceRoot = ''
+    sourceRoot=$(echo */python)
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://cxxtest.com;
diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
index b172b82a295..2940ab45eaa 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/pkgs/development/libraries/openvdb/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec
 
   buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ];
 
-  sourceRoot = "openvdb-v${version}-src/openvdb";
+  setSourceRoot = ''
+    sourceRoot=$(echo */openvdb)
+  '';
 
   installTargets = "install_lib";
 
diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix
index ed0f38f8538..4f93ed56211 100644
--- a/pkgs/development/libraries/partio/default.nix
+++ b/pkgs/development/libraries/partio/default.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec
 
   buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ];
 
-  sourceRoot = "partio-v${version}-src";
-
   enableParallelBuilding = true;
 
   buildPhase = ''
diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix
index 7774cdbcb88..d40ae856495 100644
--- a/pkgs/development/libraries/ptex/default.nix
+++ b/pkgs/development/libraries/ptex/default.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec
 
   buildInputs = [ zlib python cmake ];
 
-  sourceRoot = "ptex-v${version}-src";
-
   enableParallelBuilding = true;
 
   buildPhase = ''
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 9185f5b9eaa..c79f238673e 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
     owner = "fbb-git";
   };
 
-  sourceRoot = "icmake-${version}-src/icmake";
+
+  setSourceRoot = ''
+    sourceRoot=$(echo */icmake)
+  '';
 
   buildInputs = [ gcc ];
 
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 1eed4c2ad86..e0bf9eac696 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
     owner = "fbb-git";
   };
 
-  sourceRoot = "yodl-${version}-src/yodl";
+  setSourceRoot = ''
+    sourceRoot=$(echo */yodl)
+  '';
 
   preConfigure = ''
     patchShebangs ./build
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 7fb1289b7eb..c782df50758 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     owner = "fbb-git";
   };
 
-  sourceRoot = "flexcpp-${version}-src/flexc++";
+  setSourceRoot = ''
+    sourceRoot=$(echo */flexc++)
+  '';
 
   buildInputs = [ bobcat ];
   nativeBuildInputs = [ icmake yodl ];
diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix
index 43edd8723a0..50f0398e134 100644
--- a/pkgs/os-specific/linux/jool/cli.nix
+++ b/pkgs/os-specific/linux/jool/cli.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
 
   src = sourceAttrs.src;
 
-  sourceRoot = "Jool-v${sourceAttrs.version}-src/usr";
+  setSourceRoot = ''
+    sourceRoot=$(echo */usr)
+  '';
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ libnl ];
diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
index 61de807d8e8..5768e7badea 100644
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}";
 
-  sourceRoot = "${name}-src/native";
+  setSourceRoot = ''
+    sourceRoot=$(echo */native)
+  '';
 
   installPhase = ''
     mkdir -p $out/modules
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 0da3ff45a8c..7deac71f151 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy";
   };
 
-  sourceRoot = "source/src/unetbootin";
+  setSourceRoot = ''
+    sourceRoot=$(echo */src/unetbootin)
+  '';
 
   buildInputs = [ qt4 ];
   nativeBuildInputs = [ makeWrapper qmake4Hook ];
diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix
index 5cf88e68c64..b723c107936 100644
--- a/pkgs/tools/compression/zstdmt/default.nix
+++ b/pkgs/tools/compression/zstdmt/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     owner = "mcmilk";
   };
 
-  sourceRoot = "zstdmt-v${version}-src/unix";
+  setSourceRoot = ''
+    sourceRoot=$(echo */unix)
+  '';
 
   buildInputs = [
     zstd lz4
diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix
index 18e6176b706..60f3a0feb55 100644
--- a/pkgs/tools/inputmethods/zinnia/default.nix
+++ b/pkgs/tools/inputmethods/zinnia/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg";
   };
 
-  setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)";
+  setSourceRoot = ''
+    sourceRoot=$(echo */zinnia)
+  '';
 
   meta = with stdenv.lib; {
     description = "Online hand recognition system with machine learning";
diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index e303b1dd7f2..a1c04f06d14 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b";
   };
 
-  sourceRoot = "source/Unix";
+  setSourceRoot = ''
+    sourceRoot=$(echo */Unix)
+  '';
 
   buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ];
 
diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix
index c9bd3fbaa85..667cbfbcead 100644
--- a/pkgs/tools/networking/reaver-wps/default.nix
+++ b/pkgs/tools/networking/reaver-wps/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ libpcap sqlite ];
 
-  sourceRoot = "reaver-${version}/src";
+
+  setSourceRoot = ''
+    sourceRoot=$(echo */src)
+  '';
 
   configureFlags = "--sysconfdir=${confdir}";
 
diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix
index 1c508a9cf7e..f9debaaf061 100644
--- a/pkgs/tools/text/zimreader/default.nix
+++ b/pkgs/tools/text/zimreader/default.nix
@@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ];
-  setSourceRoot = "cd openzim-*/zimreader; export sourceRoot=`pwd`";
+  setSourceRoot = ''
+    sourceRoot=$(echo */zimreader)
+  '';
   preConfigure = "./autogen.sh";
 
   meta = {
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index 6fcbf5061d1..5a5757bf2f2 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -28,7 +28,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
   buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ];
-  setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`";
+  setSourceRoot = ''
+    sourceRoot=$(echo */zimwriterfs)
+  '';
   preConfigure = "./autogen.sh";
 
   meta = {
-- 
GitLab


From 88557901aedd110d70741a1dd40d099a23c1d106 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Tue, 17 Oct 2017 23:30:16 +0200
Subject: [PATCH 514/877] mopidy-iris: 3.4.9 -> 3.6.1

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

diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index 05d041380a0..caeba5eb1ac 100644
--- a/pkgs/applications/audio/mopidy-iris/default.nix
+++ b/pkgs/applications/audio/mopidy-iris/default.nix
@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mopidy-iris-${version}";
-  version = "3.4.9";
+  version = "3.6.1";
 
   src = pythonPackages.fetchPypi {
     inherit version;
     pname = "Mopidy-Iris";
-    sha256 = "0acr8ss5d0jgcy1qsjb12h0n6kr6qdp9zrbbk9vv3m3s6kcm8vgb";
+    sha256 = "1mfi3qx7pvfq4rz0py39lnbzv7sq703b6k6mypzhj1gdzbisfn46";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From a4c431b5a7f986edc46039af3df5d01ac50db2c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 2 Nov 2017 15:14:26 +0100
Subject: [PATCH 515/877] altcoins.dogecoin*: sha change

---
 pkgs/applications/altcoins/dogecoin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix
index d8df6dd8349..33c2e598fca 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/pkgs/applications/altcoins/dogecoin.nix
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
     owner = "dogecoin";
     repo = "dogecoin";
     rev = "v${version}";
-    sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvy";
+    sha256 = "04rddx20d4fps2w3h1jxa2j8iyqpjv2fh897z0z3r06qjvjzf7rr";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ openssl db5 openssl utillinux 
+  buildInputs = [ openssl db5 openssl utillinux
                   protobuf boost zlib miniupnpc ]
                   ++ optionals withGui [ qt4 qrencode ];
 
-- 
GitLab


From dce0e5d81ba4f0397f8be2371e43a9768a199876 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Thu, 2 Nov 2017 10:23:51 -0400
Subject: [PATCH 516/877] vim-plugins: add vim-docbk and related snippets

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 90502188e5f..eab2efbb6be 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2506,6 +2506,28 @@ rec {
 
   };
 
+  vim-docbk = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-docbk-2015-04-01";
+    src = fetchgit {
+      url = "https://github.com/jhradilek/vim-docbk";
+      rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e";
+      sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d";
+    };
+    dependencies = [];
+
+  };
+
+  vim-docbk-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-docbk-snippets-2017-11-02";
+    src = fetchgit {
+      url = "https://github.com/jhradilek/vim-snippets";
+      rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
+      sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc";
+    };
+    dependencies = [];
+
+  };
+
   vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim2hs-2014-04-16";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 442464a16e7..b2273221e90 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -71,6 +71,8 @@
 "github:jceb/vim-orgmode"
 "github:jeetsukumaran/vim-buffergator"
 "github:jgdavey/tslime.vim"
+"github:jhradilek/vim-docbk"
+"github:jhradilek/vim-snippets"
 "github:jiangmiao/auto-pairs"
 "github:jistr/vim-nerdtree-tabs"
 "github:jnurmine/zenburn"
-- 
GitLab


From 7c8ec77db2dd4acf1072938c4e3c7006bbb58e5d Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 14:59:35 +0000
Subject: [PATCH 517/877] android-udev-rules: 20171014 -> 20171031

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

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index b8b08430de8..28b17d7e69c 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "android-udev-rules-${version}";
-  version = "20171014";
+  version = "20171031";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    sha256 = "15mqngwv7x2xpdsaiga33lb0s9hcrhnambcv9fp6jvgkf6604cdr";
+    sha256 = "0h9rp1bmry81lybly9x7qjdmaq0sj0m1ybl237qly8zqw7ywv5la";
   };
 
   installPhase = ''
-- 
GitLab


From eb33f5bc04828103f0c0388ca61e31ff816921b2 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 2 Nov 2017 16:28:06 +0000
Subject: [PATCH 518/877] build-pecl: honour nativeBuildInputs

Otherwise certain extensions are unable to locate pkgconfig.
---
 pkgs/build-support/build-pecl.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix
index 30a42fcc0fe..ce948739c32 100644
--- a/pkgs/build-support/build-pecl.nix
+++ b/pkgs/build-support/build-pecl.nix
@@ -2,6 +2,7 @@
 
 { name
 , buildInputs ? []
+, nativeBuildInputs ? []
 , makeFlags ? []
 , src ? fetchurl {
     url = "http://pecl.php.net/get/${name}.tgz";
@@ -15,7 +16,7 @@ stdenv.mkDerivation (args // {
 
   inherit src;
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs;
   buildInputs = [ php ] ++ buildInputs;
 
   makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
-- 
GitLab


From d8702bfaebfc78a11858d9ea2346aff8336db689 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 14 Oct 2017 14:48:00 +0800
Subject: [PATCH 519/877] kde-applications: 17.08.1 -> 17.08.2

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 2232 ++++++++++++++++----------------
 2 files changed, 1117 insertions(+), 1117 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 11cbfcfe538..b4f190de136 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.08.1/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.08.2/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index f7b5ca0b31a..5e3c5b18b77 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,2235 @@
 
 {
   akonadi = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/akonadi-17.08.1.tar.xz";
-      sha256 = "1nhjhgpigi8bhavh609lxnr76w9c0j7017haiv6g6j6zd5h0pp6w";
-      name = "akonadi-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/akonadi-17.08.2.tar.xz";
+      sha256 = "1cd9ca3vifg6xsqsm8s9mzdkiavx7divwwjxk2vhb7pj8zxrnl45";
+      name = "akonadi-17.08.2.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/akonadi-calendar-17.08.1.tar.xz";
-      sha256 = "15ld1jn1962wc5ynf8cgg9z6bh7hvjcl4nv9fqaa5mwy4mik4a0z";
-      name = "akonadi-calendar-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/akonadi-calendar-17.08.2.tar.xz";
+      sha256 = "0a26li0m4swvr74vw10vwqg6m33wb74zsrjxym5g8j16y87sw660";
+      name = "akonadi-calendar-17.08.2.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/akonadi-calendar-tools-17.08.1.tar.xz";
-      sha256 = "1y4r3y9gbc1zsip25pz47fxi9fw68fr6p18mljfkcg394sygvlcr";
-      name = "akonadi-calendar-tools-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/akonadi-calendar-tools-17.08.2.tar.xz";
+      sha256 = "1y9iidqh1ssxp6mjzd4zjzsma3rvm2z1hfqjbs6sm2r1r3x3560q";
+      name = "akonadi-calendar-tools-17.08.2.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/akonadiconsole-17.08.1.tar.xz";
-      sha256 = "0xy8s23941rfh1yiz2c1v10m59jrd8hphzphckxa68zxb6cb7vws";
-      name = "akonadiconsole-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/akonadiconsole-17.08.2.tar.xz";
+      sha256 = "19bxs8ds9klyqv7xhvnh3wy5ndll6qlhfvnw5cv10yf03ahf1lhb";
+      name = "akonadiconsole-17.08.2.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/akonadi-contacts-17.08.1.tar.xz";
-      sha256 = "0hgabjca3fzb8hlzhfi54la7rgh4gaii6i2j623birslzry3mkc9";
-      name = "akonadi-contacts-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/akonadi-contacts-17.08.2.tar.xz";
+      sha256 = "0b2zm7a1zbsxgb23cz78alhs2x364jaz8qcq8nl49qp7ydp44wn1";
+      name = "akonadi-contacts-17.08.2.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/akonadi-import-wizard-17.08.1.tar.xz";
-      sha256 = "1f7k592papppfqdhgpcpw03phhdlkp18cbap1ibvzywhg1dn2qmg";
-      name = "akonadi-import-wizard-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/akonadi-import-wizard-17.08.2.tar.xz";
+      sha256 = "1ynyjmzw8zg72hkxls0rw3p7hsvgm7y41mii28fc18qdx8qcj8vw";
+      name = "akonadi-import-wizard-17.08.2.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/akonadi-mime-17.08.1.tar.xz";
-      sha256 = "1apl89r1mpj5byngzdibxr4whr0932zr3j2y51pynnmilgkmyg6v";
-      name = "akonadi-mime-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/akonadi-mime-17.08.2.tar.xz";
+      sha256 = "1pnxmljgsmdkv2rhg7ml6qy1q2j2gx4cswkakbga8fr2cds5fmjc";
+      name = "akonadi-mime-17.08.2.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/akonadi-notes-17.08.1.tar.xz";
-      sha256 = "1fgkipxhzj7c6ahdqhjii6ccxgn2qnn55jn64nrb36srmpnzrq7f";
-      name = "akonadi-notes-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/akonadi-notes-17.08.2.tar.xz";
+      sha256 = "1n9rrlczsgax0hddsqx4x8h9w49ki56lpa72y2fi2hd0hqv7bdf1";
+      name = "akonadi-notes-17.08.2.tar.xz";
     };
   };
   akonadi-search = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/akonadi-search-17.08.1.tar.xz";
-      sha256 = "1m119843brcjcymfcp9n7pfybqnw9ydhsm9ry5im52kci4rwsfhx";
-      name = "akonadi-search-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/akonadi-search-17.08.2.tar.xz";
+      sha256 = "0h8pcwv4svywf8sh698g6f3x15prcmz4nyxr92ab3x14k5na26v2";
+      name = "akonadi-search-17.08.2.tar.xz";
     };
   };
   akregator = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/akregator-17.08.1.tar.xz";
-      sha256 = "02p1vlxm91pyqhhwg3ggik9c8xw5ayz1w7bqpxmcb81gff75ha77";
-      name = "akregator-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/akregator-17.08.2.tar.xz";
+      sha256 = "0ij4zxkwiai01cyzdai68c56j86r7b6nkijhmzhgvhv2mj9gi5bg";
+      name = "akregator-17.08.2.tar.xz";
     };
   };
   analitza = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/analitza-17.08.1.tar.xz";
-      sha256 = "1kcyhim72g39ywq90hdd9ba6vwgq99xkbj82vbasy0il8xkkfcn4";
-      name = "analitza-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/analitza-17.08.2.tar.xz";
+      sha256 = "02rmgyl9sh4d3kf4412p1zgcmcmcb66drqf73fxf6cdb5addbzk3";
+      name = "analitza-17.08.2.tar.xz";
     };
   };
   ark = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ark-17.08.1.tar.xz";
-      sha256 = "019gz57c46lh5wz84r0swhbx7ywgw8s7yc1f589xh4nz18i9xi69";
-      name = "ark-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ark-17.08.2.tar.xz";
+      sha256 = "1my3y6zsfw54c4kcbsl93ixig9b07cprgq47712v47niyqnihk92";
+      name = "ark-17.08.2.tar.xz";
     };
   };
   artikulate = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/artikulate-17.08.1.tar.xz";
-      sha256 = "1dgr9ww0pm6k0rhb3lkvr65jx6pnwsck1v3sfwpyyf8rrwixbvyk";
-      name = "artikulate-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/artikulate-17.08.2.tar.xz";
+      sha256 = "0hw10djgnx8wsrs307j9hsh9famaaljdpr20dmf2ng3594hppxw1";
+      name = "artikulate-17.08.2.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/audiocd-kio-17.08.1.tar.xz";
-      sha256 = "1k987lxm5wl6prdvbxxby1ly9r2dq7r5dsfbpazm43fxpx0pqyik";
-      name = "audiocd-kio-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/audiocd-kio-17.08.2.tar.xz";
+      sha256 = "0ivnl5aq553whgwnw6282vvj065hms34v1q1hl8l12k08rb8l2jl";
+      name = "audiocd-kio-17.08.2.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/baloo-widgets-17.08.1.tar.xz";
-      sha256 = "19nij0hrcbcq4czxgh3l6gb25lkdi6j6sgmch24a8c7a106h0ips";
-      name = "baloo-widgets-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/baloo-widgets-17.08.2.tar.xz";
+      sha256 = "1qw0clwkcki6hg1hxxzb6h4nh6db7zw3ncl4hyf5550q973i2gl1";
+      name = "baloo-widgets-17.08.2.tar.xz";
     };
   };
   blinken = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/blinken-17.08.1.tar.xz";
-      sha256 = "1nwdmhsyq1yzlr17mn98np0d3zg3rjyxsmlc7lyv1kszckhmb7qq";
-      name = "blinken-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/blinken-17.08.2.tar.xz";
+      sha256 = "1qs6nbxqrp0lmwf0z30i0r8h32r1a6a18k6sk78ja52vqkr7872h";
+      name = "blinken-17.08.2.tar.xz";
     };
   };
   blogilo = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/blogilo-17.08.1.tar.xz";
-      sha256 = "1c9dq7xwdwxwdch4ygyz7pds8q41xpb5661wa4alnpd06ra0bq0c";
-      name = "blogilo-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/blogilo-17.08.2.tar.xz";
+      sha256 = "0ai91d5ydmw3yfv997hlrvky88v4aqcg7hacd3mizl23clqij4c9";
+      name = "blogilo-17.08.2.tar.xz";
     };
   };
   bomber = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/bomber-17.08.1.tar.xz";
-      sha256 = "1pcva9rgmvvkbbabwiw3aqv0aq0w2s6vxrw0gfxh6plgs42hpb24";
-      name = "bomber-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/bomber-17.08.2.tar.xz";
+      sha256 = "1z6w6hh2f1k8skx87j11i6p34lcnh2c99gv2lvpd37z9gxbf0sjw";
+      name = "bomber-17.08.2.tar.xz";
     };
   };
   bovo = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/bovo-17.08.1.tar.xz";
-      sha256 = "0vn4q6qvig9rjq8ynwg53vzas8vxg0b55mvpg801ky6kp3ma3m6i";
-      name = "bovo-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/bovo-17.08.2.tar.xz";
+      sha256 = "0vz9pfslj9f2g51yvdw8hasn92n0rn0gy4rd2f0xcfk2ifq2bwd1";
+      name = "bovo-17.08.2.tar.xz";
     };
   };
   calendarsupport = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/calendarsupport-17.08.1.tar.xz";
-      sha256 = "1p1s5sn284j2lwzm09ifp6dj6gzg6p169hh7dv7k5bshi7kzf42v";
-      name = "calendarsupport-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/calendarsupport-17.08.2.tar.xz";
+      sha256 = "0zrazkcdm2m9rxdbgwcmidlxwnj1v4lnchf0d21i267dnck87m8x";
+      name = "calendarsupport-17.08.2.tar.xz";
     };
   };
   cantor = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/cantor-17.08.1.tar.xz";
-      sha256 = "1m6si2gy6n20z27sby7g7nqaxl067qpkj29l6b3qsyyx03w73n33";
-      name = "cantor-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/cantor-17.08.2.tar.xz";
+      sha256 = "14hn1980z8wsr446r94scd3wdy83myy4wklxl24bynxpwiwxzv99";
+      name = "cantor-17.08.2.tar.xz";
     };
   };
   cervisia = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/cervisia-17.08.1.tar.xz";
-      sha256 = "13p5gs2cg939mcnq2hvvncj8v7vr7pcklq932xhy4qfwhqbhkxp1";
-      name = "cervisia-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/cervisia-17.08.2.tar.xz";
+      sha256 = "0h56dfy27nf14dqz20f7chjzyhsdricxdrxxkw839r593k25fipd";
+      name = "cervisia-17.08.2.tar.xz";
     };
   };
   dolphin = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/dolphin-17.08.1.tar.xz";
-      sha256 = "04b9vq03m6s5mrv7q4na65kv9hpx7i4v45g6ls7pcyxi6ziszr3q";
-      name = "dolphin-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/dolphin-17.08.2.tar.xz";
+      sha256 = "1m3v7z0k47r3fzl4w4nsldslw0z6sy1zn3mn3ssc03jhgqnj3grs";
+      name = "dolphin-17.08.2.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/dolphin-plugins-17.08.1.tar.xz";
-      sha256 = "0vrs8yk2vqfbc79xjkj95zndyig2gz2b8aafs61q25b29lzilyq9";
-      name = "dolphin-plugins-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/dolphin-plugins-17.08.2.tar.xz";
+      sha256 = "12mp7qf8aharyk8hqr8igwqnxraxy3nmad99mxkyny6wlkha459l";
+      name = "dolphin-plugins-17.08.2.tar.xz";
     };
   };
   dragon = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/dragon-17.08.1.tar.xz";
-      sha256 = "143x7x07z5af0z7za8r3jiq5id33rmb62ygp84af905lm2gf2yk0";
-      name = "dragon-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/dragon-17.08.2.tar.xz";
+      sha256 = "0h9h2axwjqqvqla6mfml3bvk7gp36kij7swl96gsn7sy4ch0ydbz";
+      name = "dragon-17.08.2.tar.xz";
     };
   };
   eventviews = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/eventviews-17.08.1.tar.xz";
-      sha256 = "1av86sbldkrgsdybxqzgda1pnd4y27ygxsibr76w6y8fnk66zrg7";
-      name = "eventviews-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/eventviews-17.08.2.tar.xz";
+      sha256 = "0gd7jmwidh9fngjbn8m6jhymzxv8qdxv3ksnawcamjxxd2k951c1";
+      name = "eventviews-17.08.2.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ffmpegthumbs-17.08.1.tar.xz";
-      sha256 = "1lgi8rs3zbrwlcxbhq9qys8w0yh4f0rbalig0y020igbplkn9ccs";
-      name = "ffmpegthumbs-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ffmpegthumbs-17.08.2.tar.xz";
+      sha256 = "0bycdr60jnr0a121fr9alvma5zbkqm6wj45h81jvggdvmnrg7inh";
+      name = "ffmpegthumbs-17.08.2.tar.xz";
     };
   };
   filelight = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/filelight-17.08.1.tar.xz";
-      sha256 = "0wi0j55z8h58slbq4hinhfycpjb69m5g4ilk0csjw8syxhmy1jhl";
-      name = "filelight-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/filelight-17.08.2.tar.xz";
+      sha256 = "0q7cn7hbmwg6km96yc3m1yd64nsnav8q9yjiri2k3p6v6if1042h";
+      name = "filelight-17.08.2.tar.xz";
     };
   };
   granatier = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/granatier-17.08.1.tar.xz";
-      sha256 = "0panmz171ba3vfvdgjcwg1nxwv52qsh6qazagz7p5bv0hkf6y94n";
-      name = "granatier-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/granatier-17.08.2.tar.xz";
+      sha256 = "17ymbyzkgkwcinf65hzy3ny1zzg6p88bcg6kix1pbdmhmw4nhhj0";
+      name = "granatier-17.08.2.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/grantlee-editor-17.08.1.tar.xz";
-      sha256 = "0xpkip7cy6d318mh3l8014zdifhx3njx8vk2cr2f00bjvs879zfj";
-      name = "grantlee-editor-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/grantlee-editor-17.08.2.tar.xz";
+      sha256 = "1385wcf2y3jjj9csp6p7iqyrlv0wxq32dkhdf33y80j29xnrckzp";
+      name = "grantlee-editor-17.08.2.tar.xz";
     };
   };
   grantleetheme = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/grantleetheme-17.08.1.tar.xz";
-      sha256 = "0l6ycr609wvxad1dwgy56blcnag5pr30gj59d5dcnq0iqcs9v5w9";
-      name = "grantleetheme-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/grantleetheme-17.08.2.tar.xz";
+      sha256 = "1i1x8d7hkhzqbn4c1q0snni8x2dw1hlxkc0zw8hfyfppc9a1x5ha";
+      name = "grantleetheme-17.08.2.tar.xz";
     };
   };
   gwenview = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/gwenview-17.08.1.tar.xz";
-      sha256 = "1f5c78007sqy3iq0rx8cskma8rjzinaahy26r054l59gq6b0d3v7";
-      name = "gwenview-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/gwenview-17.08.2.tar.xz";
+      sha256 = "0kw48xwinvyix23m1h4ark91w6nygr0a9kisdj3ighw29dqbqryx";
+      name = "gwenview-17.08.2.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/incidenceeditor-17.08.1.tar.xz";
-      sha256 = "0axwkhwqgmdnh9qn6j87j44x24vqb5bhch2pscrifdni05j99wzx";
-      name = "incidenceeditor-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/incidenceeditor-17.08.2.tar.xz";
+      sha256 = "1jdwk67pxk9dwraq187wg58y0sgxwr5d18506fykrs7gv68p8dsl";
+      name = "incidenceeditor-17.08.2.tar.xz";
     };
   };
   jovie = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/jovie-17.08.1.tar.xz";
-      sha256 = "19zhm6iqq505bwdd6f57rkzc9fmqqmw60071n679khrcgmsyx7ac";
-      name = "jovie-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/jovie-17.08.2.tar.xz";
+      sha256 = "0wh0wk653fzlaxkxjbsm305wqmvdy88vw7qr81mh9ziyfj4qpm7p";
+      name = "jovie-17.08.2.tar.xz";
     };
   };
   juk = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/juk-17.08.1.tar.xz";
-      sha256 = "1r3igqgw2ani4500sndbqnxcbyjg8l0lcd0l0r6wmqs9cgf1w5d5";
-      name = "juk-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/juk-17.08.2.tar.xz";
+      sha256 = "0i1zh8asbzjg7s6qq26fwc1g5g9ivnppba0xnhz5c3y0nmz0g3i1";
+      name = "juk-17.08.2.tar.xz";
     };
   };
   k3b = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/k3b-17.08.1.tar.xz";
-      sha256 = "1pv8fpalqr7fpcy7dypzjp91h82scvzfk5g0mpzjpqlmn99hgfj1";
-      name = "k3b-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/k3b-17.08.2.tar.xz";
+      sha256 = "1n7fw4zhsjc5bxxva420m8k0lmbx4whq8ay1ckianarjc8jm5dwx";
+      name = "k3b-17.08.2.tar.xz";
     };
   };
   kaccessible = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kaccessible-17.08.1.tar.xz";
-      sha256 = "13j1c9l8qhll0a8fcny9nibr858w5cjpahccxgkh9v54iy3f243s";
-      name = "kaccessible-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kaccessible-17.08.2.tar.xz";
+      sha256 = "1phfz8n6gs9g216qhwmjhcrr0qpfk2q7bxxx68f86zzfv6b4fhjd";
+      name = "kaccessible-17.08.2.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kaccounts-integration-17.08.1.tar.xz";
-      sha256 = "0y09hnjhxy7lnqjhz82z090wv3y5942xh1vhgyi5ac7pkgyzjh7m";
-      name = "kaccounts-integration-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kaccounts-integration-17.08.2.tar.xz";
+      sha256 = "0v4ikcapq0vdfhj0v5c202yfbg1b82jbl74rpcw7lap7xjdxshgi";
+      name = "kaccounts-integration-17.08.2.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kaccounts-providers-17.08.1.tar.xz";
-      sha256 = "0dyrsvh98b75fxpap3x4vwvqx2dxyvcg4sfkic9sv137kwl8ihcp";
-      name = "kaccounts-providers-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kaccounts-providers-17.08.2.tar.xz";
+      sha256 = "1ir4s03ccf8mw56z2f293q4pb2rnh8rp0bs05nq93jjsxap3ssxn";
+      name = "kaccounts-providers-17.08.2.tar.xz";
     };
   };
   kaddressbook = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kaddressbook-17.08.1.tar.xz";
-      sha256 = "0qf3wfjgbzjxrvhnwa702yhp54m8f4wk8d67jsgrlpvq3lizrzrf";
-      name = "kaddressbook-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kaddressbook-17.08.2.tar.xz";
+      sha256 = "0smihkmhi10c0khid3ziiwvbrlk3ihw7f1a2mf1pc62gmagf6iva";
+      name = "kaddressbook-17.08.2.tar.xz";
     };
   };
   kajongg = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kajongg-17.08.1.tar.xz";
-      sha256 = "10bymw4bwqxjppvynwcx600ybr02kyd9m2ya0pi2208kj2s317m5";
-      name = "kajongg-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kajongg-17.08.2.tar.xz";
+      sha256 = "0607606yisch8s0ffv67fhpn8b5chi0y9h4giasc2s8m67zzjsvz";
+      name = "kajongg-17.08.2.tar.xz";
     };
   };
   kalarm = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kalarm-17.08.1.tar.xz";
-      sha256 = "0nxkln40bwlfdn2fp5a2a55x40zakq5nrir9bi920jpp78ivx2mf";
-      name = "kalarm-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kalarm-17.08.2.tar.xz";
+      sha256 = "17sh27h6c1p0h1r6rfpqmh1pfd7clnwslhnj4rfxhvh95svdqgam";
+      name = "kalarm-17.08.2.tar.xz";
     };
   };
   kalarmcal = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kalarmcal-17.08.1.tar.xz";
-      sha256 = "1dvv1rbh67c2vxcls8jv8chcgbp7q8c2jdjsr2cx2lmiasz0lqlf";
-      name = "kalarmcal-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kalarmcal-17.08.2.tar.xz";
+      sha256 = "00bfr9xsyg3r8nmvsana2n9m8ynhw1wcvx7dw3pazxf3f1sn5qvc";
+      name = "kalarmcal-17.08.2.tar.xz";
     };
   };
   kalgebra = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kalgebra-17.08.1.tar.xz";
-      sha256 = "07l3gff8la0cjd3aszm2v0gykfb2ws6k5hix0ck9q62kz1h6zd8d";
-      name = "kalgebra-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kalgebra-17.08.2.tar.xz";
+      sha256 = "0f7zz9xxqckrkzmfga4ap117wix2ib4lpjq75blk43951qpnwwcw";
+      name = "kalgebra-17.08.2.tar.xz";
     };
   };
   kalzium = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kalzium-17.08.1.tar.xz";
-      sha256 = "15rvpjni1a1fhr52awivzdc6v575510fs5mxxk05wqzsffa67i1f";
-      name = "kalzium-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kalzium-17.08.2.tar.xz";
+      sha256 = "1b27rx0ws6bikqa9gdr8d4mfqwsgcin5nl2m7svzdz27mb463iwc";
+      name = "kalzium-17.08.2.tar.xz";
     };
   };
   kamera = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kamera-17.08.1.tar.xz";
-      sha256 = "044mn0k18ffxhc9nnbpqhcjlzkj4657nxqwdfl65k689y1l2bff1";
-      name = "kamera-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kamera-17.08.2.tar.xz";
+      sha256 = "19id26637w39b6dlsvhllnnpvcphh20mvva1394pw386s2irdrca";
+      name = "kamera-17.08.2.tar.xz";
     };
   };
   kanagram = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kanagram-17.08.1.tar.xz";
-      sha256 = "07gykmv9r1ikaw4l3zz27rc7a23q2nizszblm1ygv2nlyj6lilgf";
-      name = "kanagram-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kanagram-17.08.2.tar.xz";
+      sha256 = "1zs1ww5w9sd9qzapl2shmfarhxsqpm8cifpw17vknwcp1w4qjwpj";
+      name = "kanagram-17.08.2.tar.xz";
     };
   };
   kapman = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kapman-17.08.1.tar.xz";
-      sha256 = "1r7r13yfgf64jfarqjiirfbhmrg6d04ija5sgl8aiib8rwnbs2lb";
-      name = "kapman-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kapman-17.08.2.tar.xz";
+      sha256 = "0wl6zhm7cyb4ii475nh7pjz1pprccimpvdx5yxph4n99wri4xjd9";
+      name = "kapman-17.08.2.tar.xz";
     };
   };
   kapptemplate = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kapptemplate-17.08.1.tar.xz";
-      sha256 = "0dcgsh4ns3749yybzz2jgdbjskxyzlnr2c0f5wzh9ilkz3yp7lq2";
-      name = "kapptemplate-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kapptemplate-17.08.2.tar.xz";
+      sha256 = "0b92kamyvw81bxvxly16kd1kcyn8l48cvk4hp0kqfxv5drr0y2sp";
+      name = "kapptemplate-17.08.2.tar.xz";
     };
   };
   kate = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kate-17.08.1.tar.xz";
-      sha256 = "0z71s9g66ivbchrd2ps3j16ickjnky7ws484y04akjjs7sryzd0l";
-      name = "kate-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kate-17.08.2.tar.xz";
+      sha256 = "1m4dh9v1y8a3398wd3qv2qcz1lqjnji62cswnw8ch4hxmns6lib2";
+      name = "kate-17.08.2.tar.xz";
     };
   };
   katomic = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/katomic-17.08.1.tar.xz";
-      sha256 = "04k29x2hvcqc22cm763aflpwzb6gqqbnpd6dknd34985fqrrcdp4";
-      name = "katomic-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/katomic-17.08.2.tar.xz";
+      sha256 = "1l8nvsm6mfsb1bvwhj77qicq010vmif8y046d2mc5sgw6xhg6xw5";
+      name = "katomic-17.08.2.tar.xz";
     };
   };
   kblackbox = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kblackbox-17.08.1.tar.xz";
-      sha256 = "1n1rxh86qcaa8dm5qcs43pdxjndzssy4pdyn90anw6bqsw1mn7q0";
-      name = "kblackbox-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kblackbox-17.08.2.tar.xz";
+      sha256 = "0i5zy6zm8w4i5hljmv1qyhrr5iv7m5qr854f6j0iyvam33f68gdh";
+      name = "kblackbox-17.08.2.tar.xz";
     };
   };
   kblocks = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kblocks-17.08.1.tar.xz";
-      sha256 = "0bx5j1kahyspbmrw2falkw037d1lkj6f1yppwdlh2l4zn7xbgx78";
-      name = "kblocks-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kblocks-17.08.2.tar.xz";
+      sha256 = "1qh2lcg9293icya06jwa01vri8y1m99jir7d0zxpwlm6rndrkca5";
+      name = "kblocks-17.08.2.tar.xz";
     };
   };
   kblog = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kblog-17.08.1.tar.xz";
-      sha256 = "0kdwv2ym3xba7n0qslrgdlmanw1zqanv5ycjnl54gf1xlbdwbpv2";
-      name = "kblog-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kblog-17.08.2.tar.xz";
+      sha256 = "1095qs877zjip4899fisgyssp1n3j8rxpxkd7dc6ms4b82xnrz19";
+      name = "kblog-17.08.2.tar.xz";
     };
   };
   kbounce = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kbounce-17.08.1.tar.xz";
-      sha256 = "0bl1pm8h547gwzx1pbc340711fp5scfa1dql7b1yjjpfg56flccm";
-      name = "kbounce-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kbounce-17.08.2.tar.xz";
+      sha256 = "0bkmk26spmlq607ycmyc5sfzi7rknim0d39fdvmn915xy7dps2l1";
+      name = "kbounce-17.08.2.tar.xz";
     };
   };
   kbreakout = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kbreakout-17.08.1.tar.xz";
-      sha256 = "021hzg4m6aqvvavdx63ydj2s71shml6x1rrd9lyyw23harh7402h";
-      name = "kbreakout-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kbreakout-17.08.2.tar.xz";
+      sha256 = "02c4ldyxd6hcffivp1n8k5q42dibwpcf4xdp856zkaf9hk40ssjz";
+      name = "kbreakout-17.08.2.tar.xz";
     };
   };
   kbruch = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kbruch-17.08.1.tar.xz";
-      sha256 = "110iar2p5wlil4b8j5gw37mizajvhc9j7fww7dmvffq1yn4m5ac2";
-      name = "kbruch-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kbruch-17.08.2.tar.xz";
+      sha256 = "0v8c63mxpd10nnbxiyfghbbjm97q37w9z08dzlys996nychmw0ba";
+      name = "kbruch-17.08.2.tar.xz";
     };
   };
   kcachegrind = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kcachegrind-17.08.1.tar.xz";
-      sha256 = "0pgc00y7l98fws7qfc9i92a9mizgkkvap48pi12r9ajj5bhy792b";
-      name = "kcachegrind-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kcachegrind-17.08.2.tar.xz";
+      sha256 = "04dh0a33z7i1nf07bhc05gm1jr4wvv4a86l9avk6dgja0pag6j30";
+      name = "kcachegrind-17.08.2.tar.xz";
     };
   };
   kcalc = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kcalc-17.08.1.tar.xz";
-      sha256 = "177mr533r71jpa64bvkbl349lkf2yzanrjh22d4rii7lqma63z4k";
-      name = "kcalc-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kcalc-17.08.2.tar.xz";
+      sha256 = "1k1l3qj4mdm8b0qbjp09hk4zd0y9qwzp062a0r428mvvcmrvpylw";
+      name = "kcalc-17.08.2.tar.xz";
     };
   };
   kcalcore = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kcalcore-17.08.1.tar.xz";
-      sha256 = "084gj40lssh6lsjn7xpvzlhlfcc6vcdk6ygv47wvf8y0yipppspw";
-      name = "kcalcore-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kcalcore-17.08.2.tar.xz";
+      sha256 = "1j3vr2ycwsgahngwhvkv747b5rr062sx6xi35bj9anmkhpbs9kwi";
+      name = "kcalcore-17.08.2.tar.xz";
     };
   };
   kcalutils = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kcalutils-17.08.1.tar.xz";
-      sha256 = "04nn5lv2x15352p42589zyh1w2fxbijkq9wmbcr51fb4nphx007l";
-      name = "kcalutils-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kcalutils-17.08.2.tar.xz";
+      sha256 = "02f5vr0l41kv6g92jj9g8yz5y422qvlgd3jbx3gmsagxxyvl5gss";
+      name = "kcalutils-17.08.2.tar.xz";
     };
   };
   kcharselect = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kcharselect-17.08.1.tar.xz";
-      sha256 = "1w6ydp7acf5ha0kag60m1anksj7fy2kk8bghpw14lv8bxzrjwdam";
-      name = "kcharselect-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kcharselect-17.08.2.tar.xz";
+      sha256 = "1nmsn0kibd318dnka96lisplcggrvcgsivrqk322mw9wg6xhg5i9";
+      name = "kcharselect-17.08.2.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kcolorchooser-17.08.1.tar.xz";
-      sha256 = "1zmzd919crj25ngcv085pp4w213x4bra54npfw4z11cmc30zz57i";
-      name = "kcolorchooser-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kcolorchooser-17.08.2.tar.xz";
+      sha256 = "0v8x3y2gxp8cm3m1dh8rjpxjnypfvrxm41vrqsz9p8lcs616zg6w";
+      name = "kcolorchooser-17.08.2.tar.xz";
     };
   };
   kcontacts = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kcontacts-17.08.1.tar.xz";
-      sha256 = "0iqpvsnwbnzczdcvbqlrgmx2czjqgl4ag4b09vhkj1s7gs8cracy";
-      name = "kcontacts-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kcontacts-17.08.2.tar.xz";
+      sha256 = "1agwvi3lnmdz9fhqg6i029jpcwys4zsk2k5rpzjdqaf7bvccb9cl";
+      name = "kcontacts-17.08.2.tar.xz";
     };
   };
   kcron = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kcron-17.08.1.tar.xz";
-      sha256 = "0yzv068jsxyag68fix421z5qfvpxm1i9v1q3pw3ksvq07ai740f3";
-      name = "kcron-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kcron-17.08.2.tar.xz";
+      sha256 = "1diqgcnlbq9x6w3sj4lk1i3kbi4g5w4j1knkc4qqjz3a6kfaqk60";
+      name = "kcron-17.08.2.tar.xz";
     };
   };
   kdav = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdav-17.08.1.tar.xz";
-      sha256 = "1m9pcydg2fwz95mym7k7wdavbw4nz18ihhrhfmcda7m61x6y8z9q";
-      name = "kdav-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdav-17.08.2.tar.xz";
+      sha256 = "0cyh8qnzcnb7qnyjbyy73bj78kqjq853aaz7fskg2f3bk2bq5fkf";
+      name = "kdav-17.08.2.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdebugsettings-17.08.1.tar.xz";
-      sha256 = "0jxy68fs45hwkd3hjl5rknwznsihk0nszmskw3hy3y64p2vvvzyf";
-      name = "kdebugsettings-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdebugsettings-17.08.2.tar.xz";
+      sha256 = "0i62w45flirca09bkwxkyyr4zhvzi4rxq7l6xh4liinl1n9kdf7w";
+      name = "kdebugsettings-17.08.2.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-dev-scripts-17.08.1.tar.xz";
-      sha256 = "16dzmx80752n3wcg2dcwh4cc0mwxwckfbms134g83gwaix5wkyvd";
-      name = "kde-dev-scripts-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-dev-scripts-17.08.2.tar.xz";
+      sha256 = "1prk2j5y8rcz3xkhw2fnfhsky9jnk25akdg2whvz4zpvfvxn5jcw";
+      name = "kde-dev-scripts-17.08.2.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-dev-utils-17.08.1.tar.xz";
-      sha256 = "1lq8cya779667yjwinvx9xyfiq79p7m93m4r2zgd7r6fpakxdkch";
-      name = "kde-dev-utils-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-dev-utils-17.08.2.tar.xz";
+      sha256 = "0zzf1w6avjwzyr8p73jqidzzfgx7gpiksmgnfqm4nf91snfg7pp4";
+      name = "kde-dev-utils-17.08.2.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdeedu-data-17.08.1.tar.xz";
-      sha256 = "1fk2r2cib8gzk1ss5z6wxdwswl3f0hvwmxdgg0cs0j11gk1m0m6g";
-      name = "kdeedu-data-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdeedu-data-17.08.2.tar.xz";
+      sha256 = "17jh5m5h64z6gkwblpq7jdsa4653bakz1mgy6qlyjlh8nljlf6wk";
+      name = "kdeedu-data-17.08.2.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdegraphics-mobipocket-17.08.1.tar.xz";
-      sha256 = "0y2yfcf2p864hzyxyxv65mkfl8qk08zh9pr24ycxfdl4g22pal6w";
-      name = "kdegraphics-mobipocket-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdegraphics-mobipocket-17.08.2.tar.xz";
+      sha256 = "008qp18m720759wj1bjm1z2nig1vafjcz8wifjgqdn3drn35qqvg";
+      name = "kdegraphics-mobipocket-17.08.2.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdegraphics-thumbnailers-17.08.1.tar.xz";
-      sha256 = "1milas13wb958z2p39rm1353lqz9ibhnpwb8ffw6wy5qdbx4fr4q";
-      name = "kdegraphics-thumbnailers-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdegraphics-thumbnailers-17.08.2.tar.xz";
+      sha256 = "11qf9dnqzw634iilmbfi9sy20w228y72w2aasjw7kg1l7y4y3y07";
+      name = "kdegraphics-thumbnailers-17.08.2.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ar-17.08.1.tar.xz";
-      sha256 = "03bj86is2a0srygmabxmwmdmqxwwxm06lh9a6g362dhglh4ypp67";
-      name = "kde-l10n-ar-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ar-17.08.2.tar.xz";
+      sha256 = "1m5qi2qw4ndqzshg7bbi3mkvxpk0dj453bngm7qzmp9bgwpbgk3b";
+      name = "kde-l10n-ar-17.08.2.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ast-17.08.1.tar.xz";
-      sha256 = "0vsyv4g8ywpvcxh1hkhx1y8plx9k068fqrgvglv9gvsr86w57xn7";
-      name = "kde-l10n-ast-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ast-17.08.2.tar.xz";
+      sha256 = "1y2qahv1d40k16s9xjckc51szzm8n2nhdy5bjqpakxv3iqy2yqvz";
+      name = "kde-l10n-ast-17.08.2.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-bg-17.08.1.tar.xz";
-      sha256 = "0bz8ydq7i0q29znbia0fcw5y19cw9a5hxh2gh8s7v6pvniazlgfx";
-      name = "kde-l10n-bg-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-bg-17.08.2.tar.xz";
+      sha256 = "0h0ls4k1jyj8w2qh688nv43p6xxad3amh4gslg4xxk30scl58pay";
+      name = "kde-l10n-bg-17.08.2.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-bs-17.08.1.tar.xz";
-      sha256 = "19jjrwga6b5vn0g8m5mgp9kgn9173km6jmj92fl63w7lhd60pqyy";
-      name = "kde-l10n-bs-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-bs-17.08.2.tar.xz";
+      sha256 = "1n2hw8835hf87d4sihnbryh702h6vh2z65s15lsrk5l760jdvyg7";
+      name = "kde-l10n-bs-17.08.2.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ca-17.08.1.tar.xz";
-      sha256 = "1ldpsjaczqfczglfk2nib4kqkzi6z16mkyisx1byw3wxix7aqak5";
-      name = "kde-l10n-ca-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ca-17.08.2.tar.xz";
+      sha256 = "18g4vs2r63p25a0i8ggyv3gi7df54z1hv140lg44k5g4pffbzv0z";
+      name = "kde-l10n-ca-17.08.2.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-17.08.1";
+    version = "ca_valencia-17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ca@valencia-17.08.1.tar.xz";
-      sha256 = "1dnvvc6jbwyvagy7ay3w1rdj82bx7zcc97i61drlv2cf1vgkmb4l";
-      name = "kde-l10n-ca_valencia-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ca@valencia-17.08.2.tar.xz";
+      sha256 = "0p7ykdkfxkqm6fa8y95j3jsmqlnkxfsigi457h8yhvikjvlym9an";
+      name = "kde-l10n-ca_valencia-17.08.2.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-cs-17.08.1.tar.xz";
-      sha256 = "0f9h5ln31395kgbqa8rj1sdkwjaczw4mvjlif9656xqglzw0dvs1";
-      name = "kde-l10n-cs-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-cs-17.08.2.tar.xz";
+      sha256 = "13qxxh1rxv25i53r6744hyr7n7nhvhnxwb425caq0z8cl0y727xi";
+      name = "kde-l10n-cs-17.08.2.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-da-17.08.1.tar.xz";
-      sha256 = "0rr0gmzfbdwnya9bipbymwqy6250zdi47chawi7j3vc4j11511g2";
-      name = "kde-l10n-da-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-da-17.08.2.tar.xz";
+      sha256 = "1nqfmq3scmka10fqvd4q62klrsly0zxk5maqp914r2kq9a4761sr";
+      name = "kde-l10n-da-17.08.2.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-de-17.08.1.tar.xz";
-      sha256 = "08ad110q4k21j8mfzigjxxrlic2c6h0cxqiawbfswzc39r0vy0lb";
-      name = "kde-l10n-de-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-de-17.08.2.tar.xz";
+      sha256 = "0q0sqzsd9qig05qapa6psizcayfcr68jkz07wv1z0lsij6hbv81w";
+      name = "kde-l10n-de-17.08.2.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-el-17.08.1.tar.xz";
-      sha256 = "1m2f8rsygmyn05i3j5mnwnr7mm4jahy2yaphxv822g6i79iy3396";
-      name = "kde-l10n-el-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-el-17.08.2.tar.xz";
+      sha256 = "1g07qwgc5mm3x6diab934cfl9acl0baa5x1d1139c84x65d5iisx";
+      name = "kde-l10n-el-17.08.2.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-17.08.1";
+    version = "en_GB-17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-en_GB-17.08.1.tar.xz";
-      sha256 = "14ql8kd60c4svg3ar5n61g544in805xsyfk2bgals0m47fy3axyf";
-      name = "kde-l10n-en_GB-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-en_GB-17.08.2.tar.xz";
+      sha256 = "03v7q53ng095rsc5h13d7ysakcr3ansvq259xw8ksqwnp3yzgivf";
+      name = "kde-l10n-en_GB-17.08.2.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-eo-17.08.1.tar.xz";
-      sha256 = "05lnk520hg9kxf6f92fn9avx4h29pjk4k8j7rsk4nwngvvygqjb6";
-      name = "kde-l10n-eo-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-eo-17.08.2.tar.xz";
+      sha256 = "1w79dmbja6aga6z8wz5pisd9r6g5gdcbqyzf8nlj2yjvijdv19h5";
+      name = "kde-l10n-eo-17.08.2.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-es-17.08.1.tar.xz";
-      sha256 = "1h2lzs1z5rcyg60f5d9jkxmdxwbhrdgbmib5h1nlz3f7jnrnpj86";
-      name = "kde-l10n-es-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-es-17.08.2.tar.xz";
+      sha256 = "0j2y55iql56wwzfmfm5c0c3f64lqr74hqzqf5bcckhh6svjiwb9m";
+      name = "kde-l10n-es-17.08.2.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-et-17.08.1.tar.xz";
-      sha256 = "0ifcsc6ic76gnbni0qm4yfcbhz4b3kww3rqly34hlrpzlwf52x5w";
-      name = "kde-l10n-et-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-et-17.08.2.tar.xz";
+      sha256 = "0d7c3ij74iskf9hbfjjl48jfpgihlg8fjabcak34bklcf1h8qrl9";
+      name = "kde-l10n-et-17.08.2.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-eu-17.08.1.tar.xz";
-      sha256 = "1nxmy2bdlljjf4dqy1fsfx7iawak7nh4h3x5h72im2s49z4y01rl";
-      name = "kde-l10n-eu-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-eu-17.08.2.tar.xz";
+      sha256 = "164851achb1p4yaw4x6sq83ibl6gj4iqh4771nc847rywgmq48dh";
+      name = "kde-l10n-eu-17.08.2.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fa-17.08.1.tar.xz";
-      sha256 = "19x6zacpyc7gax1lrqls2cb9ax747ls6pm8046hcgdy2nb8byqmc";
-      name = "kde-l10n-fa-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fa-17.08.2.tar.xz";
+      sha256 = "030wwv8527yhn6k6jmjb790d05gz493dnhr759zv1yg0r1r14lsi";
+      name = "kde-l10n-fa-17.08.2.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fi-17.08.1.tar.xz";
-      sha256 = "04cdsrjr9hnx1x3w4chjaq82varc24hl65kqiyf13nr3nvgx3xba";
-      name = "kde-l10n-fi-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fi-17.08.2.tar.xz";
+      sha256 = "1rvpkdssy346aijdb183j6fnpg7wqac2svg19rjnz40rg1sbqs5g";
+      name = "kde-l10n-fi-17.08.2.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fr-17.08.1.tar.xz";
-      sha256 = "0dqjr15sg42pp3balfvanl7169nsyqyr67pjw02xzbkskh61jihg";
-      name = "kde-l10n-fr-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fr-17.08.2.tar.xz";
+      sha256 = "0i9525dvns41gvgdi3q760fivhjq8c81hsx6rmnp5gxwj2bp8nb9";
+      name = "kde-l10n-fr-17.08.2.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ga-17.08.1.tar.xz";
-      sha256 = "0lbpbkip2fgml3jni4hllixpzaya5q5xcn3m674a7hs3y7gr35gs";
-      name = "kde-l10n-ga-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ga-17.08.2.tar.xz";
+      sha256 = "0a7ym789nqjngx0sjirxb19q0wzbh250kwsrjad5nw810syk2k8d";
+      name = "kde-l10n-ga-17.08.2.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-gl-17.08.1.tar.xz";
-      sha256 = "1bbg7ya85phzxw3rcc2k04rc4axridcqdrkh719ivp7p46m47j28";
-      name = "kde-l10n-gl-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-gl-17.08.2.tar.xz";
+      sha256 = "1n0f4hs3qkraxc05ga2z4mzr425n5386f5wrd9crsw0pmsm24nm6";
+      name = "kde-l10n-gl-17.08.2.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-he-17.08.1.tar.xz";
-      sha256 = "1h4lzv2i37l2w8af5w2dxan9zancqbqbcvhc5lkngnq2mvlqhwax";
-      name = "kde-l10n-he-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-he-17.08.2.tar.xz";
+      sha256 = "1bk8ms9jspyphxki8fl2i8fy4b2xsx3bi55fhpah9r10fb3prccx";
+      name = "kde-l10n-he-17.08.2.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hi-17.08.1.tar.xz";
-      sha256 = "0zjbchy072gbslmvi894jqa5vlh4brxkqdk5n3b7nh8003f7kvdl";
-      name = "kde-l10n-hi-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hi-17.08.2.tar.xz";
+      sha256 = "1wfjj9xdnyq94h5g3054mvwn7vd9v1n1myxclxfqszbym1lp9f6h";
+      name = "kde-l10n-hi-17.08.2.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hr-17.08.1.tar.xz";
-      sha256 = "1k4zzn0cwqp6syr82nij26pnhhjiq39pd03lj1m7r83ylmywivxv";
-      name = "kde-l10n-hr-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hr-17.08.2.tar.xz";
+      sha256 = "070cbkpvvpxhi2kvmf97wazxn2x7jvrzwadfxwp8r6h1bxgpiq5f";
+      name = "kde-l10n-hr-17.08.2.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hu-17.08.1.tar.xz";
-      sha256 = "1jj20ggv96lsfl1vc7gsv3vxwb3swj2bd1v8hyaycc86bw51qfcs";
-      name = "kde-l10n-hu-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hu-17.08.2.tar.xz";
+      sha256 = "1g77mh1av10h24hkqim86ik23nqxj6an4r4swzxl3ncibdx1x02f";
+      name = "kde-l10n-hu-17.08.2.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ia-17.08.1.tar.xz";
-      sha256 = "0b0mp1jdbbarqd3ajc0fmjpq01y3yw37dd0ihs0r9l2v6s1ivrx2";
-      name = "kde-l10n-ia-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ia-17.08.2.tar.xz";
+      sha256 = "1d83558mvki39sffhrha6z3dgs1giwpbk27yi759fbc4k07w28pv";
+      name = "kde-l10n-ia-17.08.2.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-id-17.08.1.tar.xz";
-      sha256 = "1hdw5cgwmsp6d36jg9a7gnhiywzavrjs644w5gcw8ab2w5kzi725";
-      name = "kde-l10n-id-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-id-17.08.2.tar.xz";
+      sha256 = "0c1pfxc25izgrikbmp2afmi1j5i9gp9g3hkxn8c1znmwi4a0jp9n";
+      name = "kde-l10n-id-17.08.2.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-is-17.08.1.tar.xz";
-      sha256 = "0p9q8p3rffc79p25frgzk3jykwga3cxcc4icx29672bcy5ri6d3a";
-      name = "kde-l10n-is-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-is-17.08.2.tar.xz";
+      sha256 = "1jdh25rs37438acxkpb6bmwwyl4z310jv2k4dxcb3f7ml4szkg4k";
+      name = "kde-l10n-is-17.08.2.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-it-17.08.1.tar.xz";
-      sha256 = "1af31vfg6q30rgqfcpmjyk32rlz661azi9r205bbv45nagw5aiyz";
-      name = "kde-l10n-it-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-it-17.08.2.tar.xz";
+      sha256 = "015wj5xhi3mni6mcc2xv16vn18rmimfzi971jgg8xjd9z7z53fd7";
+      name = "kde-l10n-it-17.08.2.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ja-17.08.1.tar.xz";
-      sha256 = "1273rm1m3ap8psf8qrvvdw7yh4bn0d90mgi02dk7vqx30j8vk2sx";
-      name = "kde-l10n-ja-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ja-17.08.2.tar.xz";
+      sha256 = "0vvvq1zfhj3c5xidrvfh372x4azxic3c8lhy43rn4wjalcmhyzi0";
+      name = "kde-l10n-ja-17.08.2.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-kk-17.08.1.tar.xz";
-      sha256 = "15wkhp673bfs23rxw8wa2q3z0gqm1wblaca0azhmy4fyhgwqaciz";
-      name = "kde-l10n-kk-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-kk-17.08.2.tar.xz";
+      sha256 = "14vhxnchnlmz8ljh21vdrdirygkgkhmqpnnlmrz9pmqay7r8bzpk";
+      name = "kde-l10n-kk-17.08.2.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-km-17.08.1.tar.xz";
-      sha256 = "1c6bvy3fifdm1azqzdxbwb71pzlp90wn6k981c1ny2cpcmiwd4ps";
-      name = "kde-l10n-km-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-km-17.08.2.tar.xz";
+      sha256 = "0q82bvy359szsfa423rb3b65wbgnmvyk839blr9pzjp3gvhxiza2";
+      name = "kde-l10n-km-17.08.2.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ko-17.08.1.tar.xz";
-      sha256 = "0wxnjjdlngpva34izxq7syga4gyfj2jyf1npayzq3ii0hzjarmrq";
-      name = "kde-l10n-ko-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ko-17.08.2.tar.xz";
+      sha256 = "1v4bjws17mz022n3r49z7rz1pdmqa4dsffj7pm60ixi6p5y3gvk2";
+      name = "kde-l10n-ko-17.08.2.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-lt-17.08.1.tar.xz";
-      sha256 = "02571m0mnhryy3zggy2bzc2k3q2dqc8kwn49332jsvbmsbkznk6a";
-      name = "kde-l10n-lt-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-lt-17.08.2.tar.xz";
+      sha256 = "0f09kkaghydq4b0fs59vz4h8q8j84qnqaqqaljc3vq05ih3849n5";
+      name = "kde-l10n-lt-17.08.2.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-lv-17.08.1.tar.xz";
-      sha256 = "17xhsgqb56al5zyvhllqfnm118fimnchd037649nnkddfpl95wwi";
-      name = "kde-l10n-lv-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-lv-17.08.2.tar.xz";
+      sha256 = "0aw8lpdh6y126gbwkfm408lz84kwd44wi3ryi5ascxadklmgcydw";
+      name = "kde-l10n-lv-17.08.2.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-mr-17.08.1.tar.xz";
-      sha256 = "0p8ynpc1ryksb97zl50i23rknsr70p124wpxmr6i1i7aq8jagcqc";
-      name = "kde-l10n-mr-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-mr-17.08.2.tar.xz";
+      sha256 = "10670r4fmvd1030rnlyl1s1ixiy380jg84h3ayv3m270rydpwn4c";
+      name = "kde-l10n-mr-17.08.2.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nb-17.08.1.tar.xz";
-      sha256 = "1ikh6fpj5lw4bfpmh8ln1v3mvmd9k55jz3v67ncrfyflljvwv6v7";
-      name = "kde-l10n-nb-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nb-17.08.2.tar.xz";
+      sha256 = "0cajcnk3clz175y2vhihpj33lcq5qmd0mgcl0srz5n28978v85wk";
+      name = "kde-l10n-nb-17.08.2.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nds-17.08.1.tar.xz";
-      sha256 = "0g7da58vazj1ckw336hgp7zlp6ra31xdjp0zx6hmwcxjv9as9scy";
-      name = "kde-l10n-nds-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nds-17.08.2.tar.xz";
+      sha256 = "0r5zpc48sywkqb227kf963p01w1x7r828pr0dsy711h5wwwbnj93";
+      name = "kde-l10n-nds-17.08.2.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nl-17.08.1.tar.xz";
-      sha256 = "0d059nb4qifpm4bx0akmxn0x9bx6cs5218yh9prqn9wpzaa96vf5";
-      name = "kde-l10n-nl-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nl-17.08.2.tar.xz";
+      sha256 = "02hz160xsacsbimwqva7f5fp2zk7nnngj349v0vhyx85fk2s5hd7";
+      name = "kde-l10n-nl-17.08.2.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nn-17.08.1.tar.xz";
-      sha256 = "034570iymirny6di77gxck3j0b1n11v07kj7k80h03smq2gkb6rh";
-      name = "kde-l10n-nn-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nn-17.08.2.tar.xz";
+      sha256 = "005779r53bfzxrir56nxly5c38bzcjs20y690m3g7y4kfvlyas0d";
+      name = "kde-l10n-nn-17.08.2.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pa-17.08.1.tar.xz";
-      sha256 = "10872cgamrm39xk5kr4qd5ddzpfpgra1rysj7raw9hr5fw0h5jqx";
-      name = "kde-l10n-pa-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pa-17.08.2.tar.xz";
+      sha256 = "0475yxyzs6m35hbhk6y68s86sfvwb838ji4ycjwg5164ml6p9x7f";
+      name = "kde-l10n-pa-17.08.2.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pl-17.08.1.tar.xz";
-      sha256 = "0bvp9mcny4zbcq1pi2d33s0fkdpblg1qrizi3v3jhzmxx1i7hr3w";
-      name = "kde-l10n-pl-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pl-17.08.2.tar.xz";
+      sha256 = "13v729a2cpp1spk8zlvynf41naifks5skacgdxx7pnz3z5nq34ih";
+      name = "kde-l10n-pl-17.08.2.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pt-17.08.1.tar.xz";
-      sha256 = "0m61a31iqzwk8wj40rjnx9i662mk3n9q21vh22p7ak9kf9r9kfhv";
-      name = "kde-l10n-pt-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pt-17.08.2.tar.xz";
+      sha256 = "13v7ahpp9yz197qggq6lwgyln2z4cszk4g46jc9c4qg1wq954cch";
+      name = "kde-l10n-pt-17.08.2.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-17.08.1";
+    version = "pt_BR-17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pt_BR-17.08.1.tar.xz";
-      sha256 = "1kh7rrpx5idnkpd8j89gxkm33kjz808mvb0d6i39lsv8nqk8ifq8";
-      name = "kde-l10n-pt_BR-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pt_BR-17.08.2.tar.xz";
+      sha256 = "19qd7cm96hjbh4bwgy9r00i7fdzrsivjss00vd502s2620wxj8mh";
+      name = "kde-l10n-pt_BR-17.08.2.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ro-17.08.1.tar.xz";
-      sha256 = "04b9bjz9nprhiki00b4yffd27dk1vjz6ddjw6bh6bxrzmzg2cgbc";
-      name = "kde-l10n-ro-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ro-17.08.2.tar.xz";
+      sha256 = "15jyjdvksqvhr7hkkfkb2mp7rkkidq7r15iibphi04d7nf5rgh7h";
+      name = "kde-l10n-ro-17.08.2.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ru-17.08.1.tar.xz";
-      sha256 = "04zx9xf1ca2pl75rbkcr7fa6sy3kmzdgc626wygqg0s4bi3rlsh2";
-      name = "kde-l10n-ru-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ru-17.08.2.tar.xz";
+      sha256 = "1vk54wih1bv85ixl4zv229hi7yvfnljndlfaslzfq2ff0r3j5iyf";
+      name = "kde-l10n-ru-17.08.2.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sk-17.08.1.tar.xz";
-      sha256 = "0q4ykign8mifwfwv56p3ac7bn3ywc9anj43f8n08c7bma4idxv01";
-      name = "kde-l10n-sk-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sk-17.08.2.tar.xz";
+      sha256 = "0n4j3cp9zh2r2jyy2mksm5qx1xxkb847q8vlx896q26cbzc2sl5k";
+      name = "kde-l10n-sk-17.08.2.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sl-17.08.1.tar.xz";
-      sha256 = "13mb62fjlpbhyv485rp1f5xgdfqdkq3vm2qq82rbw4jdw140ck08";
-      name = "kde-l10n-sl-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sl-17.08.2.tar.xz";
+      sha256 = "05dpfmqcdclkkdk58q3dz9h4m5gyfdp0a47pj3wlp8gagn6lrll1";
+      name = "kde-l10n-sl-17.08.2.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sr-17.08.1.tar.xz";
-      sha256 = "0xc6pgbm3rqn5g824pzfv0cxas6anb3glm11zhk9qhj24ig1zd5c";
-      name = "kde-l10n-sr-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sr-17.08.2.tar.xz";
+      sha256 = "1yavz6rfymg9ggb8xa7wrhr774482i7l7f110mbxb0hpp0rb37l4";
+      name = "kde-l10n-sr-17.08.2.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sv-17.08.1.tar.xz";
-      sha256 = "0p067wi30d7vgxsv345vv0f01qbchnffamv4pjv8sfscbcmih9c6";
-      name = "kde-l10n-sv-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sv-17.08.2.tar.xz";
+      sha256 = "1hznlqyr93zbhp11s4q6x8ad0rscikqdxmgaw9i8h1wjiy926psy";
+      name = "kde-l10n-sv-17.08.2.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-tr-17.08.1.tar.xz";
-      sha256 = "15x2r21810mndzzqx5cz1z6a6g7czmp2wiw8hw89g6nigq3qvacx";
-      name = "kde-l10n-tr-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-tr-17.08.2.tar.xz";
+      sha256 = "1mmi73sfrzqhwwj2pb7p1bklm0cgprs8mg73k7v1nvzxfj5mm3xl";
+      name = "kde-l10n-tr-17.08.2.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ug-17.08.1.tar.xz";
-      sha256 = "1bpd63jv8dlikg3589in5h11ydkpwp5mq69vlam9z68bmbl5sy5w";
-      name = "kde-l10n-ug-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ug-17.08.2.tar.xz";
+      sha256 = "0b4qzcp08y6hv7184sxl305rl92y38h68ljs7kbmszggy33fw0xq";
+      name = "kde-l10n-ug-17.08.2.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-uk-17.08.1.tar.xz";
-      sha256 = "1yaynm508g03gn896q3zrw8y5rn4l7m8a2x2skwyjzfxy8pk4az9";
-      name = "kde-l10n-uk-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-uk-17.08.2.tar.xz";
+      sha256 = "1jvrkc765s0dmbbh6yrfwp0nq3zr8kirp88ddnxv1jn4xk1wj60c";
+      name = "kde-l10n-uk-17.08.2.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-wa-17.08.1.tar.xz";
-      sha256 = "0247pwdizs31jhrjx6kfydgkr2ghqnqsdza10a7mggz825mgg2hv";
-      name = "kde-l10n-wa-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-wa-17.08.2.tar.xz";
+      sha256 = "1jnca594pbvhm6bpqkpaibpn3bh1ady1px1cjqljm3v2173gqgsh";
+      name = "kde-l10n-wa-17.08.2.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-17.08.1";
+    version = "zh_CN-17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-zh_CN-17.08.1.tar.xz";
-      sha256 = "0a58ikf8pkxhqr25cy04s5hwhdkp81y3304wa6xcni2k5vlzca9f";
-      name = "kde-l10n-zh_CN-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-zh_CN-17.08.2.tar.xz";
+      sha256 = "1szwwhd5jsafbnma968crz7x3l6r56qyx253119c0v7hribh2lh0";
+      name = "kde-l10n-zh_CN-17.08.2.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-17.08.1";
+    version = "zh_TW-17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-zh_TW-17.08.1.tar.xz";
-      sha256 = "02lkg354vq3sqvy4iib51yynjb5yx0hsqh1alik97wajawv4fkrc";
-      name = "kde-l10n-zh_TW-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-zh_TW-17.08.2.tar.xz";
+      sha256 = "1v4qlh63l02689mjbxq3q6ljpij1ryr0z51lmymab65bk7vxh2mw";
+      name = "kde-l10n-zh_TW-17.08.2.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.36";
+    version = "4.14.37";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdelibs-4.14.36.tar.xz";
-      sha256 = "08x5frbbgib9agn9ixslpx41wki8ky4l1r60xrl2pmywmwld4ag1";
-      name = "kdelibs-4.14.36.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdelibs-4.14.37.tar.xz";
+      sha256 = "0c74yg01r802j5jwl270w9sfkkhsn2fz26xhk5w44a1gycdlm7jf";
+      name = "kdelibs-4.14.37.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdenetwork-filesharing-17.08.1.tar.xz";
-      sha256 = "1m79c4ww25gcx4aiwjwp81r18i8s2x6afpp76xi2am6v4sd8rjb3";
-      name = "kdenetwork-filesharing-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdenetwork-filesharing-17.08.2.tar.xz";
+      sha256 = "0pz2zblg8hly141xkcrqs6hnv76zq5isbvyzdad6sjngjn4spcyc";
+      name = "kdenetwork-filesharing-17.08.2.tar.xz";
     };
   };
   kdenlive = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdenlive-17.08.1.tar.xz";
-      sha256 = "0cj618pjkack3wj66nbq4src460la5qryylblswg2nzm0svqawqh";
-      name = "kdenlive-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdenlive-17.08.2.tar.xz";
+      sha256 = "0a0qadvxy9b2drpj2k163wfg73020qfclkl47krqgrn2mdvibr92";
+      name = "kdenlive-17.08.2.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdepim-addons-17.08.1.tar.xz";
-      sha256 = "105b8pf9g44b5fz8vy404jiysz7sccvllz0bvhi9ihv7a3g4gihg";
-      name = "kdepim-addons-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdepim-addons-17.08.2.tar.xz";
+      sha256 = "036zs71aqr749n2cjv61y1xhgg16lsh07lx1kdqcqwyi8qgk7c1m";
+      name = "kdepim-addons-17.08.2.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdepim-apps-libs-17.08.1.tar.xz";
-      sha256 = "000gmblsgyzgml6h4v3ccr2n0n7s359rb91higiyrzkxi1cq0bh8";
-      name = "kdepim-apps-libs-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdepim-apps-libs-17.08.2.tar.xz";
+      sha256 = "14m7qxvpfdq53amigysqj4y26j8y8c45j7k4j9gv90amlh716ss1";
+      name = "kdepim-apps-libs-17.08.2.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdepim-runtime-17.08.1.tar.xz";
-      sha256 = "0q19j5dr0lml9v88ma32vqypi3jzg2dkjzv9adl48k9d2yrywq5n";
-      name = "kdepim-runtime-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdepim-runtime-17.08.2.tar.xz";
+      sha256 = "0yvrgi8rgwpvzkhzc5zdqyhqxs0czfqqc4dsgprg27a06lb7i3lz";
+      name = "kdepim-runtime-17.08.2.tar.xz";
     };
   };
   kde-runtime = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kde-runtime-17.08.1.tar.xz";
-      sha256 = "0gl24dpkxbkjq7kqj2i022w82daihxnyi2ccld0ql9680w73s3zg";
-      name = "kde-runtime-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kde-runtime-17.08.2.tar.xz";
+      sha256 = "00bjnbpx2lbjl7nz9z118yanwqmgjmy0nvq4bgxz7i4b68aw17xb";
+      name = "kde-runtime-17.08.2.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdesdk-kioslaves-17.08.1.tar.xz";
-      sha256 = "10nz2ai5iahva93psw1dd86npwcp5xlx80n12biwqfgwj5d380k8";
-      name = "kdesdk-kioslaves-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdesdk-kioslaves-17.08.2.tar.xz";
+      sha256 = "0h1bv0dbi3a8b1q5dj999k28llckgxsf8055fw5fsbx6q2h0rq23";
+      name = "kdesdk-kioslaves-17.08.2.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdesdk-thumbnailers-17.08.1.tar.xz";
-      sha256 = "11d7vch9fc5w42wlq8bz3wpb68sjslvvqpqs67d155w682z1q4q1";
-      name = "kdesdk-thumbnailers-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdesdk-thumbnailers-17.08.2.tar.xz";
+      sha256 = "0z20hc8ssw439sdc8w2fzkaihzcag8sflymizwgf6x8c7awi4y2v";
+      name = "kdesdk-thumbnailers-17.08.2.tar.xz";
     };
   };
   kdf = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdf-17.08.1.tar.xz";
-      sha256 = "09sjv6z5565mvgnicwaykisgrh859m7h8wfggmqs3rgldsi3iy0p";
-      name = "kdf-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdf-17.08.2.tar.xz";
+      sha256 = "0pfw8br46475h2v34nc0pnz94icrlivc3xcaxrf3w6x0wypmnhxs";
+      name = "kdf-17.08.2.tar.xz";
     };
   };
   kdialog = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdialog-17.08.1.tar.xz";
-      sha256 = "1j5ahq4xksl0jrxcisai0mnk6vr126qbabd9hnwq491f419l3zh1";
-      name = "kdialog-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdialog-17.08.2.tar.xz";
+      sha256 = "03lb5h8lbravayx5fddbzb6xgi9dabcyqpld3h32ykw4v26wlb1v";
+      name = "kdialog-17.08.2.tar.xz";
     };
   };
   kdiamond = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kdiamond-17.08.1.tar.xz";
-      sha256 = "07is91glcffrznsg72drmyqmz3lyki62g6ijc14x5i7k8v26nlhi";
-      name = "kdiamond-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kdiamond-17.08.2.tar.xz";
+      sha256 = "1fkldch162m4awk6j7xx61lh8h9i5cb9x38gndz4imvwmyvfqijn";
+      name = "kdiamond-17.08.2.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/keditbookmarks-17.08.1.tar.xz";
-      sha256 = "1k18if8ssjwj8mgp2jgxxwa8hh6x5w402i8fb2nsc7b4khw02y9q";
-      name = "keditbookmarks-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/keditbookmarks-17.08.2.tar.xz";
+      sha256 = "0dfyp8macmqhczk7b60dc15wqw8wzpbp6wlm6cdibdw7hlia9hfl";
+      name = "keditbookmarks-17.08.2.tar.xz";
     };
   };
   kfilereplace = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kfilereplace-17.08.1.tar.xz";
-      sha256 = "1ra01im1yp5k73m2hyz72d73qhwv3by1zyipn4l1m2m4r62kwjcr";
-      name = "kfilereplace-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kfilereplace-17.08.2.tar.xz";
+      sha256 = "02iwzcn5lm1riv1pg9d5s20q60f569qpx1wdbz1181r6806fsi37";
+      name = "kfilereplace-17.08.2.tar.xz";
     };
   };
   kfind = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kfind-17.08.1.tar.xz";
-      sha256 = "114l6b081ddxx51ndkqjl9jnvy00nyydn245y1kskfbzk2yry1jb";
-      name = "kfind-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kfind-17.08.2.tar.xz";
+      sha256 = "06c3ba95h6lzfwlj4svwlrijbv0d8c5siljiradiam65zai2bfpd";
+      name = "kfind-17.08.2.tar.xz";
     };
   };
   kfloppy = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kfloppy-17.08.1.tar.xz";
-      sha256 = "1afnlbk42g6sm7y7xkqnxr24mz2s95qkaap2s3zqc469gj1vlnxa";
-      name = "kfloppy-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kfloppy-17.08.2.tar.xz";
+      sha256 = "0icvsbxcxxg8lyzvzbga34an968gzwpd23zssbfy8flym95ci890";
+      name = "kfloppy-17.08.2.tar.xz";
     };
   };
   kfourinline = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kfourinline-17.08.1.tar.xz";
-      sha256 = "12cy3sarcy361wivlbpx2cxc2yaffr2xfy4dwz3iz6vzx49mhyky";
-      name = "kfourinline-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kfourinline-17.08.2.tar.xz";
+      sha256 = "1d4bfl81v4v512ixi1vbfbvz8vbmn1acfxjazlhk8xjjj0ky3yb2";
+      name = "kfourinline-17.08.2.tar.xz";
     };
   };
   kgeography = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kgeography-17.08.1.tar.xz";
-      sha256 = "1mjfacc850pqsgylwfcvp7yv0c4f1qgk0y7pgwrx2nspf8i1wwhc";
-      name = "kgeography-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kgeography-17.08.2.tar.xz";
+      sha256 = "16fgkp16bhpcibf8q0ivp9zsw8ws44icg34c3r8p5fbggfnkzqk6";
+      name = "kgeography-17.08.2.tar.xz";
     };
   };
   kget = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kget-17.08.1.tar.xz";
-      sha256 = "182l5hd5hfbpl88p9yzc54n8m0mi2fffp19sjdhhadmyx142inc1";
-      name = "kget-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kget-17.08.2.tar.xz";
+      sha256 = "1n6ky1bvr24hj3d6s1lfmyybr73q9p59w80fpzbx5v8c8l2g40w0";
+      name = "kget-17.08.2.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kgoldrunner-17.08.1.tar.xz";
-      sha256 = "0rzhg7hk07yaghflskiz4wh5d3jdfvhzig3zyyhimwir90lj1gxx";
-      name = "kgoldrunner-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kgoldrunner-17.08.2.tar.xz";
+      sha256 = "085ydmcmaiahzq32gasc5ihbxg25glpc9alqzhd4flzvqf646xmx";
+      name = "kgoldrunner-17.08.2.tar.xz";
     };
   };
   kgpg = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kgpg-17.08.1.tar.xz";
-      sha256 = "1hcg9zv4f2bj1210fahxap1fnyk7zdj3gfpfpdrww6qga5z4dzcy";
-      name = "kgpg-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kgpg-17.08.2.tar.xz";
+      sha256 = "1nrz2p6h13wi4vk4mrpcjkksrr6brj1aap4mf1rpj0g1mhrhwqly";
+      name = "kgpg-17.08.2.tar.xz";
     };
   };
   khangman = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/khangman-17.08.1.tar.xz";
-      sha256 = "17xk64lclbw2gcpnfpzi9sqryr8wl8g1v19gqrplvq4zw7qfanr5";
-      name = "khangman-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/khangman-17.08.2.tar.xz";
+      sha256 = "17qmsixr4ic86imdrw0z9lyjhnw00ycnxyyrzb736cw7s4jnnick";
+      name = "khangman-17.08.2.tar.xz";
     };
   };
   khelpcenter = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/khelpcenter-17.08.1.tar.xz";
-      sha256 = "1js7sk1hdp3k7d4gjk8rzq5rw1al8bh0ap5irw5551kvbagm5dp4";
-      name = "khelpcenter-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/khelpcenter-17.08.2.tar.xz";
+      sha256 = "0n4rdw606rhc3fs7kqg28dh8ay7q3ihiaraay8by3bk5dqby8r8k";
+      name = "khelpcenter-17.08.2.tar.xz";
     };
   };
   kholidays = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kholidays-17.08.1.tar.xz";
-      sha256 = "0gsvidakx0q0wqy2bgwq339hwghdcl882nvzj445hnmy10r2d6jk";
-      name = "kholidays-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kholidays-17.08.2.tar.xz";
+      sha256 = "03acmrw577lbs5h8az4wiw0dlmxmjiqak8pvm7w0ssmd2mrkggl2";
+      name = "kholidays-17.08.2.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kidentitymanagement-17.08.1.tar.xz";
-      sha256 = "1ippkav5nvfckp4145gcwa2hdl7zjw8bcaq6af5kcxqmvlcndvwv";
-      name = "kidentitymanagement-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kidentitymanagement-17.08.2.tar.xz";
+      sha256 = "1ylv4qcsry9m8zjddgpxb93yfmzbf0aikvf4m7j040272z2as6q9";
+      name = "kidentitymanagement-17.08.2.tar.xz";
     };
   };
   kig = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kig-17.08.1.tar.xz";
-      sha256 = "0gzfdpi4qlmwg6hkx1slvnxlynsfgwv18a9law05hg35hs6zxzfk";
-      name = "kig-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kig-17.08.2.tar.xz";
+      sha256 = "19jm98rlfvzsqip8vdi8gf1hynfkizjn61j4p1srgaciffx5l8zb";
+      name = "kig-17.08.2.tar.xz";
     };
   };
   kigo = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kigo-17.08.1.tar.xz";
-      sha256 = "0c498rzvmfkl0q5hnhddlx38qwyzsz4lh05cy5v4zpq8idvnxzj5";
-      name = "kigo-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kigo-17.08.2.tar.xz";
+      sha256 = "04qlqghgnnyqcvc1f3s4l9as4pma1g09jdgy48jwxlbg1h60m48z";
+      name = "kigo-17.08.2.tar.xz";
     };
   };
   killbots = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/killbots-17.08.1.tar.xz";
-      sha256 = "0yay6pr83rh5slklmxvw3jr2bky7k5cgf55a8r6al5b4vsx2802r";
-      name = "killbots-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/killbots-17.08.2.tar.xz";
+      sha256 = "1xpigas92xn911jm0zrq47hpnxxr4lb9bvv9f5b6i7k9z8p9m8zl";
+      name = "killbots-17.08.2.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kimagemapeditor-17.08.1.tar.xz";
-      sha256 = "158vrszvz2acnbzvmjprg1j2knarffvg8awwjcfg3zn2i6arwwsg";
-      name = "kimagemapeditor-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kimagemapeditor-17.08.2.tar.xz";
+      sha256 = "13z3z4pjgky4bh5js79rnsbzcxj0ksh4wdqx3fgmjs5mzbaka5gg";
+      name = "kimagemapeditor-17.08.2.tar.xz";
     };
   };
   kimap = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kimap-17.08.1.tar.xz";
-      sha256 = "1vch7y153jg010mcz7qjxjp6f3gfxrczbfh3bvx8q70cqfmx7ssm";
-      name = "kimap-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kimap-17.08.2.tar.xz";
+      sha256 = "0klpqy092hfqrvmm4nx3blwjnkybhg9zji500ckid90kv547ffmb";
+      name = "kimap-17.08.2.tar.xz";
     };
   };
   kio-extras = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kio-extras-17.08.1.tar.xz";
-      sha256 = "1hk09yavrr1dqvxjsdg9rmn6j8jzczhnfyn71hyfbglshvlhwm8m";
-      name = "kio-extras-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kio-extras-17.08.2.tar.xz";
+      sha256 = "1pblk8vi2gcvyjw71pwihpd9n4qlhcksfs3py8mcll1pz2ijbz6n";
+      name = "kio-extras-17.08.2.tar.xz";
     };
   };
   kiriki = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kiriki-17.08.1.tar.xz";
-      sha256 = "0cxmxxwn6ps00kf64z61r3k7iyr5falrbzmf6gz19m535b79drhi";
-      name = "kiriki-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kiriki-17.08.2.tar.xz";
+      sha256 = "1w83ggi02ibhgsmyw5s9cnjjqgx0zwbakf42l1dif9882svg38h7";
+      name = "kiriki-17.08.2.tar.xz";
     };
   };
   kiten = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kiten-17.08.1.tar.xz";
-      sha256 = "1yp2r5linfkknvn5dx4vf2f6vxg3kzrpiqsrg34q957wvfsc91qm";
-      name = "kiten-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kiten-17.08.2.tar.xz";
+      sha256 = "0rdkwv4njdpv1air697gwlzx843ddqwa7kl15i012307jfgkbkj4";
+      name = "kiten-17.08.2.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kjumpingcube-17.08.1.tar.xz";
-      sha256 = "161px7wad80a3p6hr27dj0990jb7j143q77q7ca308qysmffghnz";
-      name = "kjumpingcube-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kjumpingcube-17.08.2.tar.xz";
+      sha256 = "0q4y35ffq48yc2h843vv970rg4h8miy5pbsxkkrflwljcarwxv65";
+      name = "kjumpingcube-17.08.2.tar.xz";
     };
   };
   kldap = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kldap-17.08.1.tar.xz";
-      sha256 = "11j0ai0y022xxgiw7ac5cgv8vqb3qa1dbh7n9jqz9lg8rhjch2ix";
-      name = "kldap-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kldap-17.08.2.tar.xz";
+      sha256 = "1p0ydrhji8cb4fmciyazy44d2nz6mhcl1brqn4ridv98hqa2ybpc";
+      name = "kldap-17.08.2.tar.xz";
     };
   };
   kleopatra = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kleopatra-17.08.1.tar.xz";
-      sha256 = "1z32xwlsslhzqzsq8ngdws1ry56myvx8j56b973scbhd29z15www";
-      name = "kleopatra-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kleopatra-17.08.2.tar.xz";
+      sha256 = "0g5qg0kg1d0cza3689ppvj4hdhqdsxjcn8hc9cfpsapz28is8yk4";
+      name = "kleopatra-17.08.2.tar.xz";
     };
   };
   klettres = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/klettres-17.08.1.tar.xz";
-      sha256 = "0s7n83smr4mrrs91bpyr3hk2s1sl3ix73scnllb6spb6gx5hhr13";
-      name = "klettres-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/klettres-17.08.2.tar.xz";
+      sha256 = "1n1z4nj3rqiyqz0ysr6fvhygayvxfyljg3z6f0y6f70n9r5n999m";
+      name = "klettres-17.08.2.tar.xz";
     };
   };
   klickety = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/klickety-17.08.1.tar.xz";
-      sha256 = "0zp836x7ssgk7y5fcni7ya9cfdc28ywgvlzc01f7bi7pwh57q50x";
-      name = "klickety-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/klickety-17.08.2.tar.xz";
+      sha256 = "1haqc96jivnb93vhzmd9kp446p32gmkpf5zys5ix20r6lbsywgd9";
+      name = "klickety-17.08.2.tar.xz";
     };
   };
   klines = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/klines-17.08.1.tar.xz";
-      sha256 = "069igz40zrwbnyvw53d59rksn2n3dxycysb9fakb165qr27kb42h";
-      name = "klines-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/klines-17.08.2.tar.xz";
+      sha256 = "1v5gqyyc6vl3s44w9v34q0g27fxf85kkk9i188j48q0kiblbxq8d";
+      name = "klines-17.08.2.tar.xz";
     };
   };
   klinkstatus = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/klinkstatus-17.08.1.tar.xz";
-      sha256 = "11fakg10rlf4finznc2i5h1lbh1qq37wvzd93yc8vdwax98pps44";
-      name = "klinkstatus-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/klinkstatus-17.08.2.tar.xz";
+      sha256 = "1nfflb850mr1cd065lwryx6rd47w5bamg7sznvrhzjzqzrq6sm0x";
+      name = "klinkstatus-17.08.2.tar.xz";
     };
   };
   kmag = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmag-17.08.1.tar.xz";
-      sha256 = "1y69rsdl9pz11xrbfg8p0ihm1691y3blb5jay0v228prbwsy2gn3";
-      name = "kmag-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmag-17.08.2.tar.xz";
+      sha256 = "16i4cysa77dmxvkhpvhja4v315nnj1i5m9pd8a62j32gkrq54cpr";
+      name = "kmag-17.08.2.tar.xz";
     };
   };
   kmahjongg = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmahjongg-17.08.1.tar.xz";
-      sha256 = "17f57shs79pbwdaqblb4i9ibs3b4psy38ys69i8k5j04v7mam48s";
-      name = "kmahjongg-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmahjongg-17.08.2.tar.xz";
+      sha256 = "06f0wrjnlqgsh4n5kf7by5calrg2p0chm0c5b6wf4k311wb1cy65";
+      name = "kmahjongg-17.08.2.tar.xz";
     };
   };
   kmail = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmail-17.08.1.tar.xz";
-      sha256 = "1c3yds59nssnqi0pxb6fjajq6yaj6ki7l83gj59wlmpsyc1nm15d";
-      name = "kmail-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmail-17.08.2.tar.xz";
+      sha256 = "0fxxys8fxal6f4grbnl5niwf80kg62zymlbsp3hk7iihis6zqq59";
+      name = "kmail-17.08.2.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmail-account-wizard-17.08.1.tar.xz";
-      sha256 = "1vipb6330p67g4qpx2g1ps0fxnqb8w1agfwxnv61k3fccxpr4gkw";
-      name = "kmail-account-wizard-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmail-account-wizard-17.08.2.tar.xz";
+      sha256 = "1qf78p18pfyl7axm447q8zcrji53h6mvahampkqgmsybp35c7fd7";
+      name = "kmail-account-wizard-17.08.2.tar.xz";
     };
   };
   kmailtransport = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmailtransport-17.08.1.tar.xz";
-      sha256 = "1r8xbccijiw5v92qq18rccvsdn87m8mwc6g53k8gxpjx37vxrba8";
-      name = "kmailtransport-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmailtransport-17.08.2.tar.xz";
+      sha256 = "0gzvvszwaqpckig8293m734gbyzx5v8sl9k9n1hi1cnwblsnn7aj";
+      name = "kmailtransport-17.08.2.tar.xz";
     };
   };
   kmbox = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmbox-17.08.1.tar.xz";
-      sha256 = "0bgjj69by4c11z7j7v7inx4gzcsn6106r28n1ds6lc1k0vv8zw2d";
-      name = "kmbox-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmbox-17.08.2.tar.xz";
+      sha256 = "01ip8j5yj09gzzgynjqnxxxyv5d69rnnvq8mgwnpm6cxyh7lc8pv";
+      name = "kmbox-17.08.2.tar.xz";
     };
   };
   kmime = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmime-17.08.1.tar.xz";
-      sha256 = "178bx5pasrrlqwzjz85ba06gs9r40prwk7z4v6ar6fr9q4pa088c";
-      name = "kmime-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmime-17.08.2.tar.xz";
+      sha256 = "1ai3czsl60rf0sqqbmvr34nz5q2dz7i5y818rrar52r7fdn93wba";
+      name = "kmime-17.08.2.tar.xz";
     };
   };
   kmines = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmines-17.08.1.tar.xz";
-      sha256 = "1al98mzy8jrp17vq4j7np1bl5j9sd79drh78zd0343mrcqa7js28";
-      name = "kmines-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmines-17.08.2.tar.xz";
+      sha256 = "0k563bsd0yczcm4h5wvq2f5i029ah9wwv2f0qjwyrbzqxcl50xi0";
+      name = "kmines-17.08.2.tar.xz";
     };
   };
   kmix = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmix-17.08.1.tar.xz";
-      sha256 = "1w783p49zgsj52cy3mv4zgvh8f55mdij2drzgk3qr510wsyf0cg5";
-      name = "kmix-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmix-17.08.2.tar.xz";
+      sha256 = "06rqnlrl2l91inllzn8jksg74sldjyghjg06vv49ly6jqyc04aqh";
+      name = "kmix-17.08.2.tar.xz";
     };
   };
   kmousetool = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmousetool-17.08.1.tar.xz";
-      sha256 = "09rjvnp7f16d6cg3d5p1ah184j7710mziiiz5r0zxq7vdnkvxzlh";
-      name = "kmousetool-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmousetool-17.08.2.tar.xz";
+      sha256 = "1y568g0s88h0i67j9x083nqj7nyfsn4vyb149j97fm7d4iifbm2s";
+      name = "kmousetool-17.08.2.tar.xz";
     };
   };
   kmouth = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmouth-17.08.1.tar.xz";
-      sha256 = "07s3fqybprw7gprksc271pspnh81yawm5prrz0lif2awvc7wp7pm";
-      name = "kmouth-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmouth-17.08.2.tar.xz";
+      sha256 = "0qbbqb0wb3pzz7xv6jvghm2fmgxkvwmyiyjc9m1yzbmrdzqj1rig";
+      name = "kmouth-17.08.2.tar.xz";
     };
   };
   kmplot = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kmplot-17.08.1.tar.xz";
-      sha256 = "1gxhfkjdsrf8klqhqji6yzv9g4sdjcjhmyvx5j71wmrdc6pdpkpf";
-      name = "kmplot-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kmplot-17.08.2.tar.xz";
+      sha256 = "1ccnlbgzvx2b1sdzrvzpmnnk4g8r7rvpczm1xjyk62r7mdbffp97";
+      name = "kmplot-17.08.2.tar.xz";
     };
   };
   knavalbattle = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/knavalbattle-17.08.1.tar.xz";
-      sha256 = "187n5kn5ri87a98rybsf4g5jcwvyxdnb4601iaaf4jb6rg3yf2pm";
-      name = "knavalbattle-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/knavalbattle-17.08.2.tar.xz";
+      sha256 = "1b0s28ybl1p62issc3rvl41zhn94y0y9aflpqkjfg6592zjc304g";
+      name = "knavalbattle-17.08.2.tar.xz";
     };
   };
   knetwalk = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/knetwalk-17.08.1.tar.xz";
-      sha256 = "10kjsw94yzz82af3adk9shm67kbg8f8p0xmh60jr97cm1lvz5186";
-      name = "knetwalk-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/knetwalk-17.08.2.tar.xz";
+      sha256 = "0b9zqa3xgwkcfrnyxd026vd47hpf9i7j5xmx1b756rqm9yr531r5";
+      name = "knetwalk-17.08.2.tar.xz";
     };
   };
   knotes = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/knotes-17.08.1.tar.xz";
-      sha256 = "0654fxaiyvhfxjyfaw9hgvv352xkix2ls7wlvyw5b15d9iqa5cl0";
-      name = "knotes-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/knotes-17.08.2.tar.xz";
+      sha256 = "02i25f43dwmlwx1yhhws0zvrvqf92zhw8868hbfxz0y1lq04navx";
+      name = "knotes-17.08.2.tar.xz";
     };
   };
   kolf = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kolf-17.08.1.tar.xz";
-      sha256 = "0cmqpyd157b3n3x18d6wiijyvjaavxp65nagw2r0prjz9dckd1cl";
-      name = "kolf-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kolf-17.08.2.tar.xz";
+      sha256 = "1m0dn1v68y7vsranlv690hx3dyffzkjmnqzbvyaad72kldq0qw0l";
+      name = "kolf-17.08.2.tar.xz";
     };
   };
   kollision = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kollision-17.08.1.tar.xz";
-      sha256 = "00chxdib0ym5x94pzgfg3zx2lixf9h5b7sfcbg0chvjlc8imfv2b";
-      name = "kollision-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kollision-17.08.2.tar.xz";
+      sha256 = "01z6yfr882hh00bga3iwcyiwxzyigxc2ddd6r8a3s6h7cpi4ik1x";
+      name = "kollision-17.08.2.tar.xz";
     };
   };
   kolourpaint = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kolourpaint-17.08.1.tar.xz";
-      sha256 = "18cf856r66gwdf149zyam53p0sqvm0bf5f0k0n62mkp80z76kbvm";
-      name = "kolourpaint-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kolourpaint-17.08.2.tar.xz";
+      sha256 = "15bfzw03dh40m51fh1zwbrzqb5g2qjryznaaymjmzamgx08ldm4n";
+      name = "kolourpaint-17.08.2.tar.xz";
     };
   };
   kompare = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kompare-17.08.1.tar.xz";
-      sha256 = "1whsbz99cdnivq6m7irvnj0vcq82s34z9mgzd4a50z3i7ms5hmvf";
-      name = "kompare-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kompare-17.08.2.tar.xz";
+      sha256 = "1l2rdv8sddhf2z0vnn591aarzq5nqbhi58cnnpdwb5px99kasnyv";
+      name = "kompare-17.08.2.tar.xz";
     };
   };
   konqueror = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/konqueror-17.08.1.tar.xz";
-      sha256 = "1plq38ap1gdjq1s02s3km3pg8l2cgx0mkicb5jldz02qxj4z8rgy";
-      name = "konqueror-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/konqueror-17.08.2.tar.xz";
+      sha256 = "1c0fpbjba9bq515v3vbzj80jclx8kcy9khzvgaxasdmd9d01yvid";
+      name = "konqueror-17.08.2.tar.xz";
     };
   };
   konquest = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/konquest-17.08.1.tar.xz";
-      sha256 = "01ps82zkd95w06im3x7cazwbn2m4xbr80ky16gd71v3sdgg5zpw7";
-      name = "konquest-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/konquest-17.08.2.tar.xz";
+      sha256 = "15mmavbkndzzfa3zzsqxh53wi2489dqr8iw25iaj3pcbjzkn75rd";
+      name = "konquest-17.08.2.tar.xz";
     };
   };
   konsole = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/konsole-17.08.1.tar.xz";
-      sha256 = "00rrwk6i0ngg07md84bkfggdmmfknkpxiqbv37pb7xis1rvz9c8p";
-      name = "konsole-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/konsole-17.08.2.tar.xz";
+      sha256 = "0a7ks2an76jwkapy9rjhf29q9h4z212yf9bvx5757lj5qn5pwxq2";
+      name = "konsole-17.08.2.tar.xz";
     };
   };
   kontact = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kontact-17.08.1.tar.xz";
-      sha256 = "1z0mqnb6567xmx7shv7v60yb2cj6wh3ndqdd9nqxp12371mgm6i0";
-      name = "kontact-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kontact-17.08.2.tar.xz";
+      sha256 = "19hkppf2jwky73v73j4c2ppah7va4yrsv40ivw50k51s68s60b4a";
+      name = "kontact-17.08.2.tar.xz";
     };
   };
   kontactinterface = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kontactinterface-17.08.1.tar.xz";
-      sha256 = "09mpmdc65lm14s6hg1yq68i1wrawss0hl002bg9apgy2rfdk34k1";
-      name = "kontactinterface-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kontactinterface-17.08.2.tar.xz";
+      sha256 = "1gws8vl7s8jyqqbb37yw6gn85sqpfra8jzmin53j4wj4s8rdir5y";
+      name = "kontactinterface-17.08.2.tar.xz";
     };
   };
   kopete = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kopete-17.08.1.tar.xz";
-      sha256 = "1inbw80a2mwfc2id12qn0as4l52hz3wfcvzcz3n4p393g0qfz8an";
-      name = "kopete-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kopete-17.08.2.tar.xz";
+      sha256 = "01km2qsf12z8sbsbg8d4ng9izaphlsfqhr29dqryf1kqrwcv6amb";
+      name = "kopete-17.08.2.tar.xz";
     };
   };
   korganizer = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/korganizer-17.08.1.tar.xz";
-      sha256 = "0q35fyqxgwp5jv2qnpcjhfs1rkyp1jjrpmi28kqh93l04njmwvc0";
-      name = "korganizer-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/korganizer-17.08.2.tar.xz";
+      sha256 = "1anmc4bfd8pdf22vprw3x82fi2f19wh7xy5xwf144kqhwbyqk7ch";
+      name = "korganizer-17.08.2.tar.xz";
     };
   };
   kpat = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kpat-17.08.1.tar.xz";
-      sha256 = "1bqqm5gb6mc1v8h524qnz2rfcplvz6v87gvc0jg3zcqjf2c4xn4y";
-      name = "kpat-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kpat-17.08.2.tar.xz";
+      sha256 = "09ck09ywhl2ywlv90ipgxs45xiwcc3sxvfmgviqxvky513kkx7mn";
+      name = "kpat-17.08.2.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kpimtextedit-17.08.1.tar.xz";
-      sha256 = "16ymcccfn8pw098gr6b2k1xvwinhnx8c3npawy9fiqg138a4bkh9";
-      name = "kpimtextedit-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kpimtextedit-17.08.2.tar.xz";
+      sha256 = "15w338kwdrkag08zyg8dzkwfg25zh67bbwsfxa6ra40hdj1azz8p";
+      name = "kpimtextedit-17.08.2.tar.xz";
     };
   };
   kppp = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kppp-17.08.1.tar.xz";
-      sha256 = "0783rn2gzgxscnfbins0drl8j8ka0lxyg3787v9778d5993fafpf";
-      name = "kppp-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kppp-17.08.2.tar.xz";
+      sha256 = "016rgayrxccmvn7pw40x12dv3qi781m2rbcbz8lkprdglzzavfrz";
+      name = "kppp-17.08.2.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kqtquickcharts-17.08.1.tar.xz";
-      sha256 = "1zym0lcim41krv1irdfvkfb4simymairqq2cp2kiagrp3ssz28km";
-      name = "kqtquickcharts-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kqtquickcharts-17.08.2.tar.xz";
+      sha256 = "186rqlwjpa43z9qi8m2xkyc739plq7cmvn6jkzgl4k21pkfbgx9f";
+      name = "kqtquickcharts-17.08.2.tar.xz";
     };
   };
   krdc = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/krdc-17.08.1.tar.xz";
-      sha256 = "1lfh7w05b19bzdfmxydb0s55zgbizsh8j8vjblgsn2vihgm2f8lp";
-      name = "krdc-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/krdc-17.08.2.tar.xz";
+      sha256 = "1yv8z3hhhwrcy58lkaifnqkq38p9gs9sc6dhd3i6fpn1bci1j72a";
+      name = "krdc-17.08.2.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kremotecontrol-17.08.1.tar.xz";
-      sha256 = "1b146xb9dnq97lswb0qnppcgjbw5vwy1y9za2k0kl3bhfvxd4qj2";
-      name = "kremotecontrol-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kremotecontrol-17.08.2.tar.xz";
+      sha256 = "0f31zbf7yc59jvdm7ivb0g7wwh5mmdk26kyjqw8dg46hg29k1p79";
+      name = "kremotecontrol-17.08.2.tar.xz";
     };
   };
   kreversi = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kreversi-17.08.1.tar.xz";
-      sha256 = "17y2iihszjshln2hwxp6nqz30iln79mwmfv8yb2bydchdy05g807";
-      name = "kreversi-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kreversi-17.08.2.tar.xz";
+      sha256 = "1zrhaxnkjirkwjmbqjpagx6jijqdvb8khfhv7pwxij2q5ia9k7d8";
+      name = "kreversi-17.08.2.tar.xz";
     };
   };
   krfb = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/krfb-17.08.1.tar.xz";
-      sha256 = "1dwyx0jdg0i64pxd7phm1kq7fyaj7jls8w08sfgq3730s4s59lfj";
-      name = "krfb-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/krfb-17.08.2.tar.xz";
+      sha256 = "1554ziphhwck62cyfq60nwiivxb9vvc7l03iz5ncwj1apgmrj9m8";
+      name = "krfb-17.08.2.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kross-interpreters-17.08.1.tar.xz";
-      sha256 = "0hzsn1kjcpy2vbqx9sxhxbz4p67wcmv6agg932iavv2hi7731j14";
-      name = "kross-interpreters-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kross-interpreters-17.08.2.tar.xz";
+      sha256 = "0g5p25s1r1i60dlgsh9kwpq851cxhmprj6z00b91z6hj46v2zzx8";
+      name = "kross-interpreters-17.08.2.tar.xz";
     };
   };
   kruler = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kruler-17.08.1.tar.xz";
-      sha256 = "1qmlhc35vhbzfllz6wrssr62d3s3xdq15s5rkpm3w05a70bilpyq";
-      name = "kruler-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kruler-17.08.2.tar.xz";
+      sha256 = "0c1sdb3nihpi3p82s49g9k86ivnr499b3jdzrqh6hfcr6dbhi8x6";
+      name = "kruler-17.08.2.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ksaneplugin-17.08.1.tar.xz";
-      sha256 = "08zl04ly9wggcr8y0azz69nvjkr4c8gnajx4w8cwlb1dkn1b5is4";
-      name = "ksaneplugin-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ksaneplugin-17.08.2.tar.xz";
+      sha256 = "0zp898jb1vc5zliidhn5v4lqlqmmpn33fxarm5br9ks4zpqzam0y";
+      name = "ksaneplugin-17.08.2.tar.xz";
     };
   };
   kscd = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kscd-17.08.1.tar.xz";
-      sha256 = "08mlbhbck68abj17mkaz76fpy4rcn0x4h4smwgxnhy88ddb15wa1";
-      name = "kscd-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kscd-17.08.2.tar.xz";
+      sha256 = "1p79dwp0gwdffhz5dhdpcyc8hrzs0ks8kxzhrrxksazc25wh3l8y";
+      name = "kscd-17.08.2.tar.xz";
     };
   };
   kshisen = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kshisen-17.08.1.tar.xz";
-      sha256 = "0rg465092qkzbshr0pj6z6d38nykdfz2alhzy50qi9i32r8iwy9m";
-      name = "kshisen-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kshisen-17.08.2.tar.xz";
+      sha256 = "1kbyhxc5kp7s3if6lb39wjx1yxrwzkavf5vrlm0xynwzr560n6ar";
+      name = "kshisen-17.08.2.tar.xz";
     };
   };
   ksirk = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ksirk-17.08.1.tar.xz";
-      sha256 = "1v4xqjak0nf4vqsf7p7i37x5c08vbxq18nb63bhwjlb2fgnbg0yh";
-      name = "ksirk-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ksirk-17.08.2.tar.xz";
+      sha256 = "0q19yvghp6fgdpjgs9qc3rxqm4ahf5h2dbnw32v3c1hv095dfvi0";
+      name = "ksirk-17.08.2.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ksnakeduel-17.08.1.tar.xz";
-      sha256 = "105rjym6vkzi9m0dmzwwb6491lfmb5y1dfqax9y2gi993x0l5ihl";
-      name = "ksnakeduel-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ksnakeduel-17.08.2.tar.xz";
+      sha256 = "1gbsf3fmkpl438wq7xpvmyanm6p7knnyxvbvbd0my288xb4l3xf5";
+      name = "ksnakeduel-17.08.2.tar.xz";
     };
   };
   kspaceduel = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kspaceduel-17.08.1.tar.xz";
-      sha256 = "11g362hax9x8b99wvcndd4hz6q918dxcn8js16cflfxn1ry80wb6";
-      name = "kspaceduel-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kspaceduel-17.08.2.tar.xz";
+      sha256 = "13pbg1pwl25qlyb9kha08gnpbx6njclld8zlasvpym2c4db5cxx2";
+      name = "kspaceduel-17.08.2.tar.xz";
     };
   };
   ksquares = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ksquares-17.08.1.tar.xz";
-      sha256 = "1lw9qlfqfsmyry5v6fvhyjh23l8dj71iyp1z3y0xikaybc4rbbi1";
-      name = "ksquares-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ksquares-17.08.2.tar.xz";
+      sha256 = "1l2pgm3rj3cl7jgc1q7rjbv3kmi6zm4jh29r1q7zhfsiwin0sfz5";
+      name = "ksquares-17.08.2.tar.xz";
     };
   };
   kstars = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kstars-17.08.1.tar.xz";
-      sha256 = "1qr8y4m6lqiv3zb7f2ys7c6iw7iryk9ayibdscq113nq0blm59zs";
-      name = "kstars-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kstars-17.08.2.tar.xz";
+      sha256 = "1l1bjqwhvzw5czlfjg4zqk48bva9xlrn53grlbl2yywzvmn5jhgy";
+      name = "kstars-17.08.2.tar.xz";
     };
   };
   ksudoku = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ksudoku-17.08.1.tar.xz";
-      sha256 = "0fb9k5hdyq2alp42x17r1cfi5qz5hm9xzcwd3vz3c1kym4xavnjp";
-      name = "ksudoku-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ksudoku-17.08.2.tar.xz";
+      sha256 = "0hb4901gx81ra8mcrcsqbdhjqxfd1s5sxal4xhg72yd80qsg1da1";
+      name = "ksudoku-17.08.2.tar.xz";
     };
   };
   ksystemlog = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ksystemlog-17.08.1.tar.xz";
-      sha256 = "0wiwak8dmdm9kih2zvw2xxg67qs94imp6s24dgfxgylqqpqirlnv";
-      name = "ksystemlog-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ksystemlog-17.08.2.tar.xz";
+      sha256 = "16fiprkbkpnnc17qkgsd4w8givk6ny3kflb8pc87f2zs2vw6dfad";
+      name = "ksystemlog-17.08.2.tar.xz";
     };
   };
   kteatime = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kteatime-17.08.1.tar.xz";
-      sha256 = "08ripkkc6b3wi499kgsng4fzk2n7kbp3i6212q47h6bmgxs8a4zp";
-      name = "kteatime-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kteatime-17.08.2.tar.xz";
+      sha256 = "1cxxcaqzpjp6n8afrg1rw61grvmmla36r979761p3w0hwpgdrln3";
+      name = "kteatime-17.08.2.tar.xz";
     };
   };
   ktimer = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktimer-17.08.1.tar.xz";
-      sha256 = "116c61k99h5y0yph2x7cz0ff99rsfblgj3db7sczhn3hkbcimakx";
-      name = "ktimer-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktimer-17.08.2.tar.xz";
+      sha256 = "0vi9lrjazw8vq811qgcd7wyfkd2n60drszii8gx7w9jq8f0hkvfp";
+      name = "ktimer-17.08.2.tar.xz";
     };
   };
   ktnef = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktnef-17.08.1.tar.xz";
-      sha256 = "07jflp67mf748vf0ph89dbzy2lifm8148kl957qw1z9i1h5sm869";
-      name = "ktnef-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktnef-17.08.2.tar.xz";
+      sha256 = "012c1xsqj1ilq7w0shh22nmvkh1l56sn3ycg6xsigchk203im17d";
+      name = "ktnef-17.08.2.tar.xz";
     };
   };
   ktouch = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktouch-17.08.1.tar.xz";
-      sha256 = "19m8bp655ir9n2pz6vly9q2x42gdnpfjs47nkfiix28mg4y004qj";
-      name = "ktouch-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktouch-17.08.2.tar.xz";
+      sha256 = "0zrqmhag522ri8d56hlrrdmgfh6ywswahs7mss61dbyig5bpfy4g";
+      name = "ktouch-17.08.2.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-accounts-kcm-17.08.1.tar.xz";
-      sha256 = "1kghza63ywjndcscwlkabfqnsnalf1kprghb47gjj15qn844g019";
-      name = "ktp-accounts-kcm-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-accounts-kcm-17.08.2.tar.xz";
+      sha256 = "0nkji06d23y7qa505r3971r83w8pnf1jrz5l3k9di1s0x93cd2lm";
+      name = "ktp-accounts-kcm-17.08.2.tar.xz";
     };
   };
   ktp-approver = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-approver-17.08.1.tar.xz";
-      sha256 = "07vkhhldqkabfga79sl9hdbfdk4fdizj066180dirwbdkllfwnpf";
-      name = "ktp-approver-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-approver-17.08.2.tar.xz";
+      sha256 = "07mismz8srzwy7bkfh1gqzrxbj40xavnahhf8dhbskqn4sw8j50q";
+      name = "ktp-approver-17.08.2.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-auth-handler-17.08.1.tar.xz";
-      sha256 = "1612gi5izaanp9rzwz163q776lszrs03a9rrx13qczdl231smyf6";
-      name = "ktp-auth-handler-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-auth-handler-17.08.2.tar.xz";
+      sha256 = "0ncbmvld2v6wz9zknrj699pixxjlk7kk22xj9q0q6ay3cdiivcf2";
+      name = "ktp-auth-handler-17.08.2.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-call-ui-17.08.1.tar.xz";
-      sha256 = "0881lgmp04g157q3pp1im113imrw9aihxd08hhm6h5cla5z97m46";
-      name = "ktp-call-ui-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-call-ui-17.08.2.tar.xz";
+      sha256 = "12k5qar1v0faqqsmzvqb8932hndk8kzhc5dkib1kccq7g068br2v";
+      name = "ktp-call-ui-17.08.2.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-common-internals-17.08.1.tar.xz";
-      sha256 = "1nlcmlkbaj7j6y1i6gnmd7s6ks4qnmcdhwidxql4vgr6bjifr5n2";
-      name = "ktp-common-internals-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-common-internals-17.08.2.tar.xz";
+      sha256 = "1423sd43xyjzs0fbpvs6nsd1rgfd8ffgmpzbyal1s2f3rb4hfk8h";
+      name = "ktp-common-internals-17.08.2.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-contact-list-17.08.1.tar.xz";
-      sha256 = "1xv0qaf05lvzwmgdfr31vynk768sc9gqrl0w1b270ks9jgsb3k9i";
-      name = "ktp-contact-list-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-contact-list-17.08.2.tar.xz";
+      sha256 = "1g07v4am7m3qyq2b8bidxdgz2iwilzsq5nigzxag44nx3kc5n269";
+      name = "ktp-contact-list-17.08.2.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-contact-runner-17.08.1.tar.xz";
-      sha256 = "150m1lr7n39n88b0kaz8494ch0ym7i68f8c3hgzaxpy0m62mskkv";
-      name = "ktp-contact-runner-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-contact-runner-17.08.2.tar.xz";
+      sha256 = "145mbfpbzsrpqpk260jq44yiawj02fw27rr70b8j8az6jffjd1i2";
+      name = "ktp-contact-runner-17.08.2.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-desktop-applets-17.08.1.tar.xz";
-      sha256 = "167h8z1xd6q50xbgirfc6sxlnclliidpb5lg7s1baqdvlpg8rarz";
-      name = "ktp-desktop-applets-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-desktop-applets-17.08.2.tar.xz";
+      sha256 = "0kj2k78pcyswykqlh0clvh475f1c62910bxhnk03533fxrgdib3v";
+      name = "ktp-desktop-applets-17.08.2.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-filetransfer-handler-17.08.1.tar.xz";
-      sha256 = "0hvy0vdznv9js9fjmhgbcmh3gq6jlnynz4mfdbj8bjff635q76az";
-      name = "ktp-filetransfer-handler-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-filetransfer-handler-17.08.2.tar.xz";
+      sha256 = "10v0j46fdbmgciznwrxvb6wn037535w4sinvhn7r2myhf7vsvpah";
+      name = "ktp-filetransfer-handler-17.08.2.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-kded-module-17.08.1.tar.xz";
-      sha256 = "0rsb6qgf6kdizpp6iw48gxr1aka1yljcwc0wx03p6s31a9aql47w";
-      name = "ktp-kded-module-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-kded-module-17.08.2.tar.xz";
+      sha256 = "03p75jdh0q3709rcc5m2iv75rjphjsbgr40kaphakv57xk5wdhqv";
+      name = "ktp-kded-module-17.08.2.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-send-file-17.08.1.tar.xz";
-      sha256 = "1ncxr7cwfbqr8pwgkl3mg4zv6klss99pansmwkyh49bbjzjc9j3v";
-      name = "ktp-send-file-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-send-file-17.08.2.tar.xz";
+      sha256 = "15pyjxhcg7hl0p3bq11w3mrn10i3q0man6rqp7w6vqlq19bjndl3";
+      name = "ktp-send-file-17.08.2.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktp-text-ui-17.08.1.tar.xz";
-      sha256 = "13isirx7in0vj4p3l2m9pnjz73bf48y586qbpn0rbzpwbc7xzbmz";
-      name = "ktp-text-ui-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktp-text-ui-17.08.2.tar.xz";
+      sha256 = "1my2k34adf95alppq4n69apin72bnl8n84mj7b61pndjiixh4q7b";
+      name = "ktp-text-ui-17.08.2.tar.xz";
     };
   };
   ktuberling = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/ktuberling-17.08.1.tar.xz";
-      sha256 = "04fsplvry85m596qkx2i7601l7pc9dag4x45sw4z325fkzvlzsx9";
-      name = "ktuberling-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/ktuberling-17.08.2.tar.xz";
+      sha256 = "02vwy4zbzj80a9233107xgqa52r3pi4hgnvi6cpbdq9cmvcxw7fq";
+      name = "ktuberling-17.08.2.tar.xz";
     };
   };
   kturtle = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kturtle-17.08.1.tar.xz";
-      sha256 = "0nrsmhdmc1qdnpwsgrhs2gd91al8b0wrm85nwia2mmyxsfnbd45l";
-      name = "kturtle-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kturtle-17.08.2.tar.xz";
+      sha256 = "0vx7im20yk1172cb5g7z7mkhbsbx78ad9azs5d23rsv9fpzwikc2";
+      name = "kturtle-17.08.2.tar.xz";
     };
   };
   kubrick = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kubrick-17.08.1.tar.xz";
-      sha256 = "07lxc4i92i08hca2y6gqq3wsyp4mn857vwmy6ja40c2wh8sl6bix";
-      name = "kubrick-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kubrick-17.08.2.tar.xz";
+      sha256 = "0f9smvasgnjswx6jvhw4b7q58k47y1mv48vzygdx61zz1jyxjr8n";
+      name = "kubrick-17.08.2.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kwalletmanager-17.08.1.tar.xz";
-      sha256 = "0dq8m160kwbrjmda4hvdgq5izdnr7nnlksb9l3cvbslpc685d8h0";
-      name = "kwalletmanager-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kwalletmanager-17.08.2.tar.xz";
+      sha256 = "1a2q58wjb816fb0wfr4d7i790jxxwbfw9fpk1g8lkfk3kbvdgsnj";
+      name = "kwalletmanager-17.08.2.tar.xz";
     };
   };
   kwave = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kwave-17.08.1.tar.xz";
-      sha256 = "097viq7k2l4hkj0w07hnyfzfmz3apnri2n1g69ir1h37wq59fw89";
-      name = "kwave-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kwave-17.08.2.tar.xz";
+      sha256 = "1szn09swm8072x2mhy9q1szjm32pgg8agga1r2chf3jxc5iah2h3";
+      name = "kwave-17.08.2.tar.xz";
     };
   };
   kwordquiz = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/kwordquiz-17.08.1.tar.xz";
-      sha256 = "14l419ghf6xvdp2fnsdskflppzzvvhlbciwn6cicrkzmdr9zkawz";
-      name = "kwordquiz-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/kwordquiz-17.08.2.tar.xz";
+      sha256 = "0i7jl7rb4bxkifvpf6dsscbvwsay9a5jvvbkkajcwfr1v5r2w969";
+      name = "kwordquiz-17.08.2.tar.xz";
     };
   };
   libgravatar = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libgravatar-17.08.1.tar.xz";
-      sha256 = "0fn860y88pvq6mdpw1jw8msvkdmknradfp037gj9kvd5ykiicbvh";
-      name = "libgravatar-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libgravatar-17.08.2.tar.xz";
+      sha256 = "0zsxijykxxa4lg939wzv0vxh8jr6smmdd0zip8bimvdc4x2k6dv1";
+      name = "libgravatar-17.08.2.tar.xz";
     };
   };
   libkcddb = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkcddb-17.08.1.tar.xz";
-      sha256 = "06i8gm7rysbdlm89nw5pd3jgbvz9vy5schwyfyhk6jbvlm43sx7z";
-      name = "libkcddb-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkcddb-17.08.2.tar.xz";
+      sha256 = "0hlk2302cnpk896fmaq7p5ph7baxi3dz673qpy8f9hlcbj5k4j35";
+      name = "libkcddb-17.08.2.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkcompactdisc-17.08.1.tar.xz";
-      sha256 = "1xrpbpg4w275afd4fbnsmjvp737v6z5nsdz5lrfxbqg8x97xb2fm";
-      name = "libkcompactdisc-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkcompactdisc-17.08.2.tar.xz";
+      sha256 = "0fimkf94xd7v2cv2ixs38x4bpsrrfk4n36i7qbpakrvnw60q0rk4";
+      name = "libkcompactdisc-17.08.2.tar.xz";
     };
   };
   libkdcraw = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkdcraw-17.08.1.tar.xz";
-      sha256 = "0r9prk1pnbm2hj5q93j7axb869lzr8v7msqhylpf3awghfmy32a0";
-      name = "libkdcraw-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkdcraw-17.08.2.tar.xz";
+      sha256 = "140wq3h13gz3sv4d67i1pnrlzghy22zxf7ads0wia0iq85s7247m";
+      name = "libkdcraw-17.08.2.tar.xz";
     };
   };
   libkdegames = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkdegames-17.08.1.tar.xz";
-      sha256 = "12w8i91pqshgb2bx4h68yni3sj7ssbcxrcdybnicg18hpcf5fzpa";
-      name = "libkdegames-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkdegames-17.08.2.tar.xz";
+      sha256 = "1131q3i7a4xz5rmcp820hjqp9bmv2wdbq6afp01572lbn9dryvir";
+      name = "libkdegames-17.08.2.tar.xz";
     };
   };
   libkdepim = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkdepim-17.08.1.tar.xz";
-      sha256 = "17pg8fwpcdkj04fwzyqgykh9a23xkmkz46mknk43b37n0bcjhxq0";
-      name = "libkdepim-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkdepim-17.08.2.tar.xz";
+      sha256 = "04n4gj2rfafkb1k2c9yq9zshmy70ag415gmc24y7js82s20jh7y8";
+      name = "libkdepim-17.08.2.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkeduvocdocument-17.08.1.tar.xz";
-      sha256 = "0kv7yirw7q953qv23f0z3m1nmdpax6f6vsrbncpdz2057p51fwf4";
-      name = "libkeduvocdocument-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkeduvocdocument-17.08.2.tar.xz";
+      sha256 = "0scj7l554zqxax4i2lg8qbw11ansrl2hp422b8348lzmcdcndsyp";
+      name = "libkeduvocdocument-17.08.2.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkexiv2-17.08.1.tar.xz";
-      sha256 = "06qwd9lnl95vyzmj7nwgxflx82rvs5wkkwx4vnp408gya8w7cpjc";
-      name = "libkexiv2-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkexiv2-17.08.2.tar.xz";
+      sha256 = "0251w8y36d7k9wnm52ycbz4yr0310bkr7msnfs6828npfzynmy6i";
+      name = "libkexiv2-17.08.2.tar.xz";
     };
   };
   libkface = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkface-17.08.1.tar.xz";
-      sha256 = "1w81dsmz9r2vx4aw5rkkg5s08jn4gqckgr1jscdxah6af354y052";
-      name = "libkface-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkface-17.08.2.tar.xz";
+      sha256 = "1x9vg4dadgcxawprqxzv6glnl9b2b5qxvq7rvnr2vi4a5p0j3kkf";
+      name = "libkface-17.08.2.tar.xz";
     };
   };
   libkgapi = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkgapi-17.08.1.tar.xz";
-      sha256 = "04nww7rip0qpz9cky28ygd9chfmpp1kycpri4s84cqdicwg691bv";
-      name = "libkgapi-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkgapi-17.08.2.tar.xz";
+      sha256 = "1rpixzydg9421gblywyj8798d786yw9qfm7dnkn7dkzbm44pfrl4";
+      name = "libkgapi-17.08.2.tar.xz";
     };
   };
   libkgeomap = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkgeomap-17.08.1.tar.xz";
-      sha256 = "0llh9ixa1wyafcvah48rfrbk4n897i97a6jrk3vnf0yrqhl8nps2";
-      name = "libkgeomap-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkgeomap-17.08.2.tar.xz";
+      sha256 = "1s0bhv4f97241k98ss1laki04z7gcx47apps06gl0px3xgmzfyk7";
+      name = "libkgeomap-17.08.2.tar.xz";
     };
   };
   libkipi = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkipi-17.08.1.tar.xz";
-      sha256 = "089avdka9rvv5j137k42d6sz6kvqci771wb8433xksnnci8r52xb";
-      name = "libkipi-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkipi-17.08.2.tar.xz";
+      sha256 = "1hgmiazsy80hxfgc0y01wg1nzz33q8l0iw6g1sl8cxkgb06hkw93";
+      name = "libkipi-17.08.2.tar.xz";
     };
   };
   libkleo = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkleo-17.08.1.tar.xz";
-      sha256 = "0d2rby5yfwpb1gy2j87kzffzn6hls3358886qhiq6pwpx2nq7chj";
-      name = "libkleo-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkleo-17.08.2.tar.xz";
+      sha256 = "0qk4mf2sgji2pc3jjd0bxan7d40f7qkg9c3sgbrxvcy3jg3vdly5";
+      name = "libkleo-17.08.2.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkmahjongg-17.08.1.tar.xz";
-      sha256 = "11ciqd54isvjfccw3xc1xrdvjjmvacgvsdsxy3arcbivikmbmdqi";
-      name = "libkmahjongg-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkmahjongg-17.08.2.tar.xz";
+      sha256 = "1jibrvwy0147lwx09n19k1nj2vnssqwyc3slx6b0z3l23apa7vdw";
+      name = "libkmahjongg-17.08.2.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libkomparediff2-17.08.1.tar.xz";
-      sha256 = "0vp33mkm52yn2gqy469m4wfmsrbzppl6hw1d842nm1q1csnva0v5";
-      name = "libkomparediff2-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libkomparediff2-17.08.2.tar.xz";
+      sha256 = "0xc00yh2v7dhnsr70ndiql6rid8yjqdh968qbmpc5jlhhk00ws80";
+      name = "libkomparediff2-17.08.2.tar.xz";
     };
   };
   libksane = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libksane-17.08.1.tar.xz";
-      sha256 = "0k2sjz86yw7lfij0kgn1byps2vd8c9hlrd4lizppflzxi2ajmkd0";
-      name = "libksane-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libksane-17.08.2.tar.xz";
+      sha256 = "0ilysa21wadnv4kcyi4g268l8mzyab7m31wq8plc1hxbi1wjb72l";
+      name = "libksane-17.08.2.tar.xz";
     };
   };
   libksieve = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/libksieve-17.08.1.tar.xz";
-      sha256 = "01d573a415i2advgad0xzxkg8f6z5fbfmyb0iim79qqhzkbmf6bm";
-      name = "libksieve-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/libksieve-17.08.2.tar.xz";
+      sha256 = "0ypa7inmndq9k08gbcliwvx5x2q7z9dwx236wvq0zww0sjgnbdyx";
+      name = "libksieve-17.08.2.tar.xz";
     };
   };
   lokalize = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/lokalize-17.08.1.tar.xz";
-      sha256 = "0gr1qj0ish0kp842654fli2irbrli77q1449xryik76frlyy16wj";
-      name = "lokalize-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/lokalize-17.08.2.tar.xz";
+      sha256 = "024awg6xhncgzvg88n57waxcw9i5k1cmp3f16l4ic93wrk8ga8c9";
+      name = "lokalize-17.08.2.tar.xz";
     };
   };
   lskat = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/lskat-17.08.1.tar.xz";
-      sha256 = "1fhkg2vjy7xpp1rnx4cp9bpvxqc4i3nymyqgph92ankal0nnw2ai";
-      name = "lskat-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/lskat-17.08.2.tar.xz";
+      sha256 = "1lc99vik1bi474wwjr9pkfd9xhxs2rw6rcb72a3bq4ks83m3kmf0";
+      name = "lskat-17.08.2.tar.xz";
     };
   };
   mailcommon = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/mailcommon-17.08.1.tar.xz";
-      sha256 = "0qw7hsy36r39l13x492mhfxj3x9inagd7fjsxvfblhgnh1c2ad0r";
-      name = "mailcommon-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/mailcommon-17.08.2.tar.xz";
+      sha256 = "1g9dr7ilw65zpjvr12hkambk691zynv9xgg9kcya1krmh50hdi53";
+      name = "mailcommon-17.08.2.tar.xz";
     };
   };
   mailimporter = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/mailimporter-17.08.1.tar.xz";
-      sha256 = "0wwciyc8azx2sln5407gv4kqcx7zfl680szxgbw533iq9kccvl0z";
-      name = "mailimporter-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/mailimporter-17.08.2.tar.xz";
+      sha256 = "1xy07wlvvg5rs9534llsd6amaxk2sylx8lfzr22s17fcpr0rl71s";
+      name = "mailimporter-17.08.2.tar.xz";
     };
   };
   marble = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/marble-17.08.1.tar.xz";
-      sha256 = "1jlz37m3a0jhnac4y6ix6n3hhxkp808qdnvxpd3my1gvn715wa58";
-      name = "marble-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/marble-17.08.2.tar.xz";
+      sha256 = "1yvhmmfgflsknlx0ffpj82clkd4py6kalf9dcf04f3lfw0k559fm";
+      name = "marble-17.08.2.tar.xz";
     };
   };
   mbox-importer = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/mbox-importer-17.08.1.tar.xz";
-      sha256 = "0kjxx0nvxb6dshibaipgdf4i8magmsxnqhfnph831x13mig15bcs";
-      name = "mbox-importer-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/mbox-importer-17.08.2.tar.xz";
+      sha256 = "1g8zvg4xxpnic1qf020zcyy6bijz4a094xzdxyx64lq7wp1bi269";
+      name = "mbox-importer-17.08.2.tar.xz";
     };
   };
   messagelib = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/messagelib-17.08.1.tar.xz";
-      sha256 = "0srjcqbqzyk8ca9ssisrils9jwm9p6b62q4b7g9bya602cbrh38b";
-      name = "messagelib-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/messagelib-17.08.2.tar.xz";
+      sha256 = "0wb371cb7glwvwhmk76r5ziq821b87d8cq9fy4pgxlj1wvsny2km";
+      name = "messagelib-17.08.2.tar.xz";
     };
   };
   minuet = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/minuet-17.08.1.tar.xz";
-      sha256 = "17vvsnvhvpqcyrb5qlchp4na1wk5f4qlkh7w8sj162jsd1lbxr9j";
-      name = "minuet-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/minuet-17.08.2.tar.xz";
+      sha256 = "1x9h3k8dpn40119s1vxpnkj78glx0hajfg9wh7jnm70phasn1jci";
+      name = "minuet-17.08.2.tar.xz";
     };
   };
   okteta = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/okteta-17.08.1.tar.xz";
-      sha256 = "00wmkzjw7h99b1lmab0llwzlmh1m4xgv3yy506hjwb78z1c6wbq2";
-      name = "okteta-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/okteta-17.08.2.tar.xz";
+      sha256 = "1f1gpyyd1xcdii34hjhflqaxfnk3clnin2ihb6fpkbz5fz2020bq";
+      name = "okteta-17.08.2.tar.xz";
     };
   };
   okular = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/okular-17.08.1.tar.xz";
-      sha256 = "027isffca4g98qm6yx7m69cp2xjplqhnh7gy00sr1b96hhnlc9c6";
-      name = "okular-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/okular-17.08.2.tar.xz";
+      sha256 = "0mkyqg5n870zc2ryxgwyrf9n57gn5jfj9wvlwc405h5q8zf5fvy5";
+      name = "okular-17.08.2.tar.xz";
     };
   };
   palapeli = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/palapeli-17.08.1.tar.xz";
-      sha256 = "0nnplg88xipmnb24qj2ki5m090g8cbinbb3azkqadwsjfc13xk06";
-      name = "palapeli-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/palapeli-17.08.2.tar.xz";
+      sha256 = "1smp7an5b059hp5d8bjwq65d11zkfbfcr1kkapbljamg1ydd4y21";
+      name = "palapeli-17.08.2.tar.xz";
     };
   };
   parley = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/parley-17.08.1.tar.xz";
-      sha256 = "034nc5qgiy50wpnkm3d8w3cf7svj6as23sarz0h5hks4ffw1bxhg";
-      name = "parley-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/parley-17.08.2.tar.xz";
+      sha256 = "15m4vsmk9s4dh5rv7x2vdcy8kbi334nms79aj8yvx01nlipv7m79";
+      name = "parley-17.08.2.tar.xz";
     };
   };
   picmi = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/picmi-17.08.1.tar.xz";
-      sha256 = "14kbrbq59kmqz1rd7izrp57i1a6d6nm8i73rwcl80vyla8cnvika";
-      name = "picmi-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/picmi-17.08.2.tar.xz";
+      sha256 = "01fqrd9za748m6gxbq3i3yvvmz2qkf3kln14wwl69hc29b6ikk0k";
+      name = "picmi-17.08.2.tar.xz";
     };
   };
   pimcommon = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/pimcommon-17.08.1.tar.xz";
-      sha256 = "14vk8pnwbc4bvha26fxdfbyn0ipxj93qgan8f24kpxc7irjkr8ic";
-      name = "pimcommon-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/pimcommon-17.08.2.tar.xz";
+      sha256 = "01jh4c55yk4wmi3i7f81hgs0bgqxpm8fccvg51z2k05swdm7x10b";
+      name = "pimcommon-17.08.2.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/pim-data-exporter-17.08.1.tar.xz";
-      sha256 = "0drzj44p66ds4p42wk45755yjcs2dpysw54mzg2qx4cdv8kf1snq";
-      name = "pim-data-exporter-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/pim-data-exporter-17.08.2.tar.xz";
+      sha256 = "1xnv07lvhbb12qp0jcrd39l54gsgnifdn1ibzxh7fnbdrv3iqxqv";
+      name = "pim-data-exporter-17.08.2.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/pim-sieve-editor-17.08.1.tar.xz";
-      sha256 = "1hclbjs596x5niszcccnzkr6x5avg2c982prq8qcrc68cdm1h7pg";
-      name = "pim-sieve-editor-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/pim-sieve-editor-17.08.2.tar.xz";
+      sha256 = "0fnm055sx18ripf5vhpiqi628vkvvgyhaw4xw7hz6hbmv8f3qsma";
+      name = "pim-sieve-editor-17.08.2.tar.xz";
     };
   };
   poxml = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/poxml-17.08.1.tar.xz";
-      sha256 = "17g62xp5g4icfmbd001rhypn34a9asj8pcgj301q5v9065z44mmn";
-      name = "poxml-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/poxml-17.08.2.tar.xz";
+      sha256 = "1hkw1m3w5v12c8vm9wdksrb9q92lki3m97949h91zmdr7lc3s3sd";
+      name = "poxml-17.08.2.tar.xz";
     };
   };
   print-manager = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/print-manager-17.08.1.tar.xz";
-      sha256 = "0f354qblzw3vkv4fypwp3fj3i29x6b478z79q5d2n6x9nk8li5in";
-      name = "print-manager-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/print-manager-17.08.2.tar.xz";
+      sha256 = "1gcr265bzj3knhqflyj12zza3cd94vgny8bxqqk7xbs2mii0pjsd";
+      name = "print-manager-17.08.2.tar.xz";
     };
   };
   rocs = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/rocs-17.08.1.tar.xz";
-      sha256 = "18nygfbyiny8zpq2jm6mxs6r4b90c4dwxwzvs0a3vrc131fjc6bc";
-      name = "rocs-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/rocs-17.08.2.tar.xz";
+      sha256 = "0y0d64fdy22kx0bpbh9wkpxg8zqg24y02ww32h3p52zxyxcx7zf1";
+      name = "rocs-17.08.2.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/signon-kwallet-extension-17.08.1.tar.xz";
-      sha256 = "1ax4l1whdxrfnl7bbs805vpp7j2m5zl55fq12vvrkw0x38m78v2h";
-      name = "signon-kwallet-extension-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/signon-kwallet-extension-17.08.2.tar.xz";
+      sha256 = "1fnhzbd5akvr9cmwfpxv7dy9bd8z7lcqzpyh9m84gdw1ppgzqypp";
+      name = "signon-kwallet-extension-17.08.2.tar.xz";
     };
   };
   spectacle = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/spectacle-17.08.1.tar.xz";
-      sha256 = "07x01i629zk0l409kl85yv5gws7cw7mzmp1mlwxrjix153sr4jr9";
-      name = "spectacle-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/spectacle-17.08.2.tar.xz";
+      sha256 = "1wv8ld3s69v00gvlk6r49v86z5l2xy243ily917v8c1imzvz6xhj";
+      name = "spectacle-17.08.2.tar.xz";
     };
   };
   step = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/step-17.08.1.tar.xz";
-      sha256 = "11p9rdg0m42200g15lq61489zz0zkkhic2j6hyynb1z1lr9c2iga";
-      name = "step-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/step-17.08.2.tar.xz";
+      sha256 = "0llag76b39vf20rbm8zgvs4hh3pynb85a2gbbgxb3v4kvg9nj9zk";
+      name = "step-17.08.2.tar.xz";
     };
   };
   svgpart = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/svgpart-17.08.1.tar.xz";
-      sha256 = "0xr0axiyn49szwwflq50sf9wp8i5xd7qs3krwznrdzlc8jcann9j";
-      name = "svgpart-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/svgpart-17.08.2.tar.xz";
+      sha256 = "10xmbck1kwp0hhg5k8v9ay2bh36xvvpz1mnixydmsyrc0x9n2zh4";
+      name = "svgpart-17.08.2.tar.xz";
     };
   };
   sweeper = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/sweeper-17.08.1.tar.xz";
-      sha256 = "04gzc06p1fh7rnb3sbma2k8lav98v3w657k0sgscnv4dvsgbcqh9";
-      name = "sweeper-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/sweeper-17.08.2.tar.xz";
+      sha256 = "1sr1fw4ny09ch0hmgn4npd6hfvgc52xfwmys1kid7hi8lwrsn7g5";
+      name = "sweeper-17.08.2.tar.xz";
     };
   };
   syndication = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/syndication-17.08.1.tar.xz";
-      sha256 = "0ihkway75n4r3zw18z07g5k2ggby5q1cz4cqi29cws1ay6s09qb9";
-      name = "syndication-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/syndication-17.08.2.tar.xz";
+      sha256 = "165fcw486qxlq5lmab7qa9bc7pkc3jfc4xqx1m5k4rgwapfk0sv9";
+      name = "syndication-17.08.2.tar.xz";
     };
   };
   umbrello = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/umbrello-17.08.1.tar.xz";
-      sha256 = "0xvxcncsxikmnxv98ar3gzcvxahsnja4jz1l23hiy2ib1lmcgcy7";
-      name = "umbrello-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/umbrello-17.08.2.tar.xz";
+      sha256 = "0prwsw8qwcgia98kjvh9xbv3cdnh24fqk2zl59diighw11q2dnsk";
+      name = "umbrello-17.08.2.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "17.08.1";
+    version = "17.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.1/src/zeroconf-ioslave-17.08.1.tar.xz";
-      sha256 = "1crypk1cdh6cav1f6fx9p60ky1yf6hyyh1n6mih8mqjiibi1brz5";
-      name = "zeroconf-ioslave-17.08.1.tar.xz";
+      url = "${mirror}/stable/applications/17.08.2/src/zeroconf-ioslave-17.08.2.tar.xz";
+      sha256 = "0bki5dz2n8psja4mfj65hshaz7qdniyx7r72kv8xn8xk0vj292x3";
+      name = "zeroconf-ioslave-17.08.2.tar.xz";
     };
   };
 }
-- 
GitLab


From 9a9ea65de9a80772dc3c385b7cd2c29a4ae1122f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 2 Nov 2017 11:42:07 -0500
Subject: [PATCH 520/877] dropbox: use buildFHSUserEnv

Instead of adapting Dropbox to NixOS with patchelf, NixOS is adapted to Dropbox
with an FHS user environment. A crash due to missing libXert (#15356) is
fixed. The client's automatic updater is fixed; this obviates the need to
update Dropbox in Nixpkgs every time the client is updated upstream!

Resolves: #15356
---
 .../networking/dropbox/default.nix            | 148 ++++--------------
 pkgs/top-level/all-packages.nix               |   2 +-
 2 files changed, 30 insertions(+), 120 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 06ac05da36d..d15b1d545b4 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -1,57 +1,23 @@
-{ mkDerivation, stdenv, lib, fetchurl, makeDesktopItem
-, makeWrapper, patchelf
-, dbus_libs, fontconfig, freetype, gcc, glib
-, libdrm, libffi, libICE, libSM
-, libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
-, libxml2, libxslt, ncurses, zlib
-, qtbase, qtdeclarative, qtwebkit, wmctrl
-}:
+{ stdenv, lib, buildFHSUserEnv, writeScript, makeDesktopItem }:
 
-# this package contains the daemon version of dropbox
-# it's unfortunately closed source
-#
-# note: the resulting program has to be invoced as
-# 'dropbox' because the internal python engine takes
-# uses the name of the program as starting point.
+let platforms = [ "i686-linux" "x86_64-linux" ]; in
 
-# Dropbox ships with its own copies of some libraries.
-# Unfortunately, upstream makes changes to the source of
-# some libraries, rendering them incompatible with the
-# open-source versions. Wherever possible, we must try
-# to make the bundled libraries work, rather than replacing
-# them with our own.
+assert lib.elem stdenv.system platforms;
 
+# Dropbox client to bootstrap installation.
+# The client is self-updating, so the actual version may be newer.
 let
-  ## Prefetch commands to run after update, from this directory:
-  ## e.g. with Emacs: C-u M-x shell-command
-  # nix-prefetch-url ../../../../ -A dropbox.src
-  # nix-prefetch-url ../../../../ -A pkgsi686Linux.dropbox.src
-
-  # NOTE: When updating, please also update in current stable,
-  # as older versions stop working
-  version = "37.4.29";
-  sha256 = {
-    "x86_64-linux" = "0ymy8gb57bjq2mq35n52q2viww6am7wy0vskyvypliicggga8iaj";
-    "i686-linux"   = "0a7zir6x7z3ad71fj1iljc2l6x09f4wi40jfaiinf8ykx85cldw6";
-  }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+  version = "38.4.27";
 
   arch = {
     "x86_64-linux" = "x86_64";
     "i686-linux"   = "x86";
-  }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
-
-  # relative location where the dropbox libraries are stored
-  appdir = "opt/dropbox";
+  }.${stdenv.system};
 
-  libs = [
-    dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
-    libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
-    ncurses zlib
-
-    qtbase qtdeclarative qtwebkit
-  ];
-  ldpath = stdenv.lib.makeLibraryPath libs;
+  installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
+in
 
+let
   desktopItem = makeDesktopItem {
     name = "dropbox";
     exec = "dropbox";
@@ -61,93 +27,37 @@ let
     categories = "Network;FileTransfer;";
     startupNotify = "false";
   };
+in
 
-in mkDerivation {
-  name = "dropbox-${version}";
-  src = fetchurl {
-    name = "dropbox-${version}.tar.gz";
-    url = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
-    inherit sha256;
-  };
-
-  sourceRoot = ".dropbox-dist";
+buildFHSUserEnv {
+  name = "dropbox";
 
-  nativeBuildInputs = [ makeWrapper patchelf ];
-  buildInputs = libs;
-  dontStrip = true; # already done
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out/${appdir}"
-    cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
-
-    # Vendored libraries interact poorly with our graphics drivers
-    rm "$out/${appdir}/libdrm.so.2"
-    rm "$out/${appdir}/libffi.so.6"
-    rm "$out/${appdir}/libGL.so.1"
-    rm "$out/${appdir}/libX11-xcb.so.1"
-
-    # Cannot use vendored Qt libraries due to problem with xkbcommon
-    rm "$out/${appdir}/"libQt5*.so.5
-    rm "$out/${appdir}/qt.conf"
-    rm -fr "$out/${appdir}/plugins"
+  targetPkgs = pkgs: with pkgs; with xlibs; [
+    libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender
+    libXxf86vm libxcb
+    curl dbus fontconfig freetype gcc glib gnutar libxml2 libxslt zlib
+  ];
 
+  extraInstallCommands = ''
     mkdir -p "$out/share/applications"
     cp "${desktopItem}/share/applications/"* $out/share/applications
-
-    mkdir -p "$out/share/icons"
-    ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor"
-
-    mkdir -p "$out/bin"
-    RPATH="${ldpath}:$out/${appdir}"
-    chmod 755 $out/${appdir}/dropbox
-    makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
-      --prefix LD_LIBRARY_PATH : "$RPATH"
-
-
-    rm $out/${appdir}/wmctrl
-    ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl
-
-    runHook postInstall
   '';
 
-  preFixup = ''
-    INTERP=$(cat $NIX_CC/nix-support/dynamic-linker)
-    RPATH="${ldpath}:$out/${appdir}"
-    getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
-    find "$out/${appdir}" -type f -print | while read obj; do
-        dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true)
-        if [[ -n "$dynamic" ]]; then
-
-            if readelf -l "$obj" 2>/dev/null | grep "INTERP" >/dev/null; then
-                echo "patching interpreter path in $type $obj"
-                patchelf --set-interpreter "$INTERP" "$obj"
-            fi
-
-            type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType")
-            if [ "$type" == "EXEC" ] || [ "$type" == "DYN" ]; then
-
-                echo "patching RPATH in $type $obj"
-                oldRPATH=$(patchelf --print-rpath "$obj")
-                patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
-
-            else
-
-                echo "unknown ELF type \"$type\"; not patching $obj"
-
-            fi
-        fi
-    done
-
-    paxmark m $out/${appdir}/dropbox
+  runScript = writeScript "install-and-start-dropbox" ''
+    if ! [ -d "$HOME/.dropbox-dist" ]; then
+        # Dropbox is not installed.
+        # Download and unpack the client. If a newer version is available,
+        # the client will update itself when run.
+        curl '${installer}' | tar -C "$HOME" -x -z
+    fi
+    exec "$HOME/.dropbox-dist/dropboxd"
   '';
 
   meta = with lib; {
     description = "Online stored folders (daemon version)";
-    homepage    = http://www.dropbox.com;
-    maintainers = with maintainers; [ ttuegel ];
+    homepage    = http://www.dropbox.com/;
     license     = licenses.unfree;
+    maintainers = with maintainers; [ ttuegel ];
     platforms   = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60fad0499da..ee9b07f013d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16543,7 +16543,7 @@ with pkgs;
   bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { };
   bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { };
 
-  dropbox = libsForQt5.callPackage ../applications/networking/dropbox { };
+  dropbox = callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 
-- 
GitLab


From b62992a483e0b169c6e08c34340d08d828edadf4 Mon Sep 17 00:00:00 2001
From: Casey Ransom <cransom@hubns.net>
Date: Thu, 19 Oct 2017 18:53:44 -0400
Subject: [PATCH 521/877] kisslicer: init at 1.6.2

---
 pkgs/tools/misc/kisslicer/default.nix | 58 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/tools/misc/kisslicer/default.nix

diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix
new file mode 100644
index 00000000000..588511638be
--- /dev/null
+++ b/pkgs/tools/misc/kisslicer/default.nix
@@ -0,0 +1,58 @@
+{ fetchzip
+, libX11
+, mesa
+, makeWrapper
+, stdenv
+}:
+
+let
+
+  libPath = stdenv.lib.makeLibraryPath [
+    mesa
+    stdenv.cc.cc
+    libX11
+  ];
+
+  inidir = "\\\${XDG_CONFIG_HOME:-\\$HOME/.config}/kisslicer";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "kisslicer-1.6.2";
+
+  src = fetchzip {
+    url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.2_release.zip";
+    sha256 = "0fb7hzic78skq3ykc37srnjsw0yri7m0pb3arlz076ws7jrcbr0f";
+    stripRoot = false;
+  };
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  buildInputs = [
+    makeWrapper
+    mesa
+    libX11
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -p * $out/bin
+  '';
+
+  fixupPhase = ''
+    chmod 755 $out/bin/KISSlicer
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath ${libPath}   $out/bin/KISSlicer
+    wrapProgram $out/bin/KISSlicer \
+      --add-flags "-inidir ${inidir}" \
+      --run "mkdir -p ${inidir}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Convert STL files into Gcode";
+    homepage = http://www.kisslicer.com;
+    license = licenses.unfree;
+    maintainers = [ maintainers.cransom ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 420c84b9b2b..f8efb5cdd2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1128,6 +1128,8 @@ with pkgs;
 
   kapacitor = callPackage ../servers/monitoring/kapacitor { };
 
+  kisslicer = callPackage ../tools/misc/kisslicer { };
+
   lcdproc = callPackage ../servers/monitoring/lcdproc { };
 
   languagetool = callPackage ../tools/text/languagetool {  };
-- 
GitLab


From 69d0eac956f8c1aa7f31b7f84fc94d0c2ed56311 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 17:14:38 +0000
Subject: [PATCH 522/877] python.pkgs.podcastparser: 0.6.1 -> 0.6.2

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

diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix
index 25682099225..b45c8d96fc4 100644
--- a/pkgs/development/python-modules/podcastparser/default.nix
+++ b/pkgs/development/python-modules/podcastparser/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "podcastparser";
-  version = "0.6.1";
+  version = "0.6.2";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "gpodder";
     repo = "podcastparser";
     rev = version;
-    sha256 = "0q3qc8adykmm692ha0c37xd6wbj830zlq900fyw6vrfan9bgdj5y";
+    sha256 = "1mhg7192d6s1ll9mx1b63yfj6k4cnv4i95jllbnydyjv9ykkv0k1";
   };
 
   propagatedBuildInputs = [ ];
-- 
GitLab


From 500300cf0ba694b50949e9ad29b7b896893f2ee7 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Thu, 2 Nov 2017 13:23:59 -0400
Subject: [PATCH 523/877] terminal-notifier: 1.5.0 -> 2.0.0

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

diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index 47cea34d4a5..c838eca5065 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -3,11 +3,12 @@
 stdenv.mkDerivation rec {
   name = "terminal-notifier-${version}";
 
-  version = "1.5.0";
+  version = "2.0.0";
 
   src = fetchzip {
     url = "https://github.com/alloy/terminal-notifier/releases/download/${version}/terminal-notifier-${version}.zip";
-    sha256 = "09x7vl0kddivqq3pyrk6sg1f0sv5l7nj0bmblq222zk3b09bgg8p";
+    sha256 = "0gi54v92hi1fkryxlz3k5s5d8h0s66cc57ds0vbm1m1qk3z4xhb0";
+    stripRoot = false;
   };
 
   dontBuild = true;
-- 
GitLab


From 51629d777d3d7ff2a91ff9bb1f09ad00544cf45a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 2 Nov 2017 13:37:24 -0400
Subject: [PATCH 524/877] kafka: Add 0.11.0.1

---
 pkgs/servers/apache-kafka/default.nix | 32 +++++++++++++++++----------
 pkgs/top-level/all-packages.nix       |  1 +
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index cc68697756c..da733df740b 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -3,18 +3,26 @@
 
 let
   versionMap = {
-    "0.8" = { kafkaVersion = "0.8.2.2";
-              scalaVersion = "2.10";
-              sha256 = "1azccf1k0nr8y1sfpjgqf9swyp87ypvgva68ci4kczwcx1z9d89v";
-            };
-    "0.9" = { kafkaVersion = "0.9.0.1";
-              scalaVersion = "2.11";
-              sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";
-            };
-    "0.10" = { kafkaVersion = "0.10.2.0";
-               scalaVersion = "2.12";
-               sha256 = "0py43s6zv8z7wr2lk8403k07xxckl11gla3vs4gr99lixc4whis1";
-             };
+    "0.8" = {
+      kafkaVersion = "0.8.2.2";
+      scalaVersion = "2.10";
+      sha256 = "1azccf1k0nr8y1sfpjgqf9swyp87ypvgva68ci4kczwcx1z9d89v";
+    };
+    "0.9" = {
+      kafkaVersion = "0.9.0.1";
+      scalaVersion = "2.11";
+      sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";
+    };
+    "0.10" = {
+      kafkaVersion = "0.10.2.0";
+      scalaVersion = "2.12";
+      sha256 = "0py43s6zv8z7wr2lk8403k07xxckl11gla3vs4gr99lixc4whis1";
+    };
+    "0.11" = {
+      kafkaVersion = "0.11.0.1";
+      scalaVersion = "2.12";
+      sha256 = "1wj639h95aq5n132fq1rbyzqh5rsa4mlhbg3c5mszqglnzdz4xn7";
+    };
   };
 in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 420c84b9b2b..dbbdabab126 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6863,6 +6863,7 @@ with pkgs;
   apacheKafka_0_8 = callPackage ../servers/apache-kafka { majorVersion = "0.8"; };
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
+  apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
 
   kt = callPackage ../tools/misc/kt {};
 
-- 
GitLab


From 46b09a8d556b03227fcd40b12d739a20d4f408ed Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 2 Nov 2017 13:46:07 -0400
Subject: [PATCH 525/877] kafka: Add 1.0.0

---
 pkgs/servers/apache-kafka/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix       | 1 +
 2 files changed, 6 insertions(+)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index da733df740b..e597a736c6f 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -23,6 +23,11 @@ let
       scalaVersion = "2.12";
       sha256 = "1wj639h95aq5n132fq1rbyzqh5rsa4mlhbg3c5mszqglnzdz4xn7";
     };
+    "1.0" = {
+      kafkaVersion = "1.0.0";
+      scalaVersion = "2.12";
+      sha256 = "1cs4nmp39m99gqjpy5klsffqksc0h9pz514jkq99qb95a83x1cfm";
+    };
   };
 in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbbdabab126..5c5d44f4552 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6864,6 +6864,7 @@ with pkgs;
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
   apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
+  apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; };
 
   kt = callPackage ../tools/misc/kt {};
 
-- 
GitLab


From 90f0fd9d0cb5952c4f9995fd33c4d63c853996e3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 2 Nov 2017 13:48:01 -0400
Subject: [PATCH 526/877] kafka: 0.10.2.0 -> 0.10.2.1

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

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index e597a736c6f..0e2dfd87dde 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -14,9 +14,9 @@ let
       sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";
     };
     "0.10" = {
-      kafkaVersion = "0.10.2.0";
+      kafkaVersion = "0.10.2.1";
       scalaVersion = "2.12";
-      sha256 = "0py43s6zv8z7wr2lk8403k07xxckl11gla3vs4gr99lixc4whis1";
+      sha256 = "0iszr6r0n9yjgq7kcp1hf00fg754m86gs4jzqc18542an94b88z5";
     };
     "0.11" = {
       kafkaVersion = "0.11.0.1";
-- 
GitLab


From ace06a2bf1527e8dcae3e82ff394c797404c3899 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 2 Nov 2017 13:48:22 -0400
Subject: [PATCH 527/877] kafka: Default to 1.0

---
 pkgs/servers/apache-kafka/default.nix | 2 +-
 pkgs/top-level/all-packages.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 0e2dfd87dde..54784f6ff31 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, jre, makeWrapper, bash,
-  majorVersion ? "0.9" }:
+  majorVersion ? "1.0" }:
 
 let
   versionMap = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c5d44f4552..fd96ade2f30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6859,7 +6859,7 @@ with pkgs;
 
   apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
 
-  apacheKafka = apacheKafka_0_10;
+  apacheKafka = apacheKafka_1_0;
   apacheKafka_0_8 = callPackage ../servers/apache-kafka { majorVersion = "0.8"; };
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
-- 
GitLab


From e18cdf0f46df107b943adc1e0a8ee644e1628e40 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Thu, 2 Nov 2017 19:59:28 +0200
Subject: [PATCH 528/877] pavucontrol-qt: use libsForQt5.callPackage

---
 pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix | 8 ++++----
 pkgs/desktops/lxqt/default.nix                     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
index 918894d2208..862a4ff9cf9 100644
--- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio, pcre }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, pcre, qtbase, qttools, qtx11extras }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtx11extras
+    qtbase
+    qttools
+    qtx11extras
     libpulseaudio
     pcre
   ];
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 79896c7b90c..40c25b3302c 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -27,7 +27,7 @@ let
     lxqt-session = callPackage ./core/lxqt-session { };
     lxqt-sudo = callPackage ./core/lxqt-sudo { };
     lxqt-themes = callPackage ./core/lxqt-themes { };
-    pavucontrol-qt = callPackage ./core/pavucontrol-qt { };
+    pavucontrol-qt = libsForQt5.callPackage ./core/pavucontrol-qt { };
     qtermwidget = callPackage ./core/qtermwidget { };
     # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0
     qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { };
-- 
GitLab


From 9fa8f3ed0d3cb32c5fdf6fe8e4aff46ee2df842c Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 3 Nov 2017 02:07:38 +0800
Subject: [PATCH 529/877] rpm: 4.13.0.1 -> 4.14.0

---
 pkgs/tools/package-management/rpm/default.nix         |  8 +++-----
 .../rpm/rpm-4.13.0.1-bfd-config.patch                 | 11 -----------
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 860be0e1f79..0e9ef3876d2 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "rpm-${version}";
-  version = "4.13.0.1";
+  version = "4.14.0";
 
   src = fetchurl {
-    url = "http://ftp.rpm.org/releases/rpm-4.13.x/rpm-${version}.tar.bz2";
-    sha256 = "27fc7ba7d419622b1ce34d6507aa70b0808bc344021d298072a0c2ec165f9b0d";
+    url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2";
+    sha256 = "053396glswgszzg6wizn76vc8zc5m2bicw025vj44g0dc1aav806";
   };
 
   outputs = [ "out" "dev" "man" ];
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
     "--sharedstatedir=/com"
   ];
 
-  patches = [ ./rpm-4.13.0.1-bfd-config.patch ];
-
   postPatch = ''
     # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here
     substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable}
diff --git a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch
deleted file mode 100644
index b8192b24f13..00000000000
--- a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru rpm-4.13.0.1/tools/sepdebugcrcfix.c rpm-4.13.0.1.new/tools/sepdebugcrcfix.c
---- rpm-4.13.0.1/tools/sepdebugcrcfix.c	2017-02-16 10:40:09.988649399 +0100
-+++ rpm-4.13.0.1.new/tools/sepdebugcrcfix.c	2017-04-15 00:02:21.151359876 +0200
-@@ -28,6 +28,7 @@
- #include <error.h>
- #include <libelf.h>
- #include <gelf.h>
-+#include <config.h>
- #include <bfd.h>
- 
- #define _(x) x
-- 
GitLab


From d27cf320cf23d45261b64326793e8e41bdba5971 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 2 Nov 2017 13:59:10 -0400
Subject: [PATCH 530/877] zookeeper: Add simple test

---
 nixos/release.nix         |  2 +-
 nixos/tests/zookeeper.nix | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/zookeeper.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index d5f59a524e0..3ecf2ca42ce 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -329,7 +329,7 @@ in rec {
   tests.wordpress = callTest tests/wordpress.nix {};
   tests.xfce = callTest tests/xfce.nix {};
   tests.xmonad = callTest tests/xmonad.nix {};
-
+  tests.zookeeper = callTest tests/zookeeper.nix {};
 
   /* Build a bunch of typical closures so that Hydra can keep track of
      the evolution of closure sizes. */
diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix
new file mode 100644
index 00000000000..d247654adad
--- /dev/null
+++ b/nixos/tests/zookeeper.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "zookeeper";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  nodes = {
+    server = { pkgs, config, ... }: {
+      services.zookeeper = {
+        enable = true;
+      };
+
+      networking.firewall.allowedTCPPorts = [ 2181 ];
+    };
+  };
+
+  testScript = ''
+    startAll;
+
+    $server->waitForUnit("zookeeper");
+    $server->waitForUnit("network.target");
+    $server->waitForOpenPort(2181);
+
+    $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 create /foo bar");
+    $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 set /foo hello");
+    $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello");
+  '';
+})
-- 
GitLab


From 0b75c1df0746e1df2b2f43ae350d6b666eed899c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 2 Nov 2017 19:11:04 +0100
Subject: [PATCH 531/877] mongodb: fix build with pcre-8.41 via upstream patch

---
 pkgs/servers/nosql/mongodb/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 11720fb154f..969cd183c5c 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -61,6 +61,12 @@ in stdenv.mkDerivation rec {
         name = "boost160.patch";
         sha256 = "0bvsf3499zj55pzamwjmsssr6x63w434944w76273fr5rxwzcmh8";
       })
+      # probably not needed for > 3.4.10
+      (fetchpatch {
+        url = https://github.com/mongodb/mongo/commit/218a7b1d4ea3d3b.diff;
+        name = "pcre-8.41.patch";
+        sha256 = "1dra51gw130bq78l2yfkdaj0jkha95ikpv4ig21rapbl63ip3znj";
+      })
     ];
 
   postPatch = ''
-- 
GitLab


From 998027a531b0fce8e1be96da7782ff56b4607772 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Wed, 1 Nov 2017 17:07:01 -0400
Subject: [PATCH 532/877] openvpn-auth-ldap: init at 2.0.3

---
 .../networking/openvpn/openvpn-auth-ldap.nix  | 76 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 2 files changed, 80 insertions(+)
 create mode 100644 pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix

diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix
new file mode 100644
index 00000000000..3d1055be02b
--- /dev/null
+++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix
@@ -0,0 +1,76 @@
+{ stdenv, lib, fetchFromGitHub, fetchpatch,
+  autoreconfHook, re2c, openldap, openvpn, gnustep, check
+}:
+
+let
+  srcName = "openvpn-auth-ldap";
+  srcVersion = "2.0.3";
+  debianRev = "6.1";
+
+  fetchPatchFromDebian =
+    {patch, sha256}:
+    fetchpatch {
+      inherit sha256;
+      url = "http://sources.debian.net/data/main/o/${srcName}/${srcVersion}-${debianRev}/debian/patches/${patch}";
+    };
+in
+
+stdenv.mkDerivation rec {
+  name = "${srcName}-${version}";
+  version = "${srcVersion}+deb${debianRev}";
+
+  srcs = fetchFromGitHub {
+    owner = "threerings";
+    repo = srcName;
+    rev = "auth-ldap-${version}";
+    sha256 = "1v635ylzf5x3l3lirf3n6173q1w8g0ssjjkf27qqw98c3iqp63sq";
+  };
+
+  patches = map fetchPatchFromDebian [
+    {patch = "STARTTLS_before_auth.patch";
+     sha256 = "14d2vy366rhzggxb1zb3ld00wmaqxi2gq885vxhlldnwpgig0jx0";}
+    {patch = "gobjc_4.7_runtime.patch";
+     sha256 = "11hpmd4i1cm3m27x8c77d9jrwxpir4cy5d74k2kxq0q77rawnxcm";}
+    {patch = "openvpn_ldap_simpler_add_handler_4";
+     sha256 = "0qj7v2w921489c18mfrs5bmipzn1mcjj9avyp15x4531ss0lyanb";}
+    {patch = "auth-ldap-gnustep.patch";
+     sha256 = "0cz3jgyzgzi2p9bavd4lh69pnlnf4s7n9ihwg6zmmh6vqsynqss3";}
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    check
+    gnustep.base
+    gnustep.libobjc
+    gnustep.make
+    openldap
+    openvpn
+    re2c
+  ];
+
+  configureFlags = [
+    "--with-objc-runtime=modern"
+    "--with-openvpn=${openvpn}/include"
+    "--libdir=$(out)/lib/openvpn"
+  ];
+
+  preInstall = ''
+    mkdir -p $out/lib/openvpn $out/share/doc/openvpn/examples
+    cp README $out/share/doc/openvpn/
+    cp auth-ldap.conf $out/share/doc/openvpn/examples/
+  '';
+
+  meta = with lib; {
+    description = "LDAP authentication plugin for OpenVPN";
+    homepage = https://github.com/threerings/openvpn-auth-ldap;
+    license = [
+      licenses.asl20
+      licenses.bsd3
+    ];
+    maintainers = [ maintainers.benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa4488b9317..a0e6c398110 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3738,6 +3738,10 @@ with pkgs;
 
   openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
 
+  openvpn-auth-ldap = callPackage ../tools/networking/openvpn/openvpn-auth-ldap.nix {
+    stdenv = clangStdenv;
+  };
+
   update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { };
 
   open-pdf-presenter = callPackage ../applications/misc/open-pdf-presenter { };
-- 
GitLab


From 7726b4602709bbda969c021c56873a6eeebe97b2 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 2 Nov 2017 14:40:25 -0400
Subject: [PATCH 533/877] openssl_1_0_2: 1.0.2l -> 1.0.2m

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 5a4d23b6a39..6a84488238b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -107,8 +107,8 @@ let
 in {
 
   openssl_1_0_2 = common {
-    version = "1.0.2l";
-    sha256 = "037kvpisc6qh5dkppcwbm5bg2q800xh2hma3vghz8xcycmdij1yf";
+    version = "1.0.2m";
+    sha256 = "03vvlfnxx4lhxc83ikfdl6jqph4h52y7lb7li03va6dkqrgg2vwc";
   };
 
   openssl_1_1_0 = common {
-- 
GitLab


From 5e2d96deb331b19fc1b69146c88a8128e8b6e466 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 2 Nov 2017 14:44:04 -0400
Subject: [PATCH 534/877] openssl_1_1_0: 1.1.0f -> 1.1.0g

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 6a84488238b..68e88cc57d0 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -112,8 +112,8 @@ in {
   };
 
   openssl_1_1_0 = common {
-    version = "1.1.0f";
-    sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj";
+    version = "1.1.0g";
+    sha256 = "1bvka2wf33w2vxv7yw578nnjqyhz2b3chvfb0l4k2ffscw950kfy";
   };
 
 }
-- 
GitLab


From eeef094dfdb34755e57c5cc46c140ebee769a61e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 2 Nov 2017 13:47:12 -0500
Subject: [PATCH 535/877] libdwarf: 20161124 -> 20170709

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

diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index a0e72f2b561..4bb91878bd3 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libelf }:
 
 let
-  version = "20161124";
+  version = "20170709";
   src = fetchurl {
     url = "http://www.prevanders.net/libdwarf-${version}.tar.gz";
-    sha512 = "38e480bce5ae8273fd585ec1d8ba94dc3e865a0ef3fcfcf38b5d92fa1ce41f8b"
-           + "8c95a7cf8a6e69e7c6f638a3cc56ebbfb37b6317047309725fa17e7929096799";
+    sha512 = "afff6716ef1af5d8aae2b887f36b9a6547fb576770bc6f630b82725ed1e59cbd"
+           + "387779aa729bbd1a5ae026a25ac76aacf64b038cd898b2419a8676f9aa8c59f1";
   };
   meta = {
     homepage = https://www.prevanders.net/dwarf.html;
-- 
GitLab


From beefaff2c19bdf1db24505cf2804487a3ba95b4c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 2 Nov 2017 15:10:33 -0400
Subject: [PATCH 536/877] kafka: Add tests

---
 nixos/release.nix          |  4 ++++
 nixos/tests/kafka_0_10.nix | 48 ++++++++++++++++++++++++++++++++++++++
 nixos/tests/kafka_0_11.nix | 48 ++++++++++++++++++++++++++++++++++++++
 nixos/tests/kafka_0_9.nix  | 48 ++++++++++++++++++++++++++++++++++++++
 nixos/tests/kafka_1_0.nix  | 48 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 196 insertions(+)
 create mode 100644 nixos/tests/kafka_0_10.nix
 create mode 100644 nixos/tests/kafka_0_11.nix
 create mode 100644 nixos/tests/kafka_0_9.nix
 create mode 100644 nixos/tests/kafka_1_0.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 3ecf2ca42ce..1e24093ce75 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -270,6 +270,10 @@ in rec {
   tests.plasma5 = callTest tests/plasma5.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};
+  tests.kafka_0_9 = callTest tests/kafka_0_9.nix {};
+  tests.kafka_0_10 = callTest tests/kafka_0_10.nix {};
+  tests.kafka_0_11 = callTest tests/kafka_0_11.nix {};
+  tests.kafka_1_0 = callTest tests/kafka_1_0.nix {};
   tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
   tests.kernel-latest = callTest tests/kernel-latest.nix {};
   tests.kernel-lts = callTest tests/kernel-lts.nix {};
diff --git a/nixos/tests/kafka_0_10.nix b/nixos/tests/kafka_0_10.nix
new file mode 100644
index 00000000000..6e7820f64bc
--- /dev/null
+++ b/nixos/tests/kafka_0_10.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+  kafkaPackage = pkgs.apacheKafka_0_10;
+in {
+  name = "kafka_0_10";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  nodes = {
+    zookeeper1 = { config, ... }: {
+      services.zookeeper = {
+        enable = true;
+      };
+
+      networking.firewall.allowedTCPPorts = [ 2181 ];
+    };
+    kafka = { config, ... }: {
+      services.apache-kafka = {
+        enable = true;
+        extraProperties = ''
+          offsets.topic.replication.factor = 1
+        '';
+        package = kafkaPackage;
+        zookeeper = "zookeeper1:2181";
+      };
+
+      networking.firewall.allowedTCPPorts = [ 9092 ];
+      virtualisation.memorySize = 2048;
+    };
+  };
+
+  testScript = ''
+    startAll;
+
+    $zookeeper1->waitForUnit("zookeeper");
+    $zookeeper1->waitForUnit("network.target");
+    $zookeeper1->waitForOpenPort(2181);
+
+    $kafka->waitForUnit("apache-kafka");
+    $kafka->waitForUnit("network.target");
+    $kafka->waitForOpenPort(9092);
+
+    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+  '';
+})
diff --git a/nixos/tests/kafka_0_11.nix b/nixos/tests/kafka_0_11.nix
new file mode 100644
index 00000000000..39f9c36bb22
--- /dev/null
+++ b/nixos/tests/kafka_0_11.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+  kafkaPackage = pkgs.apacheKafka_0_11;
+in {
+  name = "kafka_0_11";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  nodes = {
+    zookeeper1 = { config, ... }: {
+      services.zookeeper = {
+        enable = true;
+      };
+
+      networking.firewall.allowedTCPPorts = [ 2181 ];
+    };
+    kafka = { config, ... }: {
+      services.apache-kafka = {
+        enable = true;
+        extraProperties = ''
+          offsets.topic.replication.factor = 1
+        '';
+        package = kafkaPackage;
+        zookeeper = "zookeeper1:2181";
+      };
+
+      networking.firewall.allowedTCPPorts = [ 9092 ];
+      virtualisation.memorySize = 2048;
+    };
+  };
+
+  testScript = ''
+    startAll;
+
+    $zookeeper1->waitForUnit("zookeeper");
+    $zookeeper1->waitForUnit("network.target");
+    $zookeeper1->waitForOpenPort(2181);
+
+    $kafka->waitForUnit("apache-kafka");
+    $kafka->waitForUnit("network.target");
+    $kafka->waitForOpenPort(9092);
+
+    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+  '';
+})
diff --git a/nixos/tests/kafka_0_9.nix b/nixos/tests/kafka_0_9.nix
new file mode 100644
index 00000000000..fee82aba2bd
--- /dev/null
+++ b/nixos/tests/kafka_0_9.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+  kafkaPackage = pkgs.apacheKafka_0_9;
+in {
+  name = "kafka_0_9";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  nodes = {
+    zookeeper1 = { config, ... }: {
+      services.zookeeper = {
+        enable = true;
+      };
+
+      networking.firewall.allowedTCPPorts = [ 2181 ];
+    };
+    kafka = { config, ... }: {
+      services.apache-kafka = {
+        enable = true;
+        extraProperties = ''
+          offsets.topic.replication.factor = 1
+        '';
+        package = kafkaPackage;
+        zookeeper = "zookeeper1:2181";
+      };
+
+      networking.firewall.allowedTCPPorts = [ 9092 ];
+      virtualisation.memorySize = 2048;
+    };
+  };
+
+  testScript = ''
+    startAll;
+
+    $zookeeper1->waitForUnit("zookeeper");
+    $zookeeper1->waitForUnit("network.target");
+    $zookeeper1->waitForOpenPort(2181);
+
+    $kafka->waitForUnit("apache-kafka");
+    $kafka->waitForUnit("network.target");
+    $kafka->waitForOpenPort(9092);
+
+    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+  '';
+})
diff --git a/nixos/tests/kafka_1_0.nix b/nixos/tests/kafka_1_0.nix
new file mode 100644
index 00000000000..936840dbcfd
--- /dev/null
+++ b/nixos/tests/kafka_1_0.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+  kafkaPackage = pkgs.apacheKafka_1_0;
+in {
+  name = "kafka_1_0";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  nodes = {
+    zookeeper1 = { config, ... }: {
+      services.zookeeper = {
+        enable = true;
+      };
+
+      networking.firewall.allowedTCPPorts = [ 2181 ];
+    };
+    kafka = { config, ... }: {
+      services.apache-kafka = {
+        enable = true;
+        extraProperties = ''
+          offsets.topic.replication.factor = 1
+        '';
+        package = kafkaPackage;
+        zookeeper = "zookeeper1:2181";
+      };
+
+      networking.firewall.allowedTCPPorts = [ 9092 ];
+      virtualisation.memorySize = 2048;
+    };
+  };
+
+  testScript = ''
+    startAll;
+
+    $zookeeper1->waitForUnit("zookeeper");
+    $zookeeper1->waitForUnit("network.target");
+    $zookeeper1->waitForOpenPort(2181);
+
+    $kafka->waitForUnit("apache-kafka");
+    $kafka->waitForUnit("network.target");
+    $kafka->waitForOpenPort(9092);
+
+    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+  '';
+})
-- 
GitLab


From 30d4deccbdf4b1d9083f9db6a7fa953dda3b678d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 2 Nov 2017 15:12:19 -0400
Subject: [PATCH 537/877] kafka: Remove 0.8

---
 pkgs/servers/apache-kafka/default.nix | 5 -----
 pkgs/top-level/all-packages.nix       | 1 -
 2 files changed, 6 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 54784f6ff31..152e6045574 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -3,11 +3,6 @@
 
 let
   versionMap = {
-    "0.8" = {
-      kafkaVersion = "0.8.2.2";
-      scalaVersion = "2.10";
-      sha256 = "1azccf1k0nr8y1sfpjgqf9swyp87ypvgva68ci4kczwcx1z9d89v";
-    };
     "0.9" = {
       kafkaVersion = "0.9.0.1";
       scalaVersion = "2.11";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd96ade2f30..085792f5394 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6860,7 +6860,6 @@ with pkgs;
   apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
 
   apacheKafka = apacheKafka_1_0;
-  apacheKafka_0_8 = callPackage ../servers/apache-kafka { majorVersion = "0.8"; };
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
   apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
-- 
GitLab


From e06dbe4f5b51850746ef2c363be8326a1a3e84bf Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 2 Nov 2017 15:13:10 -0400
Subject: [PATCH 538/877] openssl: fix nix patch for recent update

---
 pkgs/development/libraries/openssl/nix-ssl-cert-file.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch
index b615f1482b7..893fb3eb664 100644
--- a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch
+++ b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch
@@ -5,10 +5,10 @@ diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto
      switch (cmd) {
      case X509_L_FILE_LOAD:
          if (argl == X509_FILETYPE_DEFAULT) {
--            file = (char *)getenv(X509_get_default_cert_file_env());
-+            file = (char *)getenv("NIX_SSL_CERT_FILE");
+-            file = getenv(X509_get_default_cert_file_env());
++            file = getenv("NIX_SSL_CERT_FILE");
 +            if (!file)
-+                file = (char *)getenv(X509_get_default_cert_file_env());
++                file = getenv(X509_get_default_cert_file_env());
              if (file)
                  ok = (X509_load_cert_crl_file(ctx, file,
                                                X509_FILETYPE_PEM) != 0);
-- 
GitLab


From 3c74fcf6bf84b515f0b20f08d417caeae32bfb53 Mon Sep 17 00:00:00 2001
From: John Boehr <jbboehr@gmail.com>
Date: Thu, 2 Nov 2017 12:49:55 -0700
Subject: [PATCH 539/877] phpPackages.apcu: 5.1.2 -> 5.1.8 and enable tests

See #30734 - 5.1.2 segfaults
---
 pkgs/top-level/php-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 960de37332f..7e12d817e17 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -18,9 +18,13 @@ let
   };
 
   apcu51 = assert isPhp7; buildPecl {
-    name = "apcu-5.1.2";
+    name = "apcu-5.1.8";
 
-    sha256 = "0r5pfbjbmdj46h20jm3iqmy969qd27ajyf0phjhgykv6j0cqjlgd";
+    sha256 = "01dfbf0245d8cc0f51ba16467a60b5fad08e30b28df7846e0dd213da1143ecce";
+
+    doCheck = true;
+    checkTarget = "test";
+    checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"];
   };
 
   ast = assert isPhp7; buildPecl {
-- 
GitLab


From 454c42c8493fb4425ae98444fcb8e14db013c3d4 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 31 Oct 2017 12:57:34 +0100
Subject: [PATCH 540/877] vboot_reference: Update

In addition to updating to a more recent upstream version, this
installs the development signing keys and removes the separate
vbutil_* tools in favour of the single futility tool.
---
 pkgs/tools/system/vboot_reference/default.nix | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index 6dfc6d1349d..0b8933bb7af 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -1,42 +1,35 @@
-{ stdenv, fetchgit, pkgconfig, libuuid, openssl }:
+{ stdenv, fetchgit, pkgconfig, libuuid, openssl, libyaml, lzma }:
 
 stdenv.mkDerivation rec {
-  version = "20130507";
-  checkout = "25/50225/2";
+  version = "20171023";
+  checkout = "8122e0b8b13794";
 
   name = "vboot_reference-${version}";
 
   src = fetchgit {
     url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference;
-    rev = "refs/changes/${checkout}";
-    sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc";
+    rev = "${checkout}";
+    sha256 = "0qxm3qlvm2fgjrn9b3n8rdccw2f5pdi7z542m2hdfddflx7jz1w7";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl stdenv.cc.libc.static ]
-    ++ stdenv.lib.optional (libuuid != null)
-         (libuuid.overrideAttrs (attrs:
-           { configureFlags = attrs.configureFlags ++ [ "--enable-static" ]; }));
+  buildInputs = [ openssl libuuid libyaml lzma ];
 
-  arch = if stdenv.system == "x86_64-linux" then "x86_64"
-    else if stdenv.system == "i686-linux" then "x86"
-    else throw "vboot_reference for: ${stdenv.system} not supported!";
+  enableParallelBuilding = true;
 
   buildPhase = ''
-    make ARCH=${arch} `pwd`/build/cgpt/cgpt
-    make ARCH=${arch} `pwd`/build/utility/vbutil_kernel
-    make ARCH=${arch} `pwd`/build/utility/vbutil_key
-    make ARCH=${arch} `pwd`/build/utility/vbutil_keyblock
-    make ARCH=${arch} `pwd`/build/utility/vbutil_firmware
+    patchShebangs scripts
+    make -j''${NIX_BUILD_CORES:-1} \
+         `pwd`/build/cgpt/cgpt \
+         `pwd`/build/futility/futility
   '';
 
   installPhase = ''
     mkdir -p $out/bin
     cp build/cgpt/cgpt $out/bin
-    cp build/utility/vbutil_kernel $out/bin
-    cp build/utility/vbutil_key $out/bin
-    cp build/utility/vbutil_keyblock $out/bin
-    cp build/utility/vbutil_firmware $out/bin
+    cp build/futility/futility $out/bin
+    mkdir -p $out/share/vboot
+    cp -r tests/devkeys* $out/share/vboot/
   '';
 
   meta = {
-- 
GitLab


From 0721c1ff3d04313a266cf5d688945996048780f9 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Thu, 2 Nov 2017 21:45:19 +0100
Subject: [PATCH 541/877] numix-gtk-theme: fix hash

---
 pkgs/misc/themes/numix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix
index 233a73df868..e21faf8b805 100644
--- a/pkgs/misc/themes/numix/default.nix
+++ b/pkgs/misc/themes/numix/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     repo = "numix-gtk-theme";
     owner = "numixproject";
     rev = version;
-    sha256 = "1fmlc6vi8prvwsq0nxxcd00lp04bwmapzjqf727wb1czqf2lf0dv";
+    sha256 = "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7";
   };
 
   nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];
-- 
GitLab


From 994cff67e34e909e5f5e2009aa13f1c21e6b2e5f Mon Sep 17 00:00:00 2001
From: John Boehr <jbboehr@gmail.com>
Date: Thu, 2 Nov 2017 13:49:34 -0700
Subject: [PATCH 542/877] phpPackages.redis: rev 4a37e4 -> 3.1.4

---
 pkgs/top-level/php-packages.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 960de37332f..f5b4d34b34e 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -269,22 +269,16 @@ let
     buildInputs = [ pkgs.geoip ];
   };
 
-  redis = if isPhp7 then redisPhp7 else redis22;
+  redis = if isPhp7 then redis31 else redis22;
 
   redis22 = assert !isPhp7; buildPecl {
     name = "redis-2.2.7";
     sha256 = "00n9dpk9ak0bl35sbcd3msr78sijrxdlb727nhg7f2g7swf37rcm";
   };
 
-  # Not released yet
-  redisPhp7 = assert isPhp7; buildPecl rec {
-    name = "redis-php7";
-
-    src = fetchgit {
-      url = "https://github.com/phpredis/phpredis";
-      rev = "4a37e47d0256581ce2f7a3b15b5bb932add09f36";
-      sha256 = "1qm2ifa0zf95l1g967iiabmja17srpwz73lfci7z13ffdw1ayhfd";
-    };
+  redis31 = assert isPhp7; buildPecl {
+    name = "redis-3.1.4";
+    sha256 = "0rgjdrqfif8pfn3ipk1v4gyjkkdcdrdk479qbpda89w25vaxzsxd";
   };
 
   v8 = assert isPhp7; buildPecl rec {
-- 
GitLab


From c60bee3a4143800d4d4352e8a176f31130dca8b5 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 20:53:58 +0000
Subject: [PATCH 543/877] python.pkgs.jsbeautifier: fix name

---
 pkgs/development/python-modules/jsbeautifier/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix
index 47bbdb5d07b..a2278566c6d 100644
--- a/pkgs/development/python-modules/jsbeautifier/default.nix
+++ b/pkgs/development/python-modules/jsbeautifier/default.nix
@@ -3,7 +3,7 @@
 buildPythonApplication rec {
   pname = "jsbeautifier";
   version = "1.7.4";
-  name = "jsbeautifier-1.6.14";
+  name = "${pname}-${version}";
 
   propagatedBuildInputs = [ six ];
 
-- 
GitLab


From 5bd48158e9dc41b6a9b011295ff94908502f2a06 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 2 Nov 2017 22:10:57 +0100
Subject: [PATCH 544/877] nodePackages: remove overrides for non-existent
 packages

---
 pkgs/development/node-packages/default-v4.nix | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix
index c058154a996..7546b2e34ce 100644
--- a/pkgs/development/node-packages/default-v4.nix
+++ b/pkgs/development/node-packages/default-v4.nix
@@ -9,42 +9,4 @@ nodePackages // {
   node-inspector = nodePackages.node-inspector.override (oldAttrs: {
     buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
   });
-  
-  phantomjs = nodePackages.phantomjs.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
-  });
-  
-  webdrvr = nodePackages.webdrvr.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
-    
-    preRebuild = ''
-      mkdir $TMPDIR/webdrvr
-      
-      ln -s ${pkgs.fetchurl {
-        url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar";
-        sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b";
-      }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar
-      ln -s ${pkgs.fetchurl {
-        url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip";
-        sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89";
-      }} $TMPDIR/webdrvr/chromedriver_linux64.zip
-    '';
-  });
-  
-  wring = nodePackages.wring.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
-  });
-  
-  npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
-    postInstall = "npm run-script prepublish";
-  };
-
-  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
-    postInstall = ''
-      for prog in bower2nix fetch-bower; do
-        wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
-      done
-    '';
-  });
 }
-- 
GitLab


From d1491f490f04ab398cd6f520227f3904333da55a Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Thu, 2 Nov 2017 22:18:35 +0100
Subject: [PATCH 545/877] add sorki to maintainers

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 797adae97b1..97411d57bea 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -585,6 +585,7 @@
   snyh = "Xia Bin <snyh@snyh.org>";
   solson = "Scott Olson <scott@solson.me>";
   sorpaas = "Wei Tang <hi@that.world>";
+  sorki = "Richard Marko <srk@48.io>";
   spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>";
   spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>";
   spinus = "Tomasz Czyż <tomasz.czyz@gmail.com>";
-- 
GitLab


From 2b3726251990557f17457a50626ae4cbd86a1e3c Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Thu, 2 Nov 2017 22:19:13 +0100
Subject: [PATCH 546/877] ipmicfg: init at 1.27.0

---
 pkgs/applications/misc/ipmicfg/default.nix | 31 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/ipmicfg/default.nix

diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
new file mode 100644
index 00000000000..92a16656ac9
--- /dev/null
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchurl, patchelf, unzip }:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation rec {
+  name = "ipmicfg-${version}";
+  version = "1.27.0";
+  buildVersion = "170620";
+
+  src = fetchurl {
+    url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip";
+    sha256 = "0mlhrxnkwazq5456csfds6w2z5pv2ksnqnxlv4prp07bwi2bccid";
+  };
+
+  buildInputs = [ unzip ];
+  installPhase = ''
+    mkdir -p "$out/opt/ipmicfg"
+    cp Linux/64bit/* "$out/opt/ipmicfg"
+
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$out/opt/ipmicfg/IPMICFG-Linux.x86_64"
+    patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}:${stdenv.cc.cc.lib}/lib64" "$out/opt/ipmicfg/IPMICFG-Linux.x86_64"
+
+    mkdir "$out/bin"
+    ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg"
+  '';
+
+   meta = with stdenv.lib; {
+     license = licenses.unfree;
+     maintainers = with maintainers; [ sorki ];
+   };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc0a8342145..5886b757493 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2739,6 +2739,7 @@ with pkgs;
 
   ipmiutil = callPackage ../tools/system/ipmiutil {};
 
+  ipmicfg = callPackage ../applications/misc/ipmicfg {};
   ipmiview = callPackage ../applications/misc/ipmiview {};
 
   ipcalc = callPackage ../tools/networking/ipcalc {};
-- 
GitLab


From af13b05dda7a598c51a81a81b92c36d27e599889 Mon Sep 17 00:00:00 2001
From: nocent <nocent@protonmail.ch>
Date: Thu, 2 Nov 2017 21:57:25 +0000
Subject: [PATCH 547/877] networkmanager: add power saving and mac address
 randomization options for wifi devices

---
 .../services/networking/networkmanager.nix    | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index e03309c8729..6bdae32f72b 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -32,6 +32,11 @@ let
     ipv6.ip6-privacy=2
     ethernet.cloned-mac-address=${cfg.ethernet.macAddress}
     wifi.cloned-mac-address=${cfg.wifi.macAddress}
+    ${optionalString (cfg.wifi.powersave != null)
+      ''wifi.powersave=${if cfg.wifi.powersave then "3" else "2"}''}
+
+    [device]
+    wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"}
   '';
 
   /*
@@ -179,7 +184,27 @@ in {
       };
 
       ethernet.macAddress = macAddressOpt;
-      wifi.macAddress = macAddressOpt;
+
+      wifi = {
+        macAddress = macAddressOpt;
+
+        powersave = mkOption {
+          type = types.nullOr types.bool;
+          default = null;
+          description = ''
+            Whether to enable Wi-Fi power saving.
+          '';
+        };
+
+        scanRandMacAddress = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Whether to enable MAC address randomization of a Wi-Fi device
+            during scanning.
+          '';
+        };
+      };
 
       useDnsmasq = mkOption {
         type = types.bool;
-- 
GitLab


From 054baf2cbe2dcab905e221b45fdbbb2fe794fc10 Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Fri, 3 Nov 2017 09:29:22 +1030
Subject: [PATCH 548/877] awsebcli: unbreak after cement update

awsebcli requests that the cement package be exactly at version 2.8.2 and won't
build without it.
---
 pkgs/tools/virtualization/awsebcli/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index e43bc18ba70..cb1285504d2 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -3,6 +3,16 @@ let
 
   localPython = python.override {
     packageOverrides = self: super: rec {
+      cement = super.cement.overridePythonAttrs (oldAttrs: rec {
+        version = "2.8.2";
+
+        src = super.fetchPypi {
+          inherit (oldAttrs) pname;
+          inherit version;
+          sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7";
+        };
+      });
+
       colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
         version = "0.3.7";
 
-- 
GitLab


From fcf0df2cf6e5e71cc1a13b230e121c946ca4c945 Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Fri, 3 Nov 2017 09:35:47 +1030
Subject: [PATCH 549/877] awsebcli: tiny whitespace fix

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

diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index cb1285504d2..8b1174622b1 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -1,4 +1,4 @@
- { stdenv, python }:
+{ stdenv, python }:
 let
 
   localPython = python.override {
-- 
GitLab


From 47c000b89414a859fa6a9fd02e47eec752bdc3cf Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Fri, 3 Nov 2017 09:36:21 +1030
Subject: [PATCH 550/877] awsebcli: 3.11.0 -> 3.12.0

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

diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index 8b1174622b1..7439af27560 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -77,11 +77,11 @@ let
 in with localPython.pkgs; buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "awsebcli";
-  version = "3.11.0";
+  version = "3.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "052388annhyirlzdr89hbgif8k7pw7win2zm1ybn4iiisr5l49zi";
+    sha256 = "0ljras4bgxpmk1l3plialmhi7jsm2cpzx0dcs9411ijykzkamdkd";
   };
 
   checkInputs = [
-- 
GitLab


From da067f40f93693083416d59028e4fa344941e394 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 2 Nov 2017 23:06:05 +0000
Subject: [PATCH 551/877] ipmicfg: fix style

---
 pkgs/applications/misc/ipmicfg/default.nix | 22 ++++++++++++----------
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
index 92a16656ac9..af67db3f654 100644
--- a/pkgs/applications/misc/ipmicfg/default.nix
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -1,31 +1,33 @@
-{ stdenv, lib, fetchurl, patchelf, unzip }:
-
-assert stdenv.isLinux;
+{ stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
   name = "ipmicfg-${version}";
   version = "1.27.0";
   buildVersion = "170620";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip";
-    sha256 = "0mlhrxnkwazq5456csfds6w2z5pv2ksnqnxlv4prp07bwi2bccid";
+    sha256 = "0jr2vih4hzymb62mbqyykwcrjhbhazf6wr1g0cq8ji586i3z3vw5";
   };
 
-  buildInputs = [ unzip ];
   installPhase = ''
-    mkdir -p "$out/opt/ipmicfg"
+    mkdir -p "$out/bin" "$out/opt/ipmicfg"
     cp Linux/64bit/* "$out/opt/ipmicfg"
 
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$out/opt/ipmicfg/IPMICFG-Linux.x86_64"
-    patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}:${stdenv.cc.cc.lib}/lib64" "$out/opt/ipmicfg/IPMICFG-Linux.x86_64"
+    patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \
+       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+       --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
 
-    mkdir "$out/bin"
     ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg"
   '';
 
+   dontPatchShebangs = true; # There are no scripts and it complains about null bytes.
+
    meta = with stdenv.lib; {
+     description = "Supermicro IPMI configuration tool";
+     homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm";
      license = licenses.unfree;
+     platforms = [ "x86_64-linux" ];
      maintainers = with maintainers; [ sorki ];
    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5886b757493..908b0dc75ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2740,6 +2740,7 @@ with pkgs;
   ipmiutil = callPackage ../tools/system/ipmiutil {};
 
   ipmicfg = callPackage ../applications/misc/ipmicfg {};
+
   ipmiview = callPackage ../applications/misc/ipmiview {};
 
   ipcalc = callPackage ../tools/networking/ipcalc {};
-- 
GitLab


From c8943272153d1ad5c7dd1329bf0045f2834d52dd Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 2 Nov 2017 20:35:05 +0100
Subject: [PATCH 552/877] postage: replaced by pgmanage-10.0.2

postage is no longer maintained and has been replaced by the identical pgmanage. See:

https://github.com/workflowproducts/postage#postage-has-been-replaced-with-pgmanage

The following error is raised when a user enables the deprecated `services.postage.enable` option:

Failed assertions:
- services.postage is deprecated in favor of pgmanage. They have the same options so just substitute postage for pgmanage.
---
 nixos/doc/manual/release-notes/rl-1803.xml    |   9 ++
 nixos/modules/module-list.nix                 |   2 +-
 .../databases/{postage.nix => pgmanage.nix}   | 125 ++++++++++--------
 nixos/release.nix                             |   1 +
 nixos/tests/pgmanage.nix                      |  39 ++++++
 .../misc/{postage => pgmanage}/default.nix    |  16 +--
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 +-
 8 files changed, 131 insertions(+), 64 deletions(-)
 rename nixos/modules/services/databases/{postage.nix => pgmanage.nix} (53%)
 create mode 100644 nixos/tests/pgmanage.nix
 rename pkgs/applications/misc/{postage => pgmanage}/default.nix (63%)

diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index 6fa14b55386..17b385242f6 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -63,6 +63,15 @@ following incompatible changes:</para>
       pass literal dollar signs through Postfix, double them.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <literal>postage</literal> package (for web-based PostgreSQL
+      administration) has been renamed to <literal>pgmanage</literal>. The
+      corresponding module has also been renamed. To migrate please rename all
+      <option>services.postage</option> options to
+      <option>services.pgmanage</option>.
+    </para>
+  </listitem>
 </itemizedlist>
 
 </section>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 44bcec5aec2..e66a2ba272a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -185,7 +185,7 @@
   ./services/databases/neo4j.nix
   ./services/databases/openldap.nix
   ./services/databases/opentsdb.nix
-  ./services/databases/postage.nix
+  ./services/databases/pgmanage.nix
   ./services/databases/postgresql.nix
   ./services/databases/redis.nix
   ./services/databases/riak.nix
diff --git a/nixos/modules/services/databases/postage.nix b/nixos/modules/services/databases/pgmanage.nix
similarity index 53%
rename from nixos/modules/services/databases/postage.nix
rename to nixos/modules/services/databases/pgmanage.nix
index d49c9a83a46..86733a3e5a0 100644
--- a/nixos/modules/services/databases/postage.nix
+++ b/nixos/modules/services/databases/pgmanage.nix
@@ -3,16 +3,16 @@
 with lib;
 
 let
-  cfg = config.services.postage;
+  cfg = config.services.pgmanage;
 
   confFile = pkgs.writeTextFile {
-    name = "postage.conf";
+    name = "pgmanage.conf";
     text =  ''
-      connection_file = ${postageConnectionsFile}
+      connection_file = ${pgmanageConnectionsFile}
 
       allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections}
 
-      postage_port = ${toString cfg.port}
+      pgmanage_port = ${toString cfg.port}
 
       super_only = ${builtins.toJSON cfg.superOnly}
 
@@ -20,7 +20,7 @@ let
 
       login_timeout = ${toString cfg.loginTimeout}
 
-      web_root = ${cfg.package}/etc/postage/web_root
+      web_root = ${cfg.package}/etc/pgmanage/web_root
 
       data_root = ${cfg.dataRoot}
 
@@ -33,24 +33,23 @@ let
     '';
   };
 
-  postageConnectionsFile = pkgs.writeTextFile {
-    name = "postage-connections.conf";
+  pgmanageConnectionsFile = pkgs.writeTextFile {
+    name = "pgmanage-connections.conf";
     text = concatStringsSep "\n"
       (mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections);
   };
 
-  postage = "postage";
-in {
+  pgmanage = "pgmanage";
 
-  options.services.postage = {
+  pgmanageOptions = {
     enable = mkEnableOption "PostgreSQL Administration for the web";
 
     package = mkOption {
       type = types.package;
-      default = pkgs.postage;
-      defaultText = "pkgs.postage";
+      default = pkgs.pgmanage;
+      defaultText = "pkgs.pgmanage";
       description = ''
-        The postage package to use.
+        The pgmanage package to use.
       '';
     };
 
@@ -62,14 +61,14 @@ in {
         "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";
       };
       description = ''
-        Postage requires at least one PostgreSQL server be defined.
+        pgmanage requires at least one PostgreSQL server be defined.
         </para><para>
         Detailed information about PostgreSQL connection strings is available at:
         <link xlink:href="http://www.postgresql.org/docs/current/static/libpq-connect.html"/>
         </para><para>
         Note that you should not specify your user name or password. That
         information will be entered on the login screen. If you specify a
-        username or password, it will be removed by Postage before attempting to
+        username or password, it will be removed by pgmanage before attempting to
         connect to a database.
       '';
     };
@@ -78,7 +77,7 @@ in {
       type = types.bool;
       default = false;
       description = ''
-        This tells Postage whether or not to allow anyone to use a custom
+        This tells pgmanage whether or not to allow anyone to use a custom
         connection from the login screen.
       '';
     };
@@ -87,7 +86,7 @@ in {
       type = types.int;
       default = 8080;
       description = ''
-        This tells Postage what port to listen on for browser requests.
+        This tells pgmanage what port to listen on for browser requests.
       '';
     };
 
@@ -95,7 +94,7 @@ in {
       type = types.bool;
       default = true;
       description = ''
-        This tells Postage whether or not to set the listening socket to local
+        This tells pgmanage whether or not to set the listening socket to local
         addresses only.
       '';
     };
@@ -104,10 +103,10 @@ in {
       type = types.bool;
       default = true;
       description = ''
-        This tells Postage whether or not to only allow super users to
+        This tells pgmanage whether or not to only allow super users to
         login. The recommended value is true and will restrict users who are not
         super users from logging in to any PostgreSQL instance through
-        Postage. Note that a connection will be made to PostgreSQL in order to
+        pgmanage. Note that a connection will be made to PostgreSQL in order to
         test if the user is a superuser.
       '';
     };
@@ -116,8 +115,8 @@ in {
       type = types.nullOr types.str;
       default = null;
       description = ''
-        This tells Postage to only allow users in a certain PostgreSQL group to
-        login to Postage. Note that a connection will be made to PostgreSQL in
+        This tells pgmanage to only allow users in a certain PostgreSQL group to
+        login to pgmanage. Note that a connection will be made to PostgreSQL in
         order to test if the user is a member of the login group.
       '';
     };
@@ -133,10 +132,10 @@ in {
 
     dataRoot = mkOption {
       type = types.str;
-      default = "/var/lib/postage";
+      default = "/var/lib/pgmanage";
       description = ''
-        This tells Postage where to put the SQL file history. All tabs are saved
-        to this location so that if you get disconnected from Postage you
+        This tells pgmanage where to put the SQL file history. All tabs are saved
+        to this location so that if you get disconnected from pgmanage you
         don't lose your work.
       '';
     };
@@ -156,15 +155,15 @@ in {
       });
       default = null;
       description = ''
-        These options tell Postage where the TLS Certificate and Key files
+        These options tell pgmanage where the TLS Certificate and Key files
         reside. If you use these options then you'll only be able to access
-        Postage through a secure TLS connection. These options are only
-        necessary if you wish to connect directly to Postage using a secure TLS
-        connection. As an alternative, you can set up Postage in a reverse proxy
+        pgmanage through a secure TLS connection. These options are only
+        necessary if you wish to connect directly to pgmanage using a secure TLS
+        connection. As an alternative, you can set up pgmanage in a reverse proxy
         configuration. This allows your web server to terminate the secure
-        connection and pass on the request to Postage. You can find help to set
+        connection and pass on the request to pgmanage. You can find help to set
         up this configuration in:
-        <link xlink:href="https://github.com/workflowproducts/postage/blob/master/INSTALL_NGINX.md"/>
+        <link xlink:href="https://github.com/pgManage/pgManage/blob/master/INSTALL_NGINX.md"/>
       '';
     };
 
@@ -177,29 +176,47 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
-    systemd.services.postage = {
-      description = "postage - PostgreSQL Administration for the web";
-      wants    = [ "postgresql.service" ];
-      after    = [ "postgresql.service" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        User         = postage;
-        Group        = postage;
-        ExecStart    = "${pkgs.postage}/sbin/postage -c ${confFile}" +
-                       optionalString cfg.localOnly " --local-only=true";
-      };
-    };
-    users = {
-      users."${postage}" = {
-        name  = postage;
-        group = postage;
-        home  = cfg.dataRoot;
-        createHome = true;
+
+in {
+
+  options.services.pgmanage = pgmanageOptions;
+
+  # This is deprecated and should be removed for NixOS-18.03.
+  options.services.postage = pgmanageOptions;
+
+  config = mkMerge [
+    { assertions = [
+        { assertion = !config.services.postage.enable;
+          message =
+            "services.postage is deprecated in favour of pgmanage. " +
+            "They have the same options so just substitute postage for pgmanage." ;
+        }
+      ];
+    }
+    (mkIf cfg.enable {
+      systemd.services.pgmanage = {
+        description = "pgmanage - PostgreSQL Administration for the web";
+        wants    = [ "postgresql.service" ];
+        after    = [ "postgresql.service" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          User         = pgmanage;
+          Group        = pgmanage;
+          ExecStart    = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" +
+                         optionalString cfg.localOnly " --local-only=true";
+        };
       };
-      groups."${postage}" = {
-        name = postage;
+      users = {
+        users."${pgmanage}" = {
+          name  = pgmanage;
+          group = pgmanage;
+          home  = cfg.dataRoot;
+          createHome = true;
+        };
+        groups."${pgmanage}" = {
+          name = pgmanage;
+        };
       };
-    };
-  };
+    })
+  ];
 }
diff --git a/nixos/release.nix b/nixos/release.nix
index d5f59a524e0..5701d7826ca 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -306,6 +306,7 @@ in rec {
   #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
   tests.peerflix = callTest tests/peerflix.nix {};
   tests.postgresql = callSubTests tests/postgresql.nix {};
+  tests.pgmanage = callTest tests/pgmanage.nix {};
   tests.postgis = callTest tests/postgis.nix {};
   #tests.pgjwt = callTest tests/pgjwt.nix {};
   tests.printing = callTest tests/printing.nix {};
diff --git a/nixos/tests/pgmanage.nix b/nixos/tests/pgmanage.nix
new file mode 100644
index 00000000000..110cbd5c5b4
--- /dev/null
+++ b/nixos/tests/pgmanage.nix
@@ -0,0 +1,39 @@
+import ./make-test.nix ({ pkgs, ... } :
+let
+  role     = "test";
+  password = "secret";
+  conn     = "local";
+in
+{
+  name = "pgmanage";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ basvandijk ];
+  };
+  nodes = {
+    one = { config, pkgs, ... }: {
+      services = {
+        postgresql = {
+          enable = true;
+          initialScript = pkgs.writeText "pg-init-script" ''
+            CREATE ROLE ${role} SUPERUSER LOGIN PASSWORD '${password}';
+          '';
+        };
+        pgmanage = {
+          enable = true;
+          connections = {
+            "${conn}" = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres";
+          };
+        };
+      };
+    };
+  };
+
+  testScript = ''
+    startAll;
+    $one->waitForUnit("default.target");
+    $one->requireActiveUnit("pgmanage.service");
+
+    # Test if we can log in.
+    $one->waitUntilSucceeds("curl 'http://localhost:8080/pgmanage/auth' --data 'action=login&connname=${conn}&username=${role}&password=${password}' --fail");
+  '';
+})
diff --git a/pkgs/applications/misc/postage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
similarity index 63%
rename from pkgs/applications/misc/postage/default.nix
rename to pkgs/applications/misc/pgmanage/default.nix
index eeb879ee6e4..fd66ce8fc31 100644
--- a/pkgs/applications/misc/postage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, runCommand, postgresql, openssl } :
 
 stdenv.mkDerivation rec {
-  name = "postage-${version}";
-  version = "3.2.18";
+  name = "pgmanage-${version}";
+  version = "10.0.2";
 
   src = fetchFromGitHub {
-    owner  = "workflowproducts";
-    repo   = "postage";
-    rev    = "eV${version}";
-    sha256 = "1kdg8pw2vxwkxw3b6dim4s740s60j3iyrh96524wi3lqkkq98krn";
+    owner  = "pgManage";
+    repo   = "pgManage";
+    rev    = "v${version}";
+    sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a";
   };
 
   buildInputs = [ postgresql openssl ];
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
       the style of NGINX and Node.js. This heart makes Postage as fast as any
       PostgreSQL interface can hope to be.
     '';
-    homepage = http://www.workflowproducts.com/postage.html;
-    license = licenses.asl20;
+    homepage = https://github.com/pgManage/pgManage;
+    license = licenses.postgresql;
     maintainers = [ maintainers.basvandijk ];
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 20d9ba83354..b6f36aa9de1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -116,6 +116,7 @@ mapAliases (rec {
   pgp-tools = signing-party; # added 2017-03-26
   pidgin-with-plugins = pidgin; # added 2016-06
   pidginlatexSF = pidginlatex; # added 2014-11-02
+  postage = pgmanage; # added 2017-11-03
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
   PPSSPP = ppsspp; # added 2017-10-01
   prometheus-statsd-bridge = prometheus-statsd-exporter;  # added 2017-08-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9edb35b6153..ced083faeef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19309,7 +19309,7 @@ with pkgs;
 
   opkg-utils = callPackage ../tools/package-management/opkg-utils { };
 
-  postage = callPackage ../applications/misc/postage { };
+  pgmanage = callPackage ../applications/misc/pgmanage { };
 
   pgadmin = callPackage ../applications/misc/pgadmin { };
 
-- 
GitLab


From 40124cd0cf474dd17959b5ae36c8a98112c173c0 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Thu, 2 Nov 2017 21:51:35 +0000
Subject: [PATCH 553/877] Add wrapper for idris exe for gcc/gmp runtime deps

Fixes #10450

When compiling packages with -o the executable invokes gcc.
There is no compile time flag to control this invocation so for
now we create a wrapper which provides the dependency at runtime.
---
 pkgs/development/idris-modules/default.nix       |  9 +++++++--
 pkgs/development/idris-modules/idris-wrapper.nix | 14 ++++++++++++++
 pkgs/top-level/all-packages.nix                  |  5 ++++-
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/idris-modules/idris-wrapper.nix

diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 4d7c4928283..16f6c65b094 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, idris, overrides ? (self: super: {}) }: let
+{ pkgs, idris-no-deps, overrides ? (self: super: {}) }: let
   inherit (pkgs.lib) callPackageWith fix' extends;
 
   /* Taken from haskell-modules/default.nix, should probably abstract this away */
@@ -33,7 +33,12 @@
 
     value = callPackage (./. + "/${name}.nix") {};
   }) files)) // {
-    inherit idris callPackage;
+    inherit idris-no-deps callPackage;
+    # See #10450 about why we have to wrap the executable
+    idris =
+        (pkgs.callPackage ./idris-wrapper.nix {})
+          idris-no-deps
+          { path = [ pkgs.gcc ]; lib = [pkgs.gmp]; };
 
     # A list of all of the libraries that come with idris
     builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_;
diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix
new file mode 100644
index 00000000000..32424ba1f86
--- /dev/null
+++ b/pkgs/development/idris-modules/idris-wrapper.nix
@@ -0,0 +1,14 @@
+{ symlinkJoin, makeWrapper, stdenv }: idris: { path, lib }:
+
+symlinkJoin {
+  name = idris.name;
+  src = idris.src;
+  paths = [ idris ];
+  buildInputs = [ makeWrapper ];
+  postBuild = ''
+    wrapProgram $out/bin/idris \
+      --suffix PATH : ${ stdenv.lib.makeBinPath path } \
+      --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib}
+      '';
+  }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a76c4eac651..294a79b101e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5876,7 +5876,8 @@ with pkgs;
   icedtea_web = icedtea8_web;
 
   idrisPackages = callPackage ../development/idris-modules {
-    idris =
+
+    idris-no-deps =
       let
         inherit (self.haskell) lib;
         haskellPackages = self.haskellPackages.override {
@@ -5893,6 +5894,8 @@ with pkgs;
         haskellPackages.idris;
   };
 
+  idris = idrisPackages.with-packages [ idrisPackages.base ] ;
+
   intercal = callPackage ../development/compilers/intercal { };
 
   irony-server = callPackage ../development/tools/irony-server/default.nix {
-- 
GitLab


From 6d80920ab948f31b497afda7fcfc6235ada46f85 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Fri, 3 Nov 2017 00:21:16 +0100
Subject: [PATCH 554/877] htpdate: 1.1.3 -> 1.2.0

---
 pkgs/tools/networking/htpdate/default.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix
index 10ed8f34e3a..d937f3c2f0b 100644
--- a/pkgs/tools/networking/htpdate/default.nix
+++ b/pkgs/tools/networking/htpdate/default.nix
@@ -1,24 +1,26 @@
-{ stdenv, fetchurl, coreutils, binutils }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.3";
+  version = "1.2.0";
   name = "htpdate-${version}";
 
   src = fetchurl {
-    url = "http://twekkel.home.xs4all.nl/htp/htpdate-${version}.tar.gz";
-    sha256 = "0hfg4qrsmpqw03m9qwf3zgi4brbf65w6wd3w30nkamc7x8b4vn5i";
+    url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz";
+    sha256 = "00xwppq3aj951m0srjvxmr17kiaaflyjmbfkvpnfs3jvqhzczci2";
   };
 
-  installFlags = [
-    "INSTALL=${coreutils}/bin/install"
-    "STRIP=${binutils}/bin/strip"
+  makeFlags = [
+    "INSTALL=install"
+    "STRIP=strip"
     "prefix=$(out)"
   ];
 
-  meta = {
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
     description = "Utility to fetch time and set the system clock over HTTP";
     homepage = http://www.vervest.org/htp/;
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = platforms.unix;
+    license = licenses.gpl2Plus;
   };
 }
-- 
GitLab


From 5dc3ea4b31746eda99854b9f926ac3c0b5bba1fa Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Fri, 3 Nov 2017 09:42:54 +1030
Subject: [PATCH 555/877] flow: 0.57.3 -> 0.58.0

---
 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 372295084d5..803bd70dbd8 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.57.3";
+  version = "0.58.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "0pmgj2mv4pmgw8slh4gdj7jskcgxbdsy09arh5rnwf0byy81fky6";
+    sha256 = "0s27zj3lx1mqpmfwqpvdcqpz9gzp40mbiy5hp5796pg7627spld5";
   };
 
   installPhase = ''
-- 
GitLab


From 7eecac6f46e58f1b894debcad4a3310fa9a290ae Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Thu, 2 Nov 2017 19:26:06 -0400
Subject: [PATCH 556/877] ngspice: Build shared library

This builds the libngspice shared library which is used by development
versions of kicad.
---
 pkgs/applications/science/electronics/ngspice/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 2588ee39add..ee7c0a5844d 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ readline libX11 flex bison libICE libXaw libXext ];
 
-  configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ];
+  configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" "--with-ngshared" ];
 
   meta = with stdenv.lib; {
     description = "The Next Generation Spice (Electronic Circuit Simulator)";
-- 
GitLab


From 14d3a7d744dc6d8b93282f87dfe19585cff923bd Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 22:41:03 +0000
Subject: [PATCH 557/877] python.pkgs.urwid: fix tests

---
 pkgs/development/python-modules/urwid/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index 129f4821e87..8d5b7ab76e5 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch }:
 
 buildPythonPackage (rec {
   pname = "urwid";
@@ -10,6 +10,19 @@ buildPythonPackage (rec {
     sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng";
   };
 
+  patches = [
+   # fix tests
+   (fetchpatch {
+     url = "https://github.com/mwhudson/urwid/commit/4b0ed8b6030450e6d99909a7c683e9642e546387.patch";
+     sha256 = "0azpn0ylbg8mfpr0y27n4lnq0ph75a4d4m9wdv3napnhf1vh9ahx";
+   })
+   # fix tests
+   (fetchpatch {
+     url = "https://github.com/floppym/urwid/commit/f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3.patch";
+     sha256 = "1b3vz7mrwz2bqvdwvbyv2j835f9lzapgw0j2km4sam76bxmgfpgq";
+   })
+  ];
+
   meta = with stdenv.lib; {
     description = "A full-featured console (xterm et al.) user interface library";
     homepage = http://excess.org/urwid;
-- 
GitLab


From 9d8cc4fab073478b9453b616b0bc2375b16134a6 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 23:32:49 +0000
Subject: [PATCH 558/877] python.pkgs.hyperframe: 4.0.1 ->  5.1.0

---
 .../python-modules/hyperframe/default.nix       | 17 +++++++++++++++++
 pkgs/top-level/python-packages.nix              | 16 +---------------
 2 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/hyperframe/default.nix

diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix
new file mode 100644
index 00000000000..91e00a7a146
--- /dev/null
+++ b/pkgs/development/python-modules/hyperframe/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "hyperframe";
+  version = "5.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "017vjbb1xjak1pxcvihhilzjnmpfvhapk7k88wp6lvdkkm9l8nd2";
+  };
+
+  meta = with stdenv.lib; {
+    description = "HTTP/2 framing layer for Python";
+    homepage = "http://hyper.rtfd.org/";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9c5fa93dfa..fa5ee02f51c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11604,21 +11604,7 @@ in {
     };
   };
 
-  hyperframe = buildPythonPackage rec {
-    name = "hyperframe-${version}";
-    version = "4.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/hyperframe/${name}.tar.gz";
-      sha256 = "0hsfq0jigwa0i58z7vbnp62l7za49gmlg75vnygq2ijhkidkcmwa";
-    };
-
-    meta = {
-      description = "HTTP/2 framing layer for Python";
-      homepage = "http://hyper.rtfd.org/";
-      license = licenses.mit;
-    };
-  };
+  hyperframe = callPackage ../development/python-modules/hyperframe { };
 
   h2 = buildPythonPackage rec {
     name = "h2-${version}";
-- 
GitLab


From fd261eefbd99e7a4d3e5adc9cfa99a32d5b7ca7d Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 23:33:38 +0000
Subject: [PATCH 559/877] python.pkgs.h2: 2.5.1 -> 3.0.1

---
 .../development/python-modules/h2/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +---------------
 2 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/h2/default.nix

diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix
new file mode 100644
index 00000000000..08cd1943eff
--- /dev/null
+++ b/pkgs/development/python-modules/h2/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, enum34, hpack, hyperframe }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "h2";
+  version = "3.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0r3f43r0v7sqgdjjg5ngw0dndk2v6cyd0jncpwya54m37y42z5mj";
+  };
+
+  propagatedBuildInputs = [ enum34 hpack hyperframe ];
+
+  meta = with stdenv.lib; {
+    description = "HTTP/2 State-Machine based protocol implementation";
+    homepage = "http://hyper.rtfd.org/";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa5ee02f51c..1e6101f0bbb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11606,23 +11606,7 @@ in {
 
   hyperframe = callPackage ../development/python-modules/hyperframe { };
 
-  h2 = buildPythonPackage rec {
-    name = "h2-${version}";
-    version = "2.5.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/h2/${name}.tar.gz";
-      sha256 = "0xhzm5vcfhdq3mihynwh4ljwi0r06lvzk3ypr0gmmbcp1x43ffb7";
-    };
-
-    propagatedBuildInputs = with self; [ enum34 hpack hyperframe ];
-
-    meta = {
-      description = "HTTP/2 State-Machine based protocol implementation";
-      homepage = "http://hyper.rtfd.org/";
-      license = licenses.mit;
-    };
-  };
+  h2 = callPackage ../development/python-modules/h2 { };
 
   editorconfig = buildPythonPackage rec {
     name = "EditorConfig-${version}";
-- 
GitLab


From 206a3c7653491165f8947aab18361787a2521119 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 23:34:11 +0000
Subject: [PATCH 560/877] python.pkgs.kaitaistruct: 0.6 -> 0.7

---
 .../python-modules/kaitaistruct/default.nix    | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             | 16 +---------------
 2 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/kaitaistruct/default.nix

diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix
new file mode 100644
index 00000000000..c9961956617
--- /dev/null
+++ b/pkgs/development/python-modules/kaitaistruct/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, kaitaistruct, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "kaitaistruct";
+  version = "0.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19j3snmr0qbd48f7yd3cc21ffv13dahf8ys591dnalbhvnkar71i";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Kaitai Struct: runtime library for Python";
+    homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1e6101f0bbb..b2962dc8459 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13812,21 +13812,7 @@ in {
 
   pecan = callPackage ../development/python-modules/pecan { };
 
-  kaitaistruct = buildPythonPackage rec {
-    name = "kaitaistruct-${version}";
-    version = "0.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/kaitaistruct/${name}.tar.gz";
-      sha256 = "0rwcrlz7f2bwmypqa38pag492bp71wp1bhz51hsaynjjyr9knr12";
-    };
-
-    meta = with stdenv.lib; {
-      description = "Kaitai Struct: runtime library for Python";
-      homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime";
-      license = licenses.mit;
-    };
-  };
+  kaitaistruct = callPackage ../development/python-modules/kaitaistruct { };
 
   Kajiki = buildPythonPackage rec {
     name = "Kajiki-${version}";
-- 
GitLab


From a478343856d0a3e47ecd198c3bde1735c934c658 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 23:35:11 +0000
Subject: [PATCH 561/877] python.pkgs.pyasn1: 0.1.9 -> 0.3.4

---
 .../python-modules/pyasn1/default.nix         | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 16 +---------------
 2 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyasn1/default.nix

diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix
new file mode 100644
index 00000000000..d0122a5b7e4
--- /dev/null
+++ b/pkgs/development/python-modules/pyasn1/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi, }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pyasn1";
+  version = "0.3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06hhy38jhwh95gpn8f03cr439273fsfsh4vhd5024r86nh5gyiir";
+  };
+
+  meta = with stdenv.lib; {
+    description = "ASN.1 tools for Python";
+    homepage = http://pyasn1.sourceforge.net/;
+    license = "mBSD";
+    platforms = platforms.unix;  # arbitrary choice
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b2962dc8459..c549a3bad4a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15524,21 +15524,7 @@ in {
   };
 
 
-  pyasn1 = buildPythonPackage rec {
-    name = "pyasn1-0.1.9";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyasn1/${name}.tar.gz";
-      sha256 = "0zraxni14bqi20kr4bi6nwsh32aibz0fq0xaczfisw0zdpcsqg45";
-    };
-
-    meta = {
-      description = "ASN.1 tools for Python";
-      homepage = http://pyasn1.sourceforge.net/;
-      license = "mBSD";
-      platforms = platforms.unix;  # arbitrary choice
-    };
-  };
+  pyasn1 = callPackage ../development/python-modules/pyasn1 { };
 
   pyasn1-modules = buildPythonPackage rec {
     name = "pyasn1-modules-${version}";
-- 
GitLab


From 3cdbc9705dd186581a812e362879b798064dfb55 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 23:35:52 +0000
Subject: [PATCH 562/877] python.pkgs.pyasn1-modules: 0.0.8 -> 0.1.5

---
 .../python-modules/pyasn1-modules/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +----------------
 2 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyasn1-modules/default.nix

diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix
new file mode 100644
index 00000000000..a7ee15d6a18
--- /dev/null
+++ b/pkgs/development/python-modules/pyasn1-modules/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, pyasn1, isPyPy }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pyasn1-modules";
+  version = "0.1.5";
+  disabled = isPyPy;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1239h6h67vg0wazg2qgv6m3hdim2gs66pl89lbnayk55bbnkwc0x";
+  };
+
+  propagatedBuildInputs = [ pyasn1 ];
+
+  meta = with stdenv.lib; {
+    description = "A collection of ASN.1-based protocols modules";
+    homepage = https://pypi.python.org/pypi/pyasn1-modules;
+    license = licenses.bsd3;
+    platforms = platforms.unix;  # same as pyasn1
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c549a3bad4a..b9f62a1f34b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15526,25 +15526,7 @@ in {
 
   pyasn1 = callPackage ../development/python-modules/pyasn1 { };
 
-  pyasn1-modules = buildPythonPackage rec {
-    name = "pyasn1-modules-${version}";
-    version = "0.0.8";
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyasn1-modules/${name}.tar.gz";
-      sha256 = "0drqgw81xd3fxdlg89kgd79zzrabvfncvkbybi2wr6w2y4s1jmhh";
-    };
-
-    propagatedBuildInputs = with self; [ pyasn1 ];
-
-    meta = {
-      description = "A collection of ASN.1-based protocols modules";
-      homepage = https://pypi.python.org/pypi/pyasn1-modules;
-      license = licenses.bsd3;
-      platforms = platforms.unix;  # same as pyasn1
-    };
-  };
+  pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { };
 
   pyaudio = buildPythonPackage rec {
     name = "python-pyaudio-${version}";
-- 
GitLab


From f255de884b147fb6efc2b1ae95493f99d5512d2a Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 23:36:38 +0000
Subject: [PATCH 563/877] python.pkgs.ldap3: 1.0.4 -> 2.3

---
 .../python-modules/ldap3/default.nix          | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +---------------
 2 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/ldap3/default.nix

diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix
new file mode 100644
index 00000000000..895272f351d
--- /dev/null
+++ b/pkgs/development/python-modules/ldap3/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }:
+
+buildPythonPackage rec {
+  version = "2.3";
+  pname = "ldap3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1b36lwil4iflk2ay8gi663abpnfm8id7qg4n3jkmmqbnc1sv6mn0";
+  };
+
+  buildInputs = [ gssapi ];
+
+  propagatedBuildInputs = [ pyasn1 ];
+
+  doCheck = false; # requires network
+
+  meta = with stdenv.lib; {
+    homepage = https://pypi.python.org/pypi/ldap3;
+    description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library";
+    license = licenses.lgpl3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9f62a1f34b..f7db34b4f61 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16856,25 +16856,7 @@ in {
     inherit (pkgs) openldap cyrus_sasl openssl;
   };
 
-  ldap3 = buildPythonPackage rec {
-    version = "1.0.4";
-    name = "ldap3-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/ldap3/${name}.tar.gz";
-      sha256 = "0j4qqj9vq022hy7wfqn8s0j4vm2g6paabbzas1vbyspawvcfai98";
-    };
-
-    buildInputs = with self; [ gssapi ];
-
-    propagatedBuildInputs = with self; [ pyasn1 ];
-
-    meta = {
-      homepage = https://pypi.python.org/pypi/ldap3;
-      description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library";
-      license = licenses.lgpl3;
-    };
-  };
+  ldap3 = callPackage ../development/python-modules/ldap3 {};
 
   ptest = buildPythonPackage rec {
     name = pname + "-" + version;
-- 
GitLab


From 0433604f51966bc43ffdbb6d741665a5738c6b7d Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 2 Nov 2017 23:38:23 +0000
Subject: [PATCH 564/877] mitmproxy: 2.0.2 -> 2017-10-31

---
 pkgs/tools/networking/mitmproxy/default.nix | 74 ++++-----------------
 1 file changed, 12 insertions(+), 62 deletions(-)

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 7348cd7f116..f96987a1300 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -1,82 +1,32 @@
 { stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }:
 
-let
-  p = python3.override {
-    packageOverrides = self: super: {
-      cryptography = super.cryptography.overridePythonAttrs (oldAttrs: rec {
-        version = "1.8.2";
-        name = "${oldAttrs.pname}-${version}";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "8e88ebac371a388024dab3ccf393bf3c1790d21bc3c299d5a6f9f83fb823beda";
-        };
-      });
-      cryptography_vectors = super.cryptography_vectors.overridePythonAttrs (oldAttrs: rec {
-        version = self.cryptography.version;
-        name = "${oldAttrs.pname}-${version}";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "00daa04c9870345f56605d91d7d4897bc1b16f6fff7c74cb602b08ef16c0fb43";
-        };
-      });
-      pyopenssl = super.pyopenssl.overridePythonAttrs (oldAttrs: rec {
-        version = "17.0.0";
-        name = "${oldAttrs.pname}-${version}";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "1pdg1gpmkzj8yasg6cmkhcivxcdp4c12nif88y4qvsxq5ffzxas8";
-        };
-        patches = fetchpatch {
-          url = "https://github.com/pyca/pyopenssl/commit/"
-              + "a40898b5f1d472f9449a344f703fa7f90cddc21d.patch";
-          sha256 = "0bdfrhfvdfxhfknn46s4db23i3hww6ami2r1l5rfrri0pn8b8mh7";
-        };
-      });
-    };
-  };
-in p.pkgs.buildPythonPackage rec {
+python3.pkgs.buildPythonPackage rec {
   baseName = "mitmproxy";
-  name = "${baseName}-${version}";
-  version = "2.0.2";
+  name = "${baseName}-unstable-2017-10-31";
 
   src = fetchFromGitHub {
     owner = baseName;
     repo = baseName;
-    rev = "v${version}";
-    sha256 = "1x1a28al5clpfd69rjcpw26gjjnpsm1vfl4scrwpdd1jhkw044h9";
+    rev = "80a8eaa708ea31dd9c5e7e1ab6b02c69079039c0";
+    sha256 = "0rvwm11yryzlp3c1i42rk2iv1m38yn6r83k41jb51hwg6wzbwzvw";
   };
 
-  patches = [
-    # fix tests
-    (fetchpatch {
-      url = "https://github.com/mitmproxy/mitmproxy/commit/b3525570929ba47c10d9d08696876c39487f7000.patch";
-      sha256 = "111fld5gqdii7rs1jhqaqrxgbyhfn6qd0y7l15k4npamsnvdnv20";
-    })
-    # bump pyOpenSSL
-    (fetchpatch {
-      url = https://github.com/mitmproxy/mitmproxy/commit/6af72160bf98b58682b8f9fc5aabf51928d2b1d3.patch;
-      sha256 = "1q4ml81pq9c8j9iscq8janbxf4s37w3bqskbs6r30yqzy63v54f2";
-    })
-    # https://github.com/mitmproxy/mitmproxy/commit/3d7cde058b7e6242d93b9bc9d3e17520ffb578a5
-    ./tornado-4.6.patch
-  ];
-
   checkPhase = ''
     export HOME=$(mktemp -d)
     # test_echo resolves hostnames
-    LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo'
+    LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo and not test_find_unclaimed_URLs '
   '';
 
-  propagatedBuildInputs = with p.pkgs; [
-    blinker click certifi construct cryptography
-    cssutils editorconfig h2 html2text hyperframe
-    jsbeautifier kaitaistruct passlib pyasn1 pyopenssl
+  propagatedBuildInputs = with python3.pkgs; [
+    blinker click certifi cryptography
+    h2 hyperframe
+    kaitaistruct passlib pyasn1 pyopenssl
     pyparsing pyperclip requests ruamel_yaml tornado
-    urwid watchdog brotlipy sortedcontainers
+    urwid brotlipy sortedcontainers ldap3
   ];
 
-  buildInputs = with p.pkgs; [
-    beautifulsoup4 flask pytz pytest pytestrunner protobuf glibcLocales
+  buildInputs = with python3.pkgs; [
+    beautifulsoup4 flask pytest pytestrunner glibcLocales
   ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 449a0531524dfffd3f8f387c651ae19235b14f5b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 2 Nov 2017 19:53:57 -0400
Subject: [PATCH 565/877] linux-copperhead: 4.13.10.a -> 4.13.11.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 6ab59a497b6..47ef31bd20a 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.13.10";
+  version = "4.13.11";
   revision = "a";
-  sha256 = "0m4yxdcll1zvvvagpjf9s7vw7dmad22qbakhc50as3ixyd7w5ah6";
+  sha256 = "1nby5iii1k0vjvs1s2qvlszln2p9sza9ivbjjdhrmvpp1shzwcvx";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
-- 
GitLab


From febacc5de6bdc4a35728598879acf3c3a8577d82 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Fri, 3 Nov 2017 01:50:00 +0100
Subject: [PATCH 566/877] grafana: 4.6.0 -> 4.6.1

---
 pkgs/servers/monitoring/grafana/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index f6a4860380b..c186fc2835f 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "4.6.0";
+  version = "4.6.1";
   name = "grafana-v${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0z3981xnx97d1gn6w31kc066kyqksacdjmxbbrsczwn7mprkv6ij";
+    sha256 = "1l606dbx3rfbqbr30iirsc2lkzqa2kc6160g2sn0205mdz8b31zj";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "14sk3rb29aa8qfskb1x9lmisn038a7v0rz5jr6x0m21rzc11ripa";
+    sha256 = "04756ry3b8fyk91lzacsixha6l4q1g532krxz759d17sfrnbaz2q";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
-- 
GitLab


From c1de18ea236994120b5ab3c3700099f8dbe0d221 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 3 Nov 2017 00:44:23 +0000
Subject: [PATCH 567/877] vigra: enable parallel building

(this rebuilds libreoffice)
---
 pkgs/development/libraries/vigra/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 2910e8b7dbb..324d977c72e 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -24,6 +24,8 @@ in stdenv.mkDerivation rec {
             ++ stdenv.lib.optionals (stdenv.system == "x86_64-linux")
                   [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Novel computer vision C++ library with customizable algorithms and data structures";
     homepage = http://hci.iwr.uni-heidelberg.de/vigra;
-- 
GitLab


From 78ed9da5e4d9c4cd3451d10195f816eb0c0983d8 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 3 Nov 2017 04:14:22 +0000
Subject: [PATCH 568/877] mkPythonDerivation: let name default to
 ${pname}-${version}

---
 pkgs/development/interpreters/python/mk-python-derivation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index bc586e0b3ce..098ab0b1719 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -8,7 +8,7 @@
 , ensureNewerSourcesHook
 }:
 
-{ name
+{ name ? "${attrs.pname}-${attrs.version}"
 
 # by default prefix `name` e.g. "python3.3-${name}"
 , namePrefix ? python.libPrefix + "-"
-- 
GitLab


From e82dc084d4d1c663c024fcc3c629d850c9cb5c3e Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Fri, 3 Nov 2017 16:02:41 +1030
Subject: [PATCH 569/877] lame: prevent build failure from using outdated
 symbol list

Before this change, trying to build LAME on Darwin would throw an error:

Undefined symbols for architecture x86_64:
  "_lame_init_old", referenced from:
     -exported_symbol[s_list] command line option
ld: symbol(s) not found for architecture x86_64
clang-4.0: error: linker command failed with exit code 1 (use -v to see invocation)
---
 pkgs/development/libraries/lame/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index 8ad7cb95a5d..2f713cb5977 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -55,6 +55,12 @@ stdenv.mkDerivation rec {
     (if debugSupport then "--enable-debug=alot" else "")
   ];
 
+  preConfigure = ''
+    # Prevent a build failure for 3.100 due to using outdated symbol list
+    # https://hydrogenaud.io/index.php/topic,114777.msg946373.html#msg946373
+    sed -i '/lame_init_old/d' include/libmp3lame.sym
+  '';
+
   meta = {
     description = "A high quality MPEG Audio Layer III (MP3) encoder";
     homepage    = http://lame.sourceforge.net;
-- 
GitLab


From 1774cc04cb9293812572503e6017758aea033147 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 3 Nov 2017 09:06:41 +0100
Subject: [PATCH 570/877] snapraid: fix release checksum

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

diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix
index c9f605ca69f..597be1b0f42 100644
--- a/pkgs/tools/filesystems/snapraid/default.nix
+++ b/pkgs/tools/filesystems/snapraid/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     owner = "amadvance";
     repo = "snapraid";
     rev = "v${version}";
-    sha256 = "13v0gz22ng09gs87f7900z2sk2hg5543njl32rfn4cxxp0jncs3r";
+    sha256 = "1vgyiagn6qvyyz4jkf8pzlg0w9apb6mzza97a9x03p82fav2afx0";
   };
 
   doCheck = true;
-- 
GitLab


From 2e6daff704922ff447eaff19cb721635fd3f27a7 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Fri, 3 Nov 2017 08:36:11 +0000
Subject: [PATCH 571/877] nixos/unbound: correct indented interface/access
 lists

---
 nixos/modules/services/networking/unbound.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index bcce4accdd6..545ee327d59 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -8,9 +8,9 @@ let
 
   stateDir = "/var/lib/unbound";
 
-  access = concatMapStrings (x: "  access-control: ${x} allow\n") cfg.allowedAccess;
+  access = concatMapStringsSep "\n  " (x: "access-control: ${x} allow") cfg.allowedAccess;
 
-  interfaces = concatMapStrings (x: "  interface: ${x}\n") cfg.interfaces;
+  interfaces = concatMapStringsSep "\n  " (x: "interface: ${x}") cfg.interfaces;
 
   isLocalAddress = x: substring 0 3 x == "::1" || substring 0 9 x == "127.0.0.1";
 
-- 
GitLab


From 5f86f5d5b185329d7d859c81b3c809f365706e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 3 Nov 2017 10:57:15 +0100
Subject: [PATCH 572/877] knot-dns: maintenance 2.6.0 -> 2.6.1

https://lists.nic.cz/pipermail/knot-dns-users/2017-November/001241.html
---
 pkgs/servers/dns/knot-dns/default.nix | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 81d6d54df69..9207ceb12f1 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
 , systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty
-, fetchpatch
 }:
 
 let inherit (stdenv.lib) optional optionals; in
@@ -8,27 +7,13 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "68e04961d0bf6ba193cb7ec658b295c4ff6e60b3754d64bcd77ebdcee0f283fd";
+    sha256 = "3013d45b4c7484268f3cad078f66f730a5bc9606e6b1061488dd821c1dce41e3";
   };
 
-  patches = [
-    # remove both for >= 2.6.1
-    (fetchpatch {
-      name = "kdig-tls.patch";
-      url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/b72d5cd032795.diff";
-      sha256 = "0ig31rp82j49jh8n3s0dcf5abhh35mcp2k2wii7bh0c60ngb29k6";
-    })
-    (fetchpatch {
-      name = "kdig-tls-sni.patch";
-      url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/2e94ccee671ec70e.diff";
-      sha256 = "0psl6650v7g240i8w196v7zxy6j11d0aa6hm11b7vnaimjshgibv";
-    })
-  ];
-
   outputs = [ "bin" "out" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 4b15ca22488a3f29c4a7d281855df5818b82afd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 3 Nov 2017 10:58:57 +0100
Subject: [PATCH 573/877] knot-resolver: 1.4.0 -> 1.5.0

https://lists.nic.cz/pipermail/knot-dns-users/2017-November/001240.html
ICANN wants to watch what root trust anchors people use.
https://www.icann.org/resources/pages/ksk-rollover
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 44c8b933400..ad5c87de365 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "ac19c121fd687c7e4f5f907b46932d26f8f9d9e01626c4dadb3847e25ea31ceb";
+    sha256 = "c032e63a6b922294746e1ab4002860346e7a6d92b8502965a13ba599088fcb42";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 05f96bf376bc04bb7cc447150b8cb182af84b35b Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 3 Nov 2017 10:25:22 +0000
Subject: [PATCH 574/877] weechat: split plugins into separate outputs

Also add a wrapper generator that allows adding the plugins back
conveniently and corresponding documentation in the package notes
section of the nixpkgs manual.
---
 doc/package-notes.xml                         |  30 +++
 .../networking/irc/weechat/default.nix        | 172 +++++++++++-------
 2 files changed, 140 insertions(+), 62 deletions(-)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 4d87a3a67fe..184bee089ae 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -664,4 +664,34 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
 
 </section>
 
+<section xml:id="sec-weechat">
+<title>Weechat</title>
+<para>
+Weechat can currently be configured to include your choice of plugins.
+To make use of this functionality, install an expression that overrides its configuration such as
+<programlisting>weechat.override {configure = {availablePlugins, ...}: {
+        plugins = with availablePlugins; [ python perl ];
+    }
+}</programlisting>
+</para>
+<para>
+The plugins currently available are <literal>python</literal>,
+<literal>perl</literal>, <literal>ruby</literal>, <literal>guile</literal>,
+<literal>tcl</literal> and <literal>lua</literal>.
+</para>
+<para>
+The python plugin allows the addition of extra libraries. For instance,
+the <literal>inotify.py</literal> script in weechat-scripts requires
+D-Bus or libnotify, and the <literal>fish.py</literal> script requires
+pycrypto. To use these scripts, use the <literal>python</literal>
+plugin's <literal>withPackages</literal> attribute:
+<programlisting>weechat.override {configure = {availablePlugins, ...}: {
+    plugins = with availablePlugins; [
+            (python.withPackages (ps: with ps; [ pycrypto python-dbus ]))
+        ];
+    }
+}
+</programlisting>
+</para>
+</section>
 </chapter>
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 49cbe29eaf2..1b730af54fe 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,81 +1,129 @@
-{ stdenv, fetchurl, ncurses, openssl, aspell, gnutls
-, zlib, curl , pkgconfig, libgcrypt
+{ stdenv, fetchurl, fetchpatch, lib
+, ncurses, openssl, aspell, gnutls
+, zlib, curl, pkgconfig, libgcrypt
 , cmake, makeWrapper, libobjc, libresolv, libiconv
+, writeScriptBin, symlinkJoin # for withPlugins
 , asciidoctor # manpages
 , guileSupport ? true, guile
 , luaSupport ? true, lua5
 , perlSupport ? true, perl
-, pythonPackages
+, pythonSupport ? true, pythonPackages
 , rubySupport ? true, ruby
 , tclSupport ? true, tcl
-, extraBuildInputs ? [] }:
-
-assert guileSupport -> guile != null;
-assert luaSupport -> lua5 != null;
-assert perlSupport -> perl != null;
-assert rubySupport -> ruby != null;
-assert tclSupport -> tcl != null;
+, extraBuildInputs ? []
+, configure ? null
+, runCommand }:
 
 let
   inherit (pythonPackages) python pycrypto pync;
-in
+  plugins = [
+    { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
+    { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }
+    { name = "ruby"; enabled = rubySupport; cmakeFlag = "ENABLE_RUBY"; buildInputs = [ ruby ]; }
+    { name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; }
+    { name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; }
+    { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON"; buildInputs = [ python ]; }
+  ];
+  enabledPlugins = builtins.filter (p: p.enabled) plugins;
 
-stdenv.mkDerivation rec {
-  version = "1.9.1";
-  name = "weechat-${version}";
+  weechat =
+    assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
+    stdenv.mkDerivation rec {
+      version = "1.9.1";
+      name = "weechat-${version}";
 
-  src = fetchurl {
-    url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
-    sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1";
-  };
+      src = fetchurl {
+        url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
+        sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1";
+      };
 
-  outputs = [ "out" "man" ];
+      patches = [
+        # TODO: Remove this patch when weechat is updated to a release that
+        # incorporates weechat/weechat#971
+        (fetchpatch {
+          url = https://github.com/lheckemann/weechat/commit/45a4f0565cc745b9c6e943f20199015185696df0.patch;
+          sha256 = "0x7vv7g0k3b2hj444x2cinyv1mq5bkr6m18grfnyy6swbymzc9bj";
+        })
+      ];
 
-  enableParallelBuilding = true;
-  cmakeFlags = with stdenv.lib; [
-    "-DENABLE_MAN=ON"
-    "-DENABLE_DOC=ON"
-  ]
-    ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
-    ++ optional (!guileSupport) "-DENABLE_GUILE=OFF"
-    ++ optional (!luaSupport)   "-DENABLE_LUA=OFF"
-    ++ optional (!perlSupport)  "-DENABLE_PERL=OFF"
-    ++ optional (!rubySupport)  "-DENABLE_RUBY=OFF"
-    ++ optional (!tclSupport)   "-DENABLE_TCL=OFF"
-    ;
+      outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
 
-  buildInputs = with stdenv.lib; [
-      ncurses python openssl aspell gnutls zlib curl pkgconfig
-      libgcrypt pycrypto makeWrapper
-      cmake
-      asciidoctor
+      enableParallelBuilding = true;
+      cmakeFlags = with stdenv.lib; [
+        "-DENABLE_MAN=ON"
+        "-DENABLE_DOC=ON"
       ]
-    ++ optionals stdenv.isDarwin [ pync libobjc libresolv ]
-    ++ optional  guileSupport    guile
-    ++ optional  luaSupport      lua5
-    ++ optional  perlSupport     perl
-    ++ optional  rubySupport     ruby
-    ++ optional  tclSupport      tcl
-    ++ extraBuildInputs;
+        ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
+        ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins
+        ;
+
+      buildInputs = with stdenv.lib; [
+          ncurses openssl aspell gnutls zlib curl pkgconfig
+          libgcrypt makeWrapper cmake asciidoctor
+          ]
+        ++ optionals stdenv.isDarwin [ libobjc libresolv ]
+        ++ concatMap (p: p.buildInputs) enabledPlugins
+        ++ extraBuildInputs;
+
+      NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"
+        # Fix '_res_9_init: undefined symbol' error
+        + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv");
+
+      postInstall = with stdenv.lib; ''
+        for p in ${concatMapStringsSep " " (p: p.name) enabledPlugins}; do
+          from=$out/lib/weechat/plugins/$p.so
+          to=''${!p}/lib/weechat/plugins/$p.so
+          mkdir -p $(dirname $to)
+          mv $from $to
+        done
+      '';
 
-  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"
-    # Fix '_res_9_init: undefined symbol' error
-    + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv");
+      meta = {
+        homepage = http://www.weechat.org/;
+        description = "A fast, light and extensible chat client";
+        license = stdenv.lib.licenses.gpl3;
+        maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ];
+        platforms = stdenv.lib.platforms.unix;
+      };
+    };
+in if configure == null then weechat else
+  let
+    perlInterpreter = perl;
+    config = configure {
+      availablePlugins = let
+          simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
+        in rec {
+          python = {
+            pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
+            withPackages = pkgsFun: (python // {
+              extraEnv = ''
+                export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
+              '';
+            });
+          };
+          perl = (simplePlugin "perl") // {
+            extraEnv = ''
+              export PATH="${perlInterpreter}/bin:$PATH"
+            '';
+          };
+          tcl = simplePlugin "tcl";
+          ruby = simplePlugin "ruby";
+          guile = simplePlugin "guile";
+          lua = simplePlugin "lua";
+        };
+      };
 
-  postInstall = with stdenv.lib; ''
-    NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
-    wrapProgram "$out/bin/weechat" \
-      ${optionalString perlSupport "--prefix PATH : ${perl}/bin"} \
-      --prefix PATH : ${pythonPackages.python}/bin \
-      --prefix PYTHONPATH : "$PYTHONPATH" \
-      --prefix PYTHONPATH : "$NIX_PYTHONPATH"
-  '';
+    inherit (config) plugins;
 
-  meta = {
-    homepage = http://www.weechat.org/;
-    description = "A fast, light and extensible chat client";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ];
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
+    pluginsDir = runCommand "weechat-plugins" {} ''
+      mkdir -p $out/plugins
+      for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do
+        ln -s $plugin $out/plugins
+      done
+    '';
+  in writeScriptBin "weechat" ''
+    #!${stdenv.shell}
+    export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
+    ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
+    exec ${weechat}/bin/weechat "$@"
+  ''
-- 
GitLab


From 208fd871492afcdec456326657fbf9376b5c5704 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 21 Nov 2016 15:15:29 +0100
Subject: [PATCH 575/877] wordgrinder: init at 0.6

---
 .../office/wordgrinder/default.nix            | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/office/wordgrinder/default.nix

diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix
new file mode 100644
index 00000000000..67f7e2816a4
--- /dev/null
+++ b/pkgs/applications/office/wordgrinder/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper
+, lua52Packages, libXft, ncurses, readline, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "wordgrinder-${version}";
+  version = "0.6-db14181";
+
+  src = fetchFromGitHub {
+    repo = "wordgrinder";
+    owner = "davidgiven";
+    rev = "db141815e8bd1da6e684a1142a59492e516f3041";
+    sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "LUA_INCLUDE=${lua52Packages.lua}/include"
+    "LUA_LIB=${lua52Packages.lua}/lib/liblua.so"
+  ];
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+
+  buildInputs = [
+    libXft
+    lua52Packages.lua
+    ncurses
+    readline
+    zlib
+  ];
+
+  # To be able to find <Xft.h>
+  NIX_CFLAGS_COMPILE = "-I${libXft.dev}/include/X11";
+
+  # Binaries look for LuaFileSystem library (lfs.so) at runtime
+  postInstall = ''
+    wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
+    wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Text-based word processor";
+    homepage = https://cowlark.com/wordgrinder;
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthiasbeyer ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7383df20c0e..d226f0aa1ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17157,6 +17157,8 @@ with pkgs;
 
   wordnet = callPackage ../applications/misc/wordnet { };
 
+  wordgrinder = callPackage ../applications/office/wordgrinder { };
+
   worker = callPackage ../applications/misc/worker { };
 
   workrave = callPackage ../applications/misc/workrave {
-- 
GitLab


From 5d0ece7fd9c24e1e8567a6a0c950bcd3910d9480 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 3 Nov 2017 12:09:25 +0100
Subject: [PATCH 576/877] pythonPackages.django: 1.11.6 -> 1.11.7

---
 pkgs/development/python-modules/django/1_11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index fb5a62296b9..2fe45b7a1f6 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -7,13 +7,13 @@
 buildPythonPackage rec {
   pname = "Django";
   name = "${pname}-${version}";
-  version = "1.11.6";
+  version = "1.11.7";
 
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz";
-    sha256 = "0q0cmwifa6c0k6kh8fpa3mjmqw7yqd616qz8m4ls3h51xyhjrd63";
+    sha256 = "16ab3p6jj1da94wkz2b5fb128ycy4826bbsnbabcd3qdaf9f6649";
   };
 
   patches = stdenv.lib.optionals withGdal [
-- 
GitLab


From b2093d4611995839962912b85aa6e57ff5f3a13c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 3 Nov 2017 13:11:36 +0200
Subject: [PATCH 577/877] linuxPackages.bcc: Fix quoting for older Nix versions

Issue #31179.
---
 pkgs/os-specific/linux/bcc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 37c8c6841f6..768c8cedd35 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     mv $out/share/bcc/man $out/share/
 
     find $out/share/bcc/tools -type f -executable -print0 | \
-    while IFS= read -r -d $'\0' f; do
+    while IFS= read -r -d ''$'\0' f; do
       pythonLibs="$out/lib/python2.7/site-packages:${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages"
       rm -f $out/bin/$(basename $f)
       makeWrapper $f $out/bin/$(basename $f) \
-- 
GitLab


From d36a83a7840e159afed4f9646bdc912630b1bb41 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Fri, 3 Nov 2017 12:31:16 +0100
Subject: [PATCH 578/877] bundlerEnv: support unicode executables (#31145)

---
 pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
index 92321d6427d..fe8c43f55ed 100644
--- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
+++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
@@ -18,7 +18,8 @@ paths.each do |path|
   next unless File.directory?("#{path}/nix-support/gem-meta")
 
   name = File.read("#{path}/nix-support/gem-meta/name")
-  executables = File.read("#{path}/nix-support/gem-meta/executables").split
+  executables = File.read("#{path}/nix-support/gem-meta/executables")
+    .force_encoding('UTF-8').split
   executables.each do |exe|
     File.open("#{out}/bin/#{exe}", "w") do |f|
       f.write(<<-EOF)
-- 
GitLab


From 09ed44c9ebacc86bdbe201440ea9f47c299d9807 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 3 Nov 2017 12:24:52 +0100
Subject: [PATCH 579/877] perl-Software-License: 0.103012 -> 0.103013

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 74532d8fd4a..e571b2fa48a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12118,12 +12118,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   SoftwareLicense = buildPerlPackage rec {
-    name = "Software-License-0.103012";
+    name = "Software-License-0.103013";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "47f9acb7f4eeed35e38c1bec37a71b61e651965233d67dadfae6390571517db1";
+      url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz";
+      sha256 = "2641d937390f43b08fa31c419713cd96a2f0bf160be04cab322631daf6810ff3";
     };
-    propagatedBuildInputs = [ DataSection TextTemplate TryTiny ];
+    buildInputs = [ TryTiny ];
+    propagatedBuildInputs = [ DataSection TextTemplate ];
     meta = {
       homepage = https://github.com/rjbs/Software-License;
       description = "Packages that provide templated software licenses";
-- 
GitLab


From 6fb9706a1cd4804791a691b0525a88ea525f6f06 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 3 Nov 2017 12:25:23 +0100
Subject: [PATCH 580/877] perl-CGI: 4.36 -> 4.37

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e571b2fa48a..13cc777cf95 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1641,12 +1641,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   CGI = buildPerlPackage rec {
-    name = "CGI-4.36";
+    name = "CGI-4.37";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
-      sha256 = "142la7jagpni5z7m4s9h9v5vpg0pisc3y3z8kdzqc7j6yba89zpy";
+      sha256 = "7a14eee5df640f7141848f653cf48d99bfc9b5c68e18167338ee01b91cdfb883";
     };
-    buildInputs = [ TestDeep TestWarn ];
+    buildInputs = [ TestDeep TestNoWarnings TestWarn ];
     propagatedBuildInputs = [ HTMLParser self."if" ];
     meta = {
       homepage = https://metacpan.org/module/CGI;
-- 
GitLab


From 10169cc3565ea76402b2ba8535d65bb5f349ddbb Mon Sep 17 00:00:00 2001
From: Fatih Altinok <fatih@picussecurity.com>
Date: Fri, 3 Nov 2017 15:48:31 +0300
Subject: [PATCH 581/877] yarn: 1.2.1 -> 1.3.2

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

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 0e66727ab1d..72b0fe2adaf 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yarn-${version}";
-  version = "1.2.1";
+  version = "1.3.2";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "0jsaszykgmli503jgwdk79qks44krjgjr0qmizh3y7z4lplqdjip";
+    sha256 = "0lyh24ais8xqfmzbb4sszd2002xl6qbsg9sdjnpwh6aysrwp56r8";
   };
 
   buildInputs = [makeWrapper nodejs];
-- 
GitLab


From d83cfdc77ff4e5922632fa071cf3c22d1e0f3c71 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 3 Nov 2017 13:04:47 +0000
Subject: [PATCH 582/877] kafkacat: fix sandboxed build

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

diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix
index 0d5c6e83c01..3a1c4225bff 100644
--- a/pkgs/development/tools/kafkacat/default.nix
+++ b/pkgs/development/tools/kafkacat/default.nix
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib rdkafka yajl ];
 
+  preConfigure = ''
+    patchShebangs ./configure
+  '';
+
   meta = with stdenv.lib; {
     description = "A generic non-JVM producer and consumer for Apache Kafka";
     homepage = https://github.com/edenhill/kafkacat;
-- 
GitLab


From 8ee4a3648ff1464c8027bcb893bc867a507ab26b Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 3 Nov 2017 14:25:01 +0100
Subject: [PATCH 583/877] xarchiver: 0.5.4.7 -> 0.5.4.12   - Fix github url   -
 Add libxslt dependency   - Gtk2 -> Gtk3

---
 pkgs/tools/archivers/xarchiver/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix
index a257ece4877..1c8d8367793 100644
--- a/pkgs/tools/archivers/xarchiver/default.nix
+++ b/pkgs/tools/archivers/xarchiver/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, gtk2, pkgconfig, intltool }:
+{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.4.7";
+  version = "0.5.4.12";
   name = "xarchiver-${version}";
 
   src = fetchFromGitHub {
     owner = "ib";
     repo = "xarchiver";
-    rev = "${name}";
-    sha256 = "0w9lx8d8r50j48qfhn2r0dlcnwy3pjyy6xjvgpr0qagy5l1q1qj4";
+    rev = "${version}";
+    sha256 = "13d8slcx3frz0dhl1w4llj7001n57cjjb8r7dlaw5qacaas3xfwi";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk2 intltool ];
+  buildInputs = [ gtk3 intltool libxslt ];
 
   meta = {
     description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
-- 
GitLab


From 1f379ed3a7d5dd79e8e9a8e7f762f59f1499cb63 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 3 Nov 2017 14:06:23 +0000
Subject: [PATCH 584/877] snes9x-gtk: fix build

---
 pkgs/misc/emulators/snes9x-gtk/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index f2d3abc0de3..6be60526eb6 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
 
-  sourceRoot = "snes9x-${version}-src";
   preAutoreconf = "cd gtk; intltoolize";  
     
   buildInputs = [ SDL zlib gtk2 libxml2 libXv ];
-- 
GitLab


From 74260a4922e678348eac91f4aa5767a3f5a039a4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 2 Nov 2017 19:15:47 +0100
Subject: [PATCH 585/877] vim: 8.0.1150 -> 8.0.1245

This update contains a lot of fixes that are too much to be summarized
here, so here is the upstream changelog (basically "git log"):

https://github.com/vim/vim/commits/v8.0.1250

The main reason for this bump is that I got annoyed by a bug that was
fixed in upstream version 8.0.1194, which caused a race condition during
vim startup when it's trying to retrieve background colors from the
terminal.

Sometimes it could happen that random commands are executed at Vim
startup (typically pasting the "" buffer) and after bisecting I've found
out that version 8.0.1194 indeed fixed this problem.

The reason why I'm updating to version 8.0.1250 is that when looking
through the Git log it contains a whole lot of fixes but no new
features, so I'd assume it's safe to upgrade.

I've tested all packages that depend on Vim and they still succeed
building. In addition to that I've used the new version for a couple of
hours without any issue.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @lovek323, @LnL7, @vaibhavsagar
---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 18e1df4575d..1b1751e9b1d 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.0.1150";
+  version = "8.0.1245";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "1k1qkmb2jbymqikrp99q1yjagdf508xzabrw7b08dlh926b2v23j";
+    sha256 = "10nh8b2jgfbq4xvha0d2qashvdyqzvq96w8k6rl6793d8y7f3z8s";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 16c69270ae96fadd6a1f39f3ef91fdc535ea03bd Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 3 Nov 2017 14:36:15 +0000
Subject: [PATCH 586/877] reaverwps-t6x: fix build

---
 pkgs/tools/networking/reaver-wps-t6x/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix
index 6e4a5561f07..2f0e19b231c 100644
--- a/pkgs/tools/networking/reaver-wps-t6x/default.nix
+++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ libpcap sqlite pixiewps ];
 
-  sourceRoot = "reaver-wps-fork-t6x-v${version}-src/src";
+  setSourceRoot = ''
+    sourceRoot=$(echo */src)
+  '';
 
   configureFlags = "--sysconfdir=${confdir}";
 
-- 
GitLab


From cc95949080a1a3ef8c1488db28bb1b28939f7c7e Mon Sep 17 00:00:00 2001
From: Yellow Ghost <ylwghst@onionmail.info>
Date: Fri, 3 Nov 2017 15:38:33 +0100
Subject: [PATCH 587/877] abiword: 3.0.1 -> 3.0.2

---
 pkgs/applications/office/abiword/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 18ece7a7401..ca7847430d6 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -5,15 +5,19 @@
 
 stdenv.mkDerivation rec {
   name = "abiword-${version}";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchurl {
-    url = "http://www.abisource.org/downloads/abiword/${version}/source/${name}.tar.gz";
-    sha256 = "1ik591rx15nn3n1297cwykl8wvrlgj78i528id9wbidgy3xzd570";
+    url = "http://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
+    sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
   };
 
   enableParallelBuilding = true;
 
+  patches = [
+  (fetchurl { url = https://gist.githubusercontent.com/ylwghst/f65fef2a751e81af57e2d64d40128247/raw/; sha256 = "1ni2sc7jhqafwkkjdwchdx56fv7rp91grxblravp2kymrf9j1add"; })
+  ];
+
   buildInputs =
     [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
       libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme
@@ -29,6 +33,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.abisource.com/;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with maintainers; [ pSub ylwghst ];
   };
 }
-- 
GitLab


From 5a539f5eb55bf35cea6ea39acd74ff89fa96459f Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 3 Nov 2017 14:43:11 +0000
Subject: [PATCH 588/877] curl-unix-socket: fix build

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

diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix
index 985cb0c3015..d145e1e12c3 100644
--- a/pkgs/tools/networking/curl-unix-socket/default.nix
+++ b/pkgs/tools/networking/curl-unix-socket/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ go ];
-  buildPhase = "go build";
-  installPhase = "install -D curl-unix-socket* $out/bin/curl-unix-socket";
+  buildPhase = "go build -o curl-unix-socket";
+  installPhase = "install -D curl-unix-socket $out/bin/curl-unix-socket";
 
   meta = with stdenv.lib; {
     description = "Run HTTP requests over UNIX socket";
-- 
GitLab


From c67a6482a3b717e6091b9b8f1d93367d97693d65 Mon Sep 17 00:00:00 2001
From: Jonathan Curran <jonathan.curran@rstudio.com>
Date: Fri, 3 Nov 2017 09:23:01 -0600
Subject: [PATCH 589/877] Fix nix-shell command example in python docs

The nix-shell command here is incorrect AFAICT.  `-i` is supposed to specify the interpreter and `-p` specifies the packages.
---
 doc/languages-frameworks/python.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 7bdbbbd903a..0ff7c4ba77e 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -165,7 +165,7 @@ run the script in the `python3` shell.
 
 ```py
 #! /usr/bin/env nix-shell
-#! nix-shell -i 'python3.withPackages(ps: [ps.numpy])'
+#! nix-shell -i python3 -p 'python3.withPackages(ps: [ps.numpy])'
 
 import numpy
 
-- 
GitLab


From 100583c7c8ce05515d41d4495f38211e24dbb38f Mon Sep 17 00:00:00 2001
From: Yellow Ghost <ylwghst@onionmail.info>
Date: Fri, 3 Nov 2017 17:45:23 +0100
Subject: [PATCH 590/877] abiword: 3.0.1 -> 3.0.2

---
 pkgs/applications/office/abiword/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index ca7847430d6..6483702e822 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches = [
-  (fetchurl { url = https://gist.githubusercontent.com/ylwghst/f65fef2a751e81af57e2d64d40128247/raw/; sha256 = "1ni2sc7jhqafwkkjdwchdx56fv7rp91grxblravp2kymrf9j1add"; })
+    (fetchurl { url = https://gist.github.com/ylwghst/b28ef051980f41aca56df7a8affd9526/raw/; sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al"; })
   ];
 
   buildInputs =
-- 
GitLab


From 5c4352fa2df3eac3f3e99cedc0ce8b478c28855e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 3 Nov 2017 18:49:15 +0100
Subject: [PATCH 591/877] Python docs: fix quotes PR #31197

---
 doc/languages-frameworks/python.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 0ff7c4ba77e..cf81b240cea 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -165,7 +165,7 @@ run the script in the `python3` shell.
 
 ```py
 #! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p 'python3.withPackages(ps: [ps.numpy])'
+#! nix-shell -i python3 -p "python3.withPackages(ps: [ps.numpy])"
 
 import numpy
 
-- 
GitLab


From 194d7852f70bfeb73dd598cf98ebf6e90f019f39 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 3 Nov 2017 21:00:46 +0300
Subject: [PATCH 592/877] sway module: setcap binary, not wrapper

---
 nixos/modules/programs/sway.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index 2934fba96dd..9070722c770 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -10,7 +10,7 @@ let
     #! ${pkgs.stdenv.shell}
     ${cfg.extraSessionCommands}
     PATH="${sway}/bin:$PATH"
-    exec ${pkgs.dbus.dbus-launch} --exit-with-session "${sway}/bin/sway"
+    exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
   '';
   swayJoined = pkgs.symlinkJoin {
     name = "sway-wrapped";
@@ -53,7 +53,8 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
     security.wrappers.sway = {
-      source = "${swayJoined}/bin/sway";
+      program = "sway-setcap";
+      source = "${sway}/bin/sway";
       capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip";
       owner = "root";
       group = "sway";
-- 
GitLab


From a9a26d98d0172e53af71d9fc9b6ee59eb772cec0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 3 Nov 2017 14:26:26 -0400
Subject: [PATCH 593/877] hipchat: 4.29.4.1662 -> 4.30.0.1663

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

diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index 326f9563070..4e116e685c6 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -4,7 +4,7 @@
 
 let
 
-  version = "4.29.4.1662";
+  version = "4.30.0.1663";
 
   rpath = stdenv.lib.makeLibraryPath [
     xdg_utils
@@ -44,7 +44,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
-        sha256 = "1cz9zv9aj8xdrjs6dgi7fpm4q9l9find4m8l0nmvac2s4r60vw6y";
+        sha256 = "13mh49nx75pvaygzi70sg96iad3mn9ym0p4p3ja46amkxbdkq7h7";
       }
     else
       throw "HipChat is not supported on ${stdenv.system}";
-- 
GitLab


From 600f393bc7e9c55394dea6edba98397342aa5e2f Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 3 Nov 2017 14:41:06 -0400
Subject: [PATCH 594/877] keybase service: Turn off debug logging

Keybase is _extremely_ verbose with its debug output when run with -d.
---
 nixos/modules/services/networking/keybase.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/keybase.nix b/nixos/modules/services/networking/keybase.nix
index 7c7982ee8ea..a149f16a84c 100644
--- a/nixos/modules/services/networking/keybase.nix
+++ b/nixos/modules/services/networking/keybase.nix
@@ -28,7 +28,7 @@ in {
       description = "Keybase service";
       serviceConfig = {
         ExecStart = ''
-          ${pkgs.keybase}/bin/keybase -d service --auto-forked
+          ${pkgs.keybase}/bin/keybase service --auto-forked
         '';
         Restart = "on-failure";
         PrivateTmp = true;
-- 
GitLab


From 525380b472697bd6488200f6757bafe4731ababc Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Fri, 27 Oct 2017 01:44:19 +0200
Subject: [PATCH 595/877] treewide: abandon Google Code homepages

---
 pkgs/applications/misc/quicksynergy/default.nix        |  2 +-
 .../applications/networking/browsers/arora/default.nix |  4 ++--
 .../applications/version-management/gource/default.nix |  2 +-
 pkgs/applications/window-managers/wmii-hg/default.nix  |  2 +-
 pkgs/development/compilers/gwt/2.4.0.nix               |  7 ++++---
 pkgs/development/compilers/teyjus/default.nix          |  4 ++--
 pkgs/development/libraries/bullet/default.nix          |  2 +-
 pkgs/development/libraries/garmintools/default.nix     |  4 ++--
 pkgs/development/libraries/glog/default.nix            |  4 ++--
 pkgs/development/libraries/gperftools/default.nix      |  2 +-
 pkgs/development/libraries/gtest/default.nix           |  2 +-
 .../development/libraries/java/junixsocket/default.nix |  4 ++--
 pkgs/development/libraries/leveldb/default.nix         |  2 +-
 pkgs/development/libraries/libcredis/default.nix       |  4 ++--
 pkgs/development/libraries/libctemplate/default.nix    |  4 ++--
 pkgs/development/libraries/libdivsufsort/default.nix   |  6 +++---
 pkgs/development/libraries/libdnet/default.nix         |  6 +++---
 pkgs/development/libraries/libfreefare/default.nix     |  6 +++---
 pkgs/development/libraries/libhangul/default.nix       |  4 ++--
 pkgs/development/libraries/libixp-hg/default.nix       |  2 +-
 pkgs/development/libraries/libkate/default.nix         |  4 ++--
 pkgs/development/libraries/libnfc/default.nix          |  2 +-
 pkgs/development/libraries/libofa/default.nix          |  4 ++--
 pkgs/development/libraries/libtiger/default.nix        |  4 ++--
 pkgs/development/libraries/marisa/default.nix          |  2 +-
 pkgs/development/libraries/mdds/0.12.1.nix             |  2 +-
 pkgs/development/libraries/mdds/0.7.1.nix              |  4 ++--
 pkgs/development/libraries/mp4v2/default.nix           |  3 ++-
 pkgs/development/libraries/npapi-sdk/default.nix       |  2 +-
 pkgs/development/libraries/ogrepaged/default.nix       |  2 +-
 .../libraries/qtscriptgenerator/default.nix            |  6 +++---
 pkgs/development/libraries/snappy/default.nix          |  4 ++--
 pkgs/development/libraries/sparsehash/default.nix      |  2 +-
 pkgs/development/ocaml-modules/bitstring/default.nix   |  2 +-
 pkgs/development/tools/misc/gtkdialog/default.nix      |  5 +++--
 pkgs/development/tools/misc/stm32flash/default.nix     |  4 ++--
 pkgs/development/tools/selenium/server/default.nix     |  2 +-
 pkgs/misc/emulators/wine/winetricks.nix                |  2 +-
 pkgs/os-specific/linux/ftop/default.nix                |  4 ++--
 pkgs/os-specific/linux/i7z/default.nix                 |  4 ++--
 pkgs/os-specific/linux/jujuutils/default.nix           |  4 ++--
 pkgs/servers/http/apache-modules/mod_wsgi/default.nix  |  2 +-
 pkgs/servers/kippo/default.nix                         | 10 +++++-----
 pkgs/servers/shellinabox/default.nix                   |  2 +-
 pkgs/tools/compression/lz4/default.nix                 |  2 +-
 pkgs/tools/filesystems/mtpfs/default.nix               |  2 +-
 pkgs/tools/filesystems/s3backer/default.nix            |  2 +-
 pkgs/tools/graphics/logstalgia/default.nix             |  2 +-
 .../inputmethods/fcitx-engines/fcitx-mozc/default.nix  |  6 +++---
 .../inputmethods/ibus-engines/ibus-mozc/default.nix    |  2 +-
 pkgs/tools/inputmethods/nabi/default.nix               |  4 ++--
 pkgs/tools/inputmethods/touchegg/default.nix           |  4 ++--
 pkgs/tools/inputmethods/uim/default.nix                |  4 ++--
 pkgs/tools/networking/pdsh/default.nix                 |  4 ++--
 pkgs/tools/networking/reaver-wps/default.nix           |  2 +-
 pkgs/tools/networking/slimrat/default.nix              |  5 +++--
 pkgs/tools/networking/udptunnel/default.nix            |  6 +++---
 pkgs/tools/package-management/opkg/default.nix         |  2 +-
 pkgs/tools/security/mfcuk/default.nix                  |  4 ++--
 pkgs/tools/security/mfoc/default.nix                   |  4 ++--
 pkgs/tools/security/omapd/default.nix                  |  4 ++--
 pkgs/tools/security/tmin/default.nix                   |  8 ++++++--
 pkgs/tools/security/tor/torsocks.nix                   |  2 +-
 pkgs/top-level/perl-packages.nix                       |  2 +-
 pkgs/top-level/python-packages.nix                     |  2 +-
 65 files changed, 118 insertions(+), 110 deletions(-)

diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix
index f7722053401..b2616bf7b77 100644
--- a/pkgs/applications/misc/quicksynergy/default.nix
+++ b/pkgs/applications/misc/quicksynergy/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
       Remember to open port 24800 (used by synergys program) if you want to
       host mouse and keyboard.";
-    homepage = https://code.google.com/p/quicksynergy/;
+    homepage = https://sourceforge.net/projects/quicksynergy/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.spinus ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix
index 8bcefe4fe7b..da042c77c40 100644
--- a/pkgs/applications/networking/browsers/arora/default.nix
+++ b/pkgs/applications/networking/browsers/arora/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.11.0";
 
   src = fetchurl {
-    url = "http://arora.googlecode.com/files/${name}.tar.gz";
+    url = "https://github.com/Arora/arora/archive/${version}.tar.gz";
     sha256 = "1ffkranxi93lrg5r7a90pix9j8xqmf0z1mb1m8579v9m34cyypvg";
   };
 
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     platforms = qt4.meta.platforms;
     maintainers = [ maintainers.phreedom ];
     description = "A cross-platform Qt4 Webkit browser";
-    homepage = http://arora.googlecode.com;
+    homepage = https://github.com/Arora/arora;
   };
 }
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index d0bea6d426d..25a85f4b92d 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
                        "-std=c++11"; # fix build with glm >= 0.9.6.0
 
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/gource/;
+    homepage = http://gource.io/;
     description = "A Software version control visualization tool";
     license = licenses.gpl3Plus;
     longDescription = ''
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
index 88c312bd265..5a8b68df364 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   makeFlags = "WMII_HGVERSION=hg${rev}";
 
   meta = {
-    homepage = https://code.google.com/archive/p/wmii/;
+    homepage = https://suckless.org/; # https://wmii.suckless.org/ does not exist anymore
     description = "A small window manager controlled by a 9P filesystem";
     maintainers = with stdenv.lib.maintainers; [ kovirobi ];
     license = stdenv.lib.licenses.mit;
diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix
index 4705c327b42..f15e1060203 100644
--- a/pkgs/development/compilers/gwt/2.4.0.nix
+++ b/pkgs/development/compilers/gwt/2.4.0.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "gwt-java-2.4.0";
 
   src = fetchurl {
-    url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip;
-    sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-web-toolkit/gwt-2.4.0.zip";
+    sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17";
   };
 
   buildInputs = [ unzip ];
@@ -17,8 +17,9 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://code.google.com/webtoolkit/;
+    homepage = http://www.gwtproject.org/;
     description = "A development toolkit for building and optimizing complex browser-based applications";
+    license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix
index 301915b7a26..222a22bf1cd 100644
--- a/pkgs/development/compilers/teyjus/default.nix
+++ b/pkgs/development/compilers/teyjus/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "teyjus-2.0b2";
 
   src = fetchurl {
-    url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/teyjus/teyjus-source-2.0-b2.tar.gz";
     sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "An efficient implementation of the Lambda Prolog language";
-    homepage = https://code.google.com/p/teyjus/;
+    homepage = https://github.com/teyjus/teyjus;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ maintainers.bcdarwin ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index 0c9f0903f14..e7b50090537 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       Bullet 3D Game Multiphysics Library provides state of the art collision
       detection, soft body and rigid body dynamics.
     '';
-    homepage = http://code.google.com/p/bullet/;
+    homepage = http://bulletphysics.org;
     license = stdenv.lib.licenses.zlib;
     maintainers = with stdenv.lib.maintainers; [ aforemny ];
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix
index f1df8c5ff7f..c1f9c6ad013 100644
--- a/pkgs/development/libraries/garmintools/default.nix
+++ b/pkgs/development/libraries/garmintools/default.nix
@@ -2,12 +2,12 @@
 stdenv.mkDerivation {
   name = "garmintools-0.10";
   src = fetchurl {
-    url = https://garmintools.googlecode.com/files/garmintools-0.10.tar.gz;
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/garmintools-0.10.tar.gz";
     sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz";
   };
   buildInputs = [ libusb ];
   meta = {
-    homepage = https://code.google.com/p/garmintools;
+    homepage = https://code.google.com/archive/p/garmintools/; # community clone at https://github.com/ianmartin/garmintools
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.ocharles ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
index c663c4e68a7..10ef1bbd920 100644
--- a/pkgs/development/libraries/glog/default.nix
+++ b/pkgs/development/libraries/glog/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "glog-${version}";
   version = "0.3.4";
-  
+
   src = fetchFromGitHub {
     owner = "Google";
     repo = "glog";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/google-glog/;
+    homepage = https://github.com/google/glog;
     license = licenses.bsd3;
     description = "Library for application-level logging";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index e6d1fd3b640..5c863cf26cb 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://code.google.com/p/gperftools/;
+    homepage = https://github.com/gperftools/gperftools;
     description = "Fast, multi-threaded malloc() and nifty performance analysis tools";
     platforms = with platforms; linux ++ darwin;
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index 84b1fa9757c..f5fc635a5a4 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Google's framework for writing C++ tests";
-    homepage = https://code.google.com/p/googletest/;
+    homepage = https://github.com/google/googletest;
     license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ zoomulator ivan-tkatchev ];
diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix
index 317ba601cfb..bc34957b9c3 100644
--- a/pkgs/development/libraries/java/junixsocket/default.nix
+++ b/pkgs/development/libraries/java/junixsocket/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "junixsocket-1.3";
 
   src = fetchurl {
-    url = "http://junixsocket.googlecode.com/files/${name}-src.tar.bz2";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/junixsocket/${name}-src.tar.bz2";
     sha256 = "0c6p8vmiv5nk8i6g1hgivnl3mpb2k3lhjjz0ss9dlirisfrxf1ym";
   };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A Java/JNI library for using Unix Domain Sockets from Java";
-    homepage = https://code.google.com/p/junixsocket/;
+    homepage = https://github.com/kohlschutter/junixsocket;
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 0057611ed0f..2a109e0366f 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ";
 
   meta = with stdenv.lib; {
-    homepage = https://code.google.com/p/leveldb/;
+    homepage = https://github.com/google/leveldb;
     description = "Fast and lightweight key/value database library by Google";
     license = licenses.bsd3;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix
index 036c918b32d..10a4c276ebd 100644
--- a/pkgs/development/libraries/libcredis/default.nix
+++ b/pkgs/development/libraries/libcredis/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libcredis-0.2.3";
 
   src = fetchurl {
-    url = "https://credis.googlecode.com/files/credis-0.2.3.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/credis/credis-0.2.3.tar.gz";
     sha256 = "1l3hlw9rrc11qggbg9a2303p3bhxxx2vqkmlk8avsrbqw15r1ayr";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C client library for Redis (key-value database)";
-    homepage = https://code.google.com/p/credis/;
+    homepage = https://code.google.com/archive/p/credis/;
     license = licenses.bsd3; # from homepage
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix
index cdaeb4969ae..94dc733a69b 100644
--- a/pkgs/development/libraries/libctemplate/default.nix
+++ b/pkgs/development/libraries/libctemplate/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       emphasizes separating logic from presentation: it is impossible to
       embed application logic in this template language.
     '';
-    homepage = http://code.google.com/p/google-ctemplate/;
-    license = "bsd";
+    homepage = https://github.com/OlafvdSpek/ctemplate;
+    license = stdenv.lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix
index d171f57eb1b..01ac56e885d 100644
--- a/pkgs/development/libraries/libdivsufsort/default.nix
+++ b/pkgs/development/libraries/libdivsufsort/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation {
   name = "libdivsufsort-2.0.1";
-  
+
   src = fetchurl {
-    url = http://libdivsufsort.googlecode.com/files/libdivsufsort-2.0.1.tar.bz2;
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdivsufsort/libdivsufsort-2.0.1.tar.bz2";
     sha256 = "1g0q40vb2k689bpasa914yi8sjsmih04017mw20zaqqpxa32rh2m";
   };
 
   meta = {
-    homepage = http://code.google.com/p/libdivsufsort/;
+    homepage = https://github.com/y-256/libdivsufsort;
     license = stdenv.lib.licenses.mit;
     description = "Library to construct the suffix array and the BW transformed string";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix
index dbda4107c48..46e264b59ca 100644
--- a/pkgs/development/libraries/libdnet/default.nix
+++ b/pkgs/development/libraries/libdnet/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = http://libdnet.googlecode.com/files/libdnet-1.12.tgz;
-    sha1 = "71302be302e84fc19b559e811951b5d600d976f8";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdnet/libdnet-1.12.tgz";
+    sha256 = "09mhbr8x66ykhf5581a5zjpplpjxibqzgkkpx689kybwg0wk1cw3";
   };
 
   buildInputs = [ automake autoconf libtool ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Provides a simplified, portable interface to several low-level networking routines";
-    homepage = http://code.google.com/p/libdnet/;
+    homepage = https://github.com/dugsong/libdnet;
     license = stdenv.lib.licenses.bsd3;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix
index 2e8fad3db82..cfae74b4b9e 100644
--- a/pkgs/development/libraries/libfreefare/default.nix
+++ b/pkgs/development/libraries/libfreefare/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.4.0";
 
   src = fetchurl {
-    url = "https://libfreefare.googlecode.com/files/libfreefare-0.4.0.tar.bz2";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libfreefare/libfreefare-0.4.0.tar.bz2";
     sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz";
   };
 
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations";
-    license = licenses.gpl3;
-    homepage = http://code.google.com/p/libfreefare/;
+    license = licenses.lgpl3;
+    homepage = https://github.com/nfc-tools/libfreefare;
     maintainers = with maintainers; [bobvanderlinden];
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix
index 79fc973731a..9e72d933433 100644
--- a/pkgs/development/libraries/libhangul/default.nix
+++ b/pkgs/development/libraries/libhangul/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation {
   name = "libhangul-0.1.0";
 
   src = fetchurl {
-    url = "https://libhangul.googlecode.com/files/libhangul-0.1.0.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-0.1.0.tar.gz";
     sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar";
   };
 
   meta = with stdenv.lib; {
     description = "Core algorithm library for Korean input routines";
-    homepage = https://code.google.com/p/libhangul;
+    homepage = https://github.com/choehwanjin/libhangul;
     license = licenses.lgpl21;
     maintainers = [ maintainers.ianwookim ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix
index 6245a810c1d..68835c1414c 100644
--- a/pkgs/development/libraries/libixp-hg/default.nix
+++ b/pkgs/development/libraries/libixp-hg/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip txt2tags ];
 
   meta = {
-    homepage = https://code.google.com/archive/p/libixp/;
+    homepage = http://repo.cat-v.org/libixp/; # see also https://libs.suckless.org/deprecated/libixp
     description = "Portable, simple C-language 9P client and server libary";
     maintainers = with stdenv.lib.maintainers; [ kovirobi ];
     license = stdenv.lib.licenses.mit;
diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix
index 7a3eb9caa66..77f047b4c58 100644
--- a/pkgs/development/libraries/libkate/default.nix
+++ b/pkgs/development/libraries/libkate/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libkate-0.3.8";
 
   src = fetchurl {
-    url = "http://libkate.googlecode.com/files/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${name}.tar.gz";
     sha256 = "00d6561g31la9bb8q99b7l4rvi67yiwm50ky8dhlsjd88h7rks2n";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       bitstream format. Kate is a karaoke and text codec meant for encapsulation
       in an Ogg container. It can carry Unicode text, images, and animate
       them.'';
-    homepage = http://code.google.com/p/libkate;
+    homepage = https://code.google.com/archive/p/libkate/;
     maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix
index 150ece2a627..bef977caa28 100644
--- a/pkgs/development/libraries/libnfc/default.nix
+++ b/pkgs/development/libraries/libnfc/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Open source library libnfc for Near Field Communication";
     license = licenses.gpl3;
-    homepage = http://code.google.com/p/libnfc/;
+    homepage = https://github.com/nfc-tools/libnfc;
     maintainers = with maintainers; [offline];
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index dc0beb07db9..531e30ba755 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "libofa-${version}";
 
   src = fetchurl {
-    url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${name}.tar.gz";
     sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2";
   };
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ expat curl fftw ];
 
   meta = {
-    homepage = http://code.google.com/musicip-libofa/;
+    homepage = https://code.google.com/archive/p/musicip-libofa/;
     description = "Library Open Fingerprint Architecture";
     longDescription = ''
       LibOFA (Library Open Fingerprint Architecture) is an open-source audio
diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix
index 3a67e1267e2..aa5de3f2a5f 100644
--- a/pkgs/development/libraries/libtiger/default.nix
+++ b/pkgs/development/libraries/libtiger/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libtiger-0.3.4";
 
   src = fetchurl {
-    url = "http://libtiger.googlecode.com/files/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libtiger/${name}.tar.gz";
     sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk";
   };
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libkate pango cairo ];
 
   meta = {
-    homepage = http://code.google.com/p/libtiger/;
+    homepage = https://code.google.com/archive/p/libtiger/;
     description = "A rendering library for Kate streams using Pango and Cairo";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix
index 5f050c6e7a7..ed824ec7592 100644
--- a/pkgs/development/libraries/marisa/default.nix
+++ b/pkgs/development/libraries/marisa/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage    = https://code.google.com/p/marisa-trie/;
+    homepage    = https://github.com/s-yata/marisa-trie;
     description = "Static and space-efficient trie data structure library";
     license     = licenses.bsd3;
     maintainers = with maintainers; [ sifmelcara ];
diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix
index 3c3a874c8ad..1c6134d0480 100644
--- a/pkgs/development/libraries/mdds/0.12.1.nix
+++ b/pkgs/development/libraries/mdds/0.12.1.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = https://code.google.com/p/multidimalgorithm/;
+    homepage = https://gitlab.com/mdds/mdds;
     description = "A collection of multi-dimensional data structure and indexing algorithm";
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix
index 9c6c8e5e334..8ff1d6d5e9a 100644
--- a/pkgs/development/libraries/mdds/0.7.1.nix
+++ b/pkgs/development/libraries/mdds/0.7.1.nix
@@ -5,12 +5,12 @@ stdenv.mkDerivation rec {
   name = "mdds-${version}";
 
   src = fetchurl {
-    url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/multidimalgorithm/mdds_${version}.tar.bz2";
     sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
   };
 
   meta = {
-    homepage = https://code.google.com/p/multidimalgorithm/;
+    homepage = https://gitlab.com/mdds/mdds/;
     description = "A collection of multi-dimensional data structure and indexing algorithm";
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
index 741ca96348d..de8e5f78646 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = {
-    homepage = http://code.google.com/p/mp4v2;
+    homepage = https://code.google.com/archive/p/mp4v2/;
     maintainers = [ ];
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.mpl11;
   };
 }
diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix
index c2799d039cc..43732406064 100644
--- a/pkgs/development/libraries/npapi-sdk/default.nix
+++ b/pkgs/development/libraries/npapi-sdk/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A bundle of NPAPI headers by Mozilla";
 
-    homepage = https://code.google.com/p/npapi-sdk/;
+    homepage = https://bitbucket.org/mgorny/npapi-sdk; # see also https://github.com/mozilla/npapi-sdk
     license = licenses.bsd3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix
index d42677254e3..2408c3e4904 100644
--- a/pkgs/development/libraries/ogrepaged/default.nix
+++ b/pkgs/development/libraries/ogrepaged/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Paged Geometry for Ogre3D";
-    homepage = http://code.google.com/p/ogre-paged/;
+    homepage = https://github.com/RigsOfRods/ogre-paged;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
index 103b495f8e2..a4c51cb2d75 100644
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "qtscriptgenerator-0.1.0";
   src = fetchurl {
-    url = http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-0.1.0.tar.gz;
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/qtscriptgenerator/qtscriptgenerator-src-0.1.0.tar.gz";
     sha256 = "0h8zjh38n2wfz7jld0jz6a09y66dbsd2jhm4f2024qfgcmxcabj6";
   };
   buildInputs = [ qt4 ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     cd generator
     qmake
     make
-    # Set QTDIR, see http://code.google.com/p/qtscriptgenerator/issues/detail?id=38
+    # Set QTDIR, see https://code.google.com/archive/p/qtscriptgenerator/issues/38
     QTDIR=${qt4} ./generator
     cd ../qtbindings
     qmake
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "QtScript bindings generator";
-    homepage = http://code.google.com/p/qtscriptgenerator/;
+    homepage = https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/;
     inherit (qt4.meta) platforms;
     maintainers = [ ];
   };
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index a31fa1f0516..c5e52124cee 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "snappy-${version}";
   version = "1.1.4";
-  
+
   src = fetchurl {
     url = "http://github.com/google/snappy/releases/download/${version}/"
         + "snappy-${version}.tar.gz";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   doCheck = !stdenv.isDarwin;
 
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/snappy/;
+    homepage = https://google.github.io/snappy/;
     license = licenses.bsd3;
     description = "Compression/decompression library for very high speeds";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix
index 15b84363e02..f898152d820 100644
--- a/pkgs/development/libraries/sparsehash/default.nix
+++ b/pkgs/development/libraries/sparsehash/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/sparsehash/;
+    homepage = https://github.com/sparsehash/sparsehash;
     description = "An extremely memory-efficient hash_map implementation";
     platforms = platforms.all;
     license = licenses.bsd3;
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index d6909efe4a6..7e9ba518251 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -20,7 +20,7 @@ buildOcaml rec {
 
   meta = with stdenv.lib; {
     description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";
-    homepage = http://code.google.com/p/bitstring/;
+    homepage = https://github.com/xguerin/bitstring;
     license = licenses.lgpl21Plus;
     maintainers = [ maintainers.maurer ];
   };
diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix
index 71e9ee27a9e..50f451ebae2 100644
--- a/pkgs/development/tools/misc/gtkdialog/default.nix
+++ b/pkgs/development/tools/misc/gtkdialog/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gtkdialog-0.8.3";
 
   src = fetchurl {
-    url = http://gtkdialog.googlecode.com/files/gtkdialog-0.8.3.tar.gz;
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gtkdialog/gtkdialog-0.8.3.tar.gz";
     sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e";
   };
 
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
   buildInputs = [ gtk2 hicolor_icon_theme ];
 
   meta = {
-    homepage = http://gtkdialog.googlecode.com/;
+    homepage = https://code.google.com/archive/p/gtkdialog/;
+    # community links: http://murga-linux.com/puppy/viewtopic.php?t=111923 -> https://github.com/01micko/gtkdialog
     description = "Small utility for fast and easy GUI building from many scripted and compiled languages";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix
index f20343156e3..f81b327d842 100644
--- a/pkgs/development/tools/misc/stm32flash/default.nix
+++ b/pkgs/development/tools/misc/stm32flash/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "stm32flash-1.0";
 
   src = fetchurl {
-    url = https://stm32flash.googlecode.com/files/stm32flash.tar.gz;
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/stm32flash/stm32flash.tar.gz";
     sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6";
   };
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Open source flash program for the STM32 ARM processors using the ST bootloader";
-    homepage = https://code.google.com/p/stm32flash/;
+    homepage = https://sourceforge.net/projects/stm32flash/;
     license = stdenv.lib.licenses.gpl2;
     platforms = platforms.all; # Should work on all platforms
     maintainers = [ maintainers.the-kenny ];
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index 4d506c900ec..3b1e8c2c8a7 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://code.google.com/p/selenium;
+    homepage = http://www.seleniumhq.org/;
     description = "Selenium Server for remote WebDriver";
     maintainers = with maintainers; [ coconnor offline ];
     platforms = platforms.all;
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix
index 357d65aed53..f5f8d6a5f10 100644
--- a/pkgs/misc/emulators/wine/winetricks.nix
+++ b/pkgs/misc/emulators/wine/winetricks.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A script to install DLLs needed to work around problems in Wine";
     license = stdenv.lib.licenses.lgpl21;
-    homepage = http://code.google.com/p/winetricks/;
+    homepage = https://github.com/Winetricks/winetricks;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix
index 1ca7d43b6a7..73a6d18fc8b 100644
--- a/pkgs/os-specific/linux/ftop/default.nix
+++ b/pkgs/os-specific/linux/ftop/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0";
 
   src = fetchurl {
-    url = "http://ftop.googlecode.com/files/${name}.tar.bz2";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${name}.tar.bz2";
     sha256 = "3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Show progress of open files and file systems";
-    homepage = https://code.google.com/p/ftop/;
+    homepage = https://code.google.com/archive/p/ftop/;
     license = licenses.gpl3Plus;
     longDescription = ''
       ftop is to files what top is to processes. The progress of all open files
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index dcbf3232e94..6d0c5ae82bc 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "i7z-0.27.2";
 
   src = fetchurl {
-    url = "http://i7z.googlecode.com/files/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/i7z/${name}.tar.gz";
     sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7";
   };
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A better i7 (and now i3, i5) reporting tool for Linux";
-    homepage = http://code.google.com/p/i7z;
+    homepage = https://github.com/ajaiantilal/i7z;
     repositories.git = https://github.com/ajaiantilal/i7z.git;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix
index 8e9f29306e7..617dad8bddd 100644
--- a/pkgs/os-specific/linux/jujuutils/default.nix
+++ b/pkgs/os-specific/linux/jujuutils/default.nix
@@ -4,14 +4,14 @@ stdenv.mkDerivation {
   name = "jujuutils-0.2";
 
   src = fetchurl {
-    url = "http://jujuutils.googlecode.com/files/jujuutils-0.2.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-0.2.tar.gz";
     sha256 = "1r74m7s7rs9d6y7cffi7mdap3jf96qwm1v6jcw53x5cikgmfxn4x";
   };
 
   buildInputs = [ linuxHeaders ];
 
   meta = {
-    homepage = http://code.google.com/p/jujuutils/;
+    homepage = https://github.com/cladisch/linux-firewire-utils;
     description = "Utilities around FireWire devices connected to a Linux computer";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 1d8507fc4eb..1e898075d19 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://code.google.com/p/modwsgi/;
+    homepage = https://github.com/GrahamDumpleton/mod_wsgi;
     description = "Host Python applications in Apache through the WSGI interface";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix
index 2e2923e17c3..55440143870 100644
--- a/pkgs/servers/kippo/default.nix
+++ b/pkgs/servers/kippo/default.nix
@@ -63,8 +63,8 @@ in stdenv.mkDerivation rec {
     name = "kippo-${version}";
     version = "0.8";
     src = fetchurl {
-      url = "https://kippo.googlecode.com/files/kippo-${version}.tar.gz";
-      sha1 = "f57a5cf88171cb005afe44a4b33cb16f825c33d6";
+      url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${name}.tar.gz";
+      sha256 = "0rd2mk36d02qd24z8s4xyy64fy54rzpar4379iq4dcjwg7l7f63d";
     };
     buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ];
     installPhase = ''
@@ -76,17 +76,17 @@ in stdenv.mkDerivation rec {
             --replace "data_path = data" "data_path = /var/lib/kippo/data" \
             --replace "txtcmds_path = txtcmds" "txtcmds_path = /var/lib/kippo/txtcmds" \
             --replace "public_key = public.key" "public_key = /var/lib/kippo/keys/public.key" \
-            --replace "private_key = private.key" "private_key = /var/lib/kippo/keys/private.key" 
+            --replace "private_key = private.key" "private_key = /var/lib/kippo/keys/private.key"
         mkdir -p $out/bin
         mkdir -p $out/src
-        mv ./* $out/src 
+        mv ./* $out/src
         mv $out/src/utils/* $out/bin
         '';
 
     passthru.twisted = twisted_13;
 
     meta = with stdenv.lib; {
-      homepage = https://code.google.com/p/kippo;
+      homepage = https://github.com/desaster/kippo;
       description = "SSH Honeypot";
       longDescription = ''
         Default port is 2222. Recommend using something like this for port redirection to default SSH port:
diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index 2a36e1f67a2..70bf5c32b3d 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://code.google.com/p/shellinabox;
+    homepage = https://github.com/shellinabox/shellinabox;
     description = "Web based AJAX terminal emulator";
     license = licenses.gpl2;
     maintainers = with maintainers; [ tomberek lihop ];
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 4b2f0276d78..bc8666a2690 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       multiple GB/s per core, typically reaching RAM speed limits on
       multi-core systems.
     '';
-    homepage = https://code.google.com/p/lz4/;
+    homepage = https://lz4.github.io/lz4/;
     license = with licenses; [ bsd2 gpl2Plus ];
     platforms = platforms.unix;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix
index 6d2b073d869..ac1a7c1c148 100644
--- a/pkgs/tools/filesystems/mtpfs/default.nix
+++ b/pkgs/tools/filesystems/mtpfs/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = https://code.google.com/p/mtpfs/;
+    homepage = https://github.com/cjd/mtpfs;
     description = "FUSE Filesystem providing access to MTP devices";
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.qknight ];
diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix
index cc31a668059..b39be214d89 100644
--- a/pkgs/tools/filesystems/s3backer/default.nix
+++ b/pkgs/tools/filesystems/s3backer/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/s3backer/;
+    homepage = https://github.com/archiecobbs/s3backer;
     description = "FUSE-based single file backing store via Amazon S3";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index abebc0fc4ca..2f18857b2a1 100644
--- a/pkgs/tools/graphics/logstalgia/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
                   glm freetype ];
 
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/logstalgia;
+    homepage = http://logstalgia.io/;
     description = "Website traffic visualization tool";
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
index 596b3ce1565..170ac4c6a26 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
@@ -33,7 +33,7 @@ in clangStdenv.mkDerivation rec {
   '';
 
   patch_version = "2.18.2612.102.1";
-  patches = [ 
+  patches = [
     (fetchpatch rec {
       name   = "fcitx-mozc-${patch_version}.patch";
       url    = "https://download.fcitx-im.org/fcitx-mozc/${name}";
@@ -43,7 +43,7 @@ in clangStdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/unix/fcitx/mozc.conf \
-      --replace "/usr/share/fcitx/mozc/icon/mozc.png" "mozc" 
+      --replace "/usr/share/fcitx/mozc/icon/mozc.png" "mozc"
   '';
 
   configurePhase = ''
@@ -91,7 +91,7 @@ in clangStdenv.mkDerivation rec {
   meta = with clangStdenv.lib; {
     isFcitxEngine = true;
     description   = "Fcitx engine for Google japanese input method";
-    homepage      = http://code.google.com/p/mozc/;
+    homepage      = https://github.com/google/mozc;
     downloadPage  = "http://download.fcitx-im.org/fcitx-mozc/";
     license       = licenses.free;
     platforms     = platforms.linux;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index 2e32075992c..fd924cdd2a2 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -15,7 +15,7 @@ in clangStdenv.mkDerivation rec {
   meta = with clangStdenv.lib; {
     isIbusEngine = true;
     description  = "Japanese input method from Google";
-    homepage     = http://code.google.com/p/mozc/;
+    homepage     = https://github.com/google/mozc;
     license      = licenses.free;
     platforms    = platforms.linux;
     maintainers  = with maintainers; [ gebner ericsagnes ];
diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix
index 7ca5af555f9..b93c59d9789 100644
--- a/pkgs/tools/inputmethods/nabi/default.nix
+++ b/pkgs/tools/inputmethods/nabi/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "nabi-1.0.0";
 
   src = fetchurl {
-    url = "http://nabi.googlecode.com/files/nabi-1.0.0.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-1.0.0.tar.gz";
     sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw";
   };
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "The Easy Hangul XIM";
-    homepage = https://code.google.com/p/nabi;
+    homepage = https://github.com/choehwanjin/nabi;
     license = licenses.gpl2;
     maintainers = [ maintainers.ianwookim ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix
index b32d0c78a1b..bdcbc939a07 100644
--- a/pkgs/tools/inputmethods/touchegg/default.nix
+++ b/pkgs/tools/inputmethods/touchegg/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "touchegg-${version}";
   version = "1.1.1";
   src = fetchurl {
-    url = "https://touchegg.googlecode.com/files/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${name}.tar.gz";
     sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038";
   };
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://code.google.com/p/touchegg/;
+    homepage = https://github.com/JoseExposito/touchegg;
     description = "Macro binding for touch surfaces";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 9af5de0476a..3f37c1a2ab0 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -38,12 +38,12 @@ stdenv.mkDerivation rec {
   dontUseCmakeConfigure = true;
 
   src = fetchurl {
-    url = "http://uim.googlecode.com/files/uim-${version}.tar.bz2";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/uim/uim-${version}.tar.bz2";
     sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777";
   };
 
   meta = with stdenv.lib; {
-    homepage    = "http://code.google.com/p/uim/";
+    homepage    = "https://github.com/uim/uim";
     description = "A multilingual input method framework";
     license     = stdenv.lib.licenses.bsd3;
     platforms   = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index 0c8ca56024b..5633061c721 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://pdsh.googlecode.com/files/${name}.tar.bz2";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pdsh/${name}.tar.bz2";
     sha256 = "1kvzz01fyaxfqmbh53f4ljfsgvxdykh5jyr6fh4f1bw2ywxr1w2p";
   };
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://code.google.com/p/pdsh/;
+    homepage = https://github.com/chaos/pdsh;
     description = "High-performance, parallel remote shell utility";
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix
index 667cbfbcead..6cbee7d2a85 100644
--- a/pkgs/tools/networking/reaver-wps/default.nix
+++ b/pkgs/tools/networking/reaver-wps/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Brute force attack against Wifi Protected Setup";
-    homepage = http://code.google.com/p/reaver-wps;
+    homepage = https://code.google.com/archive/p/reaver-wps/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ nico202 volth ];
diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix
index 14283c279e4..ef2c91ee2fa 100644
--- a/pkgs/tools/networking/slimrat/default.nix
+++ b/pkgs/tools/networking/slimrat/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "slimrat-1.0";
   src = fetchurl {
-    url = http://slimrat.googlecode.com/files/slimrat-1.0.tar.bz2;
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/slimrat/slimrat-1.0.tar.bz2";
     sha256 = "139b71d45k4b1y47iq62a9732cnaqqbh8s4knkrgq2hx0jxpsk5a";
   };
 
@@ -24,9 +24,10 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://code.google.com/p/slimrat/;
+    homepage = https://code.google.com/archive/p/slimrat/;
     description = "Linux Rapidshare downloader";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
+    broken = true; # officially abandonned upstream
   };
 }
diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix
index b12ce573d1c..4ee4fa41833 100644
--- a/pkgs/tools/networking/udptunnel/default.nix
+++ b/pkgs/tools/networking/udptunnel/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "udptunnel-19";
 
   src = fetchurl {
-    url = http://udptunnel.googlecode.com/files/udptunnel-r19.tar.gz;
-    sha1 = "51edec3b63b659229bcf92f6157568d3b074ede0";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r19.tar.gz";
+    sha256 = "1hkrn153rdyrp9g15z4d5dq44cqlnby2bfplp6z0g3862lnv7m3l";
   };
 
   installPhase = ''
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://code.google.com/p/udptunnel/;
+    homepage = https://code.google.com/archive/p/udptunnel/;
     description = "Tunnels TCP over UDP packets";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix
index e1e57a84b55..a0368b0df89 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/pkgs/tools/package-management/opkg/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A lightweight package management system based upon ipkg";
-    homepage = http://code.google.com/p/opkg/;
+    homepage = https://git.yoctoproject.org/cgit/cgit.cgi/opkg/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix
index ebd9a6d5e7e..3d4bdd2edf1 100644
--- a/pkgs/tools/security/mfcuk/default.nix
+++ b/pkgs/tools/security/mfcuk/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.3.8";
 
   src = fetchurl {
-    url = "http://mfcuk.googlecode.com/files/mfcuk-0.3.8.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mfcuk/mfcuk-0.3.8.tar.gz";
     sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp";
   };
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "MiFare Classic Universal toolKit";
     license = licenses.gpl2;
-    homepage = http://code.google.com/p/mfcuk/;
+    homepage = https://github.com/nfc-tools/mfcuk;
     maintainers = with maintainers; [ offline ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix
index 8a454ca67fd..278818e88b5 100644
--- a/pkgs/tools/security/mfoc/default.nix
+++ b/pkgs/tools/security/mfoc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.10.6";
 
   src = fetchurl {
-    url = "http://mfoc.googlecode.com/files/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mfoc/${name}.tar.gz";
     sha1 = "3adce3029dce9124ff3bc7d0fad86fa0c374a9e3";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Mifare Classic Offline Cracker";
     license = licenses.gpl2;
-    homepage = http://code.google.com/p/mfoc/;
+    homepage = https://github.com/nfc-tools/mfoc;
     maintainers = with maintainers; [ offline ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix
index 9e01e8f0a9f..91df7f3fbb0 100644
--- a/pkgs/tools/security/omapd/default.nix
+++ b/pkgs/tools/security/omapd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.9.2";
 
   src = fetchurl {
-    url = "http://omapd.googlecode.com/files/${name}.tgz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${name}.tgz";
     sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc";
   };
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/omapd;
+    homepage = https://code.google.com/archive/p/omapd/;
     description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)";
     license = licenses.gpl3;
     maintainers = [ maintainers.tstrobel ];
diff --git a/pkgs/tools/security/tmin/default.nix b/pkgs/tools/security/tmin/default.nix
index 2c16e936a69..30bca5d1b26 100644
--- a/pkgs/tools/security/tmin/default.nix
+++ b/pkgs/tools/security/tmin/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.05";
 
   src = fetchurl {
-    url    = "https://tmin.googlecode.com/files/${name}.tar.gz";
+    url    = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/tmin/${name}.tar.gz";
     sha256 = "0166kcfs4b0da4hs2aqyn41f5l09i8rwxpi20k7x17qsxbmjbpd5";
   };
 
@@ -16,9 +16,13 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Fuzzing tool test-case optimizer";
-    homepage    = "https://code.google.com/p/tmin";
+    longDescription = ''
+      This project is obsolete and replaced by the afl-tmin tool bundled with american fuzzy lop (<literal>afl</literal>)
+    '';
+    homepage    = "https://code.google.com/archive/p/tmin/";
     license     = stdenv.lib.licenses.asl20;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    broken      = true; # officially deprecated upstream in favor of afl-tmin (afl package)
   };
 }
diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index 466dc4b4e46..ebc567f54ce 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description      = "Wrapper to safely torify applications";
-    homepage         = http://code.google.com/p/torsocks/;
+    homepage         = https://github.com/dgoulet/torsocks;
     repositories.git = https://git.torproject.org/torsocks.git;
     license          = stdenv.lib.licenses.gpl2;
     platforms        = stdenv.lib.platforms.unix;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 13cc777cf95..0bdd0f2ccac 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4056,7 +4056,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ FileWhich JSONMaybeXS TestDifferences ];
     meta = {
-      homepage = https://code.google.com/p/perl-devel-nytprof/;
+      homepage = https://github.com/timbunce/devel-nytprof;
       description = "Powerful fast feature-rich Perl source code profiler";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 60d5f9577e4..7664f422c0b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15441,7 +15441,7 @@ in {
 
     meta = {
       description = "Process and system utilization information interface for python";
-      homepage = http://code.google.com/p/psutil/;
+      homepage = https://github.com/giampaolo/psutil;
     };
   };
 
-- 
GitLab


From 4ccf05b03b79caf9cc18a370fa0fe4ab6a6ca5df Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 3 Nov 2017 18:50:20 +0000
Subject: [PATCH 596/877] qtscriptgenerator: enable parallel building

---
 .../libraries/qtscriptgenerator/default.nix   | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
index a4c51cb2d75..040072cb463 100644
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -10,28 +10,33 @@ stdenv.mkDerivation {
 
   patches = [ ./qtscriptgenerator.gcc-4.4.patch ./qt-4.8.patch ];
 
-  # Why isn't the author providing proper Makefile or a CMakeLists.txt ?
-  buildPhase = ''
+  postPatch = ''
     # remove phonon stuff which causes errors (thanks to Gentoo bug reports)
     sed -i "/typesystem_phonon.xml/d" generator/generator.qrc
     sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro
+  '';
+
+  configurePhase = ''
+    ( cd generator; qmake )
+    ( cd qtbindings; qmake )
+  '';
+
+  buildPhase = ''
+    makeFlags="SHELL=$SHELL ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}"
+    make $makeFlags -C generator
 
-    cd generator
-    qmake
-    make
     # Set QTDIR, see https://code.google.com/archive/p/qtscriptgenerator/issues/38
-    QTDIR=${qt4} ./generator
-    cd ../qtbindings
-    qmake
-    make
+    ( cd generator; QTDIR=${qt4} ./generator )
+    make $makeFlags -C qtbindings
   '';
 
   installPhase = ''
-    cd ..
     mkdir -p $out/lib/qt4/plugins/script
     cp -av plugins/script/* $out/lib/qt4/plugins/script
   '';
 
+  enableParallelBuilding = true;
+
   hardeningDisable = [ "format" ];
 
   meta = {
-- 
GitLab


From 8e982d5f2e09105242f6ff95e5b15eae9025fed9 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 3 Nov 2017 19:58:01 +0100
Subject: [PATCH 597/877] zstd: 1.3.0 -> 1.3.2

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

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 2be3bf167da..aad9421305e 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
-    sha256 = "1rnxfhcmg8zsagyf70hiwm32mam60hq58pzgy7jn8c3iwv24mpz5";
+    sha256 = "1hwh6pw1z3y5kpwcwxrk8cwc83anigiqhy3z06ywy1jll8im57pz";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";
-- 
GitLab


From ae25bd35c6d332b8ff34ca98cb88d00612982e90 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 3 Nov 2017 20:01:12 +0100
Subject: [PATCH 598/877] zsh-completions: 0.26.0 -> 0.27.0

---
 pkgs/shells/zsh-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh-completions/default.nix
index 4a5731b9152..92a9d293e84 100644
--- a/pkgs/shells/zsh-completions/default.nix
+++ b/pkgs/shells/zsh-completions/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "zsh-completions-${version}";
-  version = "0.26.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-completions";
     rev = "${version}";
-    sha256 = "16yhwf42a11v8bhnfb7nda0svxmglzph3c0cknvf8p5m6mkqj9s2";
+    sha256 = "1c2xx9bkkvyy0c6aq9vv3fjw7snlm0m5bjygfk5391qgjpvchd29";
   };
 
   installPhase= ''
-- 
GitLab


From 95d6424e9ab887e048530de490f799b4f9da79b2 Mon Sep 17 00:00:00 2001
From: vinymeuh <vinymeuh@gmail.com>
Date: Mon, 30 Oct 2017 19:34:41 +0100
Subject: [PATCH 599/877] pythonPackages.py3exiv2: init at 0.2.1

---
 .../python-modules/py3exiv2/default.nix       | 29 +++++++++++++++++++
 .../python-modules/py3exiv2/setup.patch       | 11 +++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/py3exiv2/default.nix
 create mode 100644 pkgs/development/python-modules/py3exiv2/setup.patch

diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
new file mode 100644
index 00000000000..4656b99df0a
--- /dev/null
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -0,0 +1,29 @@
+{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }:
+
+buildPythonPackage rec {
+  pname = "py3exiv2";
+  version = "0.2.1";
+  name = "${pname}-${version}";
+  disabled = !(isPy3k);
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06q7mlqy05c3jr61nmz93fxb6ilizfyggbh5sg0krwjap2sw1fr8";
+  };
+
+  buildInputs = [ exiv2 boost ];
+
+  # work around python distutils compiling C++ with $CC (see issue #26709)
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+
+  # fix broken libboost_python3 detection
+  patches = [ ./setup.patch ];
+
+  meta = {
+    homepage = "https://launchpad.net/py3exiv2";
+    description = "A Python3 binding to the library exiv2";
+    license = with stdenv.lib.licenses; [ gpl3 ];
+    maintainers = with stdenv.lib.maintainers; [ vinymeuh ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/development/python-modules/py3exiv2/setup.patch b/pkgs/development/python-modules/py3exiv2/setup.patch
new file mode 100644
index 00000000000..bb4b1152347
--- /dev/null
+++ b/pkgs/development/python-modules/py3exiv2/setup.patch
@@ -0,0 +1,11 @@
+--- a/setup.py	2017-10-16 22:03:02.000000000 +0200
++++ b/setup.py	2017-10-16 22:03:34.000000000 +0200
+@@ -39,7 +39,7 @@
+                 if '3' in l[2:]:
+                     return l.replace('libboost', 'boost')
+ 
+-libboost = get_libboost_name()
++libboost = 'boost_python3'
+ 
+ setup(
+     name='py3exiv2',
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 60d5f9577e4..1d95a7fbfac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -232,6 +232,8 @@ in {
 
   pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}";
 
+  py3exiv2 = callPackage ../development/python-modules/py3exiv2 { };
+
   pygame = callPackage ../development/python-modules/pygame { };
 
   pygame-git = callPackage ../development/python-modules/pygame/git.nix { };
-- 
GitLab


From c7db2d7df01c80bec0a5f443212d9772c80fc965 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 3 Nov 2017 20:03:16 +0100
Subject: [PATCH 600/877] zsh-syntax-highlighting: 0.5.0 -> 0.6.0

---
 pkgs/shells/zsh-syntax-highlighting/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh-syntax-highlighting/default.nix
index a97251d8e56..b7b44098fd7 100644
--- a/pkgs/shells/zsh-syntax-highlighting/default.nix
+++ b/pkgs/shells/zsh-syntax-highlighting/default.nix
@@ -3,14 +3,14 @@
 # To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option
 
 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.6.0";
   name = "zsh-syntax-highlighting-${version}";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-syntax-highlighting";
     rev = version;
-    sha256 = "0k0m5aw67lhi4z143sdawx93y1892scvvdfdnjvljb4hf0vzs2ww";
+    sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4";
   };
 
   buildInputs = [ zsh ];
-- 
GitLab


From 930414e22e1d59f1dbc0436e7ec5e8b2f0fa7e9e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 3 Nov 2017 19:18:17 +0000
Subject: [PATCH 601/877] arora: use fetchFromGitHub

---
 .../networking/browsers/arora/default.nix            | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix
index da042c77c40..f9d5f01be20 100644
--- a/pkgs/applications/networking/browsers/arora/default.nix
+++ b/pkgs/applications/networking/browsers/arora/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ stdenv, fetchFromGitHub, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
   name = "arora-${version}";
   version = "0.11.0";
 
-  src = fetchurl {
-    url = "https://github.com/Arora/arora/archive/${version}.tar.gz";
-    sha256 = "1ffkranxi93lrg5r7a90pix9j8xqmf0z1mb1m8579v9m34cyypvg";
+  src = fetchFromGitHub {
+    owner = "Arora";
+    repo = "arora";
+    rev = version;
+    sha256 = "0wmivgx3mw51rghi6q8fgivpkqc98z2mqmllf7c98ln0wd8rkf3c";
   };
 
   buildInputs = [ qt4 ];
   nativeBuildInputs = [ qmake4Hook ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     platforms = qt4.meta.platforms;
     maintainers = [ maintainers.phreedom ];
-- 
GitLab


From d2717a55d9feaffe04f076929e62526481d1bb9c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 3 Nov 2017 19:54:35 +0200
Subject: [PATCH 602/877] ethtool: 4.11 -> 4.13

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

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index ae6ea6e3f53..85672619d61 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ethtool-${version}";
-  version = "4.11";
+  version = "4.13";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "1cp132kk2xd2cwn1ysjv0cl8i9lnq3n4zi4wy676p5k4h2mfvn0j";
+    sha256 = "1flwz4x76ajxigadq9knxgwr778g03y3qfx6c7rflc3x020a7hdp";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 78eaae0204f8b9fe64339f5aa2e11dac60a5f6f6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 3 Nov 2017 19:59:08 +0200
Subject: [PATCH 603/877] vim: 8.0.1245 -> 8.0.1257

---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 1b1751e9b1d..417f2d80516 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.0.1245";
+  version = "8.0.1257";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "10nh8b2jgfbq4xvha0d2qashvdyqzvq96w8k6rl6793d8y7f3z8s";
+    sha256 = "1y4c7wn5gr7n4c2ni36kadr26aldydxlf06yj7nsmw22ywwg78ig";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From ee23541f8981ddd85109130cf471f163f1f766b1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 1 Nov 2017 23:32:41 +0000
Subject: [PATCH 604/877] ocamlPackages.ocaml_expat: 0.9.1 -> 1.0.0

---
 pkgs/development/ocaml-modules/expat/0.9.nix  | 51 ++++++++++++
 .../ocaml-modules/expat/default.nix           | 77 +++++++------------
 pkgs/top-level/ocaml-packages.nix             |  5 +-
 3 files changed, 84 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/expat/0.9.nix

diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/pkgs/development/ocaml-modules/expat/0.9.nix
new file mode 100644
index 00000000000..5fcc317d940
--- /dev/null
+++ b/pkgs/development/ocaml-modules/expat/0.9.nix
@@ -0,0 +1,51 @@
+{stdenv, fetchurl, ocaml, findlib, ounit, expat}:
+
+let
+  pname = "ocaml-expat";
+  testcase = fetchurl {
+    url = "http://www.w3.org/TR/1998/REC-xml-19980210.xml";
+    sha256 = "00a3gsfvlkdhmcbziqhvpvy1zmcgbcihfqwcvl6ay03zf7gvw0k1";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "0.9.1";
+
+  src = fetchurl {
+    url = "http://www.xs4all.nl/~mmzeeman/ocaml/${pname}-${version}.tar.gz";
+    sha256 = "16n2j3y0jc9xgqyshw9plrwqnjiz30vnpbhahmgxlidbycw8rgjz";
+  };
+
+  buildInputs = [ocaml findlib ounit expat];
+
+  createFindlibDestdir = true;
+
+  patches = [ ./unittest.patch ];
+
+  postPatch = ''
+    substituteInPlace "unittest.ml" \
+      --replace "/home/maas/xml-samples/REC-xml-19980210.xml.txt" "${testcase}"
+    substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat.out}/lib" \
+      --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \
+      --replace "gcc" "\$(CC)"
+  '';
+
+  configurePhase = "true";  	# Skip configure
+
+  buildPhase = ''
+    make all allopt
+  '';
+
+  doCheck = true;
+
+  checkTarget = "testall";
+
+  meta = {
+    homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
+    description = "An ocaml wrapper for the Expat XML parsing library";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.roconnor ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix
index 5fcc317d940..575ca45624f 100644
--- a/pkgs/development/ocaml-modules/expat/default.nix
+++ b/pkgs/development/ocaml-modules/expat/default.nix
@@ -1,51 +1,32 @@
-{stdenv, fetchurl, ocaml, findlib, ounit, expat}:
-
-let
-  pname = "ocaml-expat";
-  testcase = fetchurl {
-    url = "http://www.w3.org/TR/1998/REC-xml-19980210.xml";
-    sha256 = "00a3gsfvlkdhmcbziqhvpvy1zmcgbcihfqwcvl6ay03zf7gvw0k1";
-  };
-
-in
+{ stdenv, fetchFromGitHub, expat, ocaml, findlib, ounit }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  version = "0.9.1";
-
-  src = fetchurl {
-    url = "http://www.xs4all.nl/~mmzeeman/ocaml/${pname}-${version}.tar.gz";
-    sha256 = "16n2j3y0jc9xgqyshw9plrwqnjiz30vnpbhahmgxlidbycw8rgjz";
-  };
-
-  buildInputs = [ocaml findlib ounit expat];
-
-  createFindlibDestdir = true;
-
-  patches = [ ./unittest.patch ];
-
-  postPatch = ''
-    substituteInPlace "unittest.ml" \
-      --replace "/home/maas/xml-samples/REC-xml-19980210.xml.txt" "${testcase}"
-    substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat.out}/lib" \
-      --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \
-      --replace "gcc" "\$(CC)"
-  '';
-
-  configurePhase = "true";  	# Skip configure
-
-  buildPhase = ''
-    make all allopt
-  '';
-
-  doCheck = true;
-
-  checkTarget = "testall";
-
-  meta = {
-    homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
-    description = "An ocaml wrapper for the Expat XML parsing library";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
-  };
+	name = "ocaml${ocaml.version}-expat-${version}";
+	version = "1.0.0";
+
+	src = fetchFromGitHub {
+		owner = "whitequark";
+		repo = "ocaml-expat";
+		rev = "v${version}";
+		sha256 = "0rb47v08ra2hhh73p3d8sl4sizqwiwc37gnkl22b23sbwbjrpbz0";
+	};
+
+	prePatch = ''
+		substituteInPlace Makefile --replace "gcc" "\$(CC)"
+	'';
+
+	buildInputs = [ ocaml findlib expat ounit ];
+
+	doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06";
+	checkTarget = "testall";
+
+	createFindlibDestdir = true;
+
+	meta = {
+		description = "OCaml wrapper for the Expat XML parsing library";
+		license = stdenv.lib.licenses.mit;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (src.meta) homepage;
+		inherit (ocaml.meta) platforms;
+	};
 }
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 43c249e7b1d..7555cf5efd7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -407,7 +407,10 @@ let
 
     ocaml_data_notation = callPackage ../development/ocaml-modules/odn { };
 
-    ocaml_expat = callPackage ../development/ocaml-modules/expat { };
+    ocaml_expat =
+    if lib.versionAtLeast ocaml.version "4.02"
+    then callPackage ../development/ocaml-modules/expat { }
+    else callPackage ../development/ocaml-modules/expat/0.9.nix { };
 
     frontc = callPackage ../development/ocaml-modules/frontc { };
 
-- 
GitLab


From 0eb284b351a5ab4c8fa347453baf9409c0e819ca Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 3 Nov 2017 12:16:53 +0000
Subject: [PATCH 605/877] alt-ergo: remove constraint on OCaml version

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 136a4723133..b0212bd2c95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18561,9 +18561,7 @@ with pkgs;
 
   acgtk = callPackage ../applications/science/logic/acgtk { };
 
-  alt-ergo = callPackage ../applications/science/logic/alt-ergo {
-    ocamlPackages = ocamlPackages_4_02;
-  };
+  alt-ergo = callPackage ../applications/science/logic/alt-ergo { };
 
   aspino = callPackage ../applications/science/logic/aspino {};
 
-- 
GitLab


From da793b2c86ec6fdc7067de1d6b598e8b1e13ec09 Mon Sep 17 00:00:00 2001
From: Yellow Ghost <ylwghst@onionmail.info>
Date: Fri, 3 Nov 2017 20:44:32 +0100
Subject: [PATCH 606/877] abiword: 3.0.1 -> 3.0.2

---
 pkgs/applications/office/abiword/default.nix  |   2 +-
 .../office/abiword/patches/fix-13791.patch    | 161 ++++++++++++++++++
 2 files changed, 162 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/office/abiword/patches/fix-13791.patch

diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 6483702e822..1563cdf3d05 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches = [
-    (fetchurl { url = https://gist.github.com/ylwghst/b28ef051980f41aca56df7a8affd9526/raw/; sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al"; })
+    ./patches/fix-13791.patch
   ];
 
   buildInputs =
diff --git a/pkgs/applications/office/abiword/patches/fix-13791.patch b/pkgs/applications/office/abiword/patches/fix-13791.patch
new file mode 100644
index 00000000000..98004f01bcb
--- /dev/null
+++ b/pkgs/applications/office/abiword/patches/fix-13791.patch
@@ -0,0 +1,161 @@
+From 46388f407c893123d9b3824a7570b050fc3b049b Mon Sep 17 00:00:00 2001
+From: James Cameron <quozl@laptop.org>
+Date: Thu, 17 Aug 2017 15:05:39 +1000
+Subject: [PATCH] Fix flickering
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- in GR_Caret::s_blink_timeout, avoid repeated calls by stopping the
+  timer, it will be restarted when needed,
+
+- in GR_Caret::s_enable, avoid extra unnecessary _blink calls when blink
+  is enabled, as they serve no purpose,
+
+- in XAP_UnixFrameImpl::_fe::expose, use the Cairo clip rectangle
+  instead of the expose event area, thanks to Hubert Figuière in
+  865c1dda7e13deff04573ffc42028b71fee07f9c,
+
+- in XAP_UnixFrameImpl::_fe::expose, do not return FALSE, as other
+  handlers will need to handle the draw event,
+
+- in GR_UnixCairoGraphics::flush, fix excessive draw events;
+  gtk_widget_queue_draw only marks the widget as needing redrawing,
+  which causes a draw event for each call to flush, therefore every
+  caret blink, so use gdk_flush instead,
+
+Fixes AbiSource #13791.
+Fixes Debian #851052.
+Fixes Fedora #1287835.
+Fixes Ubuntu LP: #1574278.
+Fixes Sugar Labs #4915.
+
+Signed-off-by: James Cameron <quozl@laptop.org>
+---
+ src/af/gr/gtk/gr_UnixCairoGraphics.cpp |  4 +---
+ src/af/gr/xp/gr_Caret.cpp              | 13 ++++---------
+ src/af/xap/gtk/xap_UnixFrameImpl.cpp   | 27 ++++++++++++++++++---------
+ src/af/xap/gtk/xap_UnixFrameImpl.h     |  2 +-
+ 4 files changed, 24 insertions(+), 22 deletions(-)
+
+diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
+index 509bd37..7c3c06f 100644
+--- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
++++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
+@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint()
+ 
+ void GR_UnixCairoGraphics::flush(void)
+ {
+-	if (m_Widget) {
+-		gtk_widget_queue_draw(m_Widget);
+-	}
++	gdk_flush();
+ }
+ 
+ bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const
+diff --git a/src/af/gr/xp/gr_Caret.cpp b/src/af/gr/xp/gr_Caret.cpp
+index 5d5d116..a8aa451 100644
+--- a/src/af/gr/xp/gr_Caret.cpp
++++ b/src/af/gr/xp/gr_Caret.cpp
+@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w)
+ {
+ 	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
+ 
++	c->m_enabler->stop();
+ 	c->m_worker->stop();
+-	c->_blink(true);
+-	if (!c->m_bCursorIsOn)
+-		c->_blink(true); // blink again
+-	else
+-	{
+-		c->_blink(true); // ?? - MARCM
+-		c->_blink(true);
+-	}
+ 	c->m_worker->start();
+-	c->m_enabler->stop();
++	c->_blink(true);
+ }
+ 
+ void GR_Caret::s_blink_timeout(UT_Worker * _w)
+ {
+ 	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
++
++	c->m_blinkTimeout->stop();
+ 	if (c->isEnabled())
+ 		c->disable();
+ }
+diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+index 780000e..e81961a 100644
+--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
++++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
+ }
+ 
+ #if GTK_CHECK_VERSION(3,0,0)
+-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
++gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
+ #else
+ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+ #endif
+ {
+ 	XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
+ 	FV_View * pView = static_cast<FV_View *>(pUnixFrameImpl->getFrame()->getCurrentView());
++	double x, y, width, height;
+ #if GTK_CHECK_VERSION(3,0,0)
+-	GdkEventExpose *pExposeEvent = reinterpret_cast<GdkEventExpose *>(gtk_get_current_event());
++	cairo_clip_extents (cr, &x, &y, &width, &height);
++	width -= x;
++	height -= y;
++#else
++	x = pExposeEvent->area.x;
++	y = pExposeEvent->area.y;
++	width = pExposeEvent->area.width;
++	height = pExposeEvent->area.height;
+ #endif
+ /* Jean: commenting out next lines since the zoom update code does draw only
+  * part of what needs to be updated. */
+@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+ 		UT_Rect rClip;
+ 		if (pGr->getPaintCount () > 0)
+ 			return TRUE;
+-		xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d  height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height));
+-		rClip.left = pGr->tlu(pExposeEvent->area.x);
+-		rClip.top = pGr->tlu(pExposeEvent->area.y);
+-		rClip.width = pGr->tlu(pExposeEvent->area.width)+1;
+-		rClip.height = pGr->tlu(pExposeEvent->area.height)+1;
+-#if GTK_CHECK_VERSION(3,0,0)
++		rClip.left = pGr->tlu(x);
++		rClip.top = pGr->tlu(y);
++ #if GTK_CHECK_VERSION(3,0,0)
++		rClip.width = pGr->tlu(width);
++		rClip.height = pGr->tlu(height);
+ 		static_cast<GR_CairoGraphics *>(pGr)->setCairo(cr);
+ 		pView->draw(&rClip);
+ 		static_cast<GR_CairoGraphics *>(pGr)->setCairo(NULL);
+ #else
++		rClip.width = pGr->tlu(width)+1;
++		rClip.height = pGr->tlu(height)+1;
+ 		pView->draw(&rClip);
+ #endif
+ 	}
+-	return FALSE;
++	return TRUE;
+ }
+ 
+ static bool bScrollWait = false;
+diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
+index 30ee5d8..26fbb2e 100644
+--- a/src/af/xap/gtk/xap_UnixFrameImpl.h
++++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
+@@ -152,7 +152,7 @@ protected:
+ 			static gint key_release_event(GtkWidget* w, GdkEventKey* e);
+ 			static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
+ #if GTK_CHECK_VERSION(3,0,0)
+-			static gint draw(GtkWidget * w, cairo_t * cr);
++			static gboolean draw(GtkWidget * w, cairo_t * cr);
+ #else
+ 			static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
+ #endif
+-- 
+2.11.0
+
-- 
GitLab


From cc04a30b6e14c4a6b2353766c8e22a6e96d30e76 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Thu, 2 Nov 2017 15:49:28 +0000
Subject: [PATCH 607/877] rambox: build from source

---
 .../instant-messengers/rambox/bare.nix        | 61 ++++++++++++++++
 .../instant-messengers/rambox/default.nix     | 70 +++++--------------
 .../rambox/fetchNodeModules.nix               | 26 +++++++
 .../rambox/hide-check-for-updates.patch       | 35 ++++++++++
 .../instant-messengers/rambox/isDev.patch     | 14 ++++
 .../instant-messengers/rambox/sencha/bare.nix | 41 +++++++++++
 .../rambox/sencha/default.nix                 | 17 +++++
 .../rambox/sencha/response.varfile            | 13 ++++
 8 files changed, 223 insertions(+), 54 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/rambox/bare.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch
 create mode 100644 pkgs/applications/networking/instant-messengers/rambox/isDev.patch
 create mode 100644 pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile

diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
new file mode 100644
index 00000000000..ceb922624a1
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha }:
+
+stdenv.mkDerivation rec {
+  name = "rambox-bare-${version}";
+  version = "0.5.13";
+
+  src = fetchFromGitHub {
+    owner = "saenzramiro";
+    repo = "rambox";
+    rev = version;
+    sha256 = "0c770a9z017y6gcrpyri7s1gifm8zi5f29bq5nvh3zzg4wgqh326";
+  };
+
+  nativeBuildInputs = [ nodejs-8_x ruby sencha ];
+
+  node_modules = fetchNodeModules {
+    inherit src;
+
+    nodejs = nodejs-8_x;
+    sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4";
+  };
+
+  patches = [ ./hide-check-for-updates.patch ./isDev.patch ];
+
+  # These credentials are only for this derivation. If you want to get credentials
+  # for another distribution, go to https://auth0.com. If you want to reuse the same
+  # domain, drop a line at yegortimoshenko@gmail.com!
+  auth0ClientID = "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU";
+  auth0Domain = "nixpkgs.auth0.com";
+
+  configurePhase = ''
+    echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
+    ln -s ${node_modules} node_modules
+  '';
+
+  buildPhase = ''
+    mkdir ../rambox-build
+    npm run sencha:compile:build
+  '';
+
+  installPhase = ''
+    mv ../rambox-build/ $out
+
+    # https://github.com/saenzramiro/rambox/issues/1281
+    echo '{"name": "rambox", "version": "${version}", "main": "electron/main.js"}' > $out/package.json
+
+    # https://github.com/saenzramiro/rambox/issues/1282
+    cp --parents ext/packages/ext-locale/build/ext-locale-*.js $out
+
+    # Symbolic link causes `Uncaught Error: Cannot find module 'immutable'`
+    cp -r ${node_modules} $out/node_modules
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Messaging and emailing app that combines common web applications into one";
+    homepage = http://rambox.pro;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ gnidorah ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 7c8367d7f7f..2e574fae8fa 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,64 +1,26 @@
-{ stdenv, fetchurl, dpkg, makeWrapper
-, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
-, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
+{ stdenv, newScope, makeWrapper, electron, xdg_utils }:
 
 let
-  bits = if stdenv.system == "x86_64-linux" then "x64"
-         else "ia32";
-
-  version = "0.5.13";
-
-  runtimeDeps = [
-    udev libnotify
-  ];
-  deps = (with xorg; [
-    libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
-    libXrender libX11 libXtst libXScrnSaver libxcb
-  ]) ++ [
-    gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
-    gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
-  ] ++ runtimeDeps;
-in stdenv.mkDerivation rec {
-  name = "rambox-${version}";
-  src = fetchurl {
-    url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb";
-    sha256 = if bits == "x64" then
-      "0bn562fr1wsnn3xsd4q2rrxi6c56vckrkfmjl2dqb30hpmj2vn0d" else
-      "180ndvkil5mk5idwnn7spfygnhhll6pjc342pfzgmzk46a723qs4";
+  callPackage = newScope self;
+  self = {
+    fetchNodeModules = callPackage ./fetchNodeModules.nix {};
+    rambox-bare = callPackage ./bare.nix {};
+    sencha = callPackage ./sencha {};
   };
+in
 
-  # don't remove runtime deps
-  dontPatchELF = true;
+with self;
 
-  buildInputs = [ dpkg makeWrapper ];
+stdenv.mkDerivation {
+  name = "rambox-${rambox-bare.version}";
 
-  unpackPhase = "dpkg-deb -x $src .";
+  nativeBuildInputs = [ makeWrapper ];
 
-  installPhase = ''
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" opt/Rambox/rambox
-    patchelf --set-rpath "$out/opt/Rambox:${stdenv.lib.makeLibraryPath deps}" opt/Rambox/rambox
+  unpackPhase = ":";
 
-    mkdir -p $out/bin
-    cp -r opt $out
-    ln -s $out/opt/Rambox/rambox $out/bin
-
-    # provide resources
-    cp -r usr/share $out
-    substituteInPlace $out/share/applications/rambox.desktop \
-      --replace Exec=\"/opt/Rambox/rambox\" Exec=rambox
-  '';
-
-  postFixup = ''
-    paxmark m $out/opt/Rambox/rambox
-    wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin
+  installPhase = ''
+    makeWrapper ${electron}/bin/electron $out/bin/rambox \
+      --add-flags "${rambox-bare} --without-update" \
+      --prefix PATH : ${xdg_utils}/bin
   '';
-
-  meta = with stdenv.lib; {
-    description = "Free and Open Source messaging and emailing app that combines common web applications into one";
-    homepage = http://rambox.pro;
-    license = licenses.mit;
-    maintainers = [ maintainers.gnidorah ];
-    platforms = ["i686-linux" "x86_64-linux"];
-    hydraPlatforms = [];
-  };
 }
diff --git a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix b/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
new file mode 100644
index 00000000000..047890a932c
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
@@ -0,0 +1,26 @@
+{ stdenv, jq }: { src, nodejs, sha256 }:
+
+# Only npm >= 5.4.2 is deterministic, see:
+# https://github.com/npm/npm/issues/17979#issuecomment-332701215
+assert stdenv.lib.versionAtLeast nodejs.version "8.9.0";
+
+stdenv.mkDerivation {
+  name = "node_modules";
+
+  outputHashAlgo = "sha256";
+  outputHash = sha256;
+  outputHashMode = "recursive";
+
+  nativeBuildInputs = [ jq nodejs ];
+
+  buildCommand = ''
+    cp -r ${src}/* .
+    HOME=. npm install --force --ignore-scripts --only=production
+    for f in $(find node_modules -name package.json); do
+      # https://github.com/npm/npm/issues/10393
+      jq -S 'delpaths(keys | map(select(startswith("_")) | [.]))' $f > $f.tmp
+      mv $f.tmp $f
+    done
+    mv node_modules $out
+  '';
+}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch
new file mode 100644
index 00000000000..8363baef2df
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch
@@ -0,0 +1,35 @@
+https://github.com/saenzramiro/rambox/issues/1283
+
+diff -urNZ a/electron/menu.js b/electron/menu.js
+--- a/electron/menu.js	2017-11-02 22:02:59.753119865 +0000
++++ b/electron/menu.js	2017-11-02 22:08:34.419698562 +0000
+@@ -220,14 +220,6 @@
+ 					}
+ 				},
+ 				{
+-					label: locale['menu.help[5]'],
+-					click(item, win) {
+-						const webContents = win.webContents;
+-						const send = webContents.send.bind(win.webContents);
+-						send('autoUpdater:check-update');
+-					}
+-				},
+-				{
+ 					label: locale['menu.help[6]'],
+ 					click() {
+ 						sendAction('showAbout')
+@@ -290,14 +282,6 @@
+ 			type: 'separator'
+ 		});
+ 		helpSubmenu.push({
+-			label: `&`+locale['menu.help[5]'],
+-			click(item, win) {
+-				const webContents = win.webContents;
+-				const send = webContents.send.bind(win.webContents);
+-				send('autoUpdater:check-update');
+-			}
+-		});
+-		helpSubmenu.push({
+ 			label: `&`+locale['menu.help[6]'],
+ 			click() {
+ 				sendAction('showAbout')
diff --git a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch b/pkgs/applications/networking/instant-messengers/rambox/isDev.patch
new file mode 100644
index 00000000000..b918144c766
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/isDev.patch
@@ -0,0 +1,14 @@
+https://github.com/saenzramiro/rambox/issues/1280
+
+diff -urNZ a/electron/main.js b/electron/main.js
+--- a/electron/main.js	2017-11-02 14:58:06.085127616 +0000
++++ b/electron/main.js	2017-11-02 14:58:18.316887679 +0000
+@@ -8,7 +8,7 @@
+ // Configuration
+ const Config = require('electron-config');
+ // Development
+-const isDev = require('electron-is-dev');
++const isDev = false;
+ // Updater
+ const updater = require('./updater');
+ // File System
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
new file mode 100644
index 00000000000..9b4a718ed23
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, gzip, which, unzip, jdk }:
+
+let
+  version = "6.5.2";
+  srcs = {
+    i686-linux = fetchurl {
+      url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
+      sha256 = "18gcqw9434xab97skcb97iw4p4s2pgggvq7jaisblap0ja00kqjr";
+    };
+    x86_64-linux = fetchurl {
+      url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip";
+      sha256 = "1b8jv99k37q1bi7b29f23lfzxc66v5fqdmr1rxsrqchwcrllc0z7";
+    };
+  };
+in
+
+stdenv.mkDerivation rec {
+  inherit version;
+
+  name = "sencha-bare-${version}";
+  src = srcs.${stdenv.system};
+
+  nativeBuildInputs = [ gzip which unzip ];
+  buildInputs = [ jdk ];
+
+  sourceRoot = ".";
+
+  configurePhase = ''
+    substituteAll ${./response.varfile} response.varfile
+  '';
+
+  installPhase = ''
+    ./SenchaCmd*.sh -q -dir $out -varfile response.varfile
+    rm $out/shell-wrapper.sh $out/Uninstaller
+  '';
+
+  meta = with stdenv.lib; {
+    license = licenses.unfree;
+    platforms = attrNames srcs;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
new file mode 100644
index 00000000000..1ca04a9e168
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, callPackage, makeWrapper }:
+
+let
+  sencha-bare = callPackage ./bare.nix {};
+in
+
+stdenv.mkDerivation {
+  name = "sencha-${sencha-bare.version}";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  unpackPhase = ":";
+
+  installPhase = ''
+    makeWrapper ${sencha-bare}/sencha $out/bin/sencha
+  '';
+}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile b/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
new file mode 100644
index 00000000000..0ff6f0a30d5
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
@@ -0,0 +1,13 @@
+addToPath$Integer=1
+parentDir=.
+sys.adminRights$Boolean=false
+sys.component.148$Boolean=true
+sys.component.157$Boolean=true
+sys.component.26$Boolean=true
+sys.component.30$Boolean=true
+sys.component.90$Boolean=true
+sys.component.91$Boolean=true
+sys.component.92$Boolean=true
+sys.component.94$Boolean=true
+sys.installationDir=@out@
+sys.languageId=en
\ No newline at end of file
-- 
GitLab


From 94043f511a62bd0c614b5aeb892c3b78913e4a29 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 3 Nov 2017 21:39:05 +0100
Subject: [PATCH 608/877] zfs: 0.7.2 -> 0.7.3

Bugfix release.
---
 pkgs/os-specific/linux/spl/default.nix | 4 ++--
 pkgs/os-specific/linux/zfs/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 5e0f83c4c68..b29573179f8 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -63,8 +63,8 @@ in
   assert buildKernel -> kernel != null;
 {
     splStable = common {
-      version = "0.7.2";
-      sha256 = "10rq0npjlp09xjdgn9lc3wm310dqc71j0wgxwj92ncf9r61zf445";
+      version = "0.7.3";
+      sha256 = "0j8mb9ky3pjz9hnz5w6fajpzajl15jq3p0xvxb6lhpqj3rjzsqxb";
     };
 
     splUnstable = common {
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index bfa8dac72ba..ccec513a470 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -140,9 +140,9 @@ in {
     incompatibleKernelVersion = null;
 
     # this package should point to the latest release.
-    version = "0.7.2";
+    version = "0.7.3";
 
-    sha256 = "1dl6i4sg7z0k4p1dmfcm9arx62x30lqsr9hycvhhs3pf58ks8z2v";
+    sha256 = "1bbajrwfilnmfhn1n69gvsaznyc4q29wi7nkwc0p9r4dli37w28b";
 
     extraPatches = [
       (fetchpatch {
-- 
GitLab


From 5e563ae7490ad47699c0e687dd6e180c07b81a1f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 3 Nov 2017 21:32:20 +0100
Subject: [PATCH 609/877] node2nix: 1.3.0 -> 1.4.0 + regenerate packages

---
 .../node-packages/composition-v4.nix          |    2 +-
 .../node-packages/composition-v6.nix          |    2 +-
 pkgs/development/node-packages/node-env.nix   |   52 +-
 .../node-packages/node-packages-v4.nix        | 6283 +++--------
 .../node-packages/node-packages-v6.nix        | 9861 ++++-------------
 5 files changed, 3997 insertions(+), 12203 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index dc5899ebf1a..f63ae1ef750 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.4.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index 0c01a169af4..4d4f68cf50c 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.4.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 356e78f027b..33073e55ce5 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -110,16 +110,16 @@ let
         text = ''
           var fs = require('fs');
           var path = require('path');
-          
+
           function resolveDependencyVersion(location, name) {
               if(location == process.env['NIX_STORE']) {
                   return null;
               } else {
                   var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
-                  
+
                   if(fs.existsSync(dependencyPackageJSON)) {
                       var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
-                      
+
                       if(dependencyPackageObj.name == name) {
                           return dependencyPackageObj.version;
                       }
@@ -128,12 +128,12 @@ let
                   }
               }
           }
-          
+
           function replaceDependencies(dependencies) {
               if(typeof dependencies == "object" && dependencies !== null) {
                   for(var dependency in dependencies) {
                       var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
-                      
+
                       if(resolvedVersion === null) {
                           process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
                       } else {
@@ -142,17 +142,17 @@ let
                   }
               }
           }
-          
+
           /* Read the package.json configuration */
           var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-          
+
           /* Pinpoint all dependencies */
           replaceDependencies(packageObj.dependencies);
           if(process.argv[2] == "development") {
               replaceDependencies(packageObj.devDependencies);
           }
           replaceDependencies(packageObj.optionalDependencies);
-          
+
           /* Write the fixed package.json file */
           fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
         '';
@@ -160,7 +160,7 @@ let
     in
     ''
       node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
-      
+
       ${stdenv.lib.optionalString (dependencies != [])
         ''
           if [ -d node_modules ]
@@ -171,11 +171,11 @@ let
           fi
         ''}
     '';
-  
+
   # Recursively traverses all dependencies of a package and pinpoints all
   # dependencies in the package.json file to the versions that are actually
   # being used.
-  
+
   pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
     ''
       if [ -d "${packageName}" ]
@@ -210,7 +210,7 @@ let
 
       compositionScript = composePackage args;
       pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-      
+
       passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
 
       installPhase = args.installPhase or ''
@@ -220,7 +220,7 @@ let
 
         # Compose the package and all its dependencies
         source $compositionScriptPath
-        
+
         # Pinpoint the versions of all dependencies to the ones that are actually being used
         echo "pinpointing versions of dependencies..."
         source $pinpointDependenciesScriptPath
@@ -287,31 +287,31 @@ let
 
         includeScript = includeDependencies { inherit dependencies; };
         pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-        
+
         passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
 
         buildCommand = ''
-          mkdir -p $out/lib
-          cd $out/lib
+          mkdir -p $out/${packageName}
+          cd $out/${packageName}
+
           source $includeScriptPath
-          
+
+          # Create fake package.json to make the npm commands work properly
+          cp ${src}/package.json .
+          chmod 644 package.json
+
           # Pinpoint the versions of all dependencies to the ones that are actually being used
           echo "pinpointing versions of dependencies..."
+          cd ..
           source $pinpointDependenciesScriptPath
-
-          # Create fake package.json to make the npm commands work properly
-          cat > package.json <<EOF
-          {
-              "name": "${packageName}",
-              "version": "${version}"
-          }
-          EOF
+          cd ${packageName}
 
           # 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
+
           npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
 
           ${stdenv.lib.optionalString (!dontNpmInstall) ''
@@ -321,6 +321,8 @@ let
             npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
           ''}
 
+          cd ..
+          mv ${packageName} lib
           ln -s $out/lib/node_modules/.bin $out/bin
         '';
       };
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index c6ef2bdfe8c..91f6468b465 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.4.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -787,13 +787,13 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "resolve-1.4.0" = {
+    "resolve-1.5.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz";
-        sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz";
+        sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6";
       };
     };
     "detect-file-0.1.0" = {
@@ -1048,13 +1048,13 @@ let
         sha1 = "20813df3d712928b207378691a45066fae72dd57";
       };
     };
-    "is-buffer-1.1.5" = {
+    "is-buffer-1.1.6" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "1.1.5";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
-        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
+        sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
       };
     };
     "is-posix-bracket-0.1.1" = {
@@ -2119,13 +2119,13 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "ajv-5.2.4" = {
+    "ajv-5.3.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "5.2.4";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-5.2.4.tgz";
-        sha1 = "3daf9a8b67221299fdae8d82d117ed8e6c80244b";
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz";
+        sha1 = "4414ff74a50879c208ee5fdc826e32c303549eda";
       };
     };
     "har-schema-2.0.0" = {
@@ -2155,6 +2155,15 @@ let
         sha1 = "96256a3bc975595eb36d82e9929d060d893439ff";
       };
     };
+    "fast-json-stable-stringify-2.0.0" = {
+      name = "fast-json-stable-stringify";
+      packageName = "fast-json-stable-stringify";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      };
+    };
     "json-schema-traverse-0.3.1" = {
       name = "json-schema-traverse";
       packageName = "json-schema-traverse";
@@ -2164,24 +2173,6 @@ let
         sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
       };
     };
-    "json-stable-stringify-1.0.1" = {
-      name = "json-stable-stringify";
-      packageName = "json-stable-stringify";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
-        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
-      };
-    };
-    "jsonify-0.0.0" = {
-      name = "jsonify";
-      packageName = "jsonify";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
-        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
-      };
-    };
     "hoek-4.2.0" = {
       name = "hoek";
       packageName = "hoek";
@@ -2209,13 +2200,13 @@ let
         sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
       };
     };
-    "sntp-2.0.2" = {
+    "sntp-2.1.0" = {
       name = "sntp";
       packageName = "sntp";
-      version = "2.0.2";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz";
-        sha1 = "5064110f0af85f7cfdb7d6b67a40028ce52b4b2b";
+        url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz";
+        sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
       };
     };
     "boom-5.2.0" = {
@@ -3361,13 +3352,13 @@ let
         sha1 = "d95bf721ec877e08db276ed3fc6eb78f9083ad46";
       };
     };
-    "node-pre-gyp-0.6.38" = {
+    "node-pre-gyp-0.6.39" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.38";
+      version = "0.6.39";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz";
-        sha1 = "e92a20f83416415bb4086f6d1fb78b3da73d113d";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz";
+        sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis";
       };
     };
     "nopt-4.0.1" = {
@@ -3406,13 +3397,22 @@ let
         sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
       };
     };
-    "tar-pack-3.4.0" = {
+    "detect-libc-1.0.2" = {
+      name = "detect-libc";
+      packageName = "detect-libc";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz";
+        sha1 = "71ad5d204bf17a6a6ca8f450c61454066ef461e1";
+      };
+    };
+    "tar-pack-3.4.1" = {
       name = "tar-pack";
       packageName = "tar-pack";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz";
-        sha1 = "23be2d7f671a8339376cbdb0b8fe3fdebf317984";
+        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz";
+        sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -3487,6 +3487,24 @@ let
         sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
       };
     };
+    "json-stable-stringify-1.0.1" = {
+      name = "json-stable-stringify";
+      packageName = "json-stable-stringify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
+        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
+      };
+    };
+    "jsonify-0.0.0" = {
+      name = "jsonify";
+      packageName = "jsonify";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
+        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
+      };
+    };
     "assert-plus-0.2.0" = {
       name = "assert-plus";
       packageName = "assert-plus";
@@ -3631,4058 +3649,1121 @@ let
         sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
       };
     };
-    "JSONStream-1.3.1" = {
-      name = "JSONStream";
-      packageName = "JSONStream";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz";
-        sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a";
-      };
-    };
-    "ansi-regex-3.0.0" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "3.0.0";
+    "adm-zip-0.4.7" = {
+      name = "adm-zip";
+      packageName = "adm-zip";
+      version = "0.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
-        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz";
+        sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
       };
     };
-    "ansicolors-0.3.2" = {
-      name = "ansicolors";
-      packageName = "ansicolors";
-      version = "0.3.2";
+    "async-2.1.2" = {
+      name = "async";
+      packageName = "async";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz";
-        sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979";
+        url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz";
+        sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
       };
     };
-    "ansistyles-0.1.3" = {
-      name = "ansistyles";
-      packageName = "ansistyles";
-      version = "0.1.3";
+    "colors-1.1.2" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz";
-        sha1 = "5de60415bda071bb37127854c864f41b23254539";
+        url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
+        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
       };
     };
-    "bluebird-3.5.1" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "3.5.1";
+    "fields-0.1.24" = {
+      name = "fields";
+      packageName = "fields";
+      version = "0.1.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz";
-        sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h";
+        url = "https://registry.npmjs.org/fields/-/fields-0.1.24.tgz";
+        sha1 = "bed93b1c2521f4705fe764f4209267fdfd89f5d3";
       };
     };
-    "cacache-9.2.9" = {
-      name = "cacache";
-      packageName = "cacache";
-      version = "9.2.9";
+    "humanize-0.0.9" = {
+      name = "humanize";
+      packageName = "humanize";
+      version = "0.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz";
-        sha512 = "11qjza6qy62lkvynngcvx7nf2vhxvvp4g0l07a8zw5pzqc5iy0zznxzgs0dw1bb2i10dr2v7i624x6v9pkzp55snam9wk5jjf7ka642";
+        url = "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
+        sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
       };
     };
-    "call-limit-1.1.0" = {
-      name = "call-limit";
-      packageName = "call-limit";
-      version = "1.1.0";
+    "longjohn-0.2.11" = {
+      name = "longjohn";
+      packageName = "longjohn";
+      version = "0.2.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/call-limit/-/call-limit-1.1.0.tgz";
-        sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea";
+        url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz";
+        sha1 = "83736a15ae5f48711b625153e98012f2de659e69";
       };
     };
-    "chownr-1.0.1" = {
-      name = "chownr";
-      packageName = "chownr";
-      version = "1.0.1";
+    "moment-2.16.0" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz";
-        sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
+        url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz";
+        sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
       };
     };
-    "cli-table2-0.2.0" = {
-      name = "cli-table2";
-      packageName = "cli-table2";
-      version = "0.2.0";
+    "node-appc-0.2.41" = {
+      name = "node-appc";
+      packageName = "node-appc";
+      version = "0.2.41";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz";
-        sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97";
+        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz";
+        sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52";
       };
     };
-    "cmd-shim-2.0.2" = {
-      name = "cmd-shim";
-      packageName = "cmd-shim";
-      version = "2.0.2";
+    "request-2.79.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.79.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz";
-        sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb";
+        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
+        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
       };
     };
-    "columnify-1.5.4" = {
-      name = "columnify";
-      packageName = "columnify";
-      version = "1.5.4";
+    "sprintf-0.1.5" = {
+      name = "sprintf";
+      packageName = "sprintf";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz";
-        sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb";
+        url = "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz";
+        sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
       };
     };
-    "config-chain-1.1.11" = {
-      name = "config-chain";
-      packageName = "config-chain";
-      version = "1.1.11";
+    "temp-0.8.3" = {
+      name = "temp";
+      packageName = "temp";
+      version = "0.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
-        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
+        url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
+        sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
       };
     };
-    "detect-indent-5.0.0" = {
-      name = "detect-indent";
-      packageName = "detect-indent";
-      version = "5.0.0";
+    "winston-1.1.2" = {
+      name = "winston";
+      packageName = "winston";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz";
-        sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
+        url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz";
+        sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c";
       };
     };
-    "dezalgo-1.0.3" = {
-      name = "dezalgo";
-      packageName = "dezalgo";
-      version = "1.0.3";
+    "fs-extra-2.1.2" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz";
-        sha1 = "7f742de066fc748bc8db820569dddce49bf0d456";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz";
+        sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35";
       };
     };
-    "editor-1.0.0" = {
-      name = "editor";
-      packageName = "editor";
-      version = "1.0.0";
+    "lodash-4.17.4" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz";
-        sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
+        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
       };
     };
-    "fs-vacuum-1.2.10" = {
-      name = "fs-vacuum";
-      packageName = "fs-vacuum";
-      version = "1.2.10";
+    "colors-0.6.2" = {
+      name = "colors";
+      packageName = "colors";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz";
-        sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36";
+        url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
       };
     };
-    "fs-write-stream-atomic-1.0.10" = {
-      name = "fs-write-stream-atomic";
-      packageName = "fs-write-stream-atomic";
-      version = "1.0.10";
+    "keypress-0.2.1" = {
+      name = "keypress";
+      packageName = "keypress";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz";
-        sha1 = "b47df53493ef911df75731e70a9ded0189db40c9";
+        url = "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz";
+        sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
       };
     };
-    "iferr-0.1.5" = {
-      name = "iferr";
-      packageName = "iferr";
-      version = "0.1.5";
+    "source-map-support-0.3.2" = {
+      name = "source-map-support";
+      packageName = "source-map-support";
+      version = "0.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz";
-        sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501";
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz";
+        sha1 = "737d5c901e0b78fdb53aca713d24f23ccbb10be1";
       };
     };
-    "init-package-json-1.10.1" = {
-      name = "init-package-json";
-      packageName = "init-package-json";
-      version = "1.10.1";
+    "source-map-0.1.32" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.1.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.1.tgz";
-        sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a";
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz";
+        sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266";
       };
     };
-    "is-cidr-1.0.0" = {
-      name = "is-cidr";
-      packageName = "is-cidr";
-      version = "1.0.0";
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-cidr/-/is-cidr-1.0.0.tgz";
-        sha1 = "fb5aacf659255310359da32cae03e40c6a1c2afc";
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
       };
     };
-    "lazy-property-1.0.0" = {
-      name = "lazy-property";
-      packageName = "lazy-property";
-      version = "1.0.0";
+    "async-2.1.4" = {
+      name = "async";
+      packageName = "async";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-property/-/lazy-property-1.0.0.tgz";
-        sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
+        url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz";
+        sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
       };
     };
-    "libnpx-9.6.0" = {
-      name = "libnpx";
-      packageName = "libnpx";
-      version = "9.6.0";
+    "diff-3.2.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.6.0.tgz";
-        sha512 = "28v6bsd92dcqj92yr2bk9r29ajwbqx46fd46mriva2934nr7s6hhkxy6f7xbf4nd7p93fxsbpzfx0ghq0y788x1zj8gnh1iswgd89sz";
+        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
+        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
       };
     };
-    "lockfile-1.0.3" = {
-      name = "lockfile";
-      packageName = "lockfile";
-      version = "1.0.3";
+    "node-uuid-1.4.7" = {
+      name = "node-uuid";
+      packageName = "node-uuid";
+      version = "1.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz";
-        sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79";
+        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
+        sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
       };
     };
-    "lodash._baseuniq-4.6.0" = {
-      name = "lodash._baseuniq";
-      packageName = "lodash._baseuniq";
-      version = "4.6.0";
+    "optimist-0.6.1" = {
+      name = "optimist";
+      packageName = "optimist";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz";
-        sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8";
+        url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
       };
     };
-    "lodash.clonedeep-4.5.0" = {
-      name = "lodash.clonedeep";
-      packageName = "lodash.clonedeep";
-      version = "4.5.0";
+    "wrench-1.5.9" = {
+      name = "wrench";
+      packageName = "wrench";
+      version = "1.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz";
-        sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
+        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz";
+        sha1 = "411691c63a9b2531b1700267279bdeca23b2142a";
       };
     };
-    "lodash.union-4.6.0" = {
-      name = "lodash.union";
-      packageName = "lodash.union";
-      version = "4.6.0";
+    "uglify-js-2.7.5" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz";
-        sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
       };
     };
-    "lodash.uniq-4.5.0" = {
-      name = "lodash.uniq";
-      packageName = "lodash.uniq";
-      version = "4.5.0";
+    "wordwrap-0.0.3" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz";
-        sha1 = "d0225373aeb652adc1bc82e4945339a842754773";
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
       };
     };
-    "lodash.without-4.4.0" = {
-      name = "lodash.without";
-      packageName = "lodash.without";
-      version = "4.4.0";
+    "minimist-0.0.10" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz";
-        sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
       };
     };
-    "lru-cache-4.1.1" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "4.1.1";
+    "async-0.2.10" = {
+      name = "async";
+      packageName = "async";
+      version = "0.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz";
-        sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb";
+        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
-    "meant-1.0.1" = {
-      name = "meant";
-      packageName = "meant";
-      version = "1.0.1";
+    "source-map-0.5.7" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz";
-        sha512 = "2b6yi25bkxg4hd38w2cpfjy0xyka4iqiyzhsnkklx3nxwbgnzr4hfl07xxpflccjvnb03zvnssw0y9fspxdk2fmq3abd4fab0n1baai";
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
       };
     };
-    "mississippi-1.3.0" = {
-      name = "mississippi";
-      packageName = "mississippi";
-      version = "1.3.0";
+    "uglify-to-browserify-1.0.2" = {
+      name = "uglify-to-browserify";
+      packageName = "uglify-to-browserify";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz";
-        sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5";
+        url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "move-concurrently-1.0.1" = {
-      name = "move-concurrently";
-      packageName = "move-concurrently";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz";
-        sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
-      };
-    };
-    "node-gyp-3.6.2" = {
-      name = "node-gyp";
-      packageName = "node-gyp";
-      version = "3.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz";
-        sha1 = "9bfbe54562286284838e750eac05295853fa1c60";
-      };
-    };
-    "npm-cache-filename-1.0.2" = {
-      name = "npm-cache-filename";
-      packageName = "npm-cache-filename";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz";
-        sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11";
-      };
-    };
-    "npm-install-checks-3.0.0" = {
-      name = "npm-install-checks";
-      packageName = "npm-install-checks";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-3.0.0.tgz";
-        sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
-      };
-    };
-    "npm-lifecycle-1.0.3" = {
-      name = "npm-lifecycle";
-      packageName = "npm-lifecycle";
-      version = "1.0.3";
+    "yargs-3.10.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-1.0.3.tgz";
-        sha512 = "0iapgirmdb46ia3apm6fsb9qv9c0hi4k9jflrxlgnrm0jhliqgas49lmpz06xafncx1sxgjngl0fw3gr472c7kapzdvpivf0fp5miqa";
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
-    "npm-package-arg-5.1.2" = {
-      name = "npm-package-arg";
-      packageName = "npm-package-arg";
-      version = "5.1.2";
+    "camelcase-1.2.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
-        sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460";
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
       };
     };
-    "npm-packlist-1.1.10" = {
-      name = "npm-packlist";
-      packageName = "npm-packlist";
-      version = "1.1.10";
+    "cliui-2.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz";
-        sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001";
+        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
       };
     };
-    "npm-profile-2.0.5" = {
-      name = "npm-profile";
-      packageName = "npm-profile";
-      version = "2.0.5";
+    "window-size-0.1.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-profile/-/npm-profile-2.0.5.tgz";
-        sha512 = "2325avpmbzxl4vi1hxnxv96rw9j0y712ym3mph3hrsvgq4p8d0yh44vnja22plnw9vplskcx661j2spzqka65zsszzngvwm806skfdl";
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
       };
     };
-    "npm-registry-client-8.5.0" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "8.5.0";
+    "center-align-0.1.3" = {
+      name = "center-align";
+      packageName = "center-align";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz";
-        sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn";
+        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
       };
     };
-    "npm-user-validate-1.0.0" = {
-      name = "npm-user-validate";
-      packageName = "npm-user-validate";
-      version = "1.0.0";
+    "right-align-0.1.3" = {
+      name = "right-align";
+      packageName = "right-align";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-1.0.0.tgz";
-        sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951";
+        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
       };
     };
-    "opener-1.4.3" = {
-      name = "opener";
-      packageName = "opener";
-      version = "1.4.3";
+    "wordwrap-0.0.2" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz";
-        sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
       };
     };
-    "pacote-6.0.4" = {
-      name = "pacote";
-      packageName = "pacote";
-      version = "6.0.4";
+    "align-text-0.1.4" = {
+      name = "align-text";
+      packageName = "align-text";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-6.0.4.tgz";
-        sha512 = "36bx0mnsvm3fvq0vbcl05j6fsjf4v4gks1hlxqyga0jxz491cis9y38j8q9cmmfdfbx9xaz3n3h93h0ik4bkn82rb3nz2413wk7xfxi";
+        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
       };
     };
-    "path-is-inside-1.0.2" = {
-      name = "path-is-inside";
-      packageName = "path-is-inside";
-      version = "1.0.2";
+    "lazy-cache-1.0.4" = {
+      name = "lazy-cache";
+      packageName = "lazy-cache";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
-        sha1 = "365417dede44430d1c11af61027facf074bdfc53";
+        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
       };
     };
-    "promise-inflight-1.0.1" = {
-      name = "promise-inflight";
-      packageName = "promise-inflight";
+    "longest-1.0.1" = {
+      name = "longest";
+      packageName = "longest";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz";
-        sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
+        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
       };
     };
-    "qrcode-terminal-0.11.0" = {
-      name = "qrcode-terminal";
-      packageName = "qrcode-terminal";
+    "caseless-0.11.0" = {
+      name = "caseless";
+      packageName = "caseless";
       version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz";
-        sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e";
-      };
-    };
-    "query-string-5.0.0" = {
-      name = "query-string";
-      packageName = "query-string";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-5.0.0.tgz";
-        sha1 = "fbdf7004b4d2aff792f9871981b7a2794f555947";
-      };
-    };
-    "qw-1.0.1" = {
-      name = "qw";
-      packageName = "qw";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qw/-/qw-1.0.1.tgz";
-        sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4";
-      };
-    };
-    "read-1.0.7" = {
-      name = "read";
-      packageName = "read";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz";
-        sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
-      };
-    };
-    "read-cmd-shim-1.0.1" = {
-      name = "read-cmd-shim";
-      packageName = "read-cmd-shim";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz";
-        sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b";
-      };
-    };
-    "read-installed-4.0.3" = {
-      name = "read-installed";
-      packageName = "read-installed";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz";
-        sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067";
-      };
-    };
-    "read-package-json-2.0.12" = {
-      name = "read-package-json";
-      packageName = "read-package-json";
-      version = "2.0.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz";
-        sha512 = "15w2z3m1iysjf0zwvyc5mix8nypx42shx90alil4sslq6caj3pgk59zsn2ppxn95nls6bs7yw7khl5rmlq9gljv27w3vs2gxg9wigwv";
-      };
-    };
-    "read-package-tree-5.1.6" = {
-      name = "read-package-tree";
-      packageName = "read-package-tree";
-      version = "5.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz";
-        sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l";
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+        sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
       };
     };
-    "retry-0.10.1" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.10.1";
+    "har-validator-2.0.6" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
-        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
+        sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
       };
     };
-    "sha-2.0.1" = {
-      name = "sha";
-      packageName = "sha";
-      version = "2.0.1";
+    "qs-6.3.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz";
-        sha1 = "6030822fbd2c9823949f8f72ed6411ee5cf25aae";
+        url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz";
+        sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c";
       };
     };
-    "slide-1.1.6" = {
-      name = "slide";
-      packageName = "slide";
-      version = "1.1.6";
+    "tunnel-agent-0.4.3" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
-        sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
+        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
       };
     };
-    "sorted-object-2.0.1" = {
-      name = "sorted-object";
-      packageName = "sorted-object";
-      version = "2.0.1";
+    "commander-2.11.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz";
-        sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc";
+        url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
+        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
       };
     };
-    "sorted-union-stream-2.1.3" = {
-      name = "sorted-union-stream";
-      packageName = "sorted-union-stream";
-      version = "2.1.3";
+    "is-my-json-valid-2.16.1" = {
+      name = "is-my-json-valid";
+      packageName = "is-my-json-valid";
+      version = "2.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz";
-        sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz";
+        sha512 = "2wmvqb2vfzjbnd2znxkg4sqpksxb9mi1lbr4r5zv535ykxzfv8dbnafra1lhk415wrbg9r1lfhyimcw5xfj3k4ry7inbmcjlnr4zj51";
       };
     };
-    "ssri-4.1.6" = {
-      name = "ssri";
-      packageName = "ssri";
-      version = "4.1.6";
+    "generate-function-2.0.0" = {
+      name = "generate-function";
+      packageName = "generate-function";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
-        sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr";
+        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+        sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
       };
     };
-    "strip-ansi-4.0.0" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "4.0.0";
+    "generate-object-property-1.2.0" = {
+      name = "generate-object-property";
+      packageName = "generate-object-property";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
-        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+        url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
+        sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
       };
     };
-    "tar-4.0.2" = {
-      name = "tar";
-      packageName = "tar";
-      version = "4.0.2";
+    "jsonpointer-4.0.1" = {
+      name = "jsonpointer";
+      packageName = "jsonpointer";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz";
-        sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
+        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
       };
     };
-    "text-table-0.2.0" = {
-      name = "text-table";
-      packageName = "text-table";
-      version = "0.2.0";
+    "is-property-1.0.2" = {
+      name = "is-property";
+      packageName = "is-property";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
-        sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
+        url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+        sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
       };
     };
-    "umask-1.1.0" = {
-      name = "umask";
-      packageName = "umask";
-      version = "1.1.0";
+    "async-1.0.0" = {
+      name = "async";
+      packageName = "async";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz";
-        sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d";
+        url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz";
+        sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
       };
     };
-    "unique-filename-1.1.0" = {
-      name = "unique-filename";
-      packageName = "unique-filename";
-      version = "1.1.0";
+    "colors-1.0.3" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz";
-        sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
+        url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
+        sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
-    "update-notifier-2.2.0" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "2.2.0";
+    "cycle-1.0.3" = {
+      name = "cycle";
+      packageName = "cycle";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz";
-        sha1 = "1b5837cf90c0736d88627732b661c138f86de72f";
+        url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+        sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
       };
     };
-    "validate-npm-package-name-3.0.0" = {
-      name = "validate-npm-package-name";
-      packageName = "validate-npm-package-name";
-      version = "3.0.0";
+    "eyes-0.1.8" = {
+      name = "eyes";
+      packageName = "eyes";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz";
-        sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
+        url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
       };
     };
-    "worker-farm-1.5.0" = {
-      name = "worker-farm";
-      packageName = "worker-farm";
-      version = "1.5.0";
+    "pkginfo-0.3.1" = {
+      name = "pkginfo";
+      packageName = "pkginfo";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.0.tgz";
-        sha512 = "2lrlysxfbyzywla6i1q07xncmw30w1icgq18c4bra25dl6wvcd3mxg1lqbf88w5h7mqnf98j8ll657wnqwjq9rwd7pbmd9i11964x0c";
+        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz";
+        sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
       };
     };
-    "write-file-atomic-2.1.0" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "2.1.0";
+    "stack-trace-0.0.10" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
-        sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni";
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
+        sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
       };
     };
-    "debuglog-1.0.1" = {
-      name = "debuglog";
-      packageName = "debuglog";
-      version = "1.0.1";
+    "jsonfile-2.4.0" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz";
-        sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492";
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
+        sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
       };
     };
-    "imurmurhash-0.1.4" = {
-      name = "imurmurhash";
-      packageName = "imurmurhash";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
-        sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
-      };
+  };
+in
+{
+  coffee-script = nodeEnv.buildNodePackage {
+    name = "coffee-script";
+    packageName = "coffee-script";
+    version = "1.12.7";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
+      sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
     };
-    "lodash._baseindexof-3.1.0" = {
-      name = "lodash._baseindexof";
-      packageName = "lodash._baseindexof";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz";
-        sha1 = "fe52b53a1c6761e42618d654e4a25789ed61822c";
-      };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Unfancy JavaScript";
+      homepage = http://coffeescript.org/;
+      license = "MIT";
     };
-    "lodash._bindcallback-3.0.1" = {
-      name = "lodash._bindcallback";
-      packageName = "lodash._bindcallback";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz";
-        sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e";
-      };
+    production = true;
+  };
+  grunt-cli = nodeEnv.buildNodePackage {
+    name = "grunt-cli";
+    packageName = "grunt-cli";
+    version = "1.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz";
+      sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8";
     };
-    "lodash._cacheindexof-3.0.2" = {
-      name = "lodash._cacheindexof";
-      packageName = "lodash._cacheindexof";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz";
-        sha1 = "3dc69ac82498d2ee5e3ce56091bafd2adc7bde92";
-      };
-    };
-    "lodash._createcache-3.1.2" = {
-      name = "lodash._createcache";
-      packageName = "lodash._createcache";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz";
-        sha1 = "56d6a064017625e79ebca6b8018e17440bdcf093";
-      };
-    };
-    "readdir-scoped-modules-1.0.2" = {
-      name = "readdir-scoped-modules";
-      packageName = "readdir-scoped-modules";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz";
-        sha1 = "9fafa37d286be5d92cbaebdee030dc9b5f406747";
-      };
-    };
-    "jsonparse-1.3.1" = {
-      name = "jsonparse";
-      packageName = "jsonparse";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz";
-        sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
-      };
-    };
-    "through-2.3.8" = {
-      name = "through";
-      packageName = "through";
-      version = "2.3.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
-        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
-      };
-    };
-    "colors-1.1.2" = {
-      name = "colors";
-      packageName = "colors";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
-        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
-      };
-    };
-    "wcwidth-1.0.1" = {
-      name = "wcwidth";
-      packageName = "wcwidth";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz";
-        sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8";
-      };
-    };
-    "proto-list-1.2.4" = {
-      name = "proto-list";
-      packageName = "proto-list";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz";
-        sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
-      };
-    };
-    "asap-2.0.6" = {
-      name = "asap";
-      packageName = "asap";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
-        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
-      };
-    };
-    "promzard-0.3.0" = {
-      name = "promzard";
-      packageName = "promzard";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz";
-        sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
-      };
-    };
-    "cidr-regex-1.0.6" = {
-      name = "cidr-regex";
-      packageName = "cidr-regex";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cidr-regex/-/cidr-regex-1.0.6.tgz";
-        sha1 = "74abfd619df370b9d54ab14475568e97dd64c0c1";
-      };
-    };
-    "dotenv-4.0.0" = {
-      name = "dotenv";
-      packageName = "dotenv";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz";
-        sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d";
-      };
-    };
-    "yargs-8.0.2" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "8.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz";
-        sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360";
-      };
-    };
-    "camelcase-4.1.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
-      };
-    };
-    "get-caller-file-1.0.2" = {
-      name = "get-caller-file";
-      packageName = "get-caller-file";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
-        sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
-      };
-    };
-    "os-locale-2.1.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy";
-      };
-    };
-    "read-pkg-up-2.0.0" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
-        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
-      };
-    };
-    "require-directory-2.1.1" = {
-      name = "require-directory";
-      packageName = "require-directory";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
-        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
-      };
-    };
-    "require-main-filename-1.0.1" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
-      };
-    };
-    "string-width-2.1.1" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
-      };
-    };
-    "which-module-2.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
-        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
-      };
-    };
-    "yargs-parser-7.0.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
-        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
-      };
-    };
-    "execa-0.7.0" = {
-      name = "execa";
-      packageName = "execa";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
-        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
-      };
-    };
-    "mem-1.1.0" = {
-      name = "mem";
-      packageName = "mem";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
-        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
-      };
-    };
-    "cross-spawn-5.1.0" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
-        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
-      };
-    };
-    "get-stream-3.0.0" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
-        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
-      };
-    };
-    "is-stream-1.1.0" = {
-      name = "is-stream";
-      packageName = "is-stream";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
-        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
-      };
-    };
-    "npm-run-path-2.0.2" = {
-      name = "npm-run-path";
-      packageName = "npm-run-path";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
-        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
-      };
-    };
-    "p-finally-1.0.0" = {
-      name = "p-finally";
-      packageName = "p-finally";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
-        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
-      };
-    };
-    "strip-eof-1.0.0" = {
-      name = "strip-eof";
-      packageName = "strip-eof";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
-        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
-      };
-    };
-    "shebang-command-1.2.0" = {
-      name = "shebang-command";
-      packageName = "shebang-command";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
-        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
-      };
-    };
-    "shebang-regex-1.0.0" = {
-      name = "shebang-regex";
-      packageName = "shebang-regex";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
-        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
-      };
-    };
-    "path-key-2.0.1" = {
-      name = "path-key";
-      packageName = "path-key";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
-        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
-      };
-    };
-    "mimic-fn-1.1.0" = {
-      name = "mimic-fn";
-      packageName = "mimic-fn";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz";
-        sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18";
-      };
-    };
-    "find-up-2.1.0" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
-        sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
-      };
-    };
-    "read-pkg-2.0.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
-        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
-      };
-    };
-    "locate-path-2.0.0" = {
-      name = "locate-path";
-      packageName = "locate-path";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
-        sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
-      };
-    };
-    "p-locate-2.0.0" = {
-      name = "p-locate";
-      packageName = "p-locate";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
-        sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
-      };
-    };
-    "path-exists-3.0.0" = {
-      name = "path-exists";
-      packageName = "path-exists";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
-        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
-      };
-    };
-    "p-limit-1.1.0" = {
-      name = "p-limit";
-      packageName = "p-limit";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz";
-        sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc";
-      };
-    };
-    "load-json-file-2.0.0" = {
-      name = "load-json-file";
-      packageName = "load-json-file";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
-        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
-      };
-    };
-    "path-type-2.0.0" = {
-      name = "path-type";
-      packageName = "path-type";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
-        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
-      };
-    };
-    "strip-bom-3.0.0" = {
-      name = "strip-bom";
-      packageName = "strip-bom";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
-        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
-      };
-    };
-    "is-fullwidth-code-point-2.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
-        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
-      };
-    };
-    "lodash._createset-4.0.3" = {
-      name = "lodash._createset";
-      packageName = "lodash._createset";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz";
-        sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
-      };
-    };
-    "pseudomap-1.0.2" = {
-      name = "pseudomap";
-      packageName = "pseudomap";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
-        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
-      };
-    };
-    "yallist-2.1.2" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
-        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
-      };
-    };
-    "concat-stream-1.6.0" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
-        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
-      };
-    };
-    "duplexify-3.5.1" = {
-      name = "duplexify";
-      packageName = "duplexify";
-      version = "3.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz";
-        sha512 = "0cyjpkdqc1lkh2fh7z9p2i6va4fvwazvpn4153ndpb2ng8w0q9x9kb0hk07yy0baj50s1kl58m7f7zmx8fqdfcp2vsl0m7hfk22i64g";
-      };
-    };
-    "end-of-stream-1.4.0" = {
-      name = "end-of-stream";
-      packageName = "end-of-stream";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz";
-        sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206";
-      };
-    };
-    "flush-write-stream-1.0.2" = {
-      name = "flush-write-stream";
-      packageName = "flush-write-stream";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz";
-        sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417";
-      };
-    };
-    "from2-2.3.0" = {
-      name = "from2";
-      packageName = "from2";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
-        sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
-      };
-    };
-    "parallel-transform-1.1.0" = {
-      name = "parallel-transform";
-      packageName = "parallel-transform";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz";
-        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
-      };
-    };
-    "pump-1.0.2" = {
-      name = "pump";
-      packageName = "pump";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz";
-        sha1 = "3b3ee6512f94f0e575538c17995f9f16990a5d51";
-      };
-    };
-    "pumpify-1.3.5" = {
-      name = "pumpify";
-      packageName = "pumpify";
-      version = "1.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz";
-        sha1 = "1b671c619940abcaeac0ad0e3a3c164be760993b";
-      };
-    };
-    "stream-each-1.2.2" = {
-      name = "stream-each";
-      packageName = "stream-each";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz";
-        sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr";
-      };
-    };
-    "typedarray-0.0.6" = {
-      name = "typedarray";
-      packageName = "typedarray";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
-        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
-      };
-    };
-    "stream-shift-1.0.0" = {
-      name = "stream-shift";
-      packageName = "stream-shift";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz";
-        sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
-      };
-    };
-    "cyclist-0.2.2" = {
-      name = "cyclist";
-      packageName = "cyclist";
-      version = "0.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz";
-        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
-      };
-    };
-    "copy-concurrently-1.0.5" = {
-      name = "copy-concurrently";
-      packageName = "copy-concurrently";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
-        sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz";
-      };
-    };
-    "run-queue-1.0.3" = {
-      name = "run-queue";
-      packageName = "run-queue";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz";
-        sha1 = "e848396f057d223f24386924618e25694161ec47";
-      };
-    };
-    "ignore-walk-3.0.1" = {
-      name = "ignore-walk";
-      packageName = "ignore-walk";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";
-        sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d";
-      };
-    };
-    "npm-bundled-1.0.3" = {
-      name = "npm-bundled";
-      packageName = "npm-bundled";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz";
-        sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907";
-      };
-    };
-    "make-fetch-happen-2.5.0" = {
-      name = "make-fetch-happen";
-      packageName = "make-fetch-happen";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.5.0.tgz";
-        sha512 = "1s6fqfsr7ksyfp0mwzlcf9rwpg74y29p67jkc8h89zy915rjsy5f85ik1659gd0y48z7lbnf3mg9c27drk74qycj446rlykim3zkw14";
-      };
-    };
-    "agentkeepalive-3.3.0" = {
-      name = "agentkeepalive";
-      packageName = "agentkeepalive";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz";
-        sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p";
-      };
-    };
-    "http-cache-semantics-3.8.0" = {
-      name = "http-cache-semantics";
-      packageName = "http-cache-semantics";
-      version = "3.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.0.tgz";
-        sha512 = "258k0vff4wrszl7vnpv4c67zc5qk0mnl8banhp8znianmahxv1y55lpz0877jicsw1k0y8g0glz4my71dd9y3ywzpingfvb2xy0ar0w";
-      };
-    };
-    "http-proxy-agent-2.0.0" = {
-      name = "http-proxy-agent";
-      packageName = "http-proxy-agent";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz";
-        sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4";
-      };
-    };
-    "https-proxy-agent-2.1.0" = {
-      name = "https-proxy-agent";
-      packageName = "https-proxy-agent";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
-        sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w";
-      };
-    };
-    "node-fetch-npm-2.0.2" = {
-      name = "node-fetch-npm";
-      packageName = "node-fetch-npm";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz";
-        sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw";
-      };
-    };
-    "promise-retry-1.1.1" = {
-      name = "promise-retry";
-      packageName = "promise-retry";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz";
-        sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d";
-      };
-    };
-    "socks-proxy-agent-3.0.1" = {
-      name = "socks-proxy-agent";
-      packageName = "socks-proxy-agent";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz";
-        sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7";
-      };
-    };
-    "humanize-ms-1.2.1" = {
-      name = "humanize-ms";
-      packageName = "humanize-ms";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz";
-        sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed";
-      };
-    };
-    "agent-base-4.1.1" = {
-      name = "agent-base";
-      packageName = "agent-base";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
-        sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9";
-      };
-    };
-    "es6-promisify-5.0.0" = {
-      name = "es6-promisify";
-      packageName = "es6-promisify";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
-        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
-      };
-    };
-    "es6-promise-4.1.1" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
-        sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r";
-      };
-    };
-    "encoding-0.1.12" = {
-      name = "encoding";
-      packageName = "encoding";
-      version = "0.1.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz";
-        sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
-      };
-    };
-    "json-parse-better-errors-1.0.1" = {
-      name = "json-parse-better-errors";
-      packageName = "json-parse-better-errors";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz";
-        sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967";
-      };
-    };
-    "err-code-1.1.2" = {
-      name = "err-code";
-      packageName = "err-code";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz";
-        sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
-      };
-    };
-    "socks-1.1.10" = {
-      name = "socks";
-      packageName = "socks";
-      version = "1.1.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz";
-        sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a";
-      };
-    };
-    "ip-1.1.5" = {
-      name = "ip";
-      packageName = "ip";
-      version = "1.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz";
-        sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a";
-      };
-    };
-    "smart-buffer-1.1.15" = {
-      name = "smart-buffer";
-      packageName = "smart-buffer";
-      version = "1.1.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz";
-        sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16";
-      };
-    };
-    "npm-pick-manifest-1.0.4" = {
-      name = "npm-pick-manifest";
-      packageName = "npm-pick-manifest";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
-        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
-      };
-    };
-    "protoduck-4.0.0" = {
-      name = "protoduck";
-      packageName = "protoduck";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz";
-        sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e";
-      };
-    };
-    "genfun-4.0.1" = {
-      name = "genfun";
-      packageName = "genfun";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/genfun/-/genfun-4.0.1.tgz";
-        sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1";
-      };
-    };
-    "decode-uri-component-0.2.0" = {
-      name = "decode-uri-component";
-      packageName = "decode-uri-component";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
-        sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
-      };
-    };
-    "strict-uri-encode-1.1.0" = {
-      name = "strict-uri-encode";
-      packageName = "strict-uri-encode";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
-        sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
-      };
-    };
-    "mute-stream-0.0.7" = {
-      name = "mute-stream";
-      packageName = "mute-stream";
-      version = "0.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
-        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
-      };
-    };
-    "util-extend-1.0.3" = {
-      name = "util-extend";
-      packageName = "util-extend";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz";
-        sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
-      };
-    };
-    "slash-1.0.0" = {
-      name = "slash";
-      packageName = "slash";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";
-        sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
-      };
-    };
-    "from2-1.3.0" = {
-      name = "from2";
-      packageName = "from2";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/from2/-/from2-1.3.0.tgz";
-        sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd";
-      };
-    };
-    "stream-iterate-1.2.0" = {
-      name = "stream-iterate";
-      packageName = "stream-iterate";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz";
-        sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1";
-      };
-    };
-    "minipass-2.2.1" = {
-      name = "minipass";
-      packageName = "minipass";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz";
-        sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv";
-      };
-    };
-    "minizlib-1.0.4" = {
-      name = "minizlib";
-      packageName = "minizlib";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz";
-        sha512 = "1lxpa3mkdc94i0d7b2ivilcky0gnmnxv5csmigzacb5gl2cz7rz4ciikq1r5an1simk86f61whwzyi5d8gic85w55q19d09sbv19pmh";
-      };
-    };
-    "yallist-3.0.2" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
-        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
-      };
-    };
-    "unique-slug-2.0.0" = {
-      name = "unique-slug";
-      packageName = "unique-slug";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz";
-        sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
-      };
-    };
-    "boxen-1.2.2" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz";
-        sha1 = "3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5";
-      };
-    };
-    "configstore-3.1.1" = {
-      name = "configstore";
-      packageName = "configstore";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
-        sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6";
-      };
-    };
-    "import-lazy-2.1.0" = {
-      name = "import-lazy";
-      packageName = "import-lazy";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz";
-        sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
-      };
-    };
-    "is-npm-1.0.0" = {
-      name = "is-npm";
-      packageName = "is-npm";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
-        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
-      };
-    };
-    "latest-version-3.1.0" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz";
-        sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
-      };
-    };
-    "semver-diff-2.1.0" = {
-      name = "semver-diff";
-      packageName = "semver-diff";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
-        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
-      };
-    };
-    "xdg-basedir-3.0.0" = {
-      name = "xdg-basedir";
-      packageName = "xdg-basedir";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz";
-        sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
-      };
-    };
-    "ansi-align-2.0.0" = {
-      name = "ansi-align";
-      packageName = "ansi-align";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz";
-        sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
-      };
-    };
-    "chalk-2.2.0" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz";
-        sha512 = "3vfffivwlp2hr7dwh84lvayba94a98ddhb8dwkv14magmfdj1n895880sik7liqv4xgnvvpr2v5jsm1gzl1fypl7nl9dpa6d3zhq4yh";
-      };
-    };
-    "cli-boxes-1.0.0" = {
-      name = "cli-boxes";
-      packageName = "cli-boxes";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz";
-        sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143";
-      };
-    };
-    "term-size-1.2.0" = {
-      name = "term-size";
-      packageName = "term-size";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz";
-        sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
-      };
-    };
-    "widest-line-1.0.0" = {
-      name = "widest-line";
-      packageName = "widest-line";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
-        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
-      };
-    };
-    "ansi-styles-3.2.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
-        sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
-      };
-    };
-    "supports-color-4.5.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz";
-        sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b";
-      };
-    };
-    "color-convert-1.9.0" = {
-      name = "color-convert";
-      packageName = "color-convert";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
-        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
-      };
-    };
-    "color-name-1.1.3" = {
-      name = "color-name";
-      packageName = "color-name";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
-        sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
-      };
-    };
-    "has-flag-2.0.0" = {
-      name = "has-flag";
-      packageName = "has-flag";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz";
-        sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51";
-      };
-    };
-    "dot-prop-4.2.0" = {
-      name = "dot-prop";
-      packageName = "dot-prop";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
-        sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
-      };
-    };
-    "make-dir-1.1.0" = {
-      name = "make-dir";
-      packageName = "make-dir";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz";
-        sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh";
-      };
-    };
-    "unique-string-1.0.0" = {
-      name = "unique-string";
-      packageName = "unique-string";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz";
-        sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
-      };
-    };
-    "is-obj-1.0.1" = {
-      name = "is-obj";
-      packageName = "is-obj";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz";
-        sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
-      };
-    };
-    "pify-3.0.0" = {
-      name = "pify";
-      packageName = "pify";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz";
-        sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
-      };
-    };
-    "crypto-random-string-1.0.0" = {
-      name = "crypto-random-string";
-      packageName = "crypto-random-string";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz";
-        sha1 = "a230f64f568310e1498009940790ec99545bca7e";
-      };
-    };
-    "package-json-4.0.1" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz";
-        sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed";
-      };
-    };
-    "got-6.7.1" = {
-      name = "got";
-      packageName = "got";
-      version = "6.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
-        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
-      };
-    };
-    "registry-auth-token-3.3.1" = {
-      name = "registry-auth-token";
-      packageName = "registry-auth-token";
-      version = "3.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz";
-        sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006";
-      };
-    };
-    "registry-url-3.1.0" = {
-      name = "registry-url";
-      packageName = "registry-url";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
-        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
-      };
-    };
-    "create-error-class-3.0.2" = {
-      name = "create-error-class";
-      packageName = "create-error-class";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz";
-        sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
-      };
-    };
-    "duplexer3-0.1.4" = {
-      name = "duplexer3";
-      packageName = "duplexer3";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz";
-        sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
-      };
-    };
-    "is-redirect-1.0.0" = {
-      name = "is-redirect";
-      packageName = "is-redirect";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
-        sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
-      };
-    };
-    "is-retry-allowed-1.1.0" = {
-      name = "is-retry-allowed";
-      packageName = "is-retry-allowed";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz";
-        sha1 = "11a060568b67339444033d0125a61a20d564fb34";
-      };
-    };
-    "lowercase-keys-1.0.0" = {
-      name = "lowercase-keys";
-      packageName = "lowercase-keys";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
-        sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306";
-      };
-    };
-    "timed-out-4.0.1" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz";
-        sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
-      };
-    };
-    "unzip-response-2.0.1" = {
-      name = "unzip-response";
-      packageName = "unzip-response";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz";
-        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
-      };
-    };
-    "url-parse-lax-1.0.0" = {
-      name = "url-parse-lax";
-      packageName = "url-parse-lax";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz";
-        sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73";
-      };
-    };
-    "capture-stack-trace-1.0.0" = {
-      name = "capture-stack-trace";
-      packageName = "capture-stack-trace";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
-        sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
-      };
-    };
-    "prepend-http-1.0.4" = {
-      name = "prepend-http";
-      packageName = "prepend-http";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz";
-        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
-      };
-    };
-    "builtins-1.0.3" = {
-      name = "builtins";
-      packageName = "builtins";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz";
-        sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88";
-      };
-    };
-    "errno-0.1.4" = {
-      name = "errno";
-      packageName = "errno";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz";
-        sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d";
-      };
-    };
-    "prr-0.0.0" = {
-      name = "prr";
-      packageName = "prr";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
-        sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
-      };
-    };
-    "adm-zip-0.4.7" = {
-      name = "adm-zip";
-      packageName = "adm-zip";
-      version = "0.4.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz";
-        sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
-      };
-    };
-    "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";
-      version = "0.1.24";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fields/-/fields-0.1.24.tgz";
-        sha1 = "bed93b1c2521f4705fe764f4209267fdfd89f5d3";
-      };
-    };
-    "humanize-0.0.9" = {
-      name = "humanize";
-      packageName = "humanize";
-      version = "0.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
-        sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
-      };
-    };
-    "longjohn-0.2.11" = {
-      name = "longjohn";
-      packageName = "longjohn";
-      version = "0.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz";
-        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.41" = {
-      name = "node-appc";
-      packageName = "node-appc";
-      version = "0.2.41";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz";
-        sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52";
-      };
-    };
-    "request-2.79.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.79.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
-        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
-      };
-    };
-    "sprintf-0.1.5" = {
-      name = "sprintf";
-      packageName = "sprintf";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz";
-        sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
-      };
-    };
-    "temp-0.8.3" = {
-      name = "temp";
-      packageName = "temp";
-      version = "0.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
-        sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
-      };
-    };
-    "winston-1.1.2" = {
-      name = "winston";
-      packageName = "winston";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz";
-        sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c";
-      };
-    };
-    "fs-extra-2.1.2" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz";
-        sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35";
-      };
-    };
-    "lodash-4.17.4" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.17.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
-        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
-      };
-    };
-    "colors-0.6.2" = {
-      name = "colors";
-      packageName = "colors";
-      version = "0.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
-        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
-      };
-    };
-    "keypress-0.2.1" = {
-      name = "keypress";
-      packageName = "keypress";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz";
-        sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
-      };
-    };
-    "source-map-support-0.3.2" = {
-      name = "source-map-support";
-      packageName = "source-map-support";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz";
-        sha1 = "737d5c901e0b78fdb53aca713d24f23ccbb10be1";
-      };
-    };
-    "source-map-0.1.32" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.1.32";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz";
-        sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266";
-      };
-    };
-    "amdefine-1.0.1" = {
-      name = "amdefine";
-      packageName = "amdefine";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
-        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
-      };
-    };
-    "async-2.1.4" = {
-      name = "async";
-      packageName = "async";
-      version = "2.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz";
-        sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
-      };
-    };
-    "diff-3.2.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
-        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
-      };
-    };
-    "node-uuid-1.4.7" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.4.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
-        sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
-      };
-    };
-    "optimist-0.6.1" = {
-      name = "optimist";
-      packageName = "optimist";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
-        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
-      };
-    };
-    "wrench-1.5.9" = {
-      name = "wrench";
-      packageName = "wrench";
-      version = "1.5.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz";
-        sha1 = "411691c63a9b2531b1700267279bdeca23b2142a";
-      };
-    };
-    "uglify-js-2.7.5" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.7.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
-        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
-      };
-    };
-    "wordwrap-0.0.3" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
-        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
-      };
-    };
-    "minimist-0.0.10" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
-        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
-      };
-    };
-    "async-0.2.10" = {
-      name = "async";
-      packageName = "async";
-      version = "0.2.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
-        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
-      };
-    };
-    "source-map-0.5.7" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.5.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
-        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
-      };
-    };
-    "uglify-to-browserify-1.0.2" = {
-      name = "uglify-to-browserify";
-      packageName = "uglify-to-browserify";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
-        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
-      };
-    };
-    "yargs-3.10.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "3.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
-        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
-      };
-    };
-    "camelcase-1.2.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
-        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
-      };
-    };
-    "cliui-2.1.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
-        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
-      };
-    };
-    "window-size-0.1.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
-        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
-      };
-    };
-    "center-align-0.1.3" = {
-      name = "center-align";
-      packageName = "center-align";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
-        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
-      };
-    };
-    "right-align-0.1.3" = {
-      name = "right-align";
-      packageName = "right-align";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
-        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
-      };
-    };
-    "wordwrap-0.0.2" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
-        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
-      };
-    };
-    "align-text-0.1.4" = {
-      name = "align-text";
-      packageName = "align-text";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
-        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
-      };
-    };
-    "lazy-cache-1.0.4" = {
-      name = "lazy-cache";
-      packageName = "lazy-cache";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
-        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
-      };
-    };
-    "longest-1.0.1" = {
-      name = "longest";
-      packageName = "longest";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
-        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
-      };
-    };
-    "caseless-0.11.0" = {
-      name = "caseless";
-      packageName = "caseless";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
-        sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
-      };
-    };
-    "har-validator-2.0.6" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
-        sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
-      };
-    };
-    "qs-6.3.2" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz";
-        sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c";
-      };
-    };
-    "tunnel-agent-0.4.3" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
-        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
-      };
-    };
-    "commander-2.11.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
-        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
-      };
-    };
-    "is-my-json-valid-2.16.1" = {
-      name = "is-my-json-valid";
-      packageName = "is-my-json-valid";
-      version = "2.16.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz";
-        sha512 = "2wmvqb2vfzjbnd2znxkg4sqpksxb9mi1lbr4r5zv535ykxzfv8dbnafra1lhk415wrbg9r1lfhyimcw5xfj3k4ry7inbmcjlnr4zj51";
-      };
-    };
-    "generate-function-2.0.0" = {
-      name = "generate-function";
-      packageName = "generate-function";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
-        sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
-      };
-    };
-    "generate-object-property-1.2.0" = {
-      name = "generate-object-property";
-      packageName = "generate-object-property";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
-        sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
-      };
-    };
-    "jsonpointer-4.0.1" = {
-      name = "jsonpointer";
-      packageName = "jsonpointer";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
-        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
-      };
-    };
-    "is-property-1.0.2" = {
-      name = "is-property";
-      packageName = "is-property";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
-        sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
-      };
-    };
-    "async-1.0.0" = {
-      name = "async";
-      packageName = "async";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz";
-        sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
-      };
-    };
-    "colors-1.0.3" = {
-      name = "colors";
-      packageName = "colors";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
-        sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
-      };
-    };
-    "cycle-1.0.3" = {
-      name = "cycle";
-      packageName = "cycle";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
-        sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
-      };
-    };
-    "eyes-0.1.8" = {
-      name = "eyes";
-      packageName = "eyes";
-      version = "0.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
-        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
-      };
-    };
-    "pkginfo-0.3.1" = {
-      name = "pkginfo";
-      packageName = "pkginfo";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz";
-        sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
-      };
-    };
-    "stack-trace-0.0.10" = {
-      name = "stack-trace";
-      packageName = "stack-trace";
-      version = "0.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
-        sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
-      };
-    };
-    "jsonfile-2.4.0" = {
-      name = "jsonfile";
-      packageName = "jsonfile";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
-        sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
-      };
-    };
-  };
-in
-{
-  coffee-script = nodeEnv.buildNodePackage {
-    name = "coffee-script";
-    packageName = "coffee-script";
-    version = "1.12.7";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-      sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Unfancy JavaScript";
-      homepage = http://coffeescript.org/;
-      license = "MIT";
-    };
-    production = true;
-  };
-  grunt-cli = nodeEnv.buildNodePackage {
-    name = "grunt-cli";
-    packageName = "grunt-cli";
-    version = "1.2.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz";
-      sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8";
-    };
-    dependencies = [
-      (sources."findup-sync-0.3.0" // {
-        dependencies = [
-          (sources."glob-5.0.15" // {
-            dependencies = [
-              (sources."inflight-1.0.6" // {
-                dependencies = [
-                  sources."wrappy-1.0.2"
-                ];
-              })
-              sources."inherits-2.0.3"
-              (sources."minimatch-3.0.4" // {
-                dependencies = [
-                  (sources."brace-expansion-1.1.8" // {
-                    dependencies = [
-                      sources."balanced-match-1.0.0"
-                      sources."concat-map-0.0.1"
-                    ];
-                  })
-                ];
-              })
-              (sources."once-1.4.0" // {
-                dependencies = [
-                  sources."wrappy-1.0.2"
-                ];
-              })
-              sources."path-is-absolute-1.0.1"
-            ];
-          })
-        ];
-      })
-      sources."grunt-known-options-1.1.0"
-      (sources."nopt-3.0.6" // {
-        dependencies = [
-          sources."abbrev-1.1.1"
-        ];
-      })
-      sources."resolve-1.1.7"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "The grunt command line interface";
-      homepage = "https://github.com/gruntjs/grunt-cli#readme";
-      license = "MIT";
-    };
-    production = true;
-  };
-  gulp = nodeEnv.buildNodePackage {
-    name = "gulp";
-    packageName = "gulp";
-    version = "3.9.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz";
-      sha1 = "571ce45928dd40af6514fc4011866016c13845b4";
-    };
-    dependencies = [
-      sources."archy-1.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.1.1"
-            ];
-          })
-          (sources."strip-ansi-3.0.1" // {
-            dependencies = [
-              sources."ansi-regex-2.1.1"
-            ];
-          })
-          sources."supports-color-2.0.0"
-        ];
-      })
-      sources."deprecated-0.0.1"
-      (sources."gulp-util-3.0.8" // {
-        dependencies = [
-          sources."array-differ-1.0.0"
-          sources."array-uniq-1.0.3"
-          sources."beeper-1.1.1"
-          sources."dateformat-2.2.0"
-          (sources."fancy-log-1.3.0" // {
-            dependencies = [
-              sources."time-stamp-1.1.0"
-            ];
-          })
-          (sources."gulplog-1.0.0" // {
-            dependencies = [
-              (sources."glogg-1.0.0" // {
-                dependencies = [
-                  sources."sparkles-1.0.0"
-                ];
-              })
-            ];
-          })
-          (sources."has-gulplog-0.1.0" // {
-            dependencies = [
-              sources."sparkles-1.0.0"
-            ];
-          })
-          sources."lodash._reescape-3.0.0"
-          sources."lodash._reevaluate-3.0.0"
-          sources."lodash._reinterpolate-3.0.0"
-          (sources."lodash.template-3.6.2" // {
-            dependencies = [
-              sources."lodash._basecopy-3.0.1"
-              sources."lodash._basetostring-3.0.1"
-              sources."lodash._basevalues-3.0.0"
-              sources."lodash._isiterateecall-3.0.9"
-              (sources."lodash.escape-3.2.0" // {
-                dependencies = [
-                  sources."lodash._root-3.0.1"
-                ];
-              })
-              (sources."lodash.keys-3.1.2" // {
-                dependencies = [
-                  sources."lodash._getnative-3.9.1"
-                  sources."lodash.isarguments-3.1.0"
-                  sources."lodash.isarray-3.0.4"
-                ];
-              })
-              sources."lodash.restparam-3.6.1"
-              sources."lodash.templatesettings-3.1.1"
-            ];
-          })
-          (sources."multipipe-0.1.2" // {
-            dependencies = [
-              (sources."duplexer2-0.0.2" // {
-                dependencies = [
-                  (sources."readable-stream-1.1.14" // {
-                    dependencies = [
-                      sources."core-util-is-1.0.2"
-                      sources."isarray-0.0.1"
-                      sources."string_decoder-0.10.31"
-                      sources."inherits-2.0.3"
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-          sources."object-assign-3.0.0"
-          sources."replace-ext-0.0.1"
-          (sources."through2-2.0.3" // {
-            dependencies = [
-              (sources."readable-stream-2.3.3" // {
-                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."safe-buffer-5.1.1"
-                  sources."string_decoder-1.0.3"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-              sources."xtend-4.0.1"
-            ];
-          })
-          (sources."vinyl-0.5.3" // {
-            dependencies = [
-              sources."clone-1.0.2"
-              sources."clone-stats-0.0.1"
-            ];
-          })
-        ];
-      })
-      sources."interpret-1.0.4"
-      (sources."liftoff-2.3.0" // {
-        dependencies = [
-          sources."extend-3.0.1"
-          (sources."findup-sync-0.4.3" // {
-            dependencies = [
-              (sources."detect-file-0.1.0" // {
-                dependencies = [
-                  sources."fs-exists-sync-0.1.0"
-                ];
-              })
-              (sources."is-glob-2.0.1" // {
-                dependencies = [
-                  sources."is-extglob-1.0.0"
-                ];
-              })
-              (sources."micromatch-2.3.11" // {
-                dependencies = [
-                  (sources."arr-diff-2.0.0" // {
-                    dependencies = [
-                      sources."arr-flatten-1.1.0"
-                    ];
-                  })
-                  sources."array-unique-0.2.1"
-                  (sources."braces-1.8.5" // {
-                    dependencies = [
-                      (sources."expand-range-1.8.2" // {
-                        dependencies = [
-                          (sources."fill-range-2.2.3" // {
-                            dependencies = [
-                              sources."is-number-2.1.0"
-                              (sources."isobject-2.1.0" // {
-                                dependencies = [
-                                  sources."isarray-1.0.0"
-                                ];
-                              })
-                              (sources."randomatic-1.1.7" // {
-                                dependencies = [
-                                  (sources."is-number-3.0.0" // {
-                                    dependencies = [
-                                      (sources."kind-of-3.2.2" // {
-                                        dependencies = [
-                                          sources."is-buffer-1.1.5"
-                                        ];
-                                      })
-                                    ];
-                                  })
-                                  (sources."kind-of-4.0.0" // {
-                                    dependencies = [
-                                      sources."is-buffer-1.1.5"
-                                    ];
-                                  })
-                                ];
-                              })
-                              sources."repeat-string-1.6.1"
-                            ];
-                          })
-                        ];
-                      })
-                      sources."preserve-0.2.0"
-                      sources."repeat-element-1.1.2"
-                    ];
-                  })
-                  (sources."expand-brackets-0.1.5" // {
-                    dependencies = [
-                      sources."is-posix-bracket-0.1.1"
-                    ];
-                  })
-                  sources."extglob-0.3.2"
-                  sources."filename-regex-2.0.1"
-                  sources."is-extglob-1.0.0"
-                  (sources."kind-of-3.2.2" // {
-                    dependencies = [
-                      sources."is-buffer-1.1.5"
-                    ];
-                  })
-                  (sources."normalize-path-2.1.1" // {
-                    dependencies = [
-                      sources."remove-trailing-separator-1.1.0"
-                    ];
-                  })
-                  (sources."object.omit-2.0.1" // {
-                    dependencies = [
-                      (sources."for-own-0.1.5" // {
-                        dependencies = [
-                          sources."for-in-1.0.2"
-                        ];
-                      })
-                      sources."is-extendable-0.1.1"
-                    ];
-                  })
-                  (sources."parse-glob-3.0.4" // {
-                    dependencies = [
-                      (sources."glob-base-0.3.0" // {
-                        dependencies = [
-                          sources."glob-parent-2.0.0"
-                        ];
-                      })
-                      sources."is-dotfile-1.0.3"
-                    ];
-                  })
-                  (sources."regex-cache-0.4.4" // {
-                    dependencies = [
-                      (sources."is-equal-shallow-0.1.3" // {
-                        dependencies = [
-                          sources."is-primitive-2.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                ];
-              })
-              (sources."resolve-dir-0.1.1" // {
-                dependencies = [
-                  (sources."expand-tilde-1.2.2" // {
-                    dependencies = [
-                      sources."os-homedir-1.0.2"
-                    ];
-                  })
-                  (sources."global-modules-0.2.3" // {
-                    dependencies = [
-                      (sources."global-prefix-0.1.5" // {
-                        dependencies = [
-                          (sources."homedir-polyfill-1.0.1" // {
-                            dependencies = [
-                              sources."parse-passwd-1.0.0"
-                            ];
-                          })
-                          sources."ini-1.3.4"
-                          (sources."which-1.3.0" // {
-                            dependencies = [
-                              sources."isexe-2.0.0"
-                            ];
-                          })
-                        ];
-                      })
-                      sources."is-windows-0.2.0"
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-          (sources."fined-1.1.0" // {
-            dependencies = [
-              (sources."expand-tilde-2.0.2" // {
-                dependencies = [
-                  (sources."homedir-polyfill-1.0.1" // {
-                    dependencies = [
-                      sources."parse-passwd-1.0.0"
-                    ];
-                  })
-                ];
-              })
-              (sources."is-plain-object-2.0.4" // {
-                dependencies = [
-                  sources."isobject-3.0.1"
-                ];
-              })
-              (sources."object.defaults-1.1.0" // {
-                dependencies = [
-                  sources."array-each-1.0.1"
-                  sources."array-slice-1.0.0"
-                  (sources."for-own-1.0.0" // {
-                    dependencies = [
-                      sources."for-in-1.0.2"
-                    ];
-                  })
-                  sources."isobject-3.0.1"
-                ];
-              })
-              (sources."object.pick-1.3.0" // {
-                dependencies = [
-                  sources."isobject-3.0.1"
-                ];
-              })
-              (sources."parse-filepath-1.0.1" // {
-                dependencies = [
-                  (sources."is-absolute-0.2.6" // {
-                    dependencies = [
-                      (sources."is-relative-0.2.1" // {
-                        dependencies = [
-                          (sources."is-unc-path-0.1.2" // {
-                            dependencies = [
-                              sources."unc-path-regex-0.1.2"
-                            ];
-                          })
-                        ];
-                      })
-                      sources."is-windows-0.2.0"
-                    ];
-                  })
-                  sources."map-cache-0.2.2"
-                  (sources."path-root-0.1.1" // {
-                    dependencies = [
-                      sources."path-root-regex-0.1.2"
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-          sources."flagged-respawn-0.3.2"
-          sources."lodash.isplainobject-4.0.6"
-          sources."lodash.isstring-4.0.1"
-          sources."lodash.mapvalues-4.6.0"
-          sources."rechoir-0.6.2"
-          (sources."resolve-1.4.0" // {
-            dependencies = [
-              sources."path-parse-1.0.5"
-            ];
-          })
-        ];
-      })
-      sources."minimist-1.2.0"
-      (sources."orchestrator-0.3.8" // {
-        dependencies = [
-          (sources."end-of-stream-0.1.5" // {
-            dependencies = [
-              (sources."once-1.3.3" // {
-                dependencies = [
-                  sources."wrappy-1.0.2"
-                ];
-              })
-            ];
-          })
-          sources."sequencify-0.0.7"
-          sources."stream-consume-0.1.0"
-        ];
-      })
-      sources."pretty-hrtime-1.0.3"
-      sources."semver-4.3.6"
-      (sources."tildify-1.2.0" // {
-        dependencies = [
-          sources."os-homedir-1.0.2"
-        ];
-      })
-      (sources."v8flags-2.1.1" // {
-        dependencies = [
-          sources."user-home-1.1.1"
-        ];
-      })
-      (sources."vinyl-fs-0.3.14" // {
-        dependencies = [
-          (sources."defaults-1.0.3" // {
-            dependencies = [
-              sources."clone-1.0.2"
-            ];
-          })
-          (sources."glob-stream-3.1.18" // {
-            dependencies = [
-              (sources."glob-4.5.3" // {
-                dependencies = [
-                  (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."minimatch-2.0.10" // {
-                dependencies = [
-                  (sources."brace-expansion-1.1.8" // {
-                    dependencies = [
-                      sources."balanced-match-1.0.0"
-                      sources."concat-map-0.0.1"
-                    ];
-                  })
-                ];
-              })
-              sources."ordered-read-streams-0.1.0"
-              (sources."glob2base-0.0.12" // {
-                dependencies = [
-                  sources."find-index-0.1.1"
-                ];
-              })
-              sources."unique-stream-1.0.0"
-            ];
-          })
-          (sources."glob-watcher-0.0.6" // {
-            dependencies = [
-              (sources."gaze-0.5.2" // {
-                dependencies = [
-                  (sources."globule-0.1.0" // {
-                    dependencies = [
-                      sources."lodash-1.0.2"
-                      (sources."glob-3.1.21" // {
-                        dependencies = [
-                          sources."graceful-fs-1.2.3"
-                          sources."inherits-1.0.2"
-                        ];
-                      })
-                      (sources."minimatch-0.2.14" // {
-                        dependencies = [
-                          sources."lru-cache-2.7.3"
-                          sources."sigmund-1.0.1"
-                        ];
-                      })
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-          (sources."graceful-fs-3.0.11" // {
-            dependencies = [
-              sources."natives-1.1.0"
-            ];
-          })
-          (sources."mkdirp-0.5.1" // {
-            dependencies = [
-              sources."minimist-0.0.8"
-            ];
-          })
-          (sources."strip-bom-1.0.0" // {
-            dependencies = [
-              sources."first-chunk-stream-1.0.0"
-              sources."is-utf8-0.2.1"
-            ];
-          })
-          (sources."through2-0.6.5" // {
-            dependencies = [
-              (sources."readable-stream-1.0.34" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-0.0.1"
-                  sources."string_decoder-0.10.31"
-                  sources."inherits-2.0.3"
-                ];
-              })
-              sources."xtend-4.0.1"
-            ];
-          })
-          (sources."vinyl-0.4.6" // {
-            dependencies = [
-              sources."clone-0.2.0"
-              sources."clone-stats-0.0.1"
-            ];
-          })
-        ];
-      })
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "The streaming build system";
-      homepage = http://gulpjs.com/;
-      license = "MIT";
-    };
-    production = true;
-  };
-  node-gyp = nodeEnv.buildNodePackage {
-    name = "node-gyp";
-    packageName = "node-gyp";
-    version = "3.6.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz";
-      sha1 = "9bfbe54562286284838e750eac05295853fa1c60";
-    };
-    dependencies = [
-      (sources."fstream-1.0.11" // {
-        dependencies = [
-          sources."inherits-2.0.3"
-        ];
-      })
-      (sources."glob-7.1.2" // {
-        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."minimatch-3.0.4" // {
-        dependencies = [
-          (sources."brace-expansion-1.1.8" // {
-            dependencies = [
-              sources."balanced-match-1.0.0"
-              sources."concat-map-0.0.1"
-            ];
-          })
-        ];
-      })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      (sources."nopt-3.0.6" // {
-        dependencies = [
-          sources."abbrev-1.1.1"
-        ];
-      })
-      (sources."npmlog-4.1.2" // {
-        dependencies = [
-          (sources."are-we-there-yet-1.1.4" // {
-            dependencies = [
-              sources."delegates-1.0.0"
-              (sources."readable-stream-2.3.3" // {
-                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."safe-buffer-5.1.1"
-                  sources."string_decoder-1.0.3"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-            ];
-          })
-          sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.4" // {
-            dependencies = [
-              sources."aproba-1.2.0"
-              sources."has-unicode-2.0.1"
-              sources."object-assign-4.1.1"
-              sources."signal-exit-3.0.2"
-              (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.1.1"
-                ];
-              })
-              sources."wide-align-1.1.2"
-            ];
-          })
-          sources."set-blocking-2.0.0"
-        ];
-      })
-      (sources."osenv-0.1.4" // {
-        dependencies = [
-          sources."os-homedir-1.0.2"
-          sources."os-tmpdir-1.0.2"
-        ];
-      })
-      (sources."request-2.83.0" // {
-        dependencies = [
-          sources."aws-sign2-0.7.0"
-          sources."aws4-1.6.0"
-          sources."caseless-0.12.0"
-          (sources."combined-stream-1.0.5" // {
-            dependencies = [
-              sources."delayed-stream-1.0.0"
-            ];
-          })
-          sources."extend-3.0.1"
-          sources."forever-agent-0.6.1"
-          (sources."form-data-2.3.1" // {
-            dependencies = [
-              sources."asynckit-0.4.0"
-            ];
-          })
-          (sources."har-validator-5.0.3" // {
-            dependencies = [
-              (sources."ajv-5.2.4" // {
-                dependencies = [
-                  sources."co-4.6.0"
-                  sources."fast-deep-equal-1.0.0"
-                  sources."json-schema-traverse-0.3.1"
-                  (sources."json-stable-stringify-1.0.1" // {
-                    dependencies = [
-                      sources."jsonify-0.0.0"
-                    ];
-                  })
-                ];
-              })
-              sources."har-schema-2.0.0"
-            ];
-          })
-          (sources."hawk-6.0.2" // {
-            dependencies = [
-              sources."hoek-4.2.0"
-              sources."boom-4.3.1"
-              (sources."cryptiles-3.1.2" // {
-                dependencies = [
-                  sources."boom-5.2.0"
-                ];
-              })
-              sources."sntp-2.0.2"
-            ];
-          })
-          (sources."http-signature-1.2.0" // {
-            dependencies = [
-              sources."assert-plus-1.0.0"
-              (sources."jsprim-1.4.1" // {
-                dependencies = [
-                  sources."extsprintf-1.3.0"
-                  sources."json-schema-0.2.3"
-                  (sources."verror-1.10.0" // {
-                    dependencies = [
-                      sources."core-util-is-1.0.2"
-                    ];
-                  })
-                ];
-              })
-              (sources."sshpk-1.13.1" // {
-                dependencies = [
-                  sources."asn1-0.2.3"
-                  sources."dashdash-1.14.1"
-                  sources."getpass-0.1.7"
-                  sources."jsbn-0.1.1"
-                  sources."tweetnacl-0.14.5"
-                  sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.1"
-                ];
-              })
-            ];
-          })
-          sources."is-typedarray-1.0.0"
-          sources."isstream-0.1.2"
-          sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.17" // {
-            dependencies = [
-              sources."mime-db-1.30.0"
-            ];
-          })
-          sources."oauth-sign-0.8.2"
-          sources."performance-now-2.1.0"
-          sources."qs-6.5.1"
-          sources."safe-buffer-5.1.1"
-          sources."stringstream-0.0.5"
-          (sources."tough-cookie-2.3.3" // {
-            dependencies = [
-              sources."punycode-1.4.1"
-            ];
-          })
-          sources."tunnel-agent-0.6.0"
-          sources."uuid-3.1.0"
-        ];
-      })
-      sources."rimraf-2.6.2"
-      sources."semver-5.3.0"
-      (sources."tar-2.2.1" // {
-        dependencies = [
-          sources."block-stream-0.0.9"
-          sources."inherits-2.0.3"
-        ];
-      })
-      (sources."which-1.3.0" // {
-        dependencies = [
-          sources."isexe-2.0.0"
-        ];
-      })
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Node.js native addon build tool";
-      homepage = "https://github.com/nodejs/node-gyp#readme";
-      license = "MIT";
-    };
-    production = true;
-  };
-  node-inspector = nodeEnv.buildNodePackage {
-    name = "node-inspector";
-    packageName = "node-inspector";
-    version = "1.1.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.1.tgz";
-      sha1 = "e7851eb973f380543c058db564a9812055eac640";
-    };
-    dependencies = [
-      sources."async-0.9.2"
-      (sources."biased-opener-0.2.8" // {
-        dependencies = [
-          (sources."browser-launcher2-0.4.6" // {
-            dependencies = [
-              sources."headless-0.1.7"
-              sources."lodash-2.4.2"
-              (sources."mkdirp-0.5.1" // {
-                dependencies = [
-                  sources."minimist-0.0.8"
-                ];
-              })
-              (sources."osenv-0.1.4" // {
-                dependencies = [
-                  sources."os-homedir-1.0.2"
-                  sources."os-tmpdir-1.0.2"
-                ];
-              })
-              (sources."plist-1.2.0" // {
-                dependencies = [
-                  sources."base64-js-0.0.8"
-                  (sources."xmlbuilder-4.0.0" // {
-                    dependencies = [
-                      sources."lodash-3.10.1"
-                    ];
-                  })
-                  sources."xmldom-0.1.27"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-              (sources."win-detect-browsers-1.0.2" // {
-                dependencies = [
-                  sources."after-0.8.2"
-                  sources."xtend-4.0.1"
-                  sources."yargs-1.3.3"
-                ];
-              })
-              sources."uid-0.0.2"
-              sources."rimraf-2.2.8"
-            ];
-          })
-          sources."minimist-1.2.0"
-          (sources."x-default-browser-0.3.1" // {
-            dependencies = [
-              (sources."default-browser-id-1.0.4" // {
-                dependencies = [
-                  (sources."bplist-parser-0.1.1" // {
-                    dependencies = [
-                      sources."big-integer-1.6.25"
-                    ];
-                  })
-                  (sources."meow-3.7.0" // {
-                    dependencies = [
-                      (sources."camelcase-keys-2.1.0" // {
-                        dependencies = [
-                          sources."camelcase-2.1.1"
-                        ];
-                      })
-                      sources."decamelize-1.2.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.2"
-                        ];
-                      })
-                      sources."map-obj-1.0.1"
-                      (sources."normalize-package-data-2.4.0" // {
-                        dependencies = [
-                          sources."hosted-git-info-2.5.0"
-                          (sources."is-builtin-module-1.0.0" // {
-                            dependencies = [
-                              sources."builtin-modules-1.1.1"
-                            ];
-                          })
-                          (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"
-                            ];
-                          })
-                        ];
-                      })
-                      sources."object-assign-4.1.1"
-                      (sources."read-pkg-up-1.0.1" // {
-                        dependencies = [
-                          (sources."find-up-1.1.2" // {
-                            dependencies = [
-                              sources."path-exists-2.1.0"
-                              (sources."pinkie-promise-2.0.1" // {
-                                dependencies = [
-                                  sources."pinkie-2.0.4"
-                                ];
-                              })
-                            ];
-                          })
-                          (sources."read-pkg-1.1.0" // {
-                            dependencies = [
-                              (sources."load-json-file-1.1.0" // {
-                                dependencies = [
-                                  sources."graceful-fs-4.1.11"
-                                  (sources."parse-json-2.2.0" // {
-                                    dependencies = [
-                                      (sources."error-ex-1.3.1" // {
-                                        dependencies = [
-                                          sources."is-arrayish-0.2.1"
-                                        ];
-                                      })
-                                    ];
-                                  })
-                                  sources."pify-2.3.0"
-                                  (sources."pinkie-promise-2.0.1" // {
-                                    dependencies = [
-                                      sources."pinkie-2.0.4"
-                                    ];
-                                  })
-                                  (sources."strip-bom-2.0.0" // {
-                                    dependencies = [
-                                      sources."is-utf8-0.2.1"
-                                    ];
-                                  })
-                                ];
-                              })
-                              (sources."path-type-1.1.0" // {
-                                dependencies = [
-                                  sources."graceful-fs-4.1.11"
-                                  sources."pify-2.3.0"
-                                  (sources."pinkie-promise-2.0.1" // {
-                                    dependencies = [
-                                      sources."pinkie-2.0.4"
-                                    ];
-                                  })
-                                ];
-                              })
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."redent-1.0.0" // {
-                        dependencies = [
-                          (sources."indent-string-2.1.0" // {
-                            dependencies = [
-                              (sources."repeating-2.0.1" // {
-                                dependencies = [
-                                  (sources."is-finite-1.0.2" // {
-                                    dependencies = [
-                                      sources."number-is-nan-1.0.1"
-                                    ];
-                                  })
-                                ];
-                              })
-                            ];
-                          })
-                          (sources."strip-indent-1.0.1" // {
-                            dependencies = [
-                              sources."get-stdin-4.0.1"
-                            ];
-                          })
-                        ];
-                      })
-                      sources."trim-newlines-1.0.0"
-                    ];
-                  })
-                  (sources."untildify-2.1.0" // {
-                    dependencies = [
-                      sources."os-homedir-1.0.2"
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-        ];
-      })
-      (sources."debug-2.6.9" // {
-        dependencies = [
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."express-4.16.2" // {
-        dependencies = [
-          (sources."accepts-1.3.4" // {
-            dependencies = [
-              (sources."mime-types-2.1.17" // {
-                dependencies = [
-                  sources."mime-db-1.30.0"
-                ];
-              })
-              sources."negotiator-0.6.1"
-            ];
-          })
-          sources."array-flatten-1.1.1"
-          (sources."body-parser-1.18.2" // {
-            dependencies = [
-              sources."bytes-3.0.0"
-              (sources."http-errors-1.6.2" // {
-                dependencies = [
-                  sources."inherits-2.0.3"
-                  sources."setprototypeof-1.0.3"
-                ];
-              })
-              sources."iconv-lite-0.4.19"
-              (sources."raw-body-2.3.2" // {
-                dependencies = [
-                  sources."unpipe-1.0.0"
-                ];
-              })
-            ];
-          })
-          sources."content-disposition-0.5.2"
-          sources."content-type-1.0.4"
-          sources."cookie-0.3.1"
-          sources."cookie-signature-1.0.6"
-          sources."depd-1.1.1"
-          sources."encodeurl-1.0.1"
-          sources."escape-html-1.0.3"
-          sources."etag-1.8.1"
-          (sources."finalhandler-1.1.0" // {
-            dependencies = [
-              sources."unpipe-1.0.0"
-            ];
-          })
-          sources."fresh-0.5.2"
-          sources."merge-descriptors-1.0.1"
-          sources."methods-1.1.2"
-          (sources."on-finished-2.3.0" // {
-            dependencies = [
-              sources."ee-first-1.1.1"
-            ];
-          })
-          sources."parseurl-1.3.2"
-          sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-2.0.2" // {
-            dependencies = [
-              sources."forwarded-0.1.2"
-              sources."ipaddr.js-1.5.2"
-            ];
-          })
-          sources."qs-6.5.1"
-          sources."range-parser-1.2.0"
-          sources."safe-buffer-5.1.1"
-          (sources."send-0.16.1" // {
-            dependencies = [
-              sources."destroy-1.0.4"
-              (sources."http-errors-1.6.2" // {
-                dependencies = [
-                  sources."inherits-2.0.3"
-                  sources."setprototypeof-1.0.3"
-                ];
-              })
-              sources."mime-1.4.1"
-              sources."ms-2.0.0"
-            ];
-          })
-          sources."serve-static-1.13.1"
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.3.1"
-          (sources."type-is-1.6.15" // {
-            dependencies = [
-              sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.17" // {
-                dependencies = [
-                  sources."mime-db-1.30.0"
-                ];
-              })
-            ];
-          })
-          sources."utils-merge-1.0.1"
-          sources."vary-1.1.2"
-        ];
-      })
-      (sources."glob-5.0.15" // {
-        dependencies = [
-          (sources."inflight-1.0.6" // {
-            dependencies = [
-              sources."wrappy-1.0.2"
-            ];
-          })
-          sources."inherits-2.0.3"
-          (sources."minimatch-3.0.4" // {
-            dependencies = [
-              (sources."brace-expansion-1.1.8" // {
-                dependencies = [
-                  sources."balanced-match-1.0.0"
-                  sources."concat-map-0.0.1"
-                ];
-              })
-            ];
-          })
-          (sources."once-1.4.0" // {
-            dependencies = [
-              sources."wrappy-1.0.2"
-            ];
-          })
-        ];
-      })
-      sources."path-is-absolute-1.0.1"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."deep-extend-0.4.2"
-          sources."ini-1.3.4"
-          sources."minimist-1.2.0"
-          sources."strip-json-comments-2.0.1"
-        ];
-      })
-      sources."semver-4.3.6"
-      (sources."serve-favicon-2.4.5" // {
-        dependencies = [
-          sources."etag-1.8.1"
-          sources."fresh-0.5.2"
-          sources."ms-2.0.0"
-          sources."parseurl-1.3.2"
-          sources."safe-buffer-5.1.1"
-        ];
-      })
-      (sources."strong-data-uri-1.0.4" // {
-        dependencies = [
-          sources."truncate-1.0.5"
-        ];
-      })
-      (sources."v8-debug-1.0.1" // {
-        dependencies = [
-          sources."nan-2.7.0"
-          (sources."node-pre-gyp-0.6.38" // {
-            dependencies = [
-              (sources."mkdirp-0.5.1" // {
-                dependencies = [
-                  sources."minimist-0.0.8"
-                ];
-              })
-              (sources."nopt-4.0.1" // {
-                dependencies = [
-                  sources."abbrev-1.1.1"
-                  (sources."osenv-0.1.4" // {
-                    dependencies = [
-                      sources."os-homedir-1.0.2"
-                      sources."os-tmpdir-1.0.2"
-                    ];
-                  })
-                ];
-              })
-              (sources."npmlog-4.1.2" // {
-                dependencies = [
-                  (sources."are-we-there-yet-1.1.4" // {
-                    dependencies = [
-                      sources."delegates-1.0.0"
-                      (sources."readable-stream-2.3.3" // {
-                        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."safe-buffer-5.1.1"
-                          sources."string_decoder-1.0.3"
-                          sources."util-deprecate-1.0.2"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.4" // {
-                    dependencies = [
-                      sources."aproba-1.2.0"
-                      sources."has-unicode-2.0.1"
-                      sources."object-assign-4.1.1"
-                      sources."signal-exit-3.0.2"
-                      (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.1.1"
-                        ];
-                      })
-                      sources."wide-align-1.1.2"
-                    ];
-                  })
-                  sources."set-blocking-2.0.0"
-                ];
-              })
-              (sources."request-2.81.0" // {
-                dependencies = [
-                  sources."aws-sign2-0.6.0"
-                  sources."aws4-1.6.0"
-                  sources."caseless-0.12.0"
-                  (sources."combined-stream-1.0.5" // {
-                    dependencies = [
-                      sources."delayed-stream-1.0.0"
-                    ];
-                  })
-                  sources."extend-3.0.1"
-                  sources."forever-agent-0.6.1"
-                  (sources."form-data-2.1.4" // {
-                    dependencies = [
-                      sources."asynckit-0.4.0"
-                    ];
-                  })
-                  (sources."har-validator-4.2.1" // {
-                    dependencies = [
-                      (sources."ajv-4.11.8" // {
-                        dependencies = [
-                          sources."co-4.6.0"
-                          (sources."json-stable-stringify-1.0.1" // {
-                            dependencies = [
-                              sources."jsonify-0.0.0"
-                            ];
-                          })
-                        ];
-                      })
-                      sources."har-schema-1.0.5"
-                    ];
-                  })
-                  (sources."http-signature-1.1.1" // {
-                    dependencies = [
-                      sources."assert-plus-0.2.0"
-                      (sources."jsprim-1.4.1" // {
-                        dependencies = [
-                          sources."assert-plus-1.0.0"
-                          sources."extsprintf-1.3.0"
-                          sources."json-schema-0.2.3"
-                          (sources."verror-1.10.0" // {
-                            dependencies = [
-                              sources."core-util-is-1.0.2"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."sshpk-1.13.1" // {
-                        dependencies = [
-                          sources."asn1-0.2.3"
-                          sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.1"
-                          sources."getpass-0.1.7"
-                          sources."jsbn-0.1.1"
-                          sources."tweetnacl-0.14.5"
-                          sources."ecc-jsbn-0.1.1"
-                          sources."bcrypt-pbkdf-1.0.1"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."is-typedarray-1.0.0"
-                  sources."isstream-0.1.2"
-                  sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.17" // {
-                    dependencies = [
-                      sources."mime-db-1.30.0"
-                    ];
-                  })
-                  sources."oauth-sign-0.8.2"
-                  sources."performance-now-0.2.0"
-                  sources."qs-6.4.0"
-                  sources."safe-buffer-5.1.1"
-                  sources."stringstream-0.0.5"
-                  (sources."tough-cookie-2.3.3" // {
+    dependencies = [
+      (sources."findup-sync-0.3.0" // {
+        dependencies = [
+          (sources."glob-5.0.15" // {
+            dependencies = [
+              (sources."inflight-1.0.6" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+              sources."inherits-2.0.3"
+              (sources."minimatch-3.0.4" // {
+                dependencies = [
+                  (sources."brace-expansion-1.1.8" // {
                     dependencies = [
-                      sources."punycode-1.4.1"
+                      sources."balanced-match-1.0.0"
+                      sources."concat-map-0.0.1"
                     ];
                   })
-                  sources."tunnel-agent-0.6.0"
-                  sources."uuid-3.1.0"
                 ];
               })
-              (sources."hawk-3.1.3" // {
+              (sources."once-1.4.0" // {
                 dependencies = [
-                  sources."hoek-2.16.3"
-                  sources."boom-2.10.1"
-                  sources."cryptiles-2.0.5"
-                  sources."sntp-1.0.9"
+                  sources."wrappy-1.0.2"
                 ];
               })
-              (sources."rimraf-2.6.2" // {
+              sources."path-is-absolute-1.0.1"
+            ];
+          })
+        ];
+      })
+      sources."grunt-known-options-1.1.0"
+      (sources."nopt-3.0.6" // {
+        dependencies = [
+          sources."abbrev-1.1.1"
+        ];
+      })
+      sources."resolve-1.1.7"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The grunt command line interface";
+      homepage = "https://github.com/gruntjs/grunt-cli#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
+  gulp = nodeEnv.buildNodePackage {
+    name = "gulp";
+    packageName = "gulp";
+    version = "3.9.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz";
+      sha1 = "571ce45928dd40af6514fc4011866016c13845b4";
+    };
+    dependencies = [
+      sources."archy-1.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.1.1"
+            ];
+          })
+          (sources."strip-ansi-3.0.1" // {
+            dependencies = [
+              sources."ansi-regex-2.1.1"
+            ];
+          })
+          sources."supports-color-2.0.0"
+        ];
+      })
+      sources."deprecated-0.0.1"
+      (sources."gulp-util-3.0.8" // {
+        dependencies = [
+          sources."array-differ-1.0.0"
+          sources."array-uniq-1.0.3"
+          sources."beeper-1.1.1"
+          sources."dateformat-2.2.0"
+          (sources."fancy-log-1.3.0" // {
+            dependencies = [
+              sources."time-stamp-1.1.0"
+            ];
+          })
+          (sources."gulplog-1.0.0" // {
+            dependencies = [
+              (sources."glogg-1.0.0" // {
                 dependencies = [
-                  (sources."glob-7.1.2" // {
-                    dependencies = [
-                      sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.6" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                      sources."inherits-2.0.3"
-                      (sources."minimatch-3.0.4" // {
-                        dependencies = [
-                          (sources."brace-expansion-1.1.8" // {
-                            dependencies = [
-                              sources."balanced-match-1.0.0"
-                              sources."concat-map-0.0.1"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."once-1.4.0" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                    ];
-                  })
+                  sources."sparkles-1.0.0"
                 ];
               })
-              sources."semver-5.4.1"
-              (sources."tar-2.2.1" // {
+            ];
+          })
+          (sources."has-gulplog-0.1.0" // {
+            dependencies = [
+              sources."sparkles-1.0.0"
+            ];
+          })
+          sources."lodash._reescape-3.0.0"
+          sources."lodash._reevaluate-3.0.0"
+          sources."lodash._reinterpolate-3.0.0"
+          (sources."lodash.template-3.6.2" // {
+            dependencies = [
+              sources."lodash._basecopy-3.0.1"
+              sources."lodash._basetostring-3.0.1"
+              sources."lodash._basevalues-3.0.0"
+              sources."lodash._isiterateecall-3.0.9"
+              (sources."lodash.escape-3.2.0" // {
                 dependencies = [
-                  sources."block-stream-0.0.9"
-                  (sources."fstream-1.0.11" // {
-                    dependencies = [
-                      sources."graceful-fs-4.1.11"
-                    ];
-                  })
-                  sources."inherits-2.0.3"
+                  sources."lodash._root-3.0.1"
                 ];
               })
-              (sources."tar-pack-3.4.0" // {
+              (sources."lodash.keys-3.1.2" // {
                 dependencies = [
-                  (sources."fstream-1.0.11" // {
-                    dependencies = [
-                      sources."graceful-fs-4.1.11"
-                      sources."inherits-2.0.3"
-                    ];
-                  })
-                  (sources."fstream-ignore-1.0.5" // {
-                    dependencies = [
-                      sources."inherits-2.0.3"
-                      (sources."minimatch-3.0.4" // {
-                        dependencies = [
-                          (sources."brace-expansion-1.1.8" // {
-                            dependencies = [
-                              sources."balanced-match-1.0.0"
-                              sources."concat-map-0.0.1"
-                            ];
-                          })
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."once-1.4.0" // {
-                    dependencies = [
-                      sources."wrappy-1.0.2"
-                    ];
-                  })
-                  (sources."readable-stream-2.3.3" // {
+                  sources."lodash._getnative-3.9.1"
+                  sources."lodash.isarguments-3.1.0"
+                  sources."lodash.isarray-3.0.4"
+                ];
+              })
+              sources."lodash.restparam-3.6.1"
+              sources."lodash.templatesettings-3.1.1"
+            ];
+          })
+          (sources."multipipe-0.1.2" // {
+            dependencies = [
+              (sources."duplexer2-0.0.2" // {
+                dependencies = [
+                  (sources."readable-stream-1.1.14" // {
                     dependencies = [
                       sources."core-util-is-1.0.2"
+                      sources."isarray-0.0.1"
+                      sources."string_decoder-0.10.31"
                       sources."inherits-2.0.3"
-                      sources."isarray-1.0.0"
-                      sources."process-nextick-args-1.0.7"
-                      sources."safe-buffer-5.1.1"
-                      sources."string_decoder-1.0.3"
-                      sources."util-deprecate-1.0.2"
                     ];
                   })
-                  sources."uid-number-0.0.6"
                 ];
               })
             ];
           })
+          sources."object-assign-3.0.0"
+          sources."replace-ext-0.0.1"
+          (sources."through2-2.0.3" // {
+            dependencies = [
+              (sources."readable-stream-2.3.3" // {
+                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."safe-buffer-5.1.1"
+                  sources."string_decoder-1.0.3"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
+              sources."xtend-4.0.1"
+            ];
+          })
+          (sources."vinyl-0.5.3" // {
+            dependencies = [
+              sources."clone-1.0.2"
+              sources."clone-stats-0.0.1"
+            ];
+          })
         ];
       })
-      (sources."v8-profiler-5.7.0" // {
+      sources."interpret-1.0.4"
+      (sources."liftoff-2.3.0" // {
         dependencies = [
-          sources."nan-2.7.0"
-          (sources."node-pre-gyp-0.6.38" // {
+          sources."extend-3.0.1"
+          (sources."findup-sync-0.4.3" // {
             dependencies = [
-              (sources."mkdirp-0.5.1" // {
+              (sources."detect-file-0.1.0" // {
                 dependencies = [
-                  sources."minimist-0.0.8"
+                  sources."fs-exists-sync-0.1.0"
                 ];
               })
-              (sources."nopt-4.0.1" // {
+              (sources."is-glob-2.0.1" // {
                 dependencies = [
-                  sources."abbrev-1.1.1"
-                  (sources."osenv-0.1.4" // {
-                    dependencies = [
-                      sources."os-homedir-1.0.2"
-                      sources."os-tmpdir-1.0.2"
-                    ];
-                  })
+                  sources."is-extglob-1.0.0"
                 ];
               })
-              (sources."npmlog-4.1.2" // {
+              (sources."micromatch-2.3.11" // {
                 dependencies = [
-                  (sources."are-we-there-yet-1.1.4" // {
+                  (sources."arr-diff-2.0.0" // {
                     dependencies = [
-                      sources."delegates-1.0.0"
-                      (sources."readable-stream-2.3.3" // {
-                        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."safe-buffer-5.1.1"
-                          sources."string_decoder-1.0.3"
-                          sources."util-deprecate-1.0.2"
-                        ];
-                      })
+                      sources."arr-flatten-1.1.0"
                     ];
                   })
-                  sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.4" // {
+                  sources."array-unique-0.2.1"
+                  (sources."braces-1.8.5" // {
                     dependencies = [
-                      sources."aproba-1.2.0"
-                      sources."has-unicode-2.0.1"
-                      sources."object-assign-4.1.1"
-                      sources."signal-exit-3.0.2"
-                      (sources."string-width-1.0.2" // {
+                      (sources."expand-range-1.8.2" // {
                         dependencies = [
-                          sources."code-point-at-1.1.0"
-                          (sources."is-fullwidth-code-point-1.0.0" // {
+                          (sources."fill-range-2.2.3" // {
                             dependencies = [
-                              sources."number-is-nan-1.0.1"
+                              sources."is-number-2.1.0"
+                              (sources."isobject-2.1.0" // {
+                                dependencies = [
+                                  sources."isarray-1.0.0"
+                                ];
+                              })
+                              (sources."randomatic-1.1.7" // {
+                                dependencies = [
+                                  (sources."is-number-3.0.0" // {
+                                    dependencies = [
+                                      (sources."kind-of-3.2.2" // {
+                                        dependencies = [
+                                          sources."is-buffer-1.1.6"
+                                        ];
+                                      })
+                                    ];
+                                  })
+                                  (sources."kind-of-4.0.0" // {
+                                    dependencies = [
+                                      sources."is-buffer-1.1.6"
+                                    ];
+                                  })
+                                ];
+                              })
+                              sources."repeat-string-1.6.1"
                             ];
                           })
                         ];
                       })
-                      (sources."strip-ansi-3.0.1" // {
-                        dependencies = [
-                          sources."ansi-regex-2.1.1"
-                        ];
-                      })
-                      sources."wide-align-1.1.2"
+                      sources."preserve-0.2.0"
+                      sources."repeat-element-1.1.2"
                     ];
                   })
-                  sources."set-blocking-2.0.0"
-                ];
-              })
-              (sources."request-2.81.0" // {
-                dependencies = [
-                  sources."aws-sign2-0.6.0"
-                  sources."aws4-1.6.0"
-                  sources."caseless-0.12.0"
-                  (sources."combined-stream-1.0.5" // {
+                  (sources."expand-brackets-0.1.5" // {
                     dependencies = [
-                      sources."delayed-stream-1.0.0"
+                      sources."is-posix-bracket-0.1.1"
                     ];
                   })
-                  sources."extend-3.0.1"
-                  sources."forever-agent-0.6.1"
-                  (sources."form-data-2.1.4" // {
+                  sources."extglob-0.3.2"
+                  sources."filename-regex-2.0.1"
+                  sources."is-extglob-1.0.0"
+                  (sources."kind-of-3.2.2" // {
                     dependencies = [
-                      sources."asynckit-0.4.0"
+                      sources."is-buffer-1.1.6"
                     ];
                   })
-                  (sources."har-validator-4.2.1" // {
+                  (sources."normalize-path-2.1.1" // {
                     dependencies = [
-                      (sources."ajv-4.11.8" // {
-                        dependencies = [
-                          sources."co-4.6.0"
-                          (sources."json-stable-stringify-1.0.1" // {
-                            dependencies = [
-                              sources."jsonify-0.0.0"
-                            ];
-                          })
-                        ];
-                      })
-                      sources."har-schema-1.0.5"
+                      sources."remove-trailing-separator-1.1.0"
                     ];
                   })
-                  (sources."http-signature-1.1.1" // {
+                  (sources."object.omit-2.0.1" // {
                     dependencies = [
-                      sources."assert-plus-0.2.0"
-                      (sources."jsprim-1.4.1" // {
-                        dependencies = [
-                          sources."assert-plus-1.0.0"
-                          sources."extsprintf-1.3.0"
-                          sources."json-schema-0.2.3"
-                          (sources."verror-1.10.0" // {
-                            dependencies = [
-                              sources."core-util-is-1.0.2"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."sshpk-1.13.1" // {
+                      (sources."for-own-0.1.5" // {
                         dependencies = [
-                          sources."asn1-0.2.3"
-                          sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.1"
-                          sources."getpass-0.1.7"
-                          sources."jsbn-0.1.1"
-                          sources."tweetnacl-0.14.5"
-                          sources."ecc-jsbn-0.1.1"
-                          sources."bcrypt-pbkdf-1.0.1"
+                          sources."for-in-1.0.2"
                         ];
                       })
+                      sources."is-extendable-0.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.17" // {
+                  (sources."parse-glob-3.0.4" // {
                     dependencies = [
-                      sources."mime-db-1.30.0"
+                      (sources."glob-base-0.3.0" // {
+                        dependencies = [
+                          sources."glob-parent-2.0.0"
+                        ];
+                      })
+                      sources."is-dotfile-1.0.3"
                     ];
                   })
-                  sources."oauth-sign-0.8.2"
-                  sources."performance-now-0.2.0"
-                  sources."qs-6.4.0"
-                  sources."safe-buffer-5.1.1"
-                  sources."stringstream-0.0.5"
-                  (sources."tough-cookie-2.3.3" // {
+                  (sources."regex-cache-0.4.4" // {
                     dependencies = [
-                      sources."punycode-1.4.1"
+                      (sources."is-equal-shallow-0.1.3" // {
+                        dependencies = [
+                          sources."is-primitive-2.0.0"
+                        ];
+                      })
                     ];
                   })
-                  sources."tunnel-agent-0.6.0"
-                  sources."uuid-3.1.0"
-                ];
-              })
-              (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."rimraf-2.6.2" // {
+              (sources."resolve-dir-0.1.1" // {
                 dependencies = [
-                  (sources."glob-7.1.2" // {
+                  (sources."expand-tilde-1.2.2" // {
                     dependencies = [
-                      sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.6" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                      sources."inherits-2.0.3"
-                      (sources."minimatch-3.0.4" // {
+                      sources."os-homedir-1.0.2"
+                    ];
+                  })
+                  (sources."global-modules-0.2.3" // {
+                    dependencies = [
+                      (sources."global-prefix-0.1.5" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.8" // {
+                          (sources."homedir-polyfill-1.0.1" // {
                             dependencies = [
-                              sources."balanced-match-1.0.0"
-                              sources."concat-map-0.0.1"
+                              sources."parse-passwd-1.0.0"
+                            ];
+                          })
+                          sources."ini-1.3.4"
+                          (sources."which-1.3.0" // {
+                            dependencies = [
+                              sources."isexe-2.0.0"
                             ];
                           })
                         ];
                       })
-                      (sources."once-1.4.0" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
+                      sources."is-windows-0.2.0"
                     ];
                   })
                 ];
               })
-              sources."semver-5.4.1"
-              (sources."tar-2.2.1" // {
+            ];
+          })
+          (sources."fined-1.1.0" // {
+            dependencies = [
+              (sources."expand-tilde-2.0.2" // {
                 dependencies = [
-                  sources."block-stream-0.0.9"
-                  (sources."fstream-1.0.11" // {
+                  (sources."homedir-polyfill-1.0.1" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.11"
+                      sources."parse-passwd-1.0.0"
                     ];
                   })
-                  sources."inherits-2.0.3"
                 ];
               })
-              (sources."tar-pack-3.4.0" // {
+              (sources."is-plain-object-2.0.4" // {
                 dependencies = [
-                  (sources."fstream-1.0.11" // {
+                  sources."isobject-3.0.1"
+                ];
+              })
+              (sources."object.defaults-1.1.0" // {
+                dependencies = [
+                  sources."array-each-1.0.1"
+                  sources."array-slice-1.0.0"
+                  (sources."for-own-1.0.0" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.11"
-                      sources."inherits-2.0.3"
+                      sources."for-in-1.0.2"
                     ];
                   })
-                  (sources."fstream-ignore-1.0.5" // {
+                  sources."isobject-3.0.1"
+                ];
+              })
+              (sources."object.pick-1.3.0" // {
+                dependencies = [
+                  sources."isobject-3.0.1"
+                ];
+              })
+              (sources."parse-filepath-1.0.1" // {
+                dependencies = [
+                  (sources."is-absolute-0.2.6" // {
                     dependencies = [
-                      sources."inherits-2.0.3"
-                      (sources."minimatch-3.0.4" // {
+                      (sources."is-relative-0.2.1" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.8" // {
+                          (sources."is-unc-path-0.1.2" // {
                             dependencies = [
-                              sources."balanced-match-1.0.0"
-                              sources."concat-map-0.0.1"
+                              sources."unc-path-regex-0.1.2"
                             ];
                           })
                         ];
                       })
+                      sources."is-windows-0.2.0"
                     ];
                   })
-                  (sources."once-1.4.0" // {
-                    dependencies = [
-                      sources."wrappy-1.0.2"
-                    ];
-                  })
-                  (sources."readable-stream-2.3.3" // {
+                  sources."map-cache-0.2.2"
+                  (sources."path-root-0.1.1" // {
                     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."safe-buffer-5.1.1"
-                      sources."string_decoder-1.0.3"
-                      sources."util-deprecate-1.0.2"
+                      sources."path-root-regex-0.1.2"
                     ];
                   })
-                  sources."uid-number-0.0.6"
                 ];
               })
             ];
           })
+          sources."flagged-respawn-0.3.2"
+          sources."lodash.isplainobject-4.0.6"
+          sources."lodash.isstring-4.0.1"
+          sources."lodash.mapvalues-4.6.0"
+          sources."rechoir-0.6.2"
+          (sources."resolve-1.5.0" // {
+            dependencies = [
+              sources."path-parse-1.0.5"
+            ];
+          })
         ];
       })
-      (sources."which-1.3.0" // {
+      sources."minimist-1.2.0"
+      (sources."orchestrator-0.3.8" // {
         dependencies = [
-          sources."isexe-2.0.0"
+          (sources."end-of-stream-0.1.5" // {
+            dependencies = [
+              (sources."once-1.3.3" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+            ];
+          })
+          sources."sequencify-0.0.7"
+          sources."stream-consume-0.1.0"
         ];
       })
-      (sources."ws-1.1.4" // {
+      sources."pretty-hrtime-1.0.3"
+      sources."semver-4.3.6"
+      (sources."tildify-1.2.0" // {
         dependencies = [
-          sources."options-0.0.6"
-          sources."ultron-1.0.2"
+          sources."os-homedir-1.0.2"
         ];
       })
-      (sources."yargs-3.32.0" // {
+      (sources."v8flags-2.1.1" // {
         dependencies = [
-          sources."camelcase-2.1.1"
-          (sources."cliui-3.2.0" // {
+          sources."user-home-1.1.1"
+        ];
+      })
+      (sources."vinyl-fs-0.3.14" // {
+        dependencies = [
+          (sources."defaults-1.0.3" // {
             dependencies = [
-              (sources."strip-ansi-3.0.1" // {
-                dependencies = [
-                  sources."ansi-regex-2.1.1"
-                ];
-              })
-              sources."wrap-ansi-2.1.0"
+              sources."clone-1.0.2"
             ];
           })
-          sources."decamelize-1.2.0"
-          (sources."os-locale-1.4.0" // {
+          (sources."glob-stream-3.1.18" // {
             dependencies = [
-              (sources."lcid-1.0.0" // {
+              (sources."glob-4.5.3" // {
                 dependencies = [
-                  sources."invert-kv-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."minimatch-2.0.10" // {
+                dependencies = [
+                  (sources."brace-expansion-1.1.8" // {
+                    dependencies = [
+                      sources."balanced-match-1.0.0"
+                      sources."concat-map-0.0.1"
+                    ];
+                  })
                 ];
               })
+              sources."ordered-read-streams-0.1.0"
+              (sources."glob2base-0.0.12" // {
+                dependencies = [
+                  sources."find-index-0.1.1"
+                ];
+              })
+              sources."unique-stream-1.0.0"
             ];
           })
-          (sources."string-width-1.0.2" // {
+          (sources."glob-watcher-0.0.6" // {
             dependencies = [
-              sources."code-point-at-1.1.0"
-              (sources."is-fullwidth-code-point-1.0.0" // {
+              (sources."gaze-0.5.2" // {
                 dependencies = [
-                  sources."number-is-nan-1.0.1"
+                  (sources."globule-0.1.0" // {
+                    dependencies = [
+                      sources."lodash-1.0.2"
+                      (sources."glob-3.1.21" // {
+                        dependencies = [
+                          sources."graceful-fs-1.2.3"
+                          sources."inherits-1.0.2"
+                        ];
+                      })
+                      (sources."minimatch-0.2.14" // {
+                        dependencies = [
+                          sources."lru-cache-2.7.3"
+                          sources."sigmund-1.0.1"
+                        ];
+                      })
+                    ];
+                  })
                 ];
               })
-              (sources."strip-ansi-3.0.1" // {
+            ];
+          })
+          (sources."graceful-fs-3.0.11" // {
+            dependencies = [
+              sources."natives-1.1.0"
+            ];
+          })
+          (sources."mkdirp-0.5.1" // {
+            dependencies = [
+              sources."minimist-0.0.8"
+            ];
+          })
+          (sources."strip-bom-1.0.0" // {
+            dependencies = [
+              sources."first-chunk-stream-1.0.0"
+              sources."is-utf8-0.2.1"
+            ];
+          })
+          (sources."through2-0.6.5" // {
+            dependencies = [
+              (sources."readable-stream-1.0.34" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-0.0.1"
+                  sources."string_decoder-0.10.31"
+                  sources."inherits-2.0.3"
                 ];
               })
+              sources."xtend-4.0.1"
+            ];
+          })
+          (sources."vinyl-0.4.6" // {
+            dependencies = [
+              sources."clone-0.2.0"
+              sources."clone-stats-0.0.1"
             ];
           })
-          sources."window-size-0.1.4"
-          sources."y18n-3.2.1"
         ];
       })
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Web Inspector based nodeJS debugger";
-      homepage = http://github.com/node-inspector/node-inspector;
+      description = "The streaming build system";
+      homepage = http://gulpjs.com/;
+      license = "MIT";
     };
     production = true;
   };
-  node-pre-gyp = nodeEnv.buildNodePackage {
-    name = "node-pre-gyp";
-    packageName = "node-pre-gyp";
-    version = "0.6.38";
+  node-gyp = nodeEnv.buildNodePackage {
+    name = "node-gyp";
+    packageName = "node-gyp";
+    version = "3.6.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz";
-      sha1 = "e92a20f83416415bb4086f6d1fb78b3da73d113d";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz";
+      sha1 = "9bfbe54562286284838e750eac05295853fa1c60";
     };
     dependencies = [
-      (sources."mkdirp-0.5.1" // {
+      (sources."fstream-1.0.11" // {
         dependencies = [
-          sources."minimist-0.0.8"
+          sources."inherits-2.0.3"
         ];
       })
-      (sources."nopt-4.0.1" // {
+      (sources."glob-7.1.2" // {
         dependencies = [
-          sources."abbrev-1.1.1"
-          (sources."osenv-0.1.4" // {
+          sources."fs.realpath-1.0.0"
+          (sources."inflight-1.0.6" // {
             dependencies = [
-              sources."os-homedir-1.0.2"
-              sources."os-tmpdir-1.0.2"
+              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."minimatch-3.0.4" // {
+        dependencies = [
+          (sources."brace-expansion-1.1.8" // {
+            dependencies = [
+              sources."balanced-match-1.0.0"
+              sources."concat-map-0.0.1"
             ];
           })
         ];
       })
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      (sources."nopt-3.0.6" // {
+        dependencies = [
+          sources."abbrev-1.1.1"
+        ];
+      })
       (sources."npmlog-4.1.2" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.4" // {
@@ -7729,17 +4810,15 @@ in
           sources."set-blocking-2.0.0"
         ];
       })
-      (sources."rc-1.2.2" // {
+      (sources."osenv-0.1.4" // {
         dependencies = [
-          sources."deep-extend-0.4.2"
-          sources."ini-1.3.4"
-          sources."minimist-1.2.0"
-          sources."strip-json-comments-2.0.1"
+          sources."os-homedir-1.0.2"
+          sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."request-2.81.0" // {
+      (sources."request-2.83.0" // {
         dependencies = [
-          sources."aws-sign2-0.6.0"
+          sources."aws-sign2-0.7.0"
           sources."aws4-1.6.0"
           sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
@@ -7749,32 +4828,41 @@ in
           })
           sources."extend-3.0.1"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.4" // {
+          (sources."form-data-2.3.1" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-4.2.1" // {
+          (sources."har-validator-5.0.3" // {
             dependencies = [
-              (sources."ajv-4.11.8" // {
+              (sources."ajv-5.3.0" // {
                 dependencies = [
                   sources."co-4.6.0"
-                  (sources."json-stable-stringify-1.0.1" // {
-                    dependencies = [
-                      sources."jsonify-0.0.0"
-                    ];
-                  })
+                  sources."fast-deep-equal-1.0.0"
+                  sources."fast-json-stable-stringify-2.0.0"
+                  sources."json-schema-traverse-0.3.1"
+                ];
+              })
+              sources."har-schema-2.0.0"
+            ];
+          })
+          (sources."hawk-6.0.2" // {
+            dependencies = [
+              sources."hoek-4.2.0"
+              sources."boom-4.3.1"
+              (sources."cryptiles-3.1.2" // {
+                dependencies = [
+                  sources."boom-5.2.0"
                 ];
               })
-              sources."har-schema-1.0.5"
+              sources."sntp-2.1.0"
             ];
           })
-          (sources."http-signature-1.1.1" // {
+          (sources."http-signature-1.2.0" // {
             dependencies = [
-              sources."assert-plus-0.2.0"
+              sources."assert-plus-1.0.0"
               (sources."jsprim-1.4.1" // {
                 dependencies = [
-                  sources."assert-plus-1.0.0"
                   sources."extsprintf-1.3.0"
                   sources."json-schema-0.2.3"
                   (sources."verror-1.10.0" // {
@@ -7787,7 +4875,6 @@ in
               (sources."sshpk-1.13.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
-                  sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.7"
                   sources."jsbn-0.1.1"
@@ -7807,8 +4894,8 @@ in
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."performance-now-0.2.0"
-          sources."qs-6.4.0"
+          sources."performance-now-2.1.0"
+          sources."qs-6.5.1"
           sources."safe-buffer-5.1.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.3" // {
@@ -7820,199 +4907,323 @@ in
           sources."uuid-3.1.0"
         ];
       })
-      (sources."hawk-3.1.3" // {
+      sources."rimraf-2.6.2"
+      sources."semver-5.3.0"
+      (sources."tar-2.2.1" // {
         dependencies = [
-          sources."hoek-2.16.3"
-          sources."boom-2.10.1"
-          sources."cryptiles-2.0.5"
-          sources."sntp-1.0.9"
+          sources."block-stream-0.0.9"
+          sources."inherits-2.0.3"
         ];
       })
-      (sources."rimraf-2.6.2" // {
+      (sources."which-1.3.0" // {
         dependencies = [
-          (sources."glob-7.1.2" // {
+          sources."isexe-2.0.0"
+        ];
+      })
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Node.js native addon build tool";
+      homepage = "https://github.com/nodejs/node-gyp#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
+  node-inspector = nodeEnv.buildNodePackage {
+    name = "node-inspector";
+    packageName = "node-inspector";
+    version = "1.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.1.tgz";
+      sha1 = "e7851eb973f380543c058db564a9812055eac640";
+    };
+    dependencies = [
+      sources."async-0.9.2"
+      (sources."biased-opener-0.2.8" // {
+        dependencies = [
+          (sources."browser-launcher2-0.4.6" // {
             dependencies = [
-              sources."fs.realpath-1.0.0"
-              (sources."inflight-1.0.6" // {
+              sources."headless-0.1.7"
+              sources."lodash-2.4.2"
+              (sources."mkdirp-0.5.1" // {
                 dependencies = [
-                  sources."wrappy-1.0.2"
+                  sources."minimist-0.0.8"
                 ];
               })
-              sources."inherits-2.0.3"
-              (sources."minimatch-3.0.4" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.8" // {
+                  sources."os-homedir-1.0.2"
+                  sources."os-tmpdir-1.0.2"
+                ];
+              })
+              (sources."plist-1.2.0" // {
+                dependencies = [
+                  sources."base64-js-0.0.8"
+                  (sources."xmlbuilder-4.0.0" // {
                     dependencies = [
-                      sources."balanced-match-1.0.0"
-                      sources."concat-map-0.0.1"
+                      sources."lodash-3.10.1"
                     ];
                   })
+                  sources."xmldom-0.1.27"
+                  sources."util-deprecate-1.0.2"
                 ];
               })
-              (sources."once-1.4.0" // {
+              (sources."win-detect-browsers-1.0.2" // {
                 dependencies = [
-                  sources."wrappy-1.0.2"
+                  sources."after-0.8.2"
+                  sources."xtend-4.0.1"
+                  sources."yargs-1.3.3"
                 ];
               })
-              sources."path-is-absolute-1.0.1"
-            ];
-          })
-        ];
-      })
-      sources."semver-5.4.1"
-      (sources."tar-2.2.1" // {
-        dependencies = [
-          sources."block-stream-0.0.9"
-          (sources."fstream-1.0.11" // {
-            dependencies = [
-              sources."graceful-fs-4.1.11"
-            ];
-          })
-          sources."inherits-2.0.3"
-        ];
-      })
-      (sources."tar-pack-3.4.0" // {
-        dependencies = [
-          (sources."debug-2.6.9" // {
-            dependencies = [
-              sources."ms-2.0.0"
-            ];
-          })
-          (sources."fstream-1.0.11" // {
-            dependencies = [
-              sources."graceful-fs-4.1.11"
-              sources."inherits-2.0.3"
+              sources."uid-0.0.2"
+              sources."rimraf-2.2.8"
             ];
           })
-          (sources."fstream-ignore-1.0.5" // {
+          sources."minimist-1.2.0"
+          (sources."x-default-browser-0.3.1" // {
             dependencies = [
-              sources."inherits-2.0.3"
-              (sources."minimatch-3.0.4" // {
+              (sources."default-browser-id-1.0.4" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.8" // {
+                  (sources."bplist-parser-0.1.1" // {
                     dependencies = [
-                      sources."balanced-match-1.0.0"
-                      sources."concat-map-0.0.1"
+                      sources."big-integer-1.6.25"
                     ];
                   })
-                ];
-              })
-            ];
-          })
-          (sources."once-1.4.0" // {
-            dependencies = [
-              sources."wrappy-1.0.2"
-            ];
-          })
-          (sources."readable-stream-2.3.3" // {
-            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."safe-buffer-5.1.1"
-              sources."string_decoder-1.0.3"
-              sources."util-deprecate-1.0.2"
+                  (sources."meow-3.7.0" // {
+                    dependencies = [
+                      (sources."camelcase-keys-2.1.0" // {
+                        dependencies = [
+                          sources."camelcase-2.1.1"
+                        ];
+                      })
+                      sources."decamelize-1.2.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.2"
+                        ];
+                      })
+                      sources."map-obj-1.0.1"
+                      (sources."normalize-package-data-2.4.0" // {
+                        dependencies = [
+                          sources."hosted-git-info-2.5.0"
+                          (sources."is-builtin-module-1.0.0" // {
+                            dependencies = [
+                              sources."builtin-modules-1.1.1"
+                            ];
+                          })
+                          (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"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."object-assign-4.1.1"
+                      (sources."read-pkg-up-1.0.1" // {
+                        dependencies = [
+                          (sources."find-up-1.1.2" // {
+                            dependencies = [
+                              sources."path-exists-2.1.0"
+                              (sources."pinkie-promise-2.0.1" // {
+                                dependencies = [
+                                  sources."pinkie-2.0.4"
+                                ];
+                              })
+                            ];
+                          })
+                          (sources."read-pkg-1.1.0" // {
+                            dependencies = [
+                              (sources."load-json-file-1.1.0" // {
+                                dependencies = [
+                                  sources."graceful-fs-4.1.11"
+                                  (sources."parse-json-2.2.0" // {
+                                    dependencies = [
+                                      (sources."error-ex-1.3.1" // {
+                                        dependencies = [
+                                          sources."is-arrayish-0.2.1"
+                                        ];
+                                      })
+                                    ];
+                                  })
+                                  sources."pify-2.3.0"
+                                  (sources."pinkie-promise-2.0.1" // {
+                                    dependencies = [
+                                      sources."pinkie-2.0.4"
+                                    ];
+                                  })
+                                  (sources."strip-bom-2.0.0" // {
+                                    dependencies = [
+                                      sources."is-utf8-0.2.1"
+                                    ];
+                                  })
+                                ];
+                              })
+                              (sources."path-type-1.1.0" // {
+                                dependencies = [
+                                  sources."graceful-fs-4.1.11"
+                                  sources."pify-2.3.0"
+                                  (sources."pinkie-promise-2.0.1" // {
+                                    dependencies = [
+                                      sources."pinkie-2.0.4"
+                                    ];
+                                  })
+                                ];
+                              })
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."redent-1.0.0" // {
+                        dependencies = [
+                          (sources."indent-string-2.1.0" // {
+                            dependencies = [
+                              (sources."repeating-2.0.1" // {
+                                dependencies = [
+                                  (sources."is-finite-1.0.2" // {
+                                    dependencies = [
+                                      sources."number-is-nan-1.0.1"
+                                    ];
+                                  })
+                                ];
+                              })
+                            ];
+                          })
+                          (sources."strip-indent-1.0.1" // {
+                            dependencies = [
+                              sources."get-stdin-4.0.1"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."trim-newlines-1.0.0"
+                    ];
+                  })
+                  (sources."untildify-2.1.0" // {
+                    dependencies = [
+                      sources."os-homedir-1.0.2"
+                    ];
+                  })
+                ];
+              })
             ];
           })
-          sources."uid-number-0.0.6"
-        ];
-      })
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Node.js native addon binary install tool";
-      homepage = "https://github.com/mapbox/node-pre-gyp#readme";
-      license = "BSD-3-Clause";
-    };
-    production = true;
-  };
-  npm = nodeEnv.buildNodePackage {
-    name = "npm";
-    packageName = "npm";
-    version = "5.5.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz";
-      sha512 = "3chqlcr8vp121jxny46vi43cm5r0p31l7a24jbbq5jz4zzi0bvp0isk0i8xqylllcas38b75a9nl9p9pj0azbmbqf1bcyf793q8wxik";
-    };
-    dependencies = [
-      (sources."JSONStream-1.3.1" // {
-        dependencies = [
-          sources."jsonparse-1.3.1"
-          sources."through-2.3.8"
         ];
       })
-      sources."abbrev-1.1.1"
-      sources."ansi-regex-3.0.0"
-      sources."ansicolors-0.3.2"
-      sources."ansistyles-0.1.3"
-      sources."aproba-1.2.0"
-      sources."archy-1.0.0"
-      sources."bluebird-3.5.1"
-      (sources."cacache-9.2.9" // {
+      (sources."debug-2.6.9" // {
         dependencies = [
-          sources."y18n-3.2.1"
+          sources."ms-2.0.0"
         ];
       })
-      sources."call-limit-1.1.0"
-      sources."chownr-1.0.1"
-      (sources."cli-table2-0.2.0" // {
+      (sources."express-4.16.2" // {
         dependencies = [
-          sources."lodash-3.10.1"
-          (sources."string-width-1.0.2" // {
+          (sources."accepts-1.3.4" // {
             dependencies = [
-              sources."code-point-at-1.1.0"
-              (sources."is-fullwidth-code-point-1.0.0" // {
+              (sources."mime-types-2.1.17" // {
                 dependencies = [
-                  sources."number-is-nan-1.0.1"
+                  sources."mime-db-1.30.0"
                 ];
               })
-              (sources."strip-ansi-3.0.1" // {
+              sources."negotiator-0.6.1"
+            ];
+          })
+          sources."array-flatten-1.1.1"
+          (sources."body-parser-1.18.2" // {
+            dependencies = [
+              sources."bytes-3.0.0"
+              (sources."http-errors-1.6.2" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.3"
+                ];
+              })
+              sources."iconv-lite-0.4.19"
+              (sources."raw-body-2.3.2" // {
+                dependencies = [
+                  sources."unpipe-1.0.0"
                 ];
               })
             ];
           })
-          sources."colors-1.1.2"
-        ];
-      })
-      sources."cmd-shim-2.0.2"
-      (sources."columnify-1.5.4" // {
-        dependencies = [
-          (sources."strip-ansi-3.0.1" // {
+          sources."content-disposition-0.5.2"
+          sources."content-type-1.0.4"
+          sources."cookie-0.3.1"
+          sources."cookie-signature-1.0.6"
+          sources."depd-1.1.1"
+          sources."encodeurl-1.0.1"
+          sources."escape-html-1.0.3"
+          sources."etag-1.8.1"
+          (sources."finalhandler-1.1.0" // {
             dependencies = [
-              sources."ansi-regex-2.1.1"
+              sources."unpipe-1.0.0"
+            ];
+          })
+          sources."fresh-0.5.2"
+          sources."merge-descriptors-1.0.1"
+          sources."methods-1.1.2"
+          (sources."on-finished-2.3.0" // {
+            dependencies = [
+              sources."ee-first-1.1.1"
+            ];
+          })
+          sources."parseurl-1.3.2"
+          sources."path-to-regexp-0.1.7"
+          (sources."proxy-addr-2.0.2" // {
+            dependencies = [
+              sources."forwarded-0.1.2"
+              sources."ipaddr.js-1.5.2"
+            ];
+          })
+          sources."qs-6.5.1"
+          sources."range-parser-1.2.0"
+          sources."safe-buffer-5.1.1"
+          (sources."send-0.16.1" // {
+            dependencies = [
+              sources."destroy-1.0.4"
+              (sources."http-errors-1.6.2" // {
+                dependencies = [
+                  sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.3"
+                ];
+              })
+              sources."mime-1.4.1"
+              sources."ms-2.0.0"
             ];
           })
-          (sources."wcwidth-1.0.1" // {
+          sources."serve-static-1.13.1"
+          sources."setprototypeof-1.1.0"
+          sources."statuses-1.3.1"
+          (sources."type-is-1.6.15" // {
             dependencies = [
-              (sources."defaults-1.0.3" // {
+              sources."media-typer-0.3.0"
+              (sources."mime-types-2.1.17" // {
                 dependencies = [
-                  sources."clone-1.0.2"
+                  sources."mime-db-1.30.0"
                 ];
               })
             ];
           })
+          sources."utils-merge-1.0.1"
+          sources."vary-1.1.2"
         ];
       })
-      (sources."config-chain-1.1.11" // {
-        dependencies = [
-          sources."proto-list-1.2.4"
-        ];
-      })
-      sources."detect-indent-5.0.0"
-      (sources."dezalgo-1.0.3" // {
-        dependencies = [
-          sources."asap-2.0.6"
-        ];
-      })
-      sources."editor-1.0.0"
-      sources."fs-vacuum-1.2.10"
-      sources."fs-write-stream-atomic-1.0.10"
-      (sources."glob-7.1.2" // {
+      (sources."glob-5.0.15" // {
         dependencies = [
-          sources."fs.realpath-1.0.0"
+          (sources."inflight-1.0.6" // {
+            dependencies = [
+              sources."wrappy-1.0.2"
+            ];
+          })
+          sources."inherits-2.0.3"
           (sources."minimatch-3.0.4" // {
             dependencies = [
               (sources."brace-expansion-1.1.8" // {
@@ -8023,385 +5234,571 @@ in
               })
             ];
           })
-          sources."path-is-absolute-1.0.1"
+          (sources."once-1.4.0" // {
+            dependencies = [
+              sources."wrappy-1.0.2"
+            ];
+          })
         ];
       })
-      sources."graceful-fs-4.1.11"
-      sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.5.0"
-      sources."iferr-0.1.5"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
-      sources."ini-1.3.4"
-      (sources."init-package-json-1.10.1" // {
+      sources."path-is-absolute-1.0.1"
+      (sources."rc-1.2.2" // {
         dependencies = [
-          sources."promzard-0.3.0"
+          sources."deep-extend-0.4.2"
+          sources."ini-1.3.4"
+          sources."minimist-1.2.0"
+          sources."strip-json-comments-2.0.1"
         ];
       })
-      (sources."is-cidr-1.0.0" // {
+      sources."semver-4.3.6"
+      (sources."serve-favicon-2.4.5" // {
         dependencies = [
-          sources."cidr-regex-1.0.6"
+          sources."etag-1.8.1"
+          sources."fresh-0.5.2"
+          sources."ms-2.0.0"
+          sources."parseurl-1.3.2"
+          sources."safe-buffer-5.1.1"
         ];
       })
-      sources."lazy-property-1.0.0"
-      (sources."libnpx-9.6.0" // {
+      (sources."strong-data-uri-1.0.4" // {
         dependencies = [
-          sources."dotenv-4.0.0"
-          sources."y18n-3.2.1"
-          (sources."yargs-8.0.2" // {
+          sources."truncate-1.0.5"
+        ];
+      })
+      (sources."v8-debug-1.0.1" // {
+        dependencies = [
+          sources."nan-2.7.0"
+          (sources."node-pre-gyp-0.6.39" // {
             dependencies = [
-              sources."camelcase-4.1.0"
-              (sources."cliui-3.2.0" // {
+              (sources."mkdirp-0.5.1" // {
+                dependencies = [
+                  sources."minimist-0.0.8"
+                ];
+              })
+              (sources."nopt-4.0.1" // {
+                dependencies = [
+                  sources."abbrev-1.1.1"
+                  (sources."osenv-0.1.4" // {
+                    dependencies = [
+                      sources."os-homedir-1.0.2"
+                      sources."os-tmpdir-1.0.2"
+                    ];
+                  })
+                ];
+              })
+              (sources."npmlog-4.1.2" // {
+                dependencies = [
+                  (sources."are-we-there-yet-1.1.4" // {
+                    dependencies = [
+                      sources."delegates-1.0.0"
+                      (sources."readable-stream-2.3.3" // {
+                        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."safe-buffer-5.1.1"
+                          sources."string_decoder-1.0.3"
+                          sources."util-deprecate-1.0.2"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."console-control-strings-1.1.0"
+                  (sources."gauge-2.7.4" // {
+                    dependencies = [
+                      sources."aproba-1.2.0"
+                      sources."has-unicode-2.0.1"
+                      sources."object-assign-4.1.1"
+                      sources."signal-exit-3.0.2"
+                      (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.1.1"
+                        ];
+                      })
+                      sources."wide-align-1.1.2"
+                    ];
+                  })
+                  sources."set-blocking-2.0.0"
+                ];
+              })
+              (sources."request-2.81.0" // {
                 dependencies = [
-                  (sources."string-width-1.0.2" // {
+                  sources."aws-sign2-0.6.0"
+                  sources."aws4-1.6.0"
+                  sources."caseless-0.12.0"
+                  (sources."combined-stream-1.0.5" // {
+                    dependencies = [
+                      sources."delayed-stream-1.0.0"
+                    ];
+                  })
+                  sources."extend-3.0.1"
+                  sources."forever-agent-0.6.1"
+                  (sources."form-data-2.1.4" // {
+                    dependencies = [
+                      sources."asynckit-0.4.0"
+                    ];
+                  })
+                  (sources."har-validator-4.2.1" // {
+                    dependencies = [
+                      (sources."ajv-4.11.8" // {
+                        dependencies = [
+                          sources."co-4.6.0"
+                          (sources."json-stable-stringify-1.0.1" // {
+                            dependencies = [
+                              sources."jsonify-0.0.0"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."har-schema-1.0.5"
+                    ];
+                  })
+                  (sources."http-signature-1.1.1" // {
                     dependencies = [
-                      sources."code-point-at-1.1.0"
-                      (sources."is-fullwidth-code-point-1.0.0" // {
+                      sources."assert-plus-0.2.0"
+                      (sources."jsprim-1.4.1" // {
+                        dependencies = [
+                          sources."assert-plus-1.0.0"
+                          sources."extsprintf-1.3.0"
+                          sources."json-schema-0.2.3"
+                          (sources."verror-1.10.0" // {
+                            dependencies = [
+                              sources."core-util-is-1.0.2"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."sshpk-1.13.1" // {
                         dependencies = [
-                          sources."number-is-nan-1.0.1"
+                          sources."asn1-0.2.3"
+                          sources."assert-plus-1.0.0"
+                          sources."dashdash-1.14.1"
+                          sources."getpass-0.1.7"
+                          sources."jsbn-0.1.1"
+                          sources."tweetnacl-0.14.5"
+                          sources."ecc-jsbn-0.1.1"
+                          sources."bcrypt-pbkdf-1.0.1"
                         ];
                       })
                     ];
                   })
-                  (sources."strip-ansi-3.0.1" // {
+                  sources."is-typedarray-1.0.0"
+                  sources."isstream-0.1.2"
+                  sources."json-stringify-safe-5.0.1"
+                  (sources."mime-types-2.1.17" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."mime-db-1.30.0"
+                    ];
+                  })
+                  sources."oauth-sign-0.8.2"
+                  sources."performance-now-0.2.0"
+                  sources."qs-6.4.0"
+                  sources."safe-buffer-5.1.1"
+                  sources."stringstream-0.0.5"
+                  (sources."tough-cookie-2.3.3" // {
+                    dependencies = [
+                      sources."punycode-1.4.1"
                     ];
                   })
-                  sources."wrap-ansi-2.1.0"
+                  sources."tunnel-agent-0.6.0"
+                  sources."uuid-3.1.0"
+                ];
+              })
+              (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."decamelize-1.2.0"
-              sources."get-caller-file-1.0.2"
-              (sources."os-locale-2.1.0" // {
+              (sources."rimraf-2.6.2" // {
                 dependencies = [
-                  (sources."execa-0.7.0" // {
+                  (sources."glob-7.1.2" // {
                     dependencies = [
-                      (sources."cross-spawn-5.1.0" // {
+                      sources."fs.realpath-1.0.0"
+                      (sources."inflight-1.0.6" // {
+                        dependencies = [
+                          sources."wrappy-1.0.2"
+                        ];
+                      })
+                      sources."inherits-2.0.3"
+                      (sources."minimatch-3.0.4" // {
                         dependencies = [
-                          (sources."shebang-command-1.2.0" // {
+                          (sources."brace-expansion-1.1.8" // {
                             dependencies = [
-                              sources."shebang-regex-1.0.0"
+                              sources."balanced-match-1.0.0"
+                              sources."concat-map-0.0.1"
                             ];
                           })
                         ];
                       })
-                      sources."get-stream-3.0.0"
-                      sources."is-stream-1.1.0"
-                      (sources."npm-run-path-2.0.2" // {
+                      (sources."once-1.4.0" // {
                         dependencies = [
-                          sources."path-key-2.0.1"
+                          sources."wrappy-1.0.2"
                         ];
                       })
-                      sources."p-finally-1.0.0"
-                      sources."signal-exit-3.0.2"
-                      sources."strip-eof-1.0.0"
-                    ];
-                  })
-                  (sources."lcid-1.0.0" // {
-                    dependencies = [
-                      sources."invert-kv-1.0.0"
                     ];
                   })
-                  (sources."mem-1.1.0" // {
+                ];
+              })
+              sources."semver-5.4.1"
+              sources."detect-libc-1.0.2"
+              (sources."tar-2.2.1" // {
+                dependencies = [
+                  sources."block-stream-0.0.9"
+                  (sources."fstream-1.0.11" // {
                     dependencies = [
-                      sources."mimic-fn-1.1.0"
+                      sources."graceful-fs-4.1.11"
                     ];
                   })
+                  sources."inherits-2.0.3"
                 ];
               })
-              (sources."read-pkg-up-2.0.0" // {
+              (sources."tar-pack-3.4.1" // {
                 dependencies = [
-                  (sources."find-up-2.1.0" // {
+                  (sources."fstream-1.0.11" // {
                     dependencies = [
-                      (sources."locate-path-2.0.0" // {
-                        dependencies = [
-                          (sources."p-locate-2.0.0" // {
-                            dependencies = [
-                              sources."p-limit-1.1.0"
-                            ];
-                          })
-                          sources."path-exists-3.0.0"
-                        ];
-                      })
+                      sources."graceful-fs-4.1.11"
+                      sources."inherits-2.0.3"
                     ];
                   })
-                  (sources."read-pkg-2.0.0" // {
+                  (sources."fstream-ignore-1.0.5" // {
                     dependencies = [
-                      (sources."load-json-file-2.0.0" // {
+                      sources."inherits-2.0.3"
+                      (sources."minimatch-3.0.4" // {
                         dependencies = [
-                          (sources."parse-json-2.2.0" // {
+                          (sources."brace-expansion-1.1.8" // {
                             dependencies = [
-                              (sources."error-ex-1.3.1" // {
-                                dependencies = [
-                                  sources."is-arrayish-0.2.1"
-                                ];
-                              })
+                              sources."balanced-match-1.0.0"
+                              sources."concat-map-0.0.1"
                             ];
                           })
-                          sources."pify-2.3.0"
-                          sources."strip-bom-3.0.0"
-                        ];
-                      })
-                      (sources."path-type-2.0.0" // {
-                        dependencies = [
-                          sources."pify-2.3.0"
                         ];
                       })
                     ];
                   })
+                  (sources."once-1.4.0" // {
+                    dependencies = [
+                      sources."wrappy-1.0.2"
+                    ];
+                  })
+                  (sources."readable-stream-2.3.3" // {
+                    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."safe-buffer-5.1.1"
+                      sources."string_decoder-1.0.3"
+                      sources."util-deprecate-1.0.2"
+                    ];
+                  })
+                  sources."uid-number-0.0.6"
                 ];
               })
-              sources."require-directory-2.1.1"
-              sources."require-main-filename-1.0.1"
-              sources."set-blocking-2.0.0"
-              (sources."string-width-2.1.1" // {
-                dependencies = [
-                  sources."is-fullwidth-code-point-2.0.0"
-                ];
-              })
-              sources."which-module-2.0.0"
-              sources."yargs-parser-7.0.0"
-            ];
-          })
-        ];
-      })
-      sources."lockfile-1.0.3"
-      (sources."lodash._baseuniq-4.6.0" // {
-        dependencies = [
-          sources."lodash._createset-4.0.3"
-          sources."lodash._root-3.0.1"
-        ];
-      })
-      sources."lodash.clonedeep-4.5.0"
-      sources."lodash.union-4.6.0"
-      sources."lodash.uniq-4.5.0"
-      sources."lodash.without-4.4.0"
-      (sources."lru-cache-4.1.1" // {
-        dependencies = [
-          sources."pseudomap-1.0.2"
-          sources."yallist-2.1.2"
-        ];
-      })
-      sources."meant-1.0.1"
-      (sources."mississippi-1.3.0" // {
-        dependencies = [
-          (sources."concat-stream-1.6.0" // {
-            dependencies = [
-              sources."typedarray-0.0.6"
-            ];
-          })
-          (sources."duplexify-3.5.1" // {
-            dependencies = [
-              sources."stream-shift-1.0.0"
-            ];
-          })
-          sources."end-of-stream-1.4.0"
-          sources."flush-write-stream-1.0.2"
-          sources."from2-2.3.0"
-          (sources."parallel-transform-1.1.0" // {
-            dependencies = [
-              sources."cyclist-0.2.2"
-            ];
-          })
-          sources."pump-1.0.2"
-          sources."pumpify-1.3.5"
-          (sources."stream-each-1.2.2" // {
-            dependencies = [
-              sources."stream-shift-1.0.0"
-            ];
-          })
-          (sources."through2-2.0.3" // {
-            dependencies = [
-              sources."xtend-4.0.1"
             ];
           })
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      (sources."move-concurrently-1.0.1" // {
-        dependencies = [
-          sources."copy-concurrently-1.0.5"
-          sources."run-queue-1.0.3"
-        ];
-      })
-      (sources."node-gyp-3.6.2" // {
+      (sources."v8-profiler-5.7.0" // {
         dependencies = [
-          sources."fstream-1.0.11"
-          (sources."minimatch-3.0.4" // {
+          sources."nan-2.7.0"
+          (sources."node-pre-gyp-0.6.39" // {
             dependencies = [
-              (sources."brace-expansion-1.1.8" // {
+              (sources."mkdirp-0.5.1" // {
                 dependencies = [
-                  sources."balanced-match-1.0.0"
-                  sources."concat-map-0.0.1"
+                  sources."minimist-0.0.8"
                 ];
               })
-            ];
-          })
-          sources."nopt-3.0.6"
-          sources."semver-5.3.0"
-          (sources."tar-2.2.1" // {
-            dependencies = [
-              sources."block-stream-0.0.9"
-            ];
-          })
-        ];
-      })
-      sources."nopt-4.0.1"
-      (sources."normalize-package-data-2.4.0" // {
-        dependencies = [
-          (sources."is-builtin-module-1.0.0" // {
-            dependencies = [
-              sources."builtin-modules-1.1.1"
-            ];
-          })
-        ];
-      })
-      sources."npm-cache-filename-1.0.2"
-      sources."npm-install-checks-3.0.0"
-      sources."npm-lifecycle-1.0.3"
-      sources."npm-package-arg-5.1.2"
-      (sources."npm-packlist-1.1.10" // {
-        dependencies = [
-          (sources."ignore-walk-3.0.1" // {
-            dependencies = [
-              (sources."minimatch-3.0.4" // {
+              (sources."nopt-4.0.1" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.8" // {
+                  sources."abbrev-1.1.1"
+                  (sources."osenv-0.1.4" // {
                     dependencies = [
-                      sources."balanced-match-1.0.0"
-                      sources."concat-map-0.0.1"
+                      sources."os-homedir-1.0.2"
+                      sources."os-tmpdir-1.0.2"
                     ];
                   })
                 ];
               })
-            ];
-          })
-          sources."npm-bundled-1.0.3"
-        ];
-      })
-      (sources."npm-profile-2.0.5" // {
-        dependencies = [
-          (sources."make-fetch-happen-2.5.0" // {
-            dependencies = [
-              (sources."agentkeepalive-3.3.0" // {
+              (sources."npmlog-4.1.2" // {
                 dependencies = [
-                  (sources."humanize-ms-1.2.1" // {
+                  (sources."are-we-there-yet-1.1.4" // {
+                    dependencies = [
+                      sources."delegates-1.0.0"
+                      (sources."readable-stream-2.3.3" // {
+                        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."safe-buffer-5.1.1"
+                          sources."string_decoder-1.0.3"
+                          sources."util-deprecate-1.0.2"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."console-control-strings-1.1.0"
+                  (sources."gauge-2.7.4" // {
+                    dependencies = [
+                      sources."aproba-1.2.0"
+                      sources."has-unicode-2.0.1"
+                      sources."object-assign-4.1.1"
+                      sources."signal-exit-3.0.2"
+                      (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.1.1"
+                        ];
+                      })
+                      sources."wide-align-1.1.2"
+                    ];
+                  })
+                  sources."set-blocking-2.0.0"
+                ];
+              })
+              (sources."request-2.81.0" // {
+                dependencies = [
+                  sources."aws-sign2-0.6.0"
+                  sources."aws4-1.6.0"
+                  sources."caseless-0.12.0"
+                  (sources."combined-stream-1.0.5" // {
+                    dependencies = [
+                      sources."delayed-stream-1.0.0"
+                    ];
+                  })
+                  sources."extend-3.0.1"
+                  sources."forever-agent-0.6.1"
+                  (sources."form-data-2.1.4" // {
+                    dependencies = [
+                      sources."asynckit-0.4.0"
+                    ];
+                  })
+                  (sources."har-validator-4.2.1" // {
                     dependencies = [
-                      sources."ms-2.0.0"
+                      (sources."ajv-4.11.8" // {
+                        dependencies = [
+                          sources."co-4.6.0"
+                          (sources."json-stable-stringify-1.0.1" // {
+                            dependencies = [
+                              sources."jsonify-0.0.0"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."har-schema-1.0.5"
                     ];
                   })
-                ];
-              })
-              sources."http-cache-semantics-3.8.0"
-              (sources."http-proxy-agent-2.0.0" // {
-                dependencies = [
-                  (sources."agent-base-4.1.1" // {
+                  (sources."http-signature-1.1.1" // {
                     dependencies = [
-                      (sources."es6-promisify-5.0.0" // {
+                      sources."assert-plus-0.2.0"
+                      (sources."jsprim-1.4.1" // {
+                        dependencies = [
+                          sources."assert-plus-1.0.0"
+                          sources."extsprintf-1.3.0"
+                          sources."json-schema-0.2.3"
+                          (sources."verror-1.10.0" // {
+                            dependencies = [
+                              sources."core-util-is-1.0.2"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."sshpk-1.13.1" // {
                         dependencies = [
-                          sources."es6-promise-4.1.1"
+                          sources."asn1-0.2.3"
+                          sources."assert-plus-1.0.0"
+                          sources."dashdash-1.14.1"
+                          sources."getpass-0.1.7"
+                          sources."jsbn-0.1.1"
+                          sources."tweetnacl-0.14.5"
+                          sources."ecc-jsbn-0.1.1"
+                          sources."bcrypt-pbkdf-1.0.1"
                         ];
                       })
                     ];
                   })
-                  (sources."debug-2.6.9" // {
+                  sources."is-typedarray-1.0.0"
+                  sources."isstream-0.1.2"
+                  sources."json-stringify-safe-5.0.1"
+                  (sources."mime-types-2.1.17" // {
+                    dependencies = [
+                      sources."mime-db-1.30.0"
+                    ];
+                  })
+                  sources."oauth-sign-0.8.2"
+                  sources."performance-now-0.2.0"
+                  sources."qs-6.4.0"
+                  sources."safe-buffer-5.1.1"
+                  sources."stringstream-0.0.5"
+                  (sources."tough-cookie-2.3.3" // {
                     dependencies = [
-                      sources."ms-2.0.0"
+                      sources."punycode-1.4.1"
                     ];
                   })
+                  sources."tunnel-agent-0.6.0"
+                  sources."uuid-3.1.0"
+                ];
+              })
+              (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."https-proxy-agent-2.1.0" // {
+              (sources."rimraf-2.6.2" // {
                 dependencies = [
-                  (sources."agent-base-4.1.1" // {
+                  (sources."glob-7.1.2" // {
                     dependencies = [
-                      (sources."es6-promisify-5.0.0" // {
+                      sources."fs.realpath-1.0.0"
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
-                          sources."es6-promise-4.1.1"
+                          sources."wrappy-1.0.2"
+                        ];
+                      })
+                      sources."inherits-2.0.3"
+                      (sources."minimatch-3.0.4" // {
+                        dependencies = [
+                          (sources."brace-expansion-1.1.8" // {
+                            dependencies = [
+                              sources."balanced-match-1.0.0"
+                              sources."concat-map-0.0.1"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."once-1.4.0" // {
+                        dependencies = [
+                          sources."wrappy-1.0.2"
                         ];
                       })
-                    ];
-                  })
-                  (sources."debug-2.6.9" // {
-                    dependencies = [
-                      sources."ms-2.0.0"
                     ];
                   })
                 ];
               })
-              (sources."node-fetch-npm-2.0.2" // {
+              sources."semver-5.4.1"
+              sources."detect-libc-1.0.2"
+              (sources."tar-2.2.1" // {
                 dependencies = [
-                  (sources."encoding-0.1.12" // {
+                  sources."block-stream-0.0.9"
+                  (sources."fstream-1.0.11" // {
                     dependencies = [
-                      sources."iconv-lite-0.4.19"
+                      sources."graceful-fs-4.1.11"
                     ];
                   })
-                  sources."json-parse-better-errors-1.0.1"
-                ];
-              })
-              (sources."promise-retry-1.1.1" // {
-                dependencies = [
-                  sources."err-code-1.1.2"
+                  sources."inherits-2.0.3"
                 ];
               })
-              (sources."socks-proxy-agent-3.0.1" // {
+              (sources."tar-pack-3.4.1" // {
                 dependencies = [
-                  (sources."agent-base-4.1.1" // {
+                  (sources."fstream-1.0.11" // {
+                    dependencies = [
+                      sources."graceful-fs-4.1.11"
+                      sources."inherits-2.0.3"
+                    ];
+                  })
+                  (sources."fstream-ignore-1.0.5" // {
                     dependencies = [
-                      (sources."es6-promisify-5.0.0" // {
+                      sources."inherits-2.0.3"
+                      (sources."minimatch-3.0.4" // {
                         dependencies = [
-                          sources."es6-promise-4.1.1"
+                          (sources."brace-expansion-1.1.8" // {
+                            dependencies = [
+                              sources."balanced-match-1.0.0"
+                              sources."concat-map-0.0.1"
+                            ];
+                          })
                         ];
                       })
                     ];
                   })
-                  (sources."socks-1.1.10" // {
+                  (sources."once-1.4.0" // {
+                    dependencies = [
+                      sources."wrappy-1.0.2"
+                    ];
+                  })
+                  (sources."readable-stream-2.3.3" // {
                     dependencies = [
-                      sources."ip-1.1.5"
-                      sources."smart-buffer-1.1.15"
+                      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."safe-buffer-5.1.1"
+                      sources."string_decoder-1.0.3"
+                      sources."util-deprecate-1.0.2"
                     ];
                   })
+                  sources."uid-number-0.0.6"
                 ];
               })
             ];
           })
         ];
       })
-      (sources."npm-registry-client-8.5.0" // {
+      (sources."which-1.3.0" // {
         dependencies = [
-          (sources."concat-stream-1.6.0" // {
-            dependencies = [
-              sources."typedarray-0.0.6"
-            ];
-          })
+          sources."isexe-2.0.0"
         ];
       })
-      sources."npm-user-validate-1.0.0"
-      (sources."npmlog-4.1.2" // {
+      (sources."ws-1.1.4" // {
         dependencies = [
-          (sources."are-we-there-yet-1.1.4" // {
+          sources."options-0.0.6"
+          sources."ultron-1.0.2"
+        ];
+      })
+      (sources."yargs-3.32.0" // {
+        dependencies = [
+          sources."camelcase-2.1.1"
+          (sources."cliui-3.2.0" // {
             dependencies = [
-              sources."delegates-1.0.0"
+              (sources."strip-ansi-3.0.1" // {
+                dependencies = [
+                  sources."ansi-regex-2.1.1"
+                ];
+              })
+              sources."wrap-ansi-2.1.0"
             ];
           })
-          sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.4" // {
+          sources."decamelize-1.2.0"
+          (sources."os-locale-1.4.0" // {
             dependencies = [
-              sources."object-assign-4.1.1"
-              sources."signal-exit-3.0.2"
-              (sources."string-width-1.0.2" // {
+              (sources."lcid-1.0.0" // {
                 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."invert-kv-1.0.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" // {
@@ -8409,165 +5806,102 @@ in
                   sources."ansi-regex-2.1.1"
                 ];
               })
-              sources."wide-align-1.1.2"
             ];
           })
-          sources."set-blocking-2.0.0"
+          sources."window-size-0.1.4"
+          sources."y18n-3.2.1"
         ];
       })
-      sources."once-1.4.0"
-      sources."opener-1.4.3"
-      (sources."osenv-0.1.4" // {
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Web Inspector based nodeJS debugger";
+      homepage = http://github.com/node-inspector/node-inspector;
+    };
+    production = true;
+  };
+  node-pre-gyp = nodeEnv.buildNodePackage {
+    name = "node-pre-gyp";
+    packageName = "node-pre-gyp";
+    version = "0.6.39";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz";
+      sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis";
+    };
+    dependencies = [
+      (sources."mkdirp-0.5.1" // {
         dependencies = [
-          sources."os-homedir-1.0.2"
-          sources."os-tmpdir-1.0.2"
+          sources."minimist-0.0.8"
         ];
       })
-      (sources."pacote-6.0.4" // {
+      (sources."nopt-4.0.1" // {
         dependencies = [
-          (sources."make-fetch-happen-2.5.0" // {
+          sources."abbrev-1.1.1"
+          (sources."osenv-0.1.4" // {
             dependencies = [
-              (sources."agentkeepalive-3.3.0" // {
-                dependencies = [
-                  (sources."humanize-ms-1.2.1" // {
-                    dependencies = [
-                      sources."ms-2.0.0"
-                    ];
-                  })
-                ];
-              })
-              sources."http-cache-semantics-3.8.0"
-              (sources."http-proxy-agent-2.0.0" // {
-                dependencies = [
-                  (sources."agent-base-4.1.1" // {
-                    dependencies = [
-                      (sources."es6-promisify-5.0.0" // {
-                        dependencies = [
-                          sources."es6-promise-4.1.1"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."debug-2.6.9" // {
-                    dependencies = [
-                      sources."ms-2.0.0"
-                    ];
-                  })
-                ];
-              })
-              (sources."https-proxy-agent-2.1.0" // {
-                dependencies = [
-                  (sources."agent-base-4.1.1" // {
-                    dependencies = [
-                      (sources."es6-promisify-5.0.0" // {
-                        dependencies = [
-                          sources."es6-promise-4.1.1"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."debug-2.6.9" // {
-                    dependencies = [
-                      sources."ms-2.0.0"
-                    ];
-                  })
-                ];
-              })
-              (sources."node-fetch-npm-2.0.2" // {
+              sources."os-homedir-1.0.2"
+              sources."os-tmpdir-1.0.2"
+            ];
+          })
+        ];
+      })
+      (sources."npmlog-4.1.2" // {
+        dependencies = [
+          (sources."are-we-there-yet-1.1.4" // {
+            dependencies = [
+              sources."delegates-1.0.0"
+              (sources."readable-stream-2.3.3" // {
                 dependencies = [
-                  (sources."encoding-0.1.12" // {
-                    dependencies = [
-                      sources."iconv-lite-0.4.19"
-                    ];
-                  })
-                  sources."json-parse-better-errors-1.0.1"
+                  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."safe-buffer-5.1.1"
+                  sources."string_decoder-1.0.3"
+                  sources."util-deprecate-1.0.2"
                 ];
               })
-              (sources."socks-proxy-agent-3.0.1" // {
+            ];
+          })
+          sources."console-control-strings-1.1.0"
+          (sources."gauge-2.7.4" // {
+            dependencies = [
+              sources."aproba-1.2.0"
+              sources."has-unicode-2.0.1"
+              sources."object-assign-4.1.1"
+              sources."signal-exit-3.0.2"
+              (sources."string-width-1.0.2" // {
                 dependencies = [
-                  (sources."agent-base-4.1.1" // {
-                    dependencies = [
-                      (sources."es6-promisify-5.0.0" // {
-                        dependencies = [
-                          sources."es6-promise-4.1.1"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."socks-1.1.10" // {
+                  sources."code-point-at-1.1.0"
+                  (sources."is-fullwidth-code-point-1.0.0" // {
                     dependencies = [
-                      sources."ip-1.1.5"
-                      sources."smart-buffer-1.1.15"
+                      sources."number-is-nan-1.0.1"
                     ];
                   })
                 ];
               })
-            ];
-          })
-          (sources."minimatch-3.0.4" // {
-            dependencies = [
-              (sources."brace-expansion-1.1.8" // {
+              (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."balanced-match-1.0.0"
-                  sources."concat-map-0.0.1"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
+              sources."wide-align-1.1.2"
             ];
           })
-          sources."npm-pick-manifest-1.0.4"
-          (sources."promise-retry-1.1.1" // {
-            dependencies = [
-              sources."err-code-1.1.2"
-            ];
-          })
-          (sources."protoduck-4.0.0" // {
-            dependencies = [
-              sources."genfun-4.0.1"
-            ];
-          })
-        ];
-      })
-      sources."path-is-inside-1.0.2"
-      sources."promise-inflight-1.0.1"
-      sources."qrcode-terminal-0.11.0"
-      (sources."query-string-5.0.0" // {
-        dependencies = [
-          sources."decode-uri-component-0.2.0"
-          sources."object-assign-4.1.1"
-          sources."strict-uri-encode-1.1.0"
-        ];
-      })
-      sources."qw-1.0.1"
-      (sources."read-1.0.7" // {
-        dependencies = [
-          sources."mute-stream-0.0.7"
-        ];
-      })
-      sources."read-cmd-shim-1.0.1"
-      (sources."read-installed-4.0.3" // {
-        dependencies = [
-          sources."util-extend-1.0.3"
-        ];
-      })
-      (sources."read-package-json-2.0.12" // {
-        dependencies = [
-          sources."json-parse-better-errors-1.0.1"
-          sources."slash-1.0.0"
+          sources."set-blocking-2.0.0"
         ];
       })
-      sources."read-package-tree-5.1.6"
-      (sources."readable-stream-2.3.3" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
-          sources."core-util-is-1.0.2"
-          sources."isarray-1.0.0"
-          sources."process-nextick-args-1.0.7"
-          sources."string_decoder-1.0.3"
-          sources."util-deprecate-1.0.2"
+          sources."deep-extend-0.4.2"
+          sources."ini-1.3.4"
+          sources."minimist-1.2.0"
+          sources."strip-json-comments-2.0.1"
         ];
       })
-      (sources."request-2.83.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
-          sources."aws-sign2-0.7.0"
+          sources."aws-sign2-0.6.0"
           sources."aws4-1.6.0"
           sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
@@ -8577,18 +5911,16 @@ in
           })
           sources."extend-3.0.1"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.3.1" // {
+          (sources."form-data-2.1.4" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-5.0.3" // {
+          (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."ajv-5.2.4" // {
+              (sources."ajv-4.11.8" // {
                 dependencies = [
                   sources."co-4.6.0"
-                  sources."fast-deep-equal-1.0.0"
-                  sources."json-schema-traverse-0.3.1"
                   (sources."json-stable-stringify-1.0.1" // {
                     dependencies = [
                       sources."jsonify-0.0.0"
@@ -8596,26 +5928,15 @@ in
                   })
                 ];
               })
-              sources."har-schema-2.0.0"
-            ];
-          })
-          (sources."hawk-6.0.2" // {
-            dependencies = [
-              sources."hoek-4.2.0"
-              sources."boom-4.3.1"
-              (sources."cryptiles-3.1.2" // {
-                dependencies = [
-                  sources."boom-5.2.0"
-                ];
-              })
-              sources."sntp-2.0.2"
+              sources."har-schema-1.0.5"
             ];
           })
-          (sources."http-signature-1.2.0" // {
+          (sources."http-signature-1.1.1" // {
             dependencies = [
-              sources."assert-plus-1.0.0"
+              sources."assert-plus-0.2.0"
               (sources."jsprim-1.4.1" // {
                 dependencies = [
+                  sources."assert-plus-1.0.0"
                   sources."extsprintf-1.3.0"
                   sources."json-schema-0.2.3"
                   (sources."verror-1.10.0" // {
@@ -8628,6 +5949,7 @@ in
               (sources."sshpk-1.13.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
+                  sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.7"
                   sources."jsbn-0.1.1"
@@ -8647,8 +5969,9 @@ in
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."performance-now-2.1.0"
-          sources."qs-6.5.1"
+          sources."performance-now-0.2.0"
+          sources."qs-6.4.0"
+          sources."safe-buffer-5.1.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.3" // {
             dependencies = [
@@ -8656,270 +5979,126 @@ in
             ];
           })
           sources."tunnel-agent-0.6.0"
+          sources."uuid-3.1.0"
         ];
       })
-      sources."retry-0.10.1"
-      sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
-      sources."semver-5.4.1"
-      sources."sha-2.0.1"
-      sources."slide-1.1.6"
-      sources."sorted-object-2.0.1"
-      (sources."sorted-union-stream-2.1.3" // {
-        dependencies = [
-          (sources."from2-1.3.0" // {
-            dependencies = [
-              (sources."readable-stream-1.1.14" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-0.0.1"
-                  sources."string_decoder-0.10.31"
-                ];
-              })
-            ];
-          })
-          (sources."stream-iterate-1.2.0" // {
-            dependencies = [
-              sources."stream-shift-1.0.0"
-            ];
-          })
-        ];
-      })
-      sources."ssri-4.1.6"
-      sources."strip-ansi-4.0.0"
-      (sources."tar-4.0.2" // {
-        dependencies = [
-          sources."minipass-2.2.1"
-          sources."minizlib-1.0.4"
-          sources."yallist-3.0.2"
-        ];
-      })
-      sources."text-table-0.2.0"
-      sources."uid-number-0.0.6"
-      sources."umask-1.1.0"
-      (sources."unique-filename-1.1.0" // {
+      (sources."hawk-3.1.3" // {
         dependencies = [
-          sources."unique-slug-2.0.0"
+          sources."hoek-2.16.3"
+          sources."boom-2.10.1"
+          sources."cryptiles-2.0.5"
+          sources."sntp-1.0.9"
         ];
       })
-      sources."unpipe-1.0.0"
-      (sources."update-notifier-2.2.0" // {
+      (sources."rimraf-2.6.2" // {
         dependencies = [
-          (sources."boxen-1.2.2" // {
+          (sources."glob-7.1.2" // {
             dependencies = [
-              sources."ansi-align-2.0.0"
-              sources."camelcase-4.1.0"
-              (sources."chalk-2.2.0" // {
-                dependencies = [
-                  (sources."ansi-styles-3.2.0" // {
-                    dependencies = [
-                      (sources."color-convert-1.9.0" // {
-                        dependencies = [
-                          sources."color-name-1.1.3"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."escape-string-regexp-1.0.5"
-                  (sources."supports-color-4.5.0" // {
-                    dependencies = [
-                      sources."has-flag-2.0.0"
-                    ];
-                  })
-                ];
-              })
-              sources."cli-boxes-1.0.0"
-              (sources."string-width-2.1.1" // {
+              sources."fs.realpath-1.0.0"
+              (sources."inflight-1.0.6" // {
                 dependencies = [
-                  sources."is-fullwidth-code-point-2.0.0"
+                  sources."wrappy-1.0.2"
                 ];
               })
-              (sources."term-size-1.2.0" // {
+              sources."inherits-2.0.3"
+              (sources."minimatch-3.0.4" // {
                 dependencies = [
-                  (sources."execa-0.7.0" // {
+                  (sources."brace-expansion-1.1.8" // {
                     dependencies = [
-                      (sources."cross-spawn-5.1.0" // {
-                        dependencies = [
-                          (sources."shebang-command-1.2.0" // {
-                            dependencies = [
-                              sources."shebang-regex-1.0.0"
-                            ];
-                          })
-                        ];
-                      })
-                      sources."get-stream-3.0.0"
-                      sources."is-stream-1.1.0"
-                      (sources."npm-run-path-2.0.2" // {
-                        dependencies = [
-                          sources."path-key-2.0.1"
-                        ];
-                      })
-                      sources."p-finally-1.0.0"
-                      sources."signal-exit-3.0.2"
-                      sources."strip-eof-1.0.0"
+                      sources."balanced-match-1.0.0"
+                      sources."concat-map-0.0.1"
                     ];
                   })
                 ];
               })
-              (sources."widest-line-1.0.0" // {
+              (sources."once-1.4.0" // {
                 dependencies = [
-                  (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.1.1"
-                        ];
-                      })
-                    ];
-                  })
+                  sources."wrappy-1.0.2"
                 ];
               })
+              sources."path-is-absolute-1.0.1"
+            ];
+          })
+        ];
+      })
+      sources."semver-5.4.1"
+      sources."detect-libc-1.0.2"
+      (sources."tar-2.2.1" // {
+        dependencies = [
+          sources."block-stream-0.0.9"
+          (sources."fstream-1.0.11" // {
+            dependencies = [
+              sources."graceful-fs-4.1.11"
             ];
           })
-          (sources."chalk-1.1.3" // {
+          sources."inherits-2.0.3"
+        ];
+      })
+      (sources."tar-pack-3.4.1" // {
+        dependencies = [
+          (sources."debug-2.6.9" // {
             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.1.1"
-                ];
-              })
-              (sources."strip-ansi-3.0.1" // {
-                dependencies = [
-                  sources."ansi-regex-2.1.1"
-                ];
-              })
-              sources."supports-color-2.0.0"
+              sources."ms-2.0.0"
             ];
           })
-          (sources."configstore-3.1.1" // {
+          (sources."fstream-1.0.11" // {
             dependencies = [
-              (sources."dot-prop-4.2.0" // {
-                dependencies = [
-                  sources."is-obj-1.0.1"
-                ];
-              })
-              (sources."make-dir-1.1.0" // {
-                dependencies = [
-                  sources."pify-3.0.0"
-                ];
-              })
-              (sources."unique-string-1.0.0" // {
-                dependencies = [
-                  sources."crypto-random-string-1.0.0"
-                ];
-              })
+              sources."graceful-fs-4.1.11"
+              sources."inherits-2.0.3"
             ];
           })
-          sources."import-lazy-2.1.0"
-          sources."is-npm-1.0.0"
-          (sources."latest-version-3.1.0" // {
+          (sources."fstream-ignore-1.0.5" // {
             dependencies = [
-              (sources."package-json-4.0.1" // {
+              sources."inherits-2.0.3"
+              (sources."minimatch-3.0.4" // {
                 dependencies = [
-                  (sources."got-6.7.1" // {
-                    dependencies = [
-                      (sources."create-error-class-3.0.2" // {
-                        dependencies = [
-                          sources."capture-stack-trace-1.0.0"
-                        ];
-                      })
-                      sources."duplexer3-0.1.4"
-                      sources."get-stream-3.0.0"
-                      sources."is-redirect-1.0.0"
-                      sources."is-retry-allowed-1.1.0"
-                      sources."is-stream-1.1.0"
-                      sources."lowercase-keys-1.0.0"
-                      sources."timed-out-4.0.1"
-                      sources."unzip-response-2.0.1"
-                      (sources."url-parse-lax-1.0.0" // {
-                        dependencies = [
-                          sources."prepend-http-1.0.4"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."registry-auth-token-3.3.1" // {
-                    dependencies = [
-                      (sources."rc-1.2.2" // {
-                        dependencies = [
-                          sources."deep-extend-0.4.2"
-                          sources."minimist-1.2.0"
-                          sources."strip-json-comments-2.0.1"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."registry-url-3.1.0" // {
+                  (sources."brace-expansion-1.1.8" // {
                     dependencies = [
-                      (sources."rc-1.2.2" // {
-                        dependencies = [
-                          sources."deep-extend-0.4.2"
-                          sources."minimist-1.2.0"
-                          sources."strip-json-comments-2.0.1"
-                        ];
-                      })
+                      sources."balanced-match-1.0.0"
+                      sources."concat-map-0.0.1"
                     ];
                   })
                 ];
               })
             ];
           })
-          sources."semver-diff-2.1.0"
-          sources."xdg-basedir-3.0.0"
-        ];
-      })
-      sources."uuid-3.1.0"
-      (sources."validate-npm-package-name-3.0.0" // {
-        dependencies = [
-          sources."builtins-1.0.3"
-        ];
-      })
-      (sources."which-1.3.0" // {
-        dependencies = [
-          sources."isexe-2.0.0"
-        ];
-      })
-      (sources."worker-farm-1.5.0" // {
-        dependencies = [
-          (sources."errno-0.1.4" // {
+          (sources."once-1.4.0" // {
             dependencies = [
-              sources."prr-0.0.0"
+              sources."wrappy-1.0.2"
             ];
           })
-          sources."xtend-4.0.1"
-        ];
-      })
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-2.1.0"
-      sources."debuglog-1.0.1"
-      sources."imurmurhash-0.1.4"
-      sources."lodash._baseindexof-3.1.0"
-      sources."lodash._bindcallback-3.0.1"
-      sources."lodash._cacheindexof-3.0.2"
-      sources."lodash._createcache-3.1.2"
-      sources."lodash._getnative-3.9.1"
-      sources."lodash.restparam-3.6.1"
-      sources."readdir-scoped-modules-1.0.2"
-      (sources."validate-npm-package-license-3.0.1" // {
-        dependencies = [
-          (sources."spdx-correct-1.0.2" // {
+          (sources."readable-stream-2.3.3" // {
             dependencies = [
-              sources."spdx-license-ids-1.2.2"
+              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."safe-buffer-5.1.1"
+              sources."string_decoder-1.0.3"
+              sources."util-deprecate-1.0.2"
             ];
           })
-          sources."spdx-expression-parse-1.0.4"
+          sources."uid-number-0.0.6"
         ];
       })
     ];
     buildInputs = globalBuildInputs;
+    meta = {
+      description = "Node.js native addon binary install tool";
+      homepage = "https://github.com/mapbox/node-pre-gyp#readme";
+      license = "BSD-3-Clause";
+    };
+    production = true;
+  };
+  npm = nodeEnv.buildNodePackage {
+    name = "npm";
+    packageName = "npm";
+    version = "5.5.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz";
+      sha512 = "3chqlcr8vp121jxny46vi43cm5r0p31l7a24jbbq5jz4zzi0bvp0isk0i8xqylllcas38b75a9nl9p9pj0azbmbqf1bcyf793q8wxik";
+    };
+    buildInputs = globalBuildInputs;
     meta = {
       description = "a package manager for JavaScript";
       homepage = https://docs.npmjs.com/;
@@ -8996,7 +6175,7 @@ in
                             dependencies = [
                               (sources."kind-of-3.2.2" // {
                                 dependencies = [
-                                  sources."is-buffer-1.1.5"
+                                  sources."is-buffer-1.1.6"
                                 ];
                               })
                               sources."longest-1.0.1"
@@ -9012,7 +6191,7 @@ in
                             dependencies = [
                               (sources."kind-of-3.2.2" // {
                                 dependencies = [
-                                  sources."is-buffer-1.1.5"
+                                  sources."is-buffer-1.1.6"
                                 ];
                               })
                               sources."longest-1.0.1"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 1b80e08ad2e..a2be42b0802 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.4.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -2021,7 +2021,7 @@ let
       };
     };
     "@types/node-8.0.47" = {
-      name = "@types/node";
+      name = "_at_types_slash_node";
       packageName = "@types/node";
       version = "8.0.47";
       src = fetchurl {
@@ -2030,7 +2030,7 @@ let
       };
     };
     "@types/request-2.0.7" = {
-      name = "@types/request";
+      name = "_at_types_slash_request";
       packageName = "@types/request";
       version = "2.0.7";
       src = fetchurl {
@@ -2039,7 +2039,7 @@ let
       };
     };
     "@types/uuid-3.4.3" = {
-      name = "@types/uuid";
+      name = "_at_types_slash_uuid";
       packageName = "@types/uuid";
       version = "3.4.3";
       src = fetchurl {
@@ -2075,7 +2075,7 @@ let
       };
     };
     "@types/form-data-2.2.0" = {
-      name = "@types/form-data";
+      name = "_at_types_slash_form-data";
       packageName = "@types/form-data";
       version = "2.2.0";
       src = fetchurl {
@@ -3523,13 +3523,13 @@ let
         sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
       };
     };
-    "crypto-browserify-3.11.1" = {
+    "crypto-browserify-3.12.0" = {
       name = "crypto-browserify";
       packageName = "crypto-browserify";
-      version = "3.11.1";
+      version = "3.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz";
-        sha512 = "2alsgx5iqvf0nr641lz4g24bpvfgv6lza2h9n34d24jhvs3s0dklnds2x2nzs2w9sfiadi6zy93c2szm5ajn50wwnb8dalf02bxkbim";
+        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
+        sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz";
       };
     };
     "defined-1.0.0" = {
@@ -3982,6 +3982,15 @@ let
         sha512 = "293m4ffiafbjg0b99a2k78wiffmlwc2v7cigrn5l3n7555x7qxyr34sp0s4p713vwlaf0ny5n57iysgkz08slld3hzw8ci1a2gxjgpi";
       };
     };
+    "randomfill-1.0.3" = {
+      name = "randomfill";
+      packageName = "randomfill";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz";
+        sha512 = "08l7hdx65kfxli7g9pcnlv84bdrccj7d267d1kfi93db6a4mihwyhvsipmx2n0yk9z45cs21isgpld6rib5saxg28s2g8nn3ap8dgk0";
+      };
+    };
     "browserify-aes-1.1.1" = {
       name = "browserify-aes";
       packageName = "browserify-aes";
@@ -6988,600 +6997,6 @@ let
         sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
       };
     };
-    "abbrev-1.0.9" = {
-      name = "abbrev";
-      packageName = "abbrev";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz";
-        sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135";
-      };
-    };
-    "ansicolors-0.3.2" = {
-      name = "ansicolors";
-      packageName = "ansicolors";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz";
-        sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979";
-      };
-    };
-    "ansistyles-0.1.3" = {
-      name = "ansistyles";
-      packageName = "ansistyles";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz";
-        sha1 = "5de60415bda071bb37127854c864f41b23254539";
-      };
-    };
-    "archy-1.0.0" = {
-      name = "archy";
-      packageName = "archy";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz";
-        sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40";
-      };
-    };
-    "async-some-1.0.2" = {
-      name = "async-some";
-      packageName = "async-some";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-some/-/async-some-1.0.2.tgz";
-        sha1 = "4d8a81620d5958791b5b98f802d3207776e95509";
-      };
-    };
-    "block-stream-0.0.9" = {
-      name = "block-stream";
-      packageName = "block-stream";
-      version = "0.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
-        sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
-      };
-    };
-    "char-spinner-1.0.1" = {
-      name = "char-spinner";
-      packageName = "char-spinner";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz";
-        sha1 = "e6ea67bd247e107112983b7ab0479ed362800081";
-      };
-    };
-    "chownr-1.0.1" = {
-      name = "chownr";
-      packageName = "chownr";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz";
-        sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
-      };
-    };
-    "cmd-shim-2.0.2" = {
-      name = "cmd-shim";
-      packageName = "cmd-shim";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz";
-        sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb";
-      };
-    };
-    "columnify-1.5.4" = {
-      name = "columnify";
-      packageName = "columnify";
-      version = "1.5.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz";
-        sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb";
-      };
-    };
-    "config-chain-1.1.11" = {
-      name = "config-chain";
-      packageName = "config-chain";
-      version = "1.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
-        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
-      };
-    };
-    "dezalgo-1.0.3" = {
-      name = "dezalgo";
-      packageName = "dezalgo";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz";
-        sha1 = "7f742de066fc748bc8db820569dddce49bf0d456";
-      };
-    };
-    "fs-vacuum-1.2.10" = {
-      name = "fs-vacuum";
-      packageName = "fs-vacuum";
-      version = "1.2.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz";
-        sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36";
-      };
-    };
-    "fs-write-stream-atomic-1.0.10" = {
-      name = "fs-write-stream-atomic";
-      packageName = "fs-write-stream-atomic";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz";
-        sha1 = "b47df53493ef911df75731e70a9ded0189db40c9";
-      };
-    };
-    "fstream-1.0.11" = {
-      name = "fstream";
-      packageName = "fstream";
-      version = "1.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz";
-        sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171";
-      };
-    };
-    "fstream-npm-1.1.1" = {
-      name = "fstream-npm";
-      packageName = "fstream-npm";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.1.1.tgz";
-        sha1 = "6b9175db6239a83d8209e232426c494dbb29690c";
-      };
-    };
-    "github-url-from-git-1.4.0" = {
-      name = "github-url-from-git";
-      packageName = "github-url-from-git";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz";
-        sha1 = "285e6b520819001bde128674704379e4ff03e0de";
-      };
-    };
-    "github-url-from-username-repo-1.0.2" = {
-      name = "github-url-from-username-repo";
-      packageName = "github-url-from-username-repo";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz";
-        sha1 = "7dd79330d2abe69c10c2cef79714c97215791dfa";
-      };
-    };
-    "glob-7.0.6" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz";
-        sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
-      };
-    };
-    "hosted-git-info-2.1.5" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "2.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz";
-        sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b";
-      };
-    };
-    "init-package-json-1.9.6" = {
-      name = "init-package-json";
-      packageName = "init-package-json";
-      version = "1.9.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.6.tgz";
-        sha1 = "789fc2b74466a4952b9ea77c0575bc78ebd60a61";
-      };
-    };
-    "lockfile-1.0.3" = {
-      name = "lockfile";
-      packageName = "lockfile";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz";
-        sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79";
-      };
-    };
-    "lru-cache-4.0.2" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz";
-        sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
-      };
-    };
-    "node-gyp-3.6.2" = {
-      name = "node-gyp";
-      packageName = "node-gyp";
-      version = "3.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz";
-        sha1 = "9bfbe54562286284838e750eac05295853fa1c60";
-      };
-    };
-    "nopt-3.0.6" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "3.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz";
-        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
-      };
-    };
-    "normalize-git-url-3.0.2" = {
-      name = "normalize-git-url";
-      packageName = "normalize-git-url";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.2.tgz";
-        sha1 = "8e5f14be0bdaedb73e07200310aa416c27350fc4";
-      };
-    };
-    "normalize-package-data-2.3.8" = {
-      name = "normalize-package-data";
-      packageName = "normalize-package-data";
-      version = "2.3.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz";
-        sha1 = "d819eda2a9dedbd1ffa563ea4071d936782295bb";
-      };
-    };
-    "npm-cache-filename-1.0.2" = {
-      name = "npm-cache-filename";
-      packageName = "npm-cache-filename";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz";
-        sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11";
-      };
-    };
-    "npm-install-checks-1.0.7" = {
-      name = "npm-install-checks";
-      packageName = "npm-install-checks";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.7.tgz";
-        sha1 = "6d91aeda0ac96801f1ed7aadee116a6c0a086a57";
-      };
-    };
-    "npm-package-arg-4.1.1" = {
-      name = "npm-package-arg";
-      packageName = "npm-package-arg";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.1.tgz";
-        sha1 = "86d9dca985b4c5e5d59772dfd5de6919998a495a";
-      };
-    };
-    "npm-registry-client-7.2.1" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "7.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.2.1.tgz";
-        sha1 = "c792266b088cc313f8525e7e35248626c723db75";
-      };
-    };
-    "npm-user-validate-0.1.5" = {
-      name = "npm-user-validate";
-      packageName = "npm-user-validate";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.5.tgz";
-        sha1 = "52465d50c2d20294a57125b996baedbf56c5004b";
-      };
-    };
-    "npmlog-2.0.4" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz";
-        sha1 = "98b52530f2514ca90d09ec5b22c8846722375692";
-      };
-    };
-    "path-is-inside-1.0.2" = {
-      name = "path-is-inside";
-      packageName = "path-is-inside";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
-        sha1 = "365417dede44430d1c11af61027facf074bdfc53";
-      };
-    };
-    "read-installed-4.0.3" = {
-      name = "read-installed";
-      packageName = "read-installed";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz";
-        sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067";
-      };
-    };
-    "readable-stream-2.1.5" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
-        sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
-      };
-    };
-    "realize-package-specifier-3.0.3" = {
-      name = "realize-package-specifier";
-      packageName = "realize-package-specifier";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.3.tgz";
-        sha1 = "d0def882952b8de3f67eba5e91199661271f41f4";
-      };
-    };
-    "retry-0.10.1" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
-        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
-      };
-    };
-    "rimraf-2.5.4" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.5.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz";
-        sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04";
-      };
-    };
-    "sha-2.0.1" = {
-      name = "sha";
-      packageName = "sha";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz";
-        sha1 = "6030822fbd2c9823949f8f72ed6411ee5cf25aae";
-      };
-    };
-    "sorted-object-2.0.1" = {
-      name = "sorted-object";
-      packageName = "sorted-object";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz";
-        sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc";
-      };
-    };
-    "text-table-0.2.0" = {
-      name = "text-table";
-      packageName = "text-table";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
-        sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
-      };
-    };
-    "uid-number-0.0.6" = {
-      name = "uid-number";
-      packageName = "uid-number";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz";
-        sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81";
-      };
-    };
-    "umask-1.1.0" = {
-      name = "umask";
-      packageName = "umask";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz";
-        sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d";
-      };
-    };
-    "validate-npm-package-name-2.2.2" = {
-      name = "validate-npm-package-name";
-      packageName = "validate-npm-package-name";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz";
-        sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085";
-      };
-    };
-    "which-1.2.14" = {
-      name = "which";
-      packageName = "which";
-      version = "1.2.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
-        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
-      };
-    };
-    "write-file-atomic-1.1.4" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.4.tgz";
-        sha1 = "b1f52dc2e8dc0e3cb04d187a25f758a38a90ca3b";
-      };
-    };
-    "proto-list-1.2.4" = {
-      name = "proto-list";
-      packageName = "proto-list";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz";
-        sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
-      };
-    };
-    "iferr-0.1.5" = {
-      name = "iferr";
-      packageName = "iferr";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz";
-        sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501";
-      };
-    };
-    "fstream-ignore-1.0.5" = {
-      name = "fstream-ignore";
-      packageName = "fstream-ignore";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz";
-        sha1 = "9c31dae34767018fe1d249b24dada67d092da105";
-      };
-    };
-    "pseudomap-1.0.2" = {
-      name = "pseudomap";
-      packageName = "pseudomap";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
-        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
-      };
-    };
-    "yallist-2.1.2" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
-        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
-      };
-    };
-    "semver-5.3.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
-        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
-      };
-    };
-    "npm-package-arg-4.2.1" = {
-      name = "npm-package-arg";
-      packageName = "npm-package-arg";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz";
-        sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec";
-      };
-    };
-    "are-we-there-yet-1.1.4" = {
-      name = "are-we-there-yet";
-      packageName = "are-we-there-yet";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz";
-        sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d";
-      };
-    };
-    "gauge-1.2.7" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "1.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz";
-        sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93";
-      };
-    };
-    "delegates-1.0.0" = {
-      name = "delegates";
-      packageName = "delegates";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
-        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
-      };
-    };
-    "has-unicode-2.0.1" = {
-      name = "has-unicode";
-      packageName = "has-unicode";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
-        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
-      };
-    };
-    "lodash.pad-4.5.1" = {
-      name = "lodash.pad";
-      packageName = "lodash.pad";
-      version = "4.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz";
-        sha1 = "4330949a833a7c8da22cc20f6a26c4d59debba70";
-      };
-    };
-    "lodash.padend-4.6.1" = {
-      name = "lodash.padend";
-      packageName = "lodash.padend";
-      version = "4.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz";
-        sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e";
-      };
-    };
-    "lodash.padstart-4.6.1" = {
-      name = "lodash.padstart";
-      packageName = "lodash.padstart";
-      version = "4.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz";
-        sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b";
-      };
-    };
-    "debuglog-1.0.1" = {
-      name = "debuglog";
-      packageName = "debuglog";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz";
-        sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492";
-      };
-    };
-    "readdir-scoped-modules-1.0.2" = {
-      name = "readdir-scoped-modules";
-      packageName = "readdir-scoped-modules";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz";
-        sha1 = "9fafa37d286be5d92cbaebdee030dc9b5f406747";
-      };
-    };
-    "util-extend-1.0.3" = {
-      name = "util-extend";
-      packageName = "util-extend";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz";
-        sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
-      };
-    };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
-      };
-    };
-    "builtins-0.0.7" = {
-      name = "builtins";
-      packageName = "builtins";
-      version = "0.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
-        sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
-      };
-    };
     "base64-js-1.1.2" = {
       name = "base64-js";
       packageName = "base64-js";
@@ -7627,6 +7042,24 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
+    "block-stream-0.0.9" = {
+      name = "block-stream";
+      packageName = "block-stream";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
+        sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
+      };
+    };
+    "fstream-1.0.11" = {
+      name = "fstream";
+      packageName = "fstream";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz";
+        sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171";
+      };
+    };
     "pegjs-0.10.0" = {
       name = "pegjs";
       packageName = "pegjs";
@@ -9188,13 +8621,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.141.0" = {
+    "aws-sdk-2.144.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.141.0";
+      version = "2.144.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.141.0.tgz";
-        sha1 = "3d96a5970fd9f540ceabcc1d4baeb33b71583aa7";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.144.0.tgz";
+        sha1 = "14d8179bb44971b08426c63a1cc5f63dc09389e7";
       };
     };
     "request-2.83.0" = {
@@ -9611,6 +9044,24 @@ let
         sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
       };
     };
+    "pseudomap-1.0.2" = {
+      name = "pseudomap";
+      packageName = "pseudomap";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
+        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
+      };
+    };
+    "yallist-2.1.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
+        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
+      };
+    };
     "shebang-regex-1.0.0" = {
       name = "shebang-regex";
       packageName = "shebang-regex";
@@ -10349,6 +9800,15 @@ let
         sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
       };
     };
+    "path-is-inside-1.0.2" = {
+      name = "path-is-inside";
+      packageName = "path-is-inside";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
+        sha1 = "365417dede44430d1c11af61027facf074bdfc53";
+      };
+    };
     "pluralize-7.0.0" = {
       name = "pluralize";
       packageName = "pluralize";
@@ -10385,6 +9845,15 @@ let
         sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai";
       };
     };
+    "text-table-0.2.0" = {
+      name = "text-table";
+      packageName = "text-table";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
+        sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
+      };
+    };
     "esrecurse-4.2.0" = {
       name = "esrecurse";
       packageName = "esrecurse";
@@ -10736,22 +10205,22 @@ let
         sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a";
       };
     };
-    "puppeteer-0.11.0" = {
+    "puppeteer-0.12.0" = {
       name = "puppeteer";
       packageName = "puppeteer";
-      version = "0.11.0";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-0.11.0.tgz";
-        sha512 = "3rfwg87lk6wc7vyansvzg9qpxlkix62l5mway31pxflgcadf475n8zm866gbcq7wxyffy0nx4hrlkhd1fchbn2i0zw6x122lmijx3zy";
+        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-0.12.0.tgz";
+        sha512 = "0lz3hi4l5ajb19cspw7s46bnygfb5njss0jb7nb21p32qjpad8lmnyavipfya9fp2wdq3240b3366n5zqis2ndj6wdwqwf5vsag5xhz";
       };
     };
-    "zen-observable-0.5.2" = {
+    "zen-observable-0.6.0" = {
       name = "zen-observable";
       packageName = "zen-observable";
-      version = "0.5.2";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz";
-        sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf";
+        url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.6.0.tgz";
+        sha512 = "0i23iwlb1ycrijxi8b09v6fx1nms22g2aj52kmbgqr7n5fxafmjmbbfkiv57c7wzvzayzy5hyqqpcvkbibwmqjdym1a5ykmarwgi6qv";
       };
     };
     "cli-spinners-1.1.0" = {
@@ -11411,141 +10880,6 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.38" = {
-      name = "node-pre-gyp";
-      packageName = "node-pre-gyp";
-      version = "0.6.38";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz";
-        sha1 = "e92a20f83416415bb4086f6d1fb78b3da73d113d";
-      };
-    };
-    "npmlog-4.1.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "4.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
-      };
-    };
-    "request-2.81.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.81.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
-        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
-      };
-    };
-    "tar-pack-3.4.1" = {
-      name = "tar-pack";
-      packageName = "tar-pack";
-      version = "3.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz";
-        sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w";
-      };
-    };
-    "console-control-strings-1.1.0" = {
-      name = "console-control-strings";
-      packageName = "console-control-strings";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
-        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
-      };
-    };
-    "gauge-2.7.4" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "2.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
-        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
-      };
-    };
-    "set-blocking-2.0.0" = {
-      name = "set-blocking";
-      packageName = "set-blocking";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
-        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
-      };
-    };
-    "aproba-1.2.0" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
-      };
-    };
-    "string-width-1.0.2" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
-      };
-    };
-    "wide-align-1.1.2" = {
-      name = "wide-align";
-      packageName = "wide-align";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
-        sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
-      };
-    };
-    "har-validator-4.2.1" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
-        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
-      };
-    };
-    "performance-now-0.2.0" = {
-      name = "performance-now";
-      packageName = "performance-now";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
-        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
-      };
-    };
-    "qs-6.4.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
-        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
-      };
-    };
-    "ajv-4.11.8" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "4.11.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
-        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
-      };
-    };
-    "har-schema-1.0.5" = {
-      name = "har-schema";
-      packageName = "har-schema";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
-        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
-      };
-    };
     "event-stream-0.5.3" = {
       name = "event-stream";
       packageName = "event-stream";
@@ -11691,6 +11025,15 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
+    "nopt-3.0.6" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "3.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz";
+        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
+      };
+    };
     "coffee-script-1.12.7" = {
       name = "coffee-script";
       packageName = "coffee-script";
@@ -12051,6 +11394,15 @@ let
         sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb";
       };
     };
+    "archy-1.0.0" = {
+      name = "archy";
+      packageName = "archy";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz";
+        sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40";
+      };
+    };
     "deprecated-0.0.1" = {
       name = "deprecated";
       packageName = "deprecated";
@@ -13006,7 +12358,7 @@ let
       };
     };
     "@ionic/cli-framework-0.0.2" = {
-      name = "@ionic/cli-framework";
+      name = "_at_ionic_slash_cli-framework";
       packageName = "@ionic/cli-framework";
       version = "0.0.2";
       src = fetchurl {
@@ -13014,13 +12366,13 @@ let
         sha512 = "0sx59z1970yad1c2k9h7mz0fkjj21im682qb503ypng99fr0bm3nl6p5sw37iy2x44jj9jbh3a7lcc3kzm8ymy5gqw4v7rxbmcn8vv0";
       };
     };
-    "@ionic/cli-utils-1.15.2" = {
-      name = "@ionic/cli-utils";
+    "@ionic/cli-utils-1.16.0" = {
+      name = "_at_ionic_slash_cli-utils";
       packageName = "@ionic/cli-utils";
-      version = "1.15.2";
+      version = "1.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.15.2.tgz";
-        sha512 = "1611izq9j89s32sjxkrv23zm9lihvk5wgyyxqwzn286npawpx2gxvs24xm45k5ysy0gxbba9k258ixj9a6vzaz644w69y63nh2fxw18";
+        url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.16.0.tgz";
+        sha512 = "090sn09fzw1qsri39vwdb4s2ams955rr4l85hpkbd0274mbwz9wxw6rdz37xvsc9hq7aj0qvhxg3kanz12m1chbml27wvxz8ah5hccq";
       };
     };
     "opn-5.1.0" = {
@@ -13095,13 +12447,13 @@ let
         sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9";
       };
     };
-    "@ionic/discover-0.3.3" = {
-      name = "@ionic/discover";
+    "@ionic/discover-0.4.0" = {
+      name = "_at_ionic_slash_discover";
       packageName = "@ionic/discover";
-      version = "0.3.3";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.3.tgz";
-        sha512 = "3brs0chjqyz8drf7i6w67bmzxgvi88pb54m6qz3ml1wc3j42hgby7x0rjzwzdhkyx5573vbr91ias805gff1piyn7x7nq0c4568zj65";
+        url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.4.0.tgz";
+        sha512 = "0x6yxaj489n9lbq0kfvdnpj1pacgv3r0vk5cnlla7w1jkvxzwaf0vbcnwd9gdaj6zkq69wm1g4zjvj37pyn1lajjkzl1f50l7cnr2ad";
       };
     };
     "archiver-2.1.0" = {
@@ -13419,6 +12771,15 @@ let
         sha512 = "260gwv2k1svhzfxs50g921jbhrqlbfr94mcs9ak0dip7i2331nqc7ip0fgdkfl3r1b30w1s87qh2ssq6wxzd08pbmkjwchqc6xdnqls";
       };
     };
+    "abbrev-1.0.9" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz";
+        sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135";
+      };
+    };
     "escodegen-1.8.1" = {
       name = "escodegen";
       packageName = "escodegen";
@@ -13779,6 +13140,15 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
+    "config-chain-1.1.11" = {
+      name = "config-chain";
+      packageName = "config-chain";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
+        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
+      };
+    };
     "editorconfig-0.13.3" = {
       name = "editorconfig";
       packageName = "editorconfig";
@@ -13788,6 +13158,15 @@ let
         sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s";
       };
     };
+    "proto-list-1.2.4" = {
+      name = "proto-list";
+      packageName = "proto-list";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz";
+        sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
+      };
+    };
     "bluebird-3.5.1" = {
       name = "bluebird";
       packageName = "bluebird";
@@ -13887,13 +13266,13 @@ let
         sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc";
       };
     };
-    "lodash-id-0.13.0" = {
+    "lodash-id-0.14.0" = {
       name = "lodash-id";
       packageName = "lodash-id";
-      version = "0.13.0";
+      version = "0.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.13.0.tgz";
-        sha1 = "1b2086c24f004f07411bdb09b775072114bcddc6";
+        url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.14.0.tgz";
+        sha1 = "baf48934e543a1b5d6346f8c84698b1a8c803896";
       };
     };
     "lowdb-0.15.5" = {
@@ -13923,6 +13302,15 @@ let
         sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051";
       };
     };
+    "nanoid-1.0.1" = {
+      name = "nanoid";
+      packageName = "nanoid";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.1.tgz";
+        sha512 = "3dh8fdgynnii8rgdpyk69z99y49bnl60244wsaw8mk2lzhfhczgf7nxgmm0qakmgzbvqqqfngq03z3j8hp70smh7ka0il806w7ajxh5";
+      };
+    };
     "please-upgrade-node-3.0.1" = {
       name = "please-upgrade-node";
       packageName = "please-upgrade-node";
@@ -13932,15 +13320,6 @@ let
         sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db";
       };
     };
-    "pluralize-3.1.0" = {
-      name = "pluralize";
-      packageName = "pluralize";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pluralize/-/pluralize-3.1.0.tgz";
-        sha1 = "84213d0a12356069daa84060c559242633161368";
-      };
-    };
     "server-destroy-1.0.1" = {
       name = "server-destroy";
       packageName = "server-destroy";
@@ -13950,31 +13329,22 @@ let
         sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd";
       };
     };
-    "shortid-2.2.8" = {
-      name = "shortid";
-      packageName = "shortid";
-      version = "2.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shortid/-/shortid-2.2.8.tgz";
-        sha1 = "033b117d6a2e975804f6f0969dbe7d3d0b355131";
-      };
-    };
-    "update-notifier-1.0.3" = {
+    "update-notifier-2.3.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "1.0.3";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz";
-        sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz";
+        sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451";
       };
     };
-    "yargs-6.6.0" = {
+    "yargs-10.0.3" = {
       name = "yargs";
       packageName = "yargs";
-      version = "6.6.0";
+      version = "10.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
-        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
+        url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz";
+        sha512 = "1vn6jsqrhybxddyhmvkh0d43n2lk1z8081glfq80zpjfs4xgwpk0mmgdiry9zgsihmv9a2qidmp5hhyqqq8mzzkr037wla0qd1nk80f";
       };
     };
     "path-to-regexp-1.7.0" = {
@@ -14013,40 +13383,76 @@ let
         sha1 = "015db3f353e02e56377755f962742e8981e7bbba";
       };
     };
-    "boxen-0.6.0" = {
+    "boxen-1.2.2" = {
       name = "boxen";
       packageName = "boxen";
-      version = "0.6.0";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";
-        sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6";
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz";
+        sha1 = "3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5";
       };
     };
-    "latest-version-2.0.0" = {
+    "configstore-3.1.1" = {
+      name = "configstore";
+      packageName = "configstore";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
+        sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6";
+      };
+    };
+    "import-lazy-2.1.0" = {
+      name = "import-lazy";
+      packageName = "import-lazy";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz";
+        sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
+      };
+    };
+    "is-installed-globally-0.1.0" = {
+      name = "is-installed-globally";
+      packageName = "is-installed-globally";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz";
+        sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80";
+      };
+    };
+    "latest-version-3.1.0" = {
       name = "latest-version";
       packageName = "latest-version";
-      version = "2.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
-        sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz";
+        sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
       };
     };
-    "lazy-req-1.1.0" = {
-      name = "lazy-req";
-      packageName = "lazy-req";
-      version = "1.1.0";
+    "xdg-basedir-3.0.0" = {
+      name = "xdg-basedir";
+      packageName = "xdg-basedir";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz";
-        sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac";
+        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz";
+        sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
       };
     };
-    "ansi-align-1.1.0" = {
+    "ansi-align-2.0.0" = {
       name = "ansi-align";
       packageName = "ansi-align";
-      version = "1.1.0";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz";
+        sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
+      };
+    };
+    "camelcase-4.1.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
-        sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba";
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
       };
     };
     "cli-boxes-1.0.0" = {
@@ -14058,13 +13464,13 @@ let
         sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143";
       };
     };
-    "filled-array-1.1.0" = {
-      name = "filled-array";
-      packageName = "filled-array";
-      version = "1.1.0";
+    "term-size-1.2.0" = {
+      name = "term-size";
+      packageName = "term-size";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
-        sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
+        url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz";
+        sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
       };
     };
     "widest-line-1.0.0" = {
@@ -14076,22 +13482,67 @@ let
         sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
       };
     };
-    "package-json-2.4.0" = {
+    "execa-0.7.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
+      };
+    };
+    "string-width-1.0.2" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+      };
+    };
+    "unique-string-1.0.0" = {
+      name = "unique-string";
+      packageName = "unique-string";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz";
+        sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
+      };
+    };
+    "crypto-random-string-1.0.0" = {
+      name = "crypto-random-string";
+      packageName = "crypto-random-string";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz";
+        sha1 = "a230f64f568310e1498009940790ec99545bca7e";
+      };
+    };
+    "global-dirs-0.1.0" = {
+      name = "global-dirs";
+      packageName = "global-dirs";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.0.tgz";
+        sha1 = "10d34039e0df04272e262cf24224f7209434df4f";
+      };
+    };
+    "package-json-4.0.1" = {
       name = "package-json";
       packageName = "package-json";
-      version = "2.4.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
-        sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
+        url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz";
+        sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed";
       };
     };
-    "got-5.7.1" = {
+    "got-6.7.1" = {
       name = "got";
       packageName = "got";
-      version = "5.7.1";
+      version = "6.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
-        sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
+        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
+        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
       };
     };
     "registry-auth-token-3.3.1" = {
@@ -14112,31 +13563,13 @@ let
         sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
       };
     };
-    "node-status-codes-1.0.0" = {
-      name = "node-status-codes";
-      packageName = "node-status-codes";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
-        sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
-      };
-    };
-    "timed-out-3.1.3" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
-        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
-      };
-    };
-    "unzip-response-1.0.2" = {
+    "unzip-response-2.0.1" = {
       name = "unzip-response";
       packageName = "unzip-response";
-      version = "1.0.2";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz";
-        sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
+        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz";
+        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
       };
     };
     "capture-stack-trace-1.0.0" = {
@@ -14148,15 +13581,6 @@ let
         sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
       };
     };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    };
     "cliui-3.2.0" = {
       name = "cliui";
       packageName = "cliui";
@@ -14175,13 +13599,13 @@ let
         sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
       };
     };
-    "os-locale-1.4.0" = {
+    "os-locale-2.1.0" = {
       name = "os-locale";
       packageName = "os-locale";
-      version = "1.4.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
-        sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
+        sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy";
       };
     };
     "require-directory-2.1.1" = {
@@ -14202,13 +13626,22 @@ let
         sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
       };
     };
-    "which-module-1.0.0" = {
+    "set-blocking-2.0.0" = {
+      name = "set-blocking";
+      packageName = "set-blocking";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
+        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+      };
+    };
+    "which-module-2.0.0" = {
       name = "which-module";
       packageName = "which-module";
-      version = "1.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
-        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
+        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
       };
     };
     "y18n-3.2.1" = {
@@ -14220,13 +13653,13 @@ let
         sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
       };
     };
-    "yargs-parser-4.2.1" = {
+    "yargs-parser-8.0.0" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "4.2.1";
+      version = "8.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
-        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz";
+        sha1 = "21d476330e5a82279a4b881345bf066102e219c6";
       };
     };
     "wrap-ansi-2.1.0" = {
@@ -15282,6 +14715,24 @@ let
         sha1 = "483126e11774df2f71b8b639dcd799c376162b82";
       };
     };
+    "cmd-shim-2.0.2" = {
+      name = "cmd-shim";
+      packageName = "cmd-shim";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz";
+        sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb";
+      };
+    };
+    "columnify-1.5.4" = {
+      name = "columnify";
+      packageName = "columnify";
+      version = "1.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz";
+        sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb";
+      };
+    };
     "command-join-2.0.0" = {
       name = "command-join";
       packageName = "command-join";
@@ -15381,6 +14832,15 @@ let
         sha1 = "7eb3735d983a7ed2262ade4ff769af5369c5c440";
       };
     };
+    "npmlog-4.1.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
+        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
+      };
+    };
     "read-cmd-shim-1.0.1" = {
       name = "read-cmd-shim";
       packageName = "read-cmd-shim";
@@ -15804,6 +15264,69 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
+    "are-we-there-yet-1.1.4" = {
+      name = "are-we-there-yet";
+      packageName = "are-we-there-yet";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz";
+        sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d";
+      };
+    };
+    "console-control-strings-1.1.0" = {
+      name = "console-control-strings";
+      packageName = "console-control-strings";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
+        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
+      };
+    };
+    "gauge-2.7.4" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
+        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
+      };
+    };
+    "delegates-1.0.0" = {
+      name = "delegates";
+      packageName = "delegates";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
+        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
+      };
+    };
+    "aproba-1.2.0" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
+        sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
+      };
+    };
+    "has-unicode-2.0.1" = {
+      name = "has-unicode";
+      packageName = "has-unicode";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
+        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
+      };
+    };
+    "wide-align-1.1.2" = {
+      name = "wide-align";
+      packageName = "wide-align";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
+        sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
+      };
+    };
     "load-json-file-2.0.0" = {
       name = "load-json-file";
       packageName = "load-json-file";
@@ -15867,24 +15390,6 @@ let
         sha1 = "658535584861ec97d730d6cf41822e1f56684128";
       };
     };
-    "camelcase-4.1.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
-      };
-    };
-    "os-locale-2.1.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy";
-      };
-    };
     "read-pkg-up-2.0.0" = {
       name = "read-pkg-up";
       packageName = "read-pkg-up";
@@ -15894,15 +15399,6 @@ let
         sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
       };
     };
-    "which-module-2.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
-        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
-      };
-    };
     "yargs-parser-7.0.0" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -15912,15 +15408,6 @@ let
         sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
       };
     };
-    "execa-0.7.0" = {
-      name = "execa";
-      packageName = "execa";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
-        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
-      };
-    };
     "vinyl-1.2.0" = {
       name = "vinyl";
       packageName = "vinyl";
@@ -16560,13 +16047,22 @@ let
         sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e";
       };
     };
-    "nijs-0.0.23" = {
+    "nijs-0.0.25" = {
       name = "nijs";
       packageName = "nijs";
-      version = "0.0.23";
+      version = "0.0.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz";
-        sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a";
+        url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz";
+        sha1 = "04b035cb530d46859d1018839a518c029133f676";
+      };
+    };
+    "retry-0.10.1" = {
+      name = "retry";
+      packageName = "retry";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
+        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
       };
     };
     "ssri-4.1.6" = {
@@ -16650,6 +16146,15 @@ let
         sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
       };
     };
+    "semver-5.3.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
+        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
+      };
+    };
     "biased-opener-0.2.8" = {
       name = "biased-opener";
       packageName = "biased-opener";
@@ -16785,6 +16290,114 @@ let
         sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28";
       };
     };
+    "node-pre-gyp-0.6.39" = {
+      name = "node-pre-gyp";
+      packageName = "node-pre-gyp";
+      version = "0.6.39";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz";
+        sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis";
+      };
+    };
+    "request-2.81.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.81.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
+      };
+    };
+    "detect-libc-1.0.2" = {
+      name = "detect-libc";
+      packageName = "detect-libc";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz";
+        sha1 = "71ad5d204bf17a6a6ca8f450c61454066ef461e1";
+      };
+    };
+    "tar-pack-3.4.1" = {
+      name = "tar-pack";
+      packageName = "tar-pack";
+      version = "3.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz";
+        sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w";
+      };
+    };
+    "har-validator-4.2.1" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
+        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
+      };
+    };
+    "performance-now-0.2.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
+        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
+      };
+    };
+    "qs-6.4.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
+        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
+      };
+    };
+    "ajv-4.11.8" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "4.11.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
+        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
+      };
+    };
+    "har-schema-1.0.5" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
+        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
+      };
+    };
+    "fstream-ignore-1.0.5" = {
+      name = "fstream-ignore";
+      packageName = "fstream-ignore";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz";
+        sha1 = "9c31dae34767018fe1d249b24dada67d092da105";
+      };
+    };
+    "uid-number-0.0.6" = {
+      name = "uid-number";
+      packageName = "uid-number";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz";
+        sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81";
+      };
+    };
+    "os-locale-1.4.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
+        sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
+      };
+    };
     "window-size-0.1.4" = {
       name = "window-size";
       packageName = "window-size";
@@ -16848,15 +16461,6 @@ let
         sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f";
       };
     };
-    "update-notifier-2.3.0" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz";
-        sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451";
-      };
-    };
     "nopt-1.0.10" = {
       name = "nopt";
       packageName = "nopt";
@@ -16866,132 +16470,6 @@ let
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
-    "boxen-1.2.2" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz";
-        sha1 = "3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5";
-      };
-    };
-    "configstore-3.1.1" = {
-      name = "configstore";
-      packageName = "configstore";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
-        sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6";
-      };
-    };
-    "import-lazy-2.1.0" = {
-      name = "import-lazy";
-      packageName = "import-lazy";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz";
-        sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
-      };
-    };
-    "is-installed-globally-0.1.0" = {
-      name = "is-installed-globally";
-      packageName = "is-installed-globally";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz";
-        sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80";
-      };
-    };
-    "latest-version-3.1.0" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz";
-        sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
-      };
-    };
-    "xdg-basedir-3.0.0" = {
-      name = "xdg-basedir";
-      packageName = "xdg-basedir";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz";
-        sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
-      };
-    };
-    "ansi-align-2.0.0" = {
-      name = "ansi-align";
-      packageName = "ansi-align";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz";
-        sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
-      };
-    };
-    "term-size-1.2.0" = {
-      name = "term-size";
-      packageName = "term-size";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz";
-        sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
-      };
-    };
-    "unique-string-1.0.0" = {
-      name = "unique-string";
-      packageName = "unique-string";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz";
-        sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
-      };
-    };
-    "crypto-random-string-1.0.0" = {
-      name = "crypto-random-string";
-      packageName = "crypto-random-string";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz";
-        sha1 = "a230f64f568310e1498009940790ec99545bca7e";
-      };
-    };
-    "global-dirs-0.1.0" = {
-      name = "global-dirs";
-      packageName = "global-dirs";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.0.tgz";
-        sha1 = "10d34039e0df04272e262cf24224f7209434df4f";
-      };
-    };
-    "package-json-4.0.1" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz";
-        sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed";
-      };
-    };
-    "got-6.7.1" = {
-      name = "got";
-      packageName = "got";
-      version = "6.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
-        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
-      };
-    };
-    "unzip-response-2.0.1" = {
-      name = "unzip-response";
-      packageName = "unzip-response";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz";
-        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
-      };
-    };
     "body-parser-1.17.2" = {
       name = "body-parser";
       packageName = "body-parser";
@@ -18567,600 +18045,6 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "cacache-9.2.9" = {
-      name = "cacache";
-      packageName = "cacache";
-      version = "9.2.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz";
-        sha512 = "11qjza6qy62lkvynngcvx7nf2vhxvvp4g0l07a8zw5pzqc5iy0zznxzgs0dw1bb2i10dr2v7i624x6v9pkzp55snam9wk5jjf7ka642";
-      };
-    };
-    "call-limit-1.1.0" = {
-      name = "call-limit";
-      packageName = "call-limit";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/call-limit/-/call-limit-1.1.0.tgz";
-        sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea";
-      };
-    };
-    "cli-table2-0.2.0" = {
-      name = "cli-table2";
-      packageName = "cli-table2";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz";
-        sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97";
-      };
-    };
-    "is-cidr-1.0.0" = {
-      name = "is-cidr";
-      packageName = "is-cidr";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-cidr/-/is-cidr-1.0.0.tgz";
-        sha1 = "fb5aacf659255310359da32cae03e40c6a1c2afc";
-      };
-    };
-    "lazy-property-1.0.0" = {
-      name = "lazy-property";
-      packageName = "lazy-property";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-property/-/lazy-property-1.0.0.tgz";
-        sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
-      };
-    };
-    "libnpx-9.6.0" = {
-      name = "libnpx";
-      packageName = "libnpx";
-      version = "9.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.6.0.tgz";
-        sha512 = "28v6bsd92dcqj92yr2bk9r29ajwbqx46fd46mriva2934nr7s6hhkxy6f7xbf4nd7p93fxsbpzfx0ghq0y788x1zj8gnh1iswgd89sz";
-      };
-    };
-    "lodash._baseuniq-4.6.0" = {
-      name = "lodash._baseuniq";
-      packageName = "lodash._baseuniq";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz";
-        sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8";
-      };
-    };
-    "lodash.clonedeep-4.5.0" = {
-      name = "lodash.clonedeep";
-      packageName = "lodash.clonedeep";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz";
-        sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
-      };
-    };
-    "lodash.union-4.6.0" = {
-      name = "lodash.union";
-      packageName = "lodash.union";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz";
-        sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88";
-      };
-    };
-    "lodash.uniq-4.5.0" = {
-      name = "lodash.uniq";
-      packageName = "lodash.uniq";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz";
-        sha1 = "d0225373aeb652adc1bc82e4945339a842754773";
-      };
-    };
-    "lodash.without-4.4.0" = {
-      name = "lodash.without";
-      packageName = "lodash.without";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz";
-        sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
-      };
-    };
-    "meant-1.0.1" = {
-      name = "meant";
-      packageName = "meant";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz";
-        sha512 = "2b6yi25bkxg4hd38w2cpfjy0xyka4iqiyzhsnkklx3nxwbgnzr4hfl07xxpflccjvnb03zvnssw0y9fspxdk2fmq3abd4fab0n1baai";
-      };
-    };
-    "mississippi-1.3.0" = {
-      name = "mississippi";
-      packageName = "mississippi";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz";
-        sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5";
-      };
-    };
-    "move-concurrently-1.0.1" = {
-      name = "move-concurrently";
-      packageName = "move-concurrently";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz";
-        sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
-      };
-    };
-    "npm-install-checks-3.0.0" = {
-      name = "npm-install-checks";
-      packageName = "npm-install-checks";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-3.0.0.tgz";
-        sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
-      };
-    };
-    "npm-lifecycle-1.0.3" = {
-      name = "npm-lifecycle";
-      packageName = "npm-lifecycle";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-1.0.3.tgz";
-        sha512 = "0iapgirmdb46ia3apm6fsb9qv9c0hi4k9jflrxlgnrm0jhliqgas49lmpz06xafncx1sxgjngl0fw3gr472c7kapzdvpivf0fp5miqa";
-      };
-    };
-    "npm-packlist-1.1.10" = {
-      name = "npm-packlist";
-      packageName = "npm-packlist";
-      version = "1.1.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz";
-        sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001";
-      };
-    };
-    "npm-profile-2.0.5" = {
-      name = "npm-profile";
-      packageName = "npm-profile";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-profile/-/npm-profile-2.0.5.tgz";
-        sha512 = "2325avpmbzxl4vi1hxnxv96rw9j0y712ym3mph3hrsvgq4p8d0yh44vnja22plnw9vplskcx661j2spzqka65zsszzngvwm806skfdl";
-      };
-    };
-    "npm-registry-client-8.5.0" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "8.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz";
-        sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn";
-      };
-    };
-    "npm-user-validate-1.0.0" = {
-      name = "npm-user-validate";
-      packageName = "npm-user-validate";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-1.0.0.tgz";
-        sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951";
-      };
-    };
-    "opener-1.4.3" = {
-      name = "opener";
-      packageName = "opener";
-      version = "1.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz";
-        sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
-      };
-    };
-    "pacote-6.0.4" = {
-      name = "pacote";
-      packageName = "pacote";
-      version = "6.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-6.0.4.tgz";
-        sha512 = "36bx0mnsvm3fvq0vbcl05j6fsjf4v4gks1hlxqyga0jxz491cis9y38j8q9cmmfdfbx9xaz3n3h93h0ik4bkn82rb3nz2413wk7xfxi";
-      };
-    };
-    "promise-inflight-1.0.1" = {
-      name = "promise-inflight";
-      packageName = "promise-inflight";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz";
-        sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
-      };
-    };
-    "qrcode-terminal-0.11.0" = {
-      name = "qrcode-terminal";
-      packageName = "qrcode-terminal";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz";
-        sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e";
-      };
-    };
-    "query-string-5.0.1" = {
-      name = "query-string";
-      packageName = "query-string";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz";
-        sha512 = "0lcnspv96dv03600bgjxk2ypak8mysp77n47jkddpz6ldcgscwyan1akqjrddii4abb2brz6gr6yq9pcbdx63m9i16kk8m5028qrkv8";
-      };
-    };
-    "qw-1.0.1" = {
-      name = "qw";
-      packageName = "qw";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qw/-/qw-1.0.1.tgz";
-        sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4";
-      };
-    };
-    "read-package-tree-5.1.6" = {
-      name = "read-package-tree";
-      packageName = "read-package-tree";
-      version = "5.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz";
-        sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l";
-      };
-    };
-    "sorted-union-stream-2.1.3" = {
-      name = "sorted-union-stream";
-      packageName = "sorted-union-stream";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz";
-        sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
-      };
-    };
-    "tar-4.0.2" = {
-      name = "tar";
-      packageName = "tar";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz";
-        sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2";
-      };
-    };
-    "unique-filename-1.1.0" = {
-      name = "unique-filename";
-      packageName = "unique-filename";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz";
-        sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
-      };
-    };
-    "update-notifier-2.2.0" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz";
-        sha1 = "1b5837cf90c0736d88627732b661c138f86de72f";
-      };
-    };
-    "worker-farm-1.5.1" = {
-      name = "worker-farm";
-      packageName = "worker-farm";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.1.tgz";
-        sha512 = "0vwa4w6rn98nh8igcx2sni6hccs5wfwhh68zxzzgffimr7gmy5nw1ks0j2n0gra7g2ahsl7p7l34mcn8702n01y30qc6xxcdbllg4sg";
-      };
-    };
-    "write-file-atomic-2.1.0" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
-        sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni";
-      };
-    };
-    "lodash._baseindexof-3.1.0" = {
-      name = "lodash._baseindexof";
-      packageName = "lodash._baseindexof";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz";
-        sha1 = "fe52b53a1c6761e42618d654e4a25789ed61822c";
-      };
-    };
-    "lodash._cacheindexof-3.0.2" = {
-      name = "lodash._cacheindexof";
-      packageName = "lodash._cacheindexof";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz";
-        sha1 = "3dc69ac82498d2ee5e3ce56091bafd2adc7bde92";
-      };
-    };
-    "lodash._createcache-3.1.2" = {
-      name = "lodash._createcache";
-      packageName = "lodash._createcache";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz";
-        sha1 = "56d6a064017625e79ebca6b8018e17440bdcf093";
-      };
-    };
-    "cidr-regex-1.0.6" = {
-      name = "cidr-regex";
-      packageName = "cidr-regex";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cidr-regex/-/cidr-regex-1.0.6.tgz";
-        sha1 = "74abfd619df370b9d54ab14475568e97dd64c0c1";
-      };
-    };
-    "dotenv-4.0.0" = {
-      name = "dotenv";
-      packageName = "dotenv";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz";
-        sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d";
-      };
-    };
-    "lodash._createset-4.0.3" = {
-      name = "lodash._createset";
-      packageName = "lodash._createset";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz";
-        sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
-      };
-    };
-    "flush-write-stream-1.0.2" = {
-      name = "flush-write-stream";
-      packageName = "flush-write-stream";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz";
-        sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417";
-      };
-    };
-    "from2-2.3.0" = {
-      name = "from2";
-      packageName = "from2";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
-        sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
-      };
-    };
-    "parallel-transform-1.1.0" = {
-      name = "parallel-transform";
-      packageName = "parallel-transform";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz";
-        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
-      };
-    };
-    "stream-each-1.2.2" = {
-      name = "stream-each";
-      packageName = "stream-each";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz";
-        sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr";
-      };
-    };
-    "cyclist-0.2.2" = {
-      name = "cyclist";
-      packageName = "cyclist";
-      version = "0.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz";
-        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
-      };
-    };
-    "copy-concurrently-1.0.5" = {
-      name = "copy-concurrently";
-      packageName = "copy-concurrently";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
-        sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz";
-      };
-    };
-    "run-queue-1.0.3" = {
-      name = "run-queue";
-      packageName = "run-queue";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz";
-        sha1 = "e848396f057d223f24386924618e25694161ec47";
-      };
-    };
-    "ignore-walk-3.0.1" = {
-      name = "ignore-walk";
-      packageName = "ignore-walk";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";
-        sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d";
-      };
-    };
-    "npm-bundled-1.0.3" = {
-      name = "npm-bundled";
-      packageName = "npm-bundled";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz";
-        sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907";
-      };
-    };
-    "make-fetch-happen-2.5.0" = {
-      name = "make-fetch-happen";
-      packageName = "make-fetch-happen";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.5.0.tgz";
-        sha512 = "1s6fqfsr7ksyfp0mwzlcf9rwpg74y29p67jkc8h89zy915rjsy5f85ik1659gd0y48z7lbnf3mg9c27drk74qycj446rlykim3zkw14";
-      };
-    };
-    "agentkeepalive-3.3.0" = {
-      name = "agentkeepalive";
-      packageName = "agentkeepalive";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz";
-        sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p";
-      };
-    };
-    "http-cache-semantics-3.8.0" = {
-      name = "http-cache-semantics";
-      packageName = "http-cache-semantics";
-      version = "3.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.0.tgz";
-        sha512 = "258k0vff4wrszl7vnpv4c67zc5qk0mnl8banhp8znianmahxv1y55lpz0877jicsw1k0y8g0glz4my71dd9y3ywzpingfvb2xy0ar0w";
-      };
-    };
-    "http-proxy-agent-2.0.0" = {
-      name = "http-proxy-agent";
-      packageName = "http-proxy-agent";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz";
-        sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4";
-      };
-    };
-    "node-fetch-npm-2.0.2" = {
-      name = "node-fetch-npm";
-      packageName = "node-fetch-npm";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz";
-        sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw";
-      };
-    };
-    "promise-retry-1.1.1" = {
-      name = "promise-retry";
-      packageName = "promise-retry";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz";
-        sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d";
-      };
-    };
-    "socks-proxy-agent-3.0.1" = {
-      name = "socks-proxy-agent";
-      packageName = "socks-proxy-agent";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz";
-        sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7";
-      };
-    };
-    "humanize-ms-1.2.1" = {
-      name = "humanize-ms";
-      packageName = "humanize-ms";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz";
-        sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed";
-      };
-    };
-    "err-code-1.1.2" = {
-      name = "err-code";
-      packageName = "err-code";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz";
-        sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
-      };
-    };
-    "socks-1.1.10" = {
-      name = "socks";
-      packageName = "socks";
-      version = "1.1.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz";
-        sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a";
-      };
-    };
-    "smart-buffer-1.1.15" = {
-      name = "smart-buffer";
-      packageName = "smart-buffer";
-      version = "1.1.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz";
-        sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16";
-      };
-    };
-    "npm-pick-manifest-1.0.4" = {
-      name = "npm-pick-manifest";
-      packageName = "npm-pick-manifest";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
-        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
-      };
-    };
-    "protoduck-4.0.0" = {
-      name = "protoduck";
-      packageName = "protoduck";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz";
-        sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e";
-      };
-    };
-    "genfun-4.0.1" = {
-      name = "genfun";
-      packageName = "genfun";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/genfun/-/genfun-4.0.1.tgz";
-        sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1";
-      };
-    };
-    "decode-uri-component-0.2.0" = {
-      name = "decode-uri-component";
-      packageName = "decode-uri-component";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
-        sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
-      };
-    };
-    "strict-uri-encode-1.1.0" = {
-      name = "strict-uri-encode";
-      packageName = "strict-uri-encode";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
-        sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
-      };
-    };
-    "stream-iterate-1.2.0" = {
-      name = "stream-iterate";
-      packageName = "stream-iterate";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz";
-        sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1";
-      };
-    };
-    "unique-slug-2.0.0" = {
-      name = "unique-slug";
-      packageName = "unique-slug";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz";
-        sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
-      };
-    };
     "argparse-0.1.15" = {
       name = "argparse";
       packageName = "argparse";
@@ -19395,141 +18279,6 @@ let
         sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11";
       };
     };
-    "aproba-1.0.4" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
-        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
-      };
-    };
-    "fstream-npm-1.2.1" = {
-      name = "fstream-npm";
-      packageName = "fstream-npm";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz";
-        sha512 = "07r7qvmx5fjjk2ra3hjrz31ciy4vhfq2k8a3wjscjl7y52885zwfvz4caa5xr3kab8l3y4c9rsz1nkpjl530irrs6q5l3z6yadyj4c8";
-      };
-    };
-    "node-gyp-3.4.0" = {
-      name = "node-gyp";
-      packageName = "node-gyp";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
-        sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
-      };
-    };
-    "npmlog-4.0.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
-        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
-      };
-    };
-    "request-2.75.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.75.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
-        sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
-      };
-    };
-    "write-file-atomic-1.2.0" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
-        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
-      };
-    };
-    "npmlog-3.1.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz";
-        sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873";
-      };
-    };
-    "path-array-1.0.1" = {
-      name = "path-array";
-      packageName = "path-array";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz";
-        sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271";
-      };
-    };
-    "gauge-2.6.0" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
-        sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
-      };
-    };
-    "array-index-1.0.0" = {
-      name = "array-index";
-      packageName = "array-index";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz";
-        sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9";
-      };
-    };
-    "es6-symbol-3.1.1" = {
-      name = "es6-symbol";
-      packageName = "es6-symbol";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
-        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
-      };
-    };
-    "d-1.0.0" = {
-      name = "d";
-      packageName = "d";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz";
-        sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
-      };
-    };
-    "es5-ext-0.10.35" = {
-      name = "es5-ext";
-      packageName = "es5-ext";
-      version = "0.10.35";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz";
-        sha1 = "18ee858ce6a3c45c7d79e91c15fcca9ec568494f";
-      };
-    };
-    "es6-iterator-2.0.3" = {
-      name = "es6-iterator";
-      packageName = "es6-iterator";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
-        sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
-      };
-    };
-    "form-data-2.0.0" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
-        sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
-      };
-    };
     "hasbin-1.2.3" = {
       name = "hasbin";
       packageName = "hasbin";
@@ -19827,6 +18576,15 @@ let
         sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852";
       };
     };
+    "lodash.clonedeep-4.5.0" = {
+      name = "lodash.clonedeep";
+      packageName = "lodash.clonedeep";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz";
+        sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
+      };
+    };
     "minimatch-3.0.2" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -19836,6 +18594,15 @@ let
         sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a";
       };
     };
+    "ansicolors-0.3.2" = {
+      name = "ansicolors";
+      packageName = "ansicolors";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz";
+        sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979";
+      };
+    };
     "clite-0.3.0" = {
       name = "clite";
       packageName = "clite";
@@ -19890,6 +18657,69 @@ let
         sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
       };
     };
+    "latest-version-2.0.0" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
+        sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
+      };
+    };
+    "filled-array-1.1.0" = {
+      name = "filled-array";
+      packageName = "filled-array";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
+        sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
+      };
+    };
+    "package-json-2.4.0" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
+        sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
+      };
+    };
+    "got-5.7.1" = {
+      name = "got";
+      packageName = "got";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
+        sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
+      };
+    };
+    "node-status-codes-1.0.0" = {
+      name = "node-status-codes";
+      packageName = "node-status-codes";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
+        sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
+      };
+    };
+    "timed-out-3.1.3" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
+        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
+      };
+    };
+    "unzip-response-1.0.2" = {
+      name = "unzip-response";
+      packageName = "unzip-response";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz";
+        sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
+      };
+    };
     "lodash.assign-4.2.0" = {
       name = "lodash.assign";
       packageName = "lodash.assign";
@@ -19899,6 +18729,15 @@ let
         sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
       };
     };
+    "which-module-1.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
+        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
+      };
+    };
     "window-size-0.2.0" = {
       name = "window-size";
       packageName = "window-size";
@@ -19917,6 +18756,15 @@ let
         sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
       };
     };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    };
     "lokijs-1.5.0" = {
       name = "lokijs";
       packageName = "lokijs";
@@ -20028,13 +18876,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.3.0" = {
+    "service-runner-2.4.0" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.3.0.tgz";
-        sha1 = "09039dfdcc40cdbd0259dd3f982916675838cb59";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.4.0.tgz";
+        sha1 = "f275be6aa01ea17bae961607edb451c1e4716a7b";
       };
     };
     "simplediff-0.1.1" = {
@@ -20109,13 +18957,13 @@ let
         sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669";
       };
     };
-    "hot-shots-4.7.1" = {
+    "hot-shots-4.8.0" = {
       name = "hot-shots";
       packageName = "hot-shots";
-      version = "4.7.1";
+      version = "4.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.7.1.tgz";
-        sha1 = "35cb2d3691c66cd18a0fcdffcc9e5b21194275b0";
+        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.8.0.tgz";
+        sha1 = "052be48430efc7d117ba7cc4d41f1833ba38c79f";
       };
     };
     "limitation-0.2.0" = {
@@ -20632,6 +19480,15 @@ let
         sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
       };
     };
+    "which-1.2.14" = {
+      name = "which";
+      packageName = "which";
+      version = "1.2.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
+        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
+      };
+    };
     "concat-stream-1.5.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
@@ -21037,7 +19894,7 @@ let
         sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4";
       };
     };
-    "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = {
+    "oauth-https://github.com/ciaranj/node-oauth/tarball/master" = {
       name = "oauth";
       packageName = "oauth";
       version = "0.9.15";
@@ -21839,6 +20696,15 @@ let
         sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
       };
     };
+    "glob-7.0.6" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz";
+        sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
+      };
+    };
     "coa-2.0.0" = {
       name = "coa";
       packageName = "coa";
@@ -22100,6 +20966,15 @@ let
         sha1 = "44c26902e4ae8ece2366cedc9ff16b10a5f391c6";
       };
     };
+    "lockfile-1.0.3" = {
+      name = "lockfile";
+      packageName = "lockfile";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz";
+        sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79";
+      };
+    };
     "make-error-cause-1.2.2" = {
       name = "make-error-cause";
       packageName = "make-error-cause";
@@ -22532,15 +21407,6 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "aproba-1.1.2" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
-        sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6";
-      };
-    };
     "lsmod-1.0.0" = {
       name = "lsmod";
       packageName = "lsmod";
@@ -22730,6 +21596,33 @@ let
         sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f";
       };
     };
+    "d-1.0.0" = {
+      name = "d";
+      packageName = "d";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz";
+        sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
+      };
+    };
+    "es5-ext-0.10.35" = {
+      name = "es5-ext";
+      packageName = "es5-ext";
+      version = "0.10.35";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz";
+        sha1 = "18ee858ce6a3c45c7d79e91c15fcca9ec568494f";
+      };
+    };
+    "es6-iterator-2.0.3" = {
+      name = "es6-iterator";
+      packageName = "es6-iterator";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
+        sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
+      };
+    };
     "es6-set-0.1.5" = {
       name = "es6-set";
       packageName = "es6-set";
@@ -22739,6 +21632,15 @@ let
         sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1";
       };
     };
+    "es6-symbol-3.1.1" = {
+      name = "es6-symbol";
+      packageName = "es6-symbol";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
+        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
+      };
+    };
     "event-emitter-0.3.5" = {
       name = "event-emitter";
       packageName = "event-emitter";
@@ -22964,6 +21866,24 @@ let
         sha1 = "5164d4faabb88dcf277f17c8a3b16bfd3da8bee3";
       };
     };
+    "update-notifier-2.2.0" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz";
+        sha1 = "1b5837cf90c0736d88627732b661c138f86de72f";
+      };
+    };
+    "yargs-6.6.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "6.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
+      };
+    };
     "zip-dir-1.0.2" = {
       name = "zip-dir";
       packageName = "zip-dir";
@@ -23063,13 +21983,13 @@ let
         sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4";
       };
     };
-    "pino-4.8.2" = {
+    "pino-4.9.0" = {
       name = "pino";
       packageName = "pino";
-      version = "4.8.2";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pino/-/pino-4.8.2.tgz";
-        sha512 = "2cd8127wzi403lmj965crklncvs06pfnnc8can3s1m2v1lrs1cfpxmnqa4g4rgdph5zz5rqfsg16a0hwzb6j15fpqhxmw3agl5axv8a";
+        url = "https://registry.npmjs.org/pino/-/pino-4.9.0.tgz";
+        sha512 = "097h26i54647qkh904ywnxifi90pngnzxkdjap0rv5an2jxh5pqfd903lb5zn136ln71xp41cq02v1r623g3klil9s4bn3qfw9yyvz4";
       };
     };
     "postcss-6.0.11" = {
@@ -23127,7 +22047,7 @@ let
       };
     };
     "@types/node-6.0.90" = {
-      name = "@types/node";
+      name = "_at_types_slash_node";
       packageName = "@types/node";
       version = "6.0.90";
       src = fetchurl {
@@ -23522,13 +22442,13 @@ let
         sha512 = "01vq6bwp36yjvywlw5jniq4ainn8jrwxsab76bv02j77ky26qm99097g7x6j8dqrjrhfgd0vs9q6nh2milhsnsk9529s42njilsq58m";
       };
     };
-    "fast-safe-stringify-1.2.0" = {
+    "fast-safe-stringify-1.2.1" = {
       name = "fast-safe-stringify";
       packageName = "fast-safe-stringify";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.0.tgz";
-        sha1 = "ebd42666fd18fe4f2ba4f0d295065f3f85cade96";
+        url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.1.tgz";
+        sha512 = "2in2h3qxnsgr2kvm4pk5hlgxgx9n4hnh83rzirgscbql55k3jwgvs9hksclxzi7il0i0qbj3iqk5qlka0rf71wq9b9qij9jxmw2lrc3";
       };
     };
     "flatstr-1.0.5" = {
@@ -23873,6 +22793,15 @@ let
         sha1 = "bbf6b39f5f43ec30bc71babcb37557acecf34353";
       };
     };
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+      };
+    };
     "jszip-2.6.1" = {
       name = "jszip";
       packageName = "jszip";
@@ -24197,6 +23126,51 @@ let
         sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1";
       };
     };
+    "npmlog-2.0.4" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz";
+        sha1 = "98b52530f2514ca90d09ec5b22c8846722375692";
+      };
+    };
+    "gauge-1.2.7" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "1.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz";
+        sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93";
+      };
+    };
+    "lodash.pad-4.5.1" = {
+      name = "lodash.pad";
+      packageName = "lodash.pad";
+      version = "4.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz";
+        sha1 = "4330949a833a7c8da22cc20f6a26c4d59debba70";
+      };
+    };
+    "lodash.padend-4.6.1" = {
+      name = "lodash.padend";
+      packageName = "lodash.padend";
+      version = "4.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz";
+        sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e";
+      };
+    };
+    "lodash.padstart-4.6.1" = {
+      name = "lodash.padstart";
+      packageName = "lodash.padstart";
+      version = "4.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz";
+        sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b";
+      };
+    };
     "bin-version-check-2.1.0" = {
       name = "bin-version-check";
       packageName = "bin-version-check";
@@ -24415,23 +23389,19 @@ in
       sources."path-is-absolute-1.0.1"
       sources."private-0.1.8"
       sources."slash-1.0.0"
-      sources."chalk-1.1.3"
+      sources."chalk-0.4.0"
       sources."esutils-2.0.2"
       sources."js-tokens-3.0.2"
-      sources."ansi-styles-2.2.1"
+      sources."ansi-styles-1.0.0"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
+      sources."strip-ansi-0.1.1"
       sources."supports-color-2.0.0"
       sources."ansi-regex-2.1.1"
       sources."core-js-2.5.1"
       sources."home-or-tmp-2.0.0"
       sources."mkdirp-0.5.1"
-      (sources."source-map-support-0.4.18" // {
-        dependencies = [
-          sources."source-map-0.5.7"
-        ];
-      })
+      sources."source-map-support-0.4.18"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."minimist-0.0.8"
@@ -24456,29 +23426,15 @@ in
       sources."jsonfile-3.0.1"
       sources."universalify-0.1.1"
       sources."array-unique-0.2.1"
-      (sources."global-modules-0.2.3" // {
-        dependencies = [
-          sources."is-windows-0.2.0"
-        ];
-      })
-      sources."is-windows-0.1.1"
-      (sources."global-prefix-0.1.5" // {
-        dependencies = [
-          sources."is-windows-0.2.0"
-        ];
-      })
+      sources."global-modules-0.2.3"
+      sources."is-windows-0.2.0"
+      sources."global-prefix-0.1.5"
       sources."homedir-polyfill-1.0.1"
       sources."ini-1.3.4"
       sources."which-1.3.0"
       sources."parse-passwd-1.0.0"
       sources."isexe-2.0.0"
-      (sources."nomnom-1.8.1" // {
-        dependencies = [
-          sources."chalk-0.4.0"
-          sources."ansi-styles-1.0.0"
-          sources."strip-ansi-0.1.1"
-        ];
-      })
+      sources."nomnom-1.8.1"
       sources."JSV-4.0.2"
       sources."underscore-1.6.0"
       sources."has-color-0.1.7"
@@ -24674,7 +23630,11 @@ in
       sources."github-0.1.6"
       sources."fast-json-patch-0.5.6"
       sources."js2xmlparser-1.0.0"
-      sources."jsonlint-1.6.2"
+      (sources."jsonlint-1.6.2" // {
+        dependencies = [
+          sources."underscore-1.6.0"
+        ];
+      })
       sources."jsonminify-0.4.1"
       sources."jsrsasign-4.8.2"
       sources."jwt-decode-2.2.0"
@@ -24702,33 +23662,27 @@ in
       sources."progress-1.1.8"
       (sources."prompt-0.2.14" // {
         dependencies = [
-          (sources."winston-0.8.3" // {
-            dependencies = [
-              sources."pkginfo-0.3.1"
-            ];
-          })
+          sources."winston-0.8.3"
           sources."async-0.2.10"
           sources."colors-0.6.2"
         ];
       })
-      (sources."readable-stream-1.0.34" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
+      sources."readable-stream-1.0.34"
       (sources."request-2.74.0" // {
         dependencies = [
-          sources."extend-3.0.1"
+          sources."readable-stream-2.0.6"
+          sources."async-2.5.0"
+          sources."commander-2.11.0"
         ];
       })
-      (sources."ssh-key-to-pem-0.11.0" // {
+      sources."ssh-key-to-pem-0.11.0"
+      sources."streamline-0.10.17"
+      sources."streamline-streams-0.1.5"
+      (sources."sync-request-3.0.0" // {
         dependencies = [
-          sources."asn1-0.1.11"
+          sources."readable-stream-2.3.3"
         ];
       })
-      sources."streamline-0.10.17"
-      sources."streamline-streams-0.1.5"
-      sources."sync-request-3.0.0"
       sources."through-2.3.4"
       sources."tunnel-0.0.2"
       sources."underscore-1.4.4"
@@ -24739,7 +23693,6 @@ in
         dependencies = [
           sources."async-1.0.0"
           sources."colors-1.0.3"
-          sources."pkginfo-0.3.1"
         ];
       })
       sources."wordwrap-0.0.2"
@@ -24760,7 +23713,7 @@ in
       sources."duplexer-0.1.1"
       sources."sax-0.5.2"
       sources."browserify-mime-1.2.9"
-      sources."extend-1.2.1"
+      sources."extend-3.0.1"
       sources."json-edm-parser-0.1.2"
       sources."md5.js-1.3.4"
       sources."jsonparse-1.2.0"
@@ -24769,7 +23722,7 @@ in
       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."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."stack-trace-0.0.10"
       sources."keypress-0.1.0"
@@ -24781,16 +23734,12 @@ in
       sources."pause-stream-0.0.11"
       sources."split-0.2.10"
       sources."stream-combiner-0.0.4"
-      (sources."nomnom-1.8.1" // {
-        dependencies = [
-          sources."underscore-1.6.0"
-        ];
-      })
+      sources."nomnom-1.8.1"
       sources."JSV-4.0.2"
-      sources."chalk-0.4.0"
+      sources."chalk-1.1.3"
       sources."has-color-0.1.7"
-      sources."ansi-styles-1.0.0"
-      sources."strip-ansi-0.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."strip-ansi-3.0.1"
       sources."@types/node-8.0.47"
       sources."@types/request-2.0.7"
       sources."@types/uuid-3.4.3"
@@ -24800,13 +23749,9 @@ in
       sources."lodash-4.17.4"
       sources."debug-0.7.4"
       sources."q-0.9.7"
-      sources."pkginfo-0.4.1"
+      sources."pkginfo-0.3.1"
       sources."revalidator-0.1.8"
-      (sources."utile-0.2.1" // {
-        dependencies = [
-          sources."async-0.2.10"
-        ];
-      })
+      sources."utile-0.2.1"
       sources."deep-equal-1.0.1"
       sources."i-0.3.6"
       sources."mkdirp-0.5.1"
@@ -24827,27 +23772,12 @@ in
       sources."isstream-0.1.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."bl-1.1.2"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."forever-agent-0.6.1"
-      (sources."form-data-1.0.1" // {
-        dependencies = [
-          sources."async-2.5.0"
-        ];
-      })
-      (sources."har-validator-2.0.6" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-          sources."commander-2.11.0"
-          sources."ansi-styles-2.2.1"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
+      sources."form-data-1.0.1"
+      sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
@@ -24875,35 +23805,15 @@ in
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
+      sources."asn1-0.1.11"
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
@@ -24915,12 +23825,7 @@ in
       sources."fibers-1.0.15"
       sources."galaxy-0.1.12"
       sources."amdefine-1.0.1"
-      (sources."concat-stream-1.6.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."string_decoder-1.0.3"
-        ];
-      })
+      sources."concat-stream-1.6.0"
       sources."http-response-object-1.1.0"
       sources."then-request-2.2.0"
       sources."typedarray-0.0.6"
@@ -24970,22 +23875,18 @@ in
       sources."bower-logger-0.2.1"
       (sources."fs-extra-0.26.7" // {
         dependencies = [
-          sources."graceful-fs-4.1.11"
+          sources."glob-7.1.2"
         ];
       })
       sources."lodash-4.2.1"
       sources."promised-temp-0.1.0"
       sources."semver-5.4.1"
-      (sources."temp-0.8.3" // {
-        dependencies = [
-          sources."rimraf-2.2.8"
-        ];
-      })
+      sources."temp-0.8.3"
       sources."glob-6.0.4"
       sources."sprintf-js-1.0.3"
       sources."deep-extend-0.4.2"
       sources."ext-name-3.0.0"
-      sources."graceful-fs-3.0.11"
+      sources."graceful-fs-4.1.11"
       sources."intersect-1.0.1"
       sources."ends-with-0.2.0"
       sources."ext-list-2.2.2"
@@ -24996,7 +23897,7 @@ in
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
-      sources."minimist-1.2.0"
+      sources."minimist-0.0.8"
       sources."normalize-package-data-2.4.0"
       sources."object-assign-4.1.1"
       sources."read-pkg-up-1.0.1"
@@ -25018,16 +23919,8 @@ in
       sources."path-exists-2.1.0"
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
-      (sources."load-json-file-1.1.0" // {
-        dependencies = [
-          sources."graceful-fs-4.1.11"
-        ];
-      })
-      (sources."path-type-1.1.0" // {
-        dependencies = [
-          sources."graceful-fs-4.1.11"
-        ];
-      })
+      sources."load-json-file-1.1.0"
+      sources."path-type-1.1.0"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
@@ -25043,22 +23936,10 @@ in
       sources."sort-keys-1.1.2"
       sources."is-plain-obj-1.1.0"
       sources."natives-1.1.0"
-      (sources."jsonfile-2.4.0" // {
-        dependencies = [
-          sources."graceful-fs-4.1.11"
-        ];
-      })
-      (sources."klaw-1.3.1" // {
-        dependencies = [
-          sources."graceful-fs-4.1.11"
-        ];
-      })
+      sources."jsonfile-2.4.0"
+      sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
-      (sources."rimraf-2.6.2" // {
-        dependencies = [
-          sources."glob-7.1.2"
-        ];
-      })
+      sources."rimraf-2.2.8"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -25070,11 +23951,7 @@ in
       sources."concat-map-0.0.1"
       sources."q-1.5.1"
       sources."debug-2.6.9"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."os-tmpdir-1.0.2"
     ];
@@ -25114,7 +23991,7 @@ in
       })
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
-      sources."crypto-browserify-3.11.1"
+      sources."crypto-browserify-3.12.0"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."domain-browser-1.1.7"
@@ -25126,11 +24003,7 @@ in
       sources."https-browserify-1.0.0"
       sources."inherits-2.0.3"
       sources."insert-module-globals-7.0.1"
-      (sources."labeled-stream-splicer-2.0.0" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
+      sources."labeled-stream-splicer-2.0.0"
       sources."module-deps-4.1.1"
       sources."os-browserify-0.3.0"
       sources."parents-1.0.1"
@@ -25189,6 +24062,7 @@ in
       sources."pbkdf2-3.0.14"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.5"
+      sources."randomfill-1.0.3"
       sources."browserify-aes-1.1.1"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.3"
@@ -25198,7 +24072,7 @@ in
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
       sources."md5.js-1.3.4"
-      sources."hash-base-3.0.4"
+      sources."hash-base-2.0.2"
       sources."bn.js-4.11.8"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
@@ -25208,11 +24082,7 @@ in
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.2"
-      (sources."ripemd160-2.0.1" // {
-        dependencies = [
-          sources."hash-base-2.0.2"
-        ];
-      })
+      sources."ripemd160-2.0.1"
       sources."sha.js-2.4.9"
       sources."miller-rabin-4.0.1"
       sources."fs.realpath-1.0.0"
@@ -25275,40 +24145,27 @@ in
       sources."keypress-0.2.1"
       sources."mime-1.4.1"
       sources."minimist-1.2.0"
-      sources."peerflix-0.34.0"
+      (sources."peerflix-0.34.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
       (sources."playerui-1.2.0" // {
         dependencies = [
           sources."chalk-0.5.1"
-          sources."ansi-styles-1.1.0"
-          sources."has-ansi-0.1.0"
-          sources."strip-ansi-0.3.0"
-          sources."supports-color-0.2.0"
-          sources."ansi-regex-0.2.1"
         ];
       })
       sources."query-string-1.0.1"
       sources."range-parser-1.2.0"
       (sources."read-torrent-1.3.0" // {
         dependencies = [
-          sources."magnet-uri-2.0.1"
-          (sources."parse-torrent-4.1.0" // {
-            dependencies = [
-              sources."magnet-uri-4.2.3"
-            ];
-          })
-          sources."thirty-two-0.0.2"
-          sources."parse-torrent-file-2.1.4"
-          sources."bencode-0.7.0"
+          sources."mime-1.2.11"
         ];
       })
       sources."router-0.6.2"
       sources."srt2vtt-1.3.1"
       sources."stream-transcoder-0.0.5"
-      (sources."xml2js-0.4.19" // {
-        dependencies = [
-          sources."xmlbuilder-9.0.4"
-        ];
-      })
+      sources."xml2js-0.4.19"
       sources."xspfr-0.3.1"
       sources."xtend-4.0.1"
       sources."castv2-0.1.9"
@@ -25319,13 +24176,13 @@ in
       sources."bufferview-1.0.1"
       sources."colour-0.7.1"
       sources."optjs-3.2.2"
-      sources."ansi-styles-2.2.1"
+      sources."ansi-styles-1.1.0"
       sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-1.0.3"
-      sources."strip-ansi-2.0.1"
-      sources."supports-color-1.3.1"
-      sources."ansi-regex-1.1.1"
-      sources."get-stdin-4.0.1"
+      sources."has-ansi-0.1.0"
+      sources."strip-ansi-0.3.0"
+      sources."supports-color-0.2.0"
+      sources."ansi-regex-0.2.1"
+      sources."get-stdin-5.0.1"
       sources."chromecast-scanner-0.5.0"
       sources."mutate.js-0.2.0"
       sources."promiscuous-0.6.0"
@@ -25333,17 +24190,13 @@ in
       sources."ware-1.3.0"
       sources."array-find-0.1.1"
       sources."multicast-dns-4.0.1"
-      sources."thunky-0.1.0"
+      sources."thunky-1.0.2"
       sources."wrap-fn-0.1.5"
       sources."co-3.1.0"
       sources."ms-2.0.0"
       sources."append-0.1.1"
-      sources."object-assign-1.0.0"
-      (sources."meow-3.7.0" // {
-        dependencies = [
-          sources."object-assign-4.1.1"
-        ];
-      })
+      sources."object-assign-4.1.1"
+      sources."meow-3.7.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -25358,7 +24211,7 @@ in
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
-      sources."semver-5.4.1"
+      sources."semver-5.1.1"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
       sources."spdx-correct-1.0.2"
@@ -25389,55 +24242,21 @@ in
       sources."network-address-0.0.5"
       sources."numeral-1.5.6"
       sources."open-0.0.5"
-      (sources."optimist-0.6.1" // {
-        dependencies = [
-          sources."minimist-0.0.10"
-        ];
-      })
-      (sources."parse-torrent-5.8.3" // {
-        dependencies = [
-          sources."get-stdin-5.0.1"
-        ];
-      })
-      (sources."pump-0.3.5" // {
-        dependencies = [
-          sources."once-1.2.0"
-        ];
-      })
-      (sources."rc-0.4.0" // {
-        dependencies = [
-          sources."minimist-0.0.10"
-        ];
-      })
-      (sources."torrent-stream-1.0.3" // {
-        dependencies = [
-          sources."end-of-stream-0.1.5"
-          sources."parse-torrent-4.1.0"
-          sources."once-1.3.3"
-          sources."magnet-uri-4.2.3"
-          sources."parse-torrent-file-2.1.4"
-          sources."thirty-two-0.0.2"
-          sources."bencode-0.7.0"
-        ];
-      })
+      sources."optimist-0.6.1"
+      sources."parse-torrent-4.1.0"
+      sources."pump-0.3.5"
+      sources."rc-0.4.0"
+      sources."torrent-stream-1.0.3"
       sources."windows-no-runnable-0.0.6"
-      (sources."mdns-js-0.5.3" // {
-        dependencies = [
-          sources."semver-5.1.1"
-        ];
-      })
+      sources."mdns-js-0.5.3"
       sources."plist-2.1.0"
       sources."dns-js-0.2.1"
       sources."qap-3.1.3"
       sources."base64-js-1.2.0"
-      sources."xmlbuilder-8.2.2"
+      sources."xmlbuilder-9.0.4"
       sources."xmldom-0.1.27"
       sources."cli-width-1.1.1"
-      (sources."figures-1.7.0" // {
-        dependencies = [
-          sources."object-assign-4.1.1"
-        ];
-      })
+      sources."figures-1.7.0"
       sources."lodash-3.10.1"
       sources."readline2-0.1.1"
       sources."rx-2.5.3"
@@ -25445,52 +24264,36 @@ in
       sources."mute-stream-0.0.4"
       sources."wordwrap-0.0.3"
       sources."blob-to-buffer-1.2.6"
-      sources."magnet-uri-5.1.7"
-      sources."parse-torrent-file-4.0.3"
+      sources."magnet-uri-2.0.1"
+      sources."parse-torrent-file-2.1.4"
       sources."simple-get-2.7.0"
-      sources."safe-buffer-5.1.1"
-      sources."thirty-two-1.0.2"
+      sources."safe-buffer-5.0.1"
+      sources."thirty-two-0.0.2"
       sources."uniq-1.0.1"
-      sources."bencode-1.0.0"
+      sources."bencode-0.8.0"
       sources."simple-sha1-2.1.0"
       sources."rusha-0.8.6"
       sources."decompress-response-3.3.0"
-      sources."once-1.4.0"
+      sources."once-1.3.3"
       sources."simple-concat-1.0.0"
       sources."mimic-response-1.0.0"
       sources."wrappy-1.0.2"
-      (sources."end-of-stream-1.0.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."end-of-stream-0.1.5"
       sources."deep-extend-0.2.11"
       sources."strip-json-comments-0.1.3"
       sources."ini-1.1.0"
       sources."bitfield-0.1.0"
-      sources."bncode-0.5.3"
-      (sources."fs-chunk-store-1.6.5" // {
-        dependencies = [
-          sources."mkdirp-0.5.1"
-          sources."thunky-1.0.2"
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."bncode-0.2.3"
+      sources."fs-chunk-store-1.6.5"
       sources."hat-0.0.3"
       sources."immediate-chunk-store-1.0.8"
       sources."ip-set-1.0.1"
-      sources."mkdirp-0.3.5"
+      sources."mkdirp-0.5.1"
       sources."peer-wire-swarm-0.12.1"
       sources."rimraf-2.6.2"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.1"
-      (sources."random-access-file-1.8.1" // {
-        dependencies = [
-          sources."mkdirp-0.5.1"
-          sources."thunky-1.0.2"
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."random-access-file-1.8.1"
       sources."randombytes-2.0.5"
       sources."run-parallel-1.1.6"
       sources."buffer-alloc-unsafe-1.0.0"
@@ -25498,17 +24301,13 @@ in
       sources."ip-1.1.5"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
-      (sources."peer-wire-protocol-0.7.0" // {
-        dependencies = [
-          sources."bncode-0.2.3"
-        ];
-      })
+      sources."peer-wire-protocol-0.7.0"
       sources."speedometer-0.1.4"
       sources."utp-0.0.7"
-      sources."readable-stream-1.1.14"
+      sources."readable-stream-2.3.3"
       sources."core-util-is-1.0.2"
-      sources."isarray-0.0.1"
-      sources."string_decoder-0.10.31"
+      sources."isarray-1.0.0"
+      sources."string_decoder-1.0.3"
       sources."cyclist-0.1.1"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
@@ -25518,24 +24317,12 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      (sources."bittorrent-dht-6.4.2" // {
-        dependencies = [
-          sources."bencode-0.7.0"
-        ];
-      })
-      (sources."bittorrent-tracker-7.7.0" // {
-        dependencies = [
-          sources."bencode-0.8.0"
-        ];
-      })
+      sources."bittorrent-dht-6.4.2"
+      sources."bittorrent-tracker-7.7.0"
       sources."re-emitter-1.1.3"
       sources."buffer-equals-1.0.4"
-      sources."k-bucket-0.6.0"
-      (sources."k-rpc-3.7.0" // {
-        dependencies = [
-          sources."k-bucket-2.0.1"
-        ];
-      })
+      sources."k-bucket-2.0.1"
+      sources."k-rpc-3.7.0"
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
       sources."k-rpc-socket-1.7.1"
@@ -25543,47 +24330,21 @@ in
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      (sources."simple-peer-6.4.4" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      (sources."simple-websocket-4.3.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."ws-2.3.1"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."simple-peer-6.4.4"
+      sources."simple-websocket-4.3.1"
       sources."string2compact-1.2.2"
-      (sources."ws-1.1.4" // {
-        dependencies = [
-          sources."ultron-1.0.2"
-        ];
-      })
+      sources."ws-2.3.1"
       sources."ipaddr.js-1.5.4"
       sources."get-browser-rtc-1.0.2"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
-      sources."ultron-1.1.0"
+      sources."ultron-1.0.2"
       sources."addr-to-ip-port-1.4.2"
       sources."options-0.0.6"
       sources."pad-0.0.5"
       sources."single-line-log-0.4.1"
-      (sources."request-2.16.6" // {
-        dependencies = [
-          sources."mime-1.2.11"
-        ];
-      })
-      (sources."form-data-0.0.10" // {
-        dependencies = [
-          sources."mime-1.2.11"
-        ];
-      })
+      sources."request-2.16.6"
+      sources."form-data-0.0.10"
       sources."hawk-0.10.2"
       sources."node-uuid-1.4.8"
       sources."cookie-jar-0.2.0"
@@ -25603,13 +24364,7 @@ in
       sources."codepage-1.4.0"
       sources."utfx-1.0.1"
       sources."voc-1.0.0"
-      (sources."concat-stream-1.6.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
+      sources."concat-stream-1.6.0"
       sources."exit-on-epipe-1.0.1"
       sources."commander-2.11.0"
       sources."typedarray-0.0.6"
@@ -25657,18 +24412,14 @@ in
       })
       (sources."cordova-lib-7.1.0" // {
         dependencies = [
-          sources."glob-7.1.1"
           sources."nopt-4.0.1"
-          sources."plist-2.0.1"
-          sources."shelljs-0.3.0"
-          sources."base64-js-1.1.2"
-          sources."xmlbuilder-8.2.2"
+          sources."cordova-common-2.0.3"
+          sources."q-1.5.1"
         ];
       })
       sources."editor-1.0.0"
       (sources."insight-0.8.2" // {
         dependencies = [
-          sources."async-1.5.2"
           sources."configstore-1.4.0"
         ];
       })
@@ -25682,14 +24433,14 @@ in
       sources."dot-prop-3.0.0"
       sources."graceful-fs-4.1.11"
       sources."mkdirp-0.5.1"
-      sources."object-assign-4.1.1"
+      sources."object-assign-3.0.0"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.4"
       sources."uuid-2.0.3"
       sources."write-file-atomic-1.3.4"
       sources."xdg-basedir-2.0.0"
       sources."is-obj-1.0.1"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.0"
       sources."os-homedir-1.0.2"
       sources."imurmurhash-0.1.4"
       sources."slide-1.1.6"
@@ -25697,12 +24448,12 @@ in
       sources."bplist-parser-0.1.1"
       sources."cordova-registry-mapper-1.1.15"
       sources."elementtree-0.1.6"
-      sources."glob-5.0.15"
+      sources."glob-7.1.2"
       sources."minimatch-3.0.4"
-      sources."plist-1.2.0"
+      sources."plist-2.0.1"
       sources."semver-5.4.1"
       sources."shelljs-0.5.3"
-      sources."underscore-1.8.3"
+      sources."underscore-1.2.1"
       sources."unorm-1.4.1"
       sources."big-integer-1.6.25"
       sources."sax-0.3.5"
@@ -25714,139 +24465,56 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."base64-js-0.0.8"
-      sources."xmlbuilder-4.0.0"
+      sources."base64-js-1.1.2"
+      sources."xmlbuilder-8.2.2"
       sources."xmldom-0.1.27"
       sources."util-deprecate-1.0.2"
       sources."lodash-3.10.1"
       sources."aliasify-2.1.0"
       (sources."cordova-create-1.1.1" // {
         dependencies = [
-          (sources."cordova-common-2.0.3" // {
-            dependencies = [
-              sources."q-1.5.1"
-              sources."shelljs-0.5.3"
-            ];
-          })
-          (sources."cordova-fetch-1.1.0" // {
-            dependencies = [
-              sources."q-1.5.1"
-              sources."shelljs-0.7.8"
-            ];
-          })
-          sources."shelljs-0.3.0"
-          sources."glob-7.1.2"
-        ];
-      })
-      (sources."cordova-fetch-1.2.0" // {
-        dependencies = [
-          sources."q-1.5.1"
-          sources."shelljs-0.7.8"
-          sources."glob-7.1.2"
+          sources."q-1.4.1"
         ];
       })
+      sources."cordova-fetch-1.1.0"
       sources."cordova-js-4.2.2"
       sources."cordova-serve-2.0.0"
-      (sources."dep-graph-1.1.0" // {
-        dependencies = [
-          sources."underscore-1.2.1"
-        ];
-      })
-      (sources."init-package-json-1.10.1" // {
-        dependencies = [
-          sources."glob-7.1.2"
-        ];
-      })
-      (sources."npm-2.15.12" // {
-        dependencies = [
-          sources."abbrev-1.0.9"
-          sources."glob-7.0.6"
-          sources."hosted-git-info-2.1.5"
-          (sources."init-package-json-1.9.6" // {
-            dependencies = [
-              sources."glob-7.1.2"
-              sources."validate-npm-package-name-3.0.0"
-            ];
-          })
-          sources."nopt-3.0.6"
-          sources."normalize-package-data-2.3.8"
-          sources."npm-package-arg-4.1.1"
-          sources."readable-stream-2.1.5"
-          sources."request-2.74.0"
-          sources."semver-5.1.1"
-          sources."validate-npm-package-name-2.2.2"
-          sources."write-file-atomic-1.1.4"
-          sources."isarray-1.0.0"
-          sources."string_decoder-0.10.31"
-          sources."qs-6.2.3"
-          sources."builtins-0.0.7"
-        ];
-      })
+      sources."dep-graph-1.1.0"
+      sources."init-package-json-1.10.1"
+      sources."npm-2.15.12"
       sources."opener-1.4.2"
       sources."properties-parser-0.3.1"
-      (sources."request-2.79.0" // {
-        dependencies = [
-          sources."form-data-2.1.4"
-          sources."qs-6.3.2"
-          sources."uuid-3.1.0"
-        ];
-      })
+      sources."request-2.79.0"
       sources."tar-2.2.1"
       sources."valid-identifier-0.0.1"
-      (sources."xcode-0.9.3" // {
-        dependencies = [
-          sources."uuid-3.0.1"
-        ];
-      })
+      sources."xcode-0.9.3"
       sources."browserify-transform-tools-1.7.0"
       sources."falafel-2.1.0"
       sources."through-2.3.8"
-      sources."acorn-5.2.1"
+      sources."acorn-4.0.13"
       sources."foreach-2.0.5"
-      sources."isarray-0.0.1"
+      sources."isarray-1.0.0"
       sources."object-keys-1.0.11"
       sources."cordova-app-hello-world-3.12.0"
-      (sources."dependency-ls-1.1.1" // {
-        dependencies = [
-          sources."q-1.4.1"
-        ];
-      })
+      sources."dependency-ls-1.1.1"
       sources."is-url-1.2.2"
       sources."interpret-1.0.4"
       sources."rechoir-0.6.2"
       sources."fs.realpath-1.0.0"
-      sources."resolve-1.5.0"
+      sources."resolve-1.1.7"
       sources."path-parse-1.0.5"
-      (sources."browserify-14.4.0" // {
-        dependencies = [
-          sources."glob-7.1.2"
-        ];
-      })
+      sources."browserify-14.4.0"
       sources."JSONStream-1.3.1"
       sources."assert-1.4.1"
       sources."browser-pack-6.0.2"
-      (sources."browser-resolve-1.11.2" // {
-        dependencies = [
-          sources."resolve-1.1.7"
-        ];
-      })
+      sources."browser-resolve-1.11.2"
       sources."browserify-zlib-0.1.4"
-      (sources."buffer-5.0.8" // {
-        dependencies = [
-          sources."base64-js-1.2.1"
-        ];
-      })
+      sources."buffer-5.0.8"
       sources."cached-path-relative-1.0.1"
-      (sources."concat-stream-1.5.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
-          sources."string_decoder-0.10.31"
-        ];
-      })
+      sources."concat-stream-1.5.2"
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
-      sources."crypto-browserify-3.11.1"
+      sources."crypto-browserify-3.12.0"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."domain-browser-1.1.7"
@@ -25865,39 +24533,19 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.3.3" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-        ];
-      })
+      sources."readable-stream-2.3.3"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
       sources."stream-http-2.7.2"
       sources."string_decoder-1.0.3"
-      (sources."subarg-1.0.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
-      (sources."syntax-error-1.3.0" // {
-        dependencies = [
-          sources."acorn-4.0.13"
-        ];
-      })
+      sources."subarg-1.0.0"
+      sources."syntax-error-1.3.0"
       sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
-      (sources."url-0.11.0" // {
-        dependencies = [
-          sources."punycode-1.3.2"
-        ];
-      })
-      (sources."util-0.10.3" // {
-        dependencies = [
-          sources."inherits-2.0.1"
-        ];
-      })
+      sources."url-0.11.0"
+      sources."util-0.10.3"
       sources."vm-browserify-0.0.4"
       sources."xtend-4.0.1"
       sources."jsonparse-1.3.1"
@@ -25922,6 +24570,7 @@ in
       sources."pbkdf2-3.0.14"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.5"
+      sources."randomfill-1.0.3"
       sources."browserify-aes-1.1.1"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.3"
@@ -25931,7 +24580,7 @@ in
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
       sources."md5.js-1.3.4"
-      sources."hash-base-3.0.4"
+      sources."hash-base-2.0.2"
       sources."bn.js-4.11.8"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
@@ -25941,27 +24590,15 @@ in
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.2"
-      (sources."ripemd160-2.0.1" // {
-        dependencies = [
-          sources."hash-base-2.0.2"
-        ];
-      })
+      sources."ripemd160-2.0.1"
       sources."sha.js-2.4.9"
       sources."miller-rabin-4.0.1"
       sources."function-bind-1.1.1"
       sources."is-buffer-1.1.6"
       sources."lexical-scope-1.2.0"
-      (sources."astw-2.2.0" // {
-        dependencies = [
-          sources."acorn-4.0.13"
-        ];
-      })
+      sources."astw-2.2.0"
       sources."stream-splicer-2.0.0"
-      (sources."detective-4.5.0" // {
-        dependencies = [
-          sources."acorn-4.0.13"
-        ];
-      })
+      sources."detective-4.5.0"
       sources."stream-combiner2-1.1.1"
       sources."path-platform-0.11.15"
       sources."json-stable-stringify-0.0.1"
@@ -26011,19 +24648,15 @@ in
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-2.0.2"
-      sources."qs-6.5.1"
+      sources."qs-6.3.2"
       sources."range-parser-1.2.0"
       sources."send-0.16.1"
       sources."serve-static-1.13.1"
-      sources."setprototypeof-1.1.0"
+      sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."type-is-1.6.15"
       sources."utils-merge-1.0.1"
-      (sources."http-errors-1.6.2" // {
-        dependencies = [
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
       sources."raw-body-2.3.2"
       sources."unpipe-1.0.0"
@@ -26036,15 +24669,11 @@ in
       sources."npm-package-arg-5.1.2"
       sources."promzard-0.3.0"
       sources."read-1.0.7"
-      (sources."read-package-json-2.0.12" // {
-        dependencies = [
-          sources."glob-7.1.2"
-        ];
-      })
+      sources."read-package-json-2.0.12"
       sources."validate-npm-package-license-3.0.1"
       sources."validate-npm-package-name-3.0.0"
       sources."hosted-git-info-2.5.0"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.5"
       sources."json-parse-better-errors-1.0.1"
       sources."normalize-package-data-2.4.0"
       sources."slash-1.0.0"
@@ -26055,113 +24684,26 @@ in
       sources."spdx-license-ids-1.2.2"
       sources."builtins-1.0.3"
       sources."abbrev-1.1.1"
-      sources."ansicolors-0.3.2"
-      sources."ansistyles-0.1.3"
-      sources."archy-1.0.0"
-      sources."async-some-1.0.2"
-      sources."block-stream-0.0.9"
-      sources."char-spinner-1.0.1"
-      sources."chmodr-1.0.2"
-      sources."chownr-1.0.1"
-      sources."cmd-shim-2.0.2"
-      sources."columnify-1.5.4"
-      sources."config-chain-1.1.11"
-      sources."dezalgo-1.0.3"
-      sources."fs-vacuum-1.2.10"
-      sources."fs-write-stream-atomic-1.0.10"
-      sources."fstream-1.0.11"
-      sources."fstream-npm-1.1.1"
-      sources."github-url-from-git-1.4.0"
-      sources."github-url-from-username-repo-1.0.2"
-      sources."ini-1.3.4"
-      sources."lockfile-1.0.3"
-      sources."lru-cache-4.0.2"
-      (sources."node-gyp-3.6.2" // {
-        dependencies = [
-          sources."glob-7.1.2"
-          sources."semver-5.3.0"
-        ];
-      })
-      sources."normalize-git-url-3.0.2"
-      sources."npm-cache-filename-1.0.2"
-      sources."npm-install-checks-1.0.7"
-      (sources."npm-registry-client-7.2.1" // {
-        dependencies = [
-          sources."npm-package-arg-4.2.1"
-        ];
-      })
-      sources."npm-user-validate-0.1.5"
-      sources."npmlog-2.0.4"
-      sources."path-is-inside-1.0.2"
-      sources."read-installed-4.0.3"
-      (sources."realize-package-specifier-3.0.3" // {
-        dependencies = [
-          sources."npm-package-arg-4.2.1"
-        ];
-      })
-      sources."retry-0.10.1"
-      (sources."rimraf-2.5.4" // {
-        dependencies = [
-          sources."glob-7.1.2"
-        ];
-      })
-      sources."sha-2.0.1"
-      sources."sorted-object-2.0.1"
-      sources."text-table-0.2.0"
-      sources."uid-number-0.0.6"
-      sources."umask-1.1.0"
-      sources."which-1.2.14"
-      sources."wcwidth-1.0.1"
-      sources."defaults-1.0.3"
-      sources."clone-1.0.2"
-      sources."proto-list-1.2.4"
-      sources."asap-2.0.6"
-      sources."iferr-0.1.5"
-      sources."fstream-ignore-1.0.5"
-      sources."pseudomap-1.0.2"
-      sources."yallist-2.1.2"
-      sources."are-we-there-yet-1.1.4"
-      sources."gauge-1.2.7"
-      sources."delegates-1.0.0"
-      sources."has-unicode-2.0.1"
-      sources."lodash.pad-4.5.1"
-      sources."lodash.padend-4.6.1"
-      sources."lodash.padstart-4.6.1"
-      sources."debuglog-1.0.1"
-      sources."readdir-scoped-modules-1.0.2"
-      sources."util-extend-1.0.3"
-      sources."buffer-shims-1.0.0"
+      sources."string.prototype.codepointat-0.2.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
-          sources."string_decoder-0.10.31"
-        ];
-      })
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-1.0.1"
+      sources."form-data-2.1.4"
       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."node-uuid-1.4.8"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
-      (sources."async-2.5.0" // {
-        dependencies = [
-          sources."lodash-4.17.4"
-        ];
-      })
+      sources."asynckit-0.4.0"
       sources."commander-2.11.0"
       sources."is-my-json-valid-2.16.1"
       sources."pinkie-promise-2.0.1"
@@ -26174,64 +24716,36 @@ in
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."isexe-2.0.0"
-      sources."string.prototype.codepointat-0.2.0"
-      sources."asynckit-0.4.0"
+      sources."block-stream-0.0.9"
+      sources."fstream-1.0.11"
+      sources."rimraf-2.6.2"
       sources."pegjs-0.10.0"
-      (sources."simple-plist-0.2.1" // {
-        dependencies = [
-          sources."plist-2.0.1"
-          sources."base64-js-1.1.2"
-          sources."xmlbuilder-8.2.2"
-        ];
-      })
+      sources."simple-plist-0.2.1"
       sources."bplist-creator-0.0.7"
       sources."stream-buffers-2.2.0"
+      sources."async-1.5.2"
       sources."inquirer-0.10.1"
       sources."lodash.debounce-3.1.1"
+      sources."node-uuid-1.4.8"
       sources."os-name-1.0.3"
       sources."ansi-escapes-1.4.0"
       sources."cli-cursor-1.0.2"
       sources."cli-width-1.1.1"
       sources."figures-1.7.0"
-      (sources."readline2-1.0.1" // {
-        dependencies = [
-          sources."mute-stream-0.0.5"
-        ];
-      })
+      sources."readline2-1.0.1"
       sources."run-async-0.1.0"
       sources."rx-lite-3.1.2"
       sources."restore-cursor-1.0.1"
@@ -26241,11 +24755,7 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."lodash._getnative-3.9.1"
-      (sources."osx-release-1.1.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."osx-release-1.1.0"
       sources."win-release-1.1.1"
       sources."is-npm-1.0.0"
       sources."latest-version-1.0.1"
@@ -26253,11 +24763,7 @@ in
       sources."semver-diff-2.1.0"
       sources."string-length-1.0.1"
       sources."package-json-1.2.0"
-      (sources."got-3.3.1" // {
-        dependencies = [
-          sources."object-assign-3.0.0"
-        ];
-      })
+      sources."got-3.3.1"
       sources."registry-url-3.1.0"
       sources."duplexify-3.5.1"
       sources."infinity-agent-2.0.3"
@@ -26270,12 +24776,9 @@ in
       sources."timed-out-2.0.0"
       sources."end-of-stream-1.4.0"
       sources."stream-shift-1.0.0"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."rc-1.2.2"
       sources."deep-extend-0.4.2"
+      sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
       sources."is-finite-1.0.2"
     ];
@@ -26342,9 +24845,7 @@ in
       sources."hiredis-0.4.1"
       (sources."json-rpc2-0.8.1" // {
         dependencies = [
-          sources."debug-1.0.5"
           sources."lodash-2.4.2"
-          sources."ms-2.0.0"
         ];
       })
       sources."lodash-3.1.0"
@@ -26358,17 +24859,8 @@ in
       sources."properties-1.2.1"
       sources."redis-0.12.1"
       sources."string-2.0.1"
-      (sources."winston-0.8.0" // {
-        dependencies = [
-          sources."async-0.2.10"
-        ];
-      })
-      (sources."superagent-0.21.0" // {
-        dependencies = [
-          sources."qs-1.2.0"
-          sources."methods-1.0.1"
-        ];
-      })
+      sources."winston-0.8.0"
+      sources."superagent-0.21.0"
       sources."through-2.3.8"
       sources."duplexer-0.1.1"
       sources."from-0.1.7"
@@ -26379,36 +24871,31 @@ in
       sources."accepts-1.2.13"
       sources."content-disposition-0.5.0"
       sources."cookie-signature-1.0.5"
-      sources."debug-2.1.3"
+      sources."debug-2.6.9"
       sources."depd-1.0.1"
       sources."escape-html-1.0.1"
       sources."etag-1.5.1"
       sources."finalhandler-0.3.3"
       sources."fresh-0.2.4"
       sources."media-typer-0.3.0"
-      sources."methods-1.1.2"
+      sources."methods-1.0.1"
       sources."on-finished-2.2.1"
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.3"
       sources."proxy-addr-1.0.10"
-      sources."qs-2.3.3"
+      sources."qs-1.2.0"
       sources."range-parser-1.0.3"
       sources."send-0.11.1"
       sources."serve-static-1.8.1"
-      (sources."type-is-1.5.7" // {
-        dependencies = [
-          sources."mime-types-2.0.14"
-          sources."mime-db-1.12.0"
-        ];
-      })
+      sources."type-is-1.5.7"
       sources."vary-1.0.1"
       sources."cookie-0.1.2"
       sources."merge-descriptors-0.0.2"
       sources."utils-merge-1.0.0"
-      sources."mime-types-2.1.17"
+      sources."mime-types-2.0.14"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.30.0"
-      sources."ms-0.7.0"
+      sources."mime-db-1.12.0"
+      sources."ms-2.0.0"
       sources."crc-3.2.1"
       sources."ee-first-1.1.0"
       sources."forwarded-0.1.2"
@@ -26487,28 +24974,18 @@ in
       sources."level-0.18.0"
       (sources."level-sublevel-6.6.1" // {
         dependencies = [
-          (sources."levelup-0.19.1" // {
-            dependencies = [
-              sources."xtend-3.0.0"
-            ];
-          })
-          sources."readable-stream-1.0.34"
+          sources."levelup-0.19.1"
+          sources."xtend-3.0.0"
         ];
       })
       sources."leveldown-0.10.6"
       (sources."levelup-0.18.6" // {
         dependencies = [
-          sources."readable-stream-1.0.34"
-          sources."semver-2.3.2"
           sources."xtend-3.0.0"
         ];
       })
       sources."lexicographic-integer-1.1.0"
-      (sources."memdown-0.10.2" // {
-        dependencies = [
-          sources."ltgt-1.0.2"
-        ];
-      })
+      sources."memdown-0.10.2"
       sources."minimist-0.2.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -26520,9 +24997,6 @@ in
           sources."minimist-1.2.0"
           sources."split2-2.2.0"
           sources."through2-2.0.3"
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
         ];
       })
       sources."pump-1.0.2"
@@ -26532,19 +25006,8 @@ in
       sources."sorted-union-stream-1.0.2"
       sources."split2-0.2.1"
       sources."stream-collector-1.0.1"
-      (sources."tar-stream-1.5.4" // {
-        dependencies = [
-          sources."bl-1.2.1"
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      (sources."through2-0.6.5" // {
-        dependencies = [
-          sources."readable-stream-1.0.34"
-        ];
-      })
+      sources."tar-stream-1.5.4"
+      sources."through2-0.6.5"
       sources."thunky-0.1.0"
       sources."xtend-4.0.1"
       sources."jsonparse-0.0.5"
@@ -26554,17 +25017,11 @@ in
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."inherits-2.0.3"
-      sources."readable-stream-1.1.14"
+      sources."readable-stream-1.0.34"
       sources."core-util-is-1.0.2"
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
-      (sources."duplexify-3.5.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
+      sources."duplexify-3.5.1"
       sources."lru-cache-2.7.3"
       sources."stream-shift-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -26572,38 +25029,26 @@ in
       sources."util-deprecate-1.0.2"
       sources."level-packager-0.18.0"
       sources."bytewise-1.1.0"
-      sources."ltgt-2.1.3"
+      sources."ltgt-1.0.2"
       sources."pull-level-2.0.3"
       sources."pull-stream-3.6.1"
       sources."typewiselite-1.0.0"
       sources."bytewise-core-1.2.3"
       sources."typewise-1.0.3"
       sources."typewise-core-1.2.0"
-      (sources."bl-0.8.2" // {
-        dependencies = [
-          sources."readable-stream-1.0.34"
-        ];
-      })
+      sources."bl-1.2.1"
       sources."deferred-leveldown-0.2.0"
       sources."errno-0.1.4"
       sources."prr-0.0.0"
-      sources."semver-5.1.1"
-      (sources."abstract-leveldown-0.12.4" // {
-        dependencies = [
-          sources."xtend-3.0.0"
-        ];
-      })
+      sources."semver-2.3.2"
+      sources."abstract-leveldown-0.12.4"
       sources."level-post-1.0.5"
       sources."pull-cat-1.1.11"
       sources."pull-live-1.0.1"
       sources."pull-pushable-2.1.1"
       sources."pull-window-2.1.4"
-      (sources."stream-to-pull-stream-1.7.2" // {
-        dependencies = [
-          sources."looper-3.0.0"
-        ];
-      })
-      sources."looper-2.0.0"
+      sources."stream-to-pull-stream-1.7.2"
+      sources."looper-3.0.0"
       sources."bindings-1.2.1"
       sources."nan-2.1.0"
       sources."json-stringify-safe-5.0.1"
@@ -26631,7 +25076,7 @@ in
       sources."JSONStream-1.3.1"
       sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.141.0"
+      sources."aws-sdk-2.144.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.83.0"
@@ -26651,7 +25096,7 @@ in
       sources."base64-js-1.2.1"
       sources."ieee754-1.1.8"
       sources."isarray-1.0.0"
-      sources."punycode-1.3.2"
+      sources."punycode-1.4.1"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
       sources."aws-sign2-0.7.0"
@@ -26672,11 +25117,7 @@ in
       sources."qs-6.5.1"
       sources."safe-buffer-5.1.1"
       sources."stringstream-0.0.5"
-      (sources."tough-cookie-2.3.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
@@ -26687,12 +25128,8 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
       sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
@@ -26732,22 +25169,16 @@ in
       sources."conf-1.3.1"
       sources."got-7.1.0"
       sources."has-ansi-3.0.0"
-      sources."import-jsx-1.3.0"
-      (sources."ink-0.3.1" // {
+      (sources."import-jsx-1.3.0" // {
         dependencies = [
-          sources."chalk-2.3.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
+          sources."has-ansi-2.0.0"
         ];
       })
+      sources."ink-0.3.1"
       sources."ink-text-input-1.1.1"
       sources."lodash.debounce-4.0.8"
       sources."mem-1.1.0"
-      (sources."meow-3.7.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."meow-3.7.0"
       sources."skin-tone-1.0.0"
       sources."execa-0.6.3"
       sources."cross-spawn-5.1.0"
@@ -26771,11 +25202,11 @@ in
       sources."pkg-up-2.0.0"
       sources."write-file-atomic-2.3.0"
       sources."is-obj-1.0.1"
-      sources."pify-3.0.0"
-      sources."find-up-2.1.0"
+      sources."pify-2.3.0"
+      sources."find-up-1.1.2"
       sources."locate-path-2.0.0"
       sources."p-locate-2.0.0"
-      sources."path-exists-3.0.0"
+      sources."path-exists-2.1.0"
       sources."p-limit-1.1.0"
       sources."graceful-fs-4.1.11"
       sources."imurmurhash-0.1.4"
@@ -26823,35 +25254,26 @@ in
       sources."private-0.1.8"
       sources."slash-1.0.0"
       sources."source-map-0.5.7"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."has-ansi-2.0.0"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
+      sources."chalk-2.3.0"
       sources."esutils-2.0.2"
       sources."js-tokens-3.0.2"
-      sources."ansi-styles-2.2.1"
+      sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      (sources."strip-ansi-3.0.1" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."supports-color-2.0.0"
+      sources."strip-ansi-4.0.0"
+      sources."supports-color-4.5.0"
       sources."detect-indent-4.0.0"
       sources."jsesc-1.3.0"
       sources."trim-right-1.0.1"
       sources."repeating-2.0.1"
       sources."is-finite-1.0.2"
       sources."number-is-nan-1.0.1"
-      sources."core-js-2.5.1"
+      sources."core-js-1.2.7"
       sources."home-or-tmp-2.0.0"
       sources."mkdirp-0.5.1"
       sources."source-map-support-0.4.18"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.0"
       sources."regenerator-runtime-0.11.0"
       sources."globals-9.18.0"
       sources."invariant-2.2.2"
@@ -26867,7 +25289,7 @@ in
       sources."caller-callsite-2.0.0"
       sources."callsites-2.0.0"
       sources."arrify-1.0.1"
-      sources."indent-string-3.2.0"
+      sources."indent-string-2.1.0"
       sources."lodash.flattendeep-4.4.0"
       sources."lodash.isequal-4.5.0"
       sources."log-update-2.2.0"
@@ -26877,25 +25299,13 @@ in
       sources."has-flag-2.0.0"
       sources."ansi-escapes-3.0.0"
       sources."cli-cursor-2.1.0"
-      (sources."wrap-ansi-3.0.1" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-        ];
-      })
+      sources."wrap-ansi-3.0.1"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."mimic-fn-1.1.0"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-        ];
-      })
+      sources."string-width-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
-      (sources."fbjs-0.8.16" // {
-        dependencies = [
-          sources."core-js-1.2.7"
-        ];
-      })
+      sources."fbjs-0.8.16"
       sources."object-assign-4.1.1"
       sources."isomorphic-fetch-2.2.1"
       sources."promise-7.3.1"
@@ -26911,17 +25321,8 @@ in
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."normalize-package-data-2.4.0"
-      (sources."read-pkg-up-1.0.1" // {
-        dependencies = [
-          sources."find-up-1.1.2"
-          sources."path-exists-2.1.0"
-        ];
-      })
-      (sources."redent-1.0.0" // {
-        dependencies = [
-          sources."indent-string-2.1.0"
-        ];
-      })
+      sources."read-pkg-up-1.0.1"
+      sources."redent-1.0.0"
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
@@ -26937,16 +25338,8 @@ in
       sources."read-pkg-1.1.0"
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
-      (sources."load-json-file-1.1.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
-      (sources."path-type-1.1.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
+      sources."load-json-file-1.1.0"
+      sources."path-type-1.1.0"
       sources."parse-json-2.2.0"
       sources."strip-bom-2.0.0"
       sources."error-ex-1.3.1"
@@ -26980,12 +25373,7 @@ in
           sources."strip-ansi-3.0.1"
         ];
       })
-      (sources."chalk-2.3.0" // {
-        dependencies = [
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
-        ];
-      })
+      sources."chalk-2.3.0"
       sources."concat-stream-1.6.0"
       sources."cross-spawn-5.1.0"
       sources."debug-3.1.0"
@@ -27016,11 +25404,7 @@ in
       sources."progress-2.0.0"
       sources."require-uncached-1.0.3"
       sources."semver-5.4.1"
-      (sources."strip-ansi-4.0.0" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."strip-ansi-4.0.0"
       sources."strip-json-comments-2.0.1"
       sources."table-4.0.2"
       sources."text-table-0.2.0"
@@ -27029,11 +25413,11 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."js-tokens-3.0.2"
-      sources."ansi-styles-2.2.1"
+      sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."supports-color-4.5.0"
+      sources."ansi-regex-3.0.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -27056,12 +25440,8 @@ in
       sources."ms-2.0.0"
       sources."esrecurse-4.2.0"
       sources."object-assign-4.1.1"
-      sources."acorn-5.2.1"
-      (sources."acorn-jsx-3.0.1" // {
-        dependencies = [
-          sources."acorn-3.3.0"
-        ];
-      })
+      sources."acorn-3.3.0"
+      sources."acorn-jsx-3.0.1"
       sources."flat-cache-1.3.0"
       sources."circular-json-0.3.3"
       sources."del-2.2.2"
@@ -27149,26 +25529,23 @@ in
       (sources."eslint-4.10.0" // {
         dependencies = [
           sources."chalk-2.3.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-styles-3.2.0"
           sources."supports-color-4.5.0"
-          sources."ansi-regex-3.0.0"
         ];
       })
       sources."optionator-0.8.2"
       sources."resolve-1.5.0"
-      (sources."supports-color-3.2.3" // {
-        dependencies = [
-          sources."has-flag-1.0.0"
-        ];
-      })
-      sources."ansi-styles-2.2.1"
+      sources."supports-color-3.2.3"
+      sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."ansi-regex-2.1.1"
+      sources."strip-ansi-4.0.0"
+      sources."ansi-regex-3.0.0"
       sources."ajv-5.3.0"
-      sources."babel-code-frame-6.26.0"
+      (sources."babel-code-frame-6.26.0" // {
+        dependencies = [
+          sources."chalk-1.1.3"
+        ];
+      })
       sources."concat-stream-1.6.0"
       sources."cross-spawn-5.1.0"
       sources."debug-3.1.0"
@@ -27184,15 +25561,7 @@ in
       sources."globals-9.18.0"
       sources."ignore-3.3.7"
       sources."imurmurhash-0.1.4"
-      (sources."inquirer-3.3.0" // {
-        dependencies = [
-          sources."chalk-2.3.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."inquirer-3.3.0"
       sources."is-resolvable-1.0.0"
       sources."js-yaml-3.10.0"
       sources."json-stable-stringify-1.0.1"
@@ -27207,13 +25576,7 @@ in
       sources."require-uncached-1.0.3"
       sources."semver-5.4.1"
       sources."strip-json-comments-2.0.1"
-      (sources."table-4.0.2" // {
-        dependencies = [
-          sources."chalk-2.3.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
-        ];
-      })
+      sources."table-4.0.2"
       sources."text-table-0.2.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -27222,7 +25585,7 @@ in
       sources."js-tokens-3.0.2"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
-      sources."has-flag-2.0.0"
+      sources."has-flag-1.0.0"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
       sources."readable-stream-2.3.3"
@@ -27242,12 +25605,8 @@ in
       sources."ms-2.0.0"
       sources."esrecurse-4.2.0"
       sources."object-assign-4.1.1"
-      sources."acorn-5.2.1"
-      (sources."acorn-jsx-3.0.1" // {
-        dependencies = [
-          sources."acorn-3.3.0"
-        ];
-      })
+      sources."acorn-3.3.0"
+      sources."acorn-jsx-3.0.1"
       sources."flat-cache-1.3.0"
       sources."circular-json-0.3.3"
       sources."del-2.2.2"
@@ -27278,12 +25637,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."string-width-2.1.1"
       sources."through-2.3.8"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
@@ -27342,10 +25696,10 @@ in
   fast-cli = nodeEnv.buildNodePackage {
     name = "fast-cli";
     packageName = "fast-cli";
-    version = "2.0.0";
+    version = "2.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/fast-cli/-/fast-cli-2.0.0.tgz";
-      sha512 = "261zykpcgv0r96yd3qck2g2a990psma49p37kdk1xgic657pv1jnp9n9js90hqv58spgmww85kig9bd7b05lyxagz4d8nm5algyc00x";
+      url = "https://registry.npmjs.org/fast-cli/-/fast-cli-2.1.0.tgz";
+      sha512 = "10v8s8wk027pmsk69zgmnhhmbjiq33sz8fv92g30m488hm62j9kzpsqjrxvr28zm6s2abszgsflp5m62rjwxi9kjy89r867728fbkb6";
     };
     dependencies = [
       sources."chalk-2.3.0"
@@ -27354,17 +25708,13 @@ in
       (sources."ora-1.3.0" // {
         dependencies = [
           sources."chalk-1.1.3"
-          sources."ansi-styles-2.2.1"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-          sources."ansi-regex-2.1.1"
         ];
       })
-      sources."puppeteer-0.11.0"
-      sources."zen-observable-0.5.2"
-      sources."ansi-styles-3.2.0"
+      sources."puppeteer-0.12.0"
+      sources."zen-observable-0.6.0"
+      sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.5.0"
+      sources."supports-color-2.0.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -27376,14 +25726,14 @@ in
       sources."signal-exit-3.0.2"
       sources."mimic-fn-1.1.0"
       sources."string-width-2.1.1"
-      sources."strip-ansi-4.0.0"
+      sources."strip-ansi-3.0.1"
       sources."is-fullwidth-code-point-2.0.0"
-      sources."ansi-regex-3.0.0"
+      sources."ansi-regex-2.1.1"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
-      sources."minimist-1.2.0"
+      sources."minimist-0.0.8"
       sources."normalize-package-data-2.4.0"
       sources."object-assign-4.1.1"
       sources."read-pkg-up-1.0.1"
@@ -27421,20 +25771,8 @@ in
       sources."number-is-nan-1.0.1"
       sources."get-stdin-4.0.1"
       sources."cli-spinners-1.1.0"
-      (sources."log-symbols-1.0.2" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-          sources."ansi-styles-2.2.1"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      (sources."has-ansi-2.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
+      sources."log-symbols-1.0.2"
+      sources."has-ansi-2.0.0"
       sources."debug-2.6.9"
       sources."extract-zip-1.6.6"
       sources."https-proxy-agent-2.1.0"
@@ -27445,11 +25783,7 @@ in
       sources."ws-3.2.0"
       sources."ms-2.0.0"
       sources."concat-stream-1.6.0"
-      (sources."mkdirp-0.5.0" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.0"
       sources."yauzl-2.4.1"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
@@ -27530,12 +25864,17 @@ in
       (sources."flatiron-0.4.3" // {
         dependencies = [
           sources."optimist-0.6.0"
+          sources."cliff-0.1.9"
+          sources."winston-0.8.0"
+        ];
+      })
+      (sources."forever-monitor-1.7.1" // {
+        dependencies = [
+          sources."optimist-0.2.8"
         ];
       })
-      sources."forever-monitor-1.7.1"
       (sources."nconf-0.6.9" // {
         dependencies = [
-          sources."async-0.2.9"
           sources."optimist-0.6.0"
         ];
       })
@@ -27546,33 +25885,23 @@ in
       (sources."prettyjson-1.2.1" // {
         dependencies = [
           sources."colors-1.1.2"
-          sources."minimist-1.2.0"
-        ];
-      })
-      (sources."shush-1.0.0" // {
-        dependencies = [
-          sources."strip-json-comments-0.1.3"
         ];
       })
+      sources."shush-1.0.0"
       sources."timespan-2.3.0"
       sources."utile-0.2.1"
       sources."winston-0.8.3"
       sources."eyes-0.1.8"
-      (sources."broadway-0.3.6" // {
-        dependencies = [
-          sources."cliff-0.1.9"
-          sources."winston-0.8.0"
-        ];
-      })
+      sources."broadway-0.3.6"
       sources."prompt-0.2.14"
       sources."director-1.2.7"
       sources."eventemitter2-0.4.14"
-      sources."async-0.2.10"
+      sources."async-0.2.9"
       sources."cycle-1.0.3"
       sources."pkginfo-0.3.1"
       sources."stack-trace-0.0.10"
       sources."wordwrap-0.0.3"
-      sources."minimist-0.0.10"
+      sources."minimist-0.0.8"
       sources."read-1.0.7"
       sources."revalidator-0.1.8"
       sources."mute-stream-0.0.7"
@@ -27605,18 +25934,9 @@ in
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
       sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
+      sources."is-number-3.0.0"
       sources."isobject-2.1.0"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
+      sources."randomatic-1.1.7"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-buffer-1.1.6"
@@ -27639,145 +25959,30 @@ in
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.38"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      sources."nopt-4.0.1"
-      sources."npmlog-4.1.2"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
-      sources."request-2.81.0"
-      sources."hawk-3.1.3"
-      sources."rimraf-2.6.2"
-      sources."semver-5.4.1"
-      sources."tar-2.2.1"
-      sources."tar-pack-3.4.1"
-      sources."abbrev-1.1.1"
-      sources."osenv-0.1.4"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.4" // {
-        dependencies = [
-          sources."object-assign-4.1.1"
-        ];
-      })
-      sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."aproba-1.2.0"
-      sources."has-unicode-2.0.1"
-      sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.2"
-      sources."ini-1.3.4"
-      sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
-      sources."har-validator-4.2.1"
-      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.17"
-      sources."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
-      sources."qs-6.4.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-4.11.8"
-      sources."har-schema-1.0.5"
-      sources."co-4.6.0"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."punycode-1.4.1"
-      sources."hoek-2.16.3"
-      sources."boom-2.10.1"
-      sources."cryptiles-2.0.5"
-      sources."sntp-1.0.9"
-      sources."glob-7.1.2"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."once-1.4.0"
-      sources."wrappy-1.0.2"
-      sources."block-stream-0.0.9"
-      sources."fstream-1.0.11"
-      sources."debug-2.6.9"
-      sources."fstream-ignore-1.0.5"
-      sources."uid-number-0.0.6"
-      sources."ms-2.0.0"
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      (sources."event-stream-0.5.3" // {
-        dependencies = [
-          sources."optimist-0.2.8"
-        ];
-      })
+      sources."event-stream-0.5.3"
+      sources."ini-1.3.4"
       sources."lazy-1.0.11"
+      sources."strip-json-comments-0.1.3"
       sources."caller-0.0.1"
       sources."tape-2.3.3"
+      sources."jsonify-0.0.0"
       sources."deep-equal-0.1.2"
       sources."defined-0.0.0"
       sources."through-2.3.8"
       sources."resumer-0.0.0"
       sources."i-0.3.6"
+      sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
+      sources."rimraf-2.6.2"
+      sources."glob-7.1.2"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."once-1.4.0"
+      sources."wrappy-1.0.2"
+      sources."isstream-0.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -27875,63 +26080,36 @@ in
     dependencies = [
       sources."coffee-script-1.12.7"
       sources."jade-1.11.0"
-      (sources."q-2.0.3" // {
-        dependencies = [
-          sources."asap-2.0.6"
-        ];
-      })
+      sources."q-2.0.3"
       sources."xml2js-0.4.19"
       sources."msgpack-1.0.2"
       sources."character-parser-1.2.1"
-      (sources."clean-css-3.4.28" // {
-        dependencies = [
-          sources."commander-2.8.1"
-        ];
-      })
-      sources."commander-2.6.0"
+      sources."clean-css-3.4.28"
+      sources."commander-2.8.1"
       sources."constantinople-3.0.2"
       sources."jstransformer-0.0.2"
       sources."mkdirp-0.5.1"
-      (sources."transformers-2.1.0" // {
-        dependencies = [
-          sources."promise-2.0.0"
-          sources."uglify-js-2.2.5"
-          sources."is-promise-1.0.1"
-          sources."source-map-0.1.43"
-        ];
-      })
-      (sources."uglify-js-2.8.29" // {
-        dependencies = [
-          sources."source-map-0.5.7"
-        ];
-      })
+      sources."transformers-2.1.0"
+      sources."uglify-js-2.2.5"
       sources."void-elements-2.0.1"
-      (sources."with-4.0.3" // {
-        dependencies = [
-          sources."acorn-1.2.2"
-        ];
-      })
-      sources."source-map-0.4.4"
+      sources."with-4.0.3"
+      sources."source-map-0.5.7"
       sources."graceful-readlink-1.0.1"
       sources."amdefine-1.0.1"
       sources."acorn-2.7.0"
-      sources."is-promise-2.1.0"
-      sources."promise-6.1.0"
-      sources."asap-1.0.0"
+      sources."is-promise-1.0.1"
+      sources."promise-2.0.0"
+      sources."asap-2.0.6"
       sources."minimist-0.0.8"
       sources."css-1.0.8"
       sources."css-parse-1.0.4"
       sources."css-stringify-1.0.5"
       sources."optimist-0.3.7"
-      sources."wordwrap-0.0.3"
+      sources."wordwrap-0.0.2"
       sources."yargs-3.10.0"
       sources."uglify-to-browserify-1.0.2"
       sources."camelcase-1.2.1"
-      (sources."cliui-2.1.0" // {
-        dependencies = [
-          sources."wordwrap-0.0.2"
-        ];
-      })
+      sources."cliui-2.1.0"
       sources."decamelize-1.2.0"
       sources."window-size-0.1.0"
       sources."center-align-0.1.3"
@@ -27979,10 +26157,7 @@ in
       sources."v8flags-2.1.1"
       (sources."vinyl-fs-0.3.14" // {
         dependencies = [
-          sources."through2-0.6.5"
-          sources."vinyl-0.4.6"
-          sources."readable-stream-1.0.34"
-          sources."clone-0.2.0"
+          sources."minimist-0.0.8"
         ];
       })
       sources."ansi-styles-2.2.1"
@@ -28005,14 +26180,8 @@ in
       sources."multipipe-0.1.2"
       sources."object-assign-3.0.0"
       sources."replace-ext-0.0.1"
-      (sources."through2-2.0.3" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      sources."vinyl-0.5.3"
+      sources."through2-0.6.5"
+      sources."vinyl-0.4.6"
       sources."time-stamp-1.1.0"
       sources."glogg-1.0.0"
       sources."sparkles-1.0.0"
@@ -28029,7 +26198,7 @@ in
       sources."lodash.isarguments-3.1.0"
       sources."lodash.isarray-3.0.4"
       sources."duplexer2-0.0.2"
-      sources."readable-stream-1.1.14"
+      sources."readable-stream-1.0.34"
       sources."core-util-is-1.0.2"
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
@@ -28038,15 +26207,11 @@ in
       sources."process-nextick-args-1.0.7"
       sources."safe-buffer-5.1.1"
       sources."util-deprecate-1.0.2"
-      sources."clone-1.0.2"
+      sources."clone-0.2.0"
       sources."clone-stats-0.0.1"
       sources."extend-3.0.1"
       sources."findup-sync-0.4.3"
-      (sources."fined-1.1.0" // {
-        dependencies = [
-          sources."expand-tilde-2.0.2"
-        ];
-      })
+      sources."fined-1.1.0"
       sources."flagged-respawn-0.3.2"
       sources."lodash.isplainobject-4.0.6"
       sources."lodash.isstring-4.0.1"
@@ -28075,27 +26240,14 @@ in
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
       sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
-      (sources."isobject-2.1.0" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-        ];
-      })
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
+      sources."is-number-3.0.0"
+      sources."isobject-3.0.1"
+      sources."randomatic-1.1.7"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."remove-trailing-separator-1.1.0"
-      sources."for-own-0.1.5"
+      sources."for-own-1.0.0"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
       sources."glob-base-0.3.0"
@@ -28103,7 +26255,7 @@ in
       sources."glob-parent-2.0.0"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."expand-tilde-1.2.2"
+      sources."expand-tilde-2.0.2"
       sources."global-modules-0.2.3"
       sources."os-homedir-1.0.2"
       sources."global-prefix-0.1.5"
@@ -28113,22 +26265,9 @@ in
       sources."which-1.3.0"
       sources."parse-passwd-1.0.0"
       sources."isexe-2.0.0"
-      (sources."is-plain-object-2.0.4" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
-      (sources."object.defaults-1.1.0" // {
-        dependencies = [
-          sources."for-own-1.0.0"
-          sources."isobject-3.0.1"
-        ];
-      })
-      (sources."object.pick-1.3.0" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."is-plain-object-2.0.4"
+      sources."object.defaults-1.1.0"
+      sources."object.pick-1.3.0"
       sources."parse-filepath-1.0.1"
       sources."array-each-1.0.1"
       sources."array-slice-1.0.0"
@@ -28147,22 +26286,13 @@ in
       sources."wrappy-1.0.2"
       sources."user-home-1.1.1"
       sources."defaults-1.0.3"
-      (sources."glob-stream-3.1.18" // {
-        dependencies = [
-          sources."through2-0.6.5"
-          sources."readable-stream-1.0.34"
-        ];
-      })
+      sources."glob-stream-3.1.18"
       sources."glob-watcher-0.0.6"
-      sources."graceful-fs-3.0.11"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."graceful-fs-1.2.3"
+      sources."mkdirp-0.5.1"
       sources."strip-bom-1.0.0"
-      sources."glob-4.5.3"
-      sources."minimatch-2.0.10"
+      sources."glob-3.1.21"
+      sources."minimatch-0.2.14"
       sources."ordered-read-streams-0.1.0"
       sources."glob2base-0.0.12"
       sources."unique-stream-1.0.0"
@@ -28172,14 +26302,7 @@ in
       sources."concat-map-0.0.1"
       sources."find-index-0.1.1"
       sources."gaze-0.5.2"
-      (sources."globule-0.1.0" // {
-        dependencies = [
-          sources."glob-3.1.21"
-          sources."minimatch-0.2.14"
-          sources."graceful-fs-1.2.3"
-          sources."inherits-1.0.2"
-        ];
-      })
+      sources."globule-0.1.0"
       sources."lodash-1.0.2"
       sources."lru-cache-2.7.3"
       sources."sigmund-1.0.1"
@@ -28234,7 +26357,7 @@ in
       sources."glob-5.0.15"
       (sources."jshint-2.8.0" // {
         dependencies = [
-          sources."minimatch-2.0.10"
+          sources."glob-3.2.11"
         ];
       })
       sources."parse-glob-3.0.4"
@@ -28243,19 +26366,14 @@ in
       sources."parserlib-0.2.5"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."minimatch-3.0.4"
+      sources."minimatch-0.3.0"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      (sources."cli-0.6.6" // {
-        dependencies = [
-          sources."glob-3.2.11"
-          sources."minimatch-0.3.0"
-        ];
-      })
+      sources."cli-0.6.6"
       sources."console-browserify-1.1.0"
       sources."exit-0.1.2"
       sources."htmlparser2-3.8.3"
@@ -28266,15 +26384,10 @@ in
       sources."date-now-0.1.4"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
-      sources."domelementtype-1.3.0"
+      sources."domelementtype-1.1.3"
       sources."readable-stream-1.1.14"
-      sources."entities-1.0.0"
-      (sources."dom-serializer-0.1.0" // {
-        dependencies = [
-          sources."domelementtype-1.1.3"
-          sources."entities-1.1.1"
-        ];
-      })
+      sources."entities-1.1.1"
+      sources."dom-serializer-0.1.0"
       sources."core-util-is-1.0.2"
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
@@ -28295,14 +26408,14 @@ in
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
-    version = "3.15.2";
+    version = "3.16.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ionic/-/ionic-3.15.2.tgz";
-      sha512 = "0sdvn9yk297mzlaw81phrpki1xcg06jyyg8kc5wkwkyxbki8vszans6ynzlicpfyq4nqj2a31h4nwh9qyb0pxm7p838a2kxl33016a6";
+      url = "https://registry.npmjs.org/ionic/-/ionic-3.16.0.tgz";
+      sha512 = "38a26yiac39b4ycigml2mxzlv0vkf7ns69cxvn9x6cb9n1bicl9q3r8ifb0dxjihmrahxcfdpc3ni6mn65hf255j9lcb22mr350f75z";
     };
     dependencies = [
       sources."@ionic/cli-framework-0.0.2"
-      sources."@ionic/cli-utils-1.15.2"
+      sources."@ionic/cli-utils-1.16.0"
       sources."chalk-2.3.0"
       sources."opn-5.1.0"
       sources."os-name-2.0.1"
@@ -28315,7 +26428,7 @@ in
       sources."ansi-regex-3.0.0"
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.1"
-      sources."debug-3.1.0"
+      sources."debug-2.6.9"
       sources."extend-3.0.1"
       sources."form-data-2.3.1"
       sources."formidable-1.1.1"
@@ -28334,55 +26447,29 @@ in
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."safe-buffer-5.1.1"
-      sources."string_decoder-1.0.3"
+      sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."@ionic/discover-0.3.3"
+      sources."@ionic/discover-0.4.0"
       sources."archiver-2.1.0"
       sources."basic-auth-1.1.0"
-      (sources."body-parser-1.18.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."body-parser-1.18.2"
       sources."chokidar-1.7.0"
       sources."ci-info-1.1.1"
       sources."cross-spawn-5.1.0"
       sources."dargs-5.1.0"
       sources."diff-3.4.0"
       sources."elementtree-0.1.7"
-      (sources."express-4.16.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."express-4.16.2"
       sources."inquirer-3.3.0"
-      (sources."leek-0.0.24" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."leek-0.0.24"
       sources."lodash-4.17.4"
-      sources."minimist-1.2.0"
+      sources."minimist-0.0.8"
       sources."proxy-middleware-0.15.0"
-      (sources."slice-ansi-1.0.0" // {
-        dependencies = [
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
+      sources."slice-ansi-1.0.0"
       sources."ssh-config-1.1.3"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
+      sources."string-width-2.1.1"
       sources."tar-2.2.1"
-      (sources."tiny-lr-1.0.5" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."tiny-lr-1.0.5"
       sources."uuid-3.1.0"
       sources."wrap-ansi-3.0.1"
       sources."ws-3.2.0"
@@ -28412,16 +26499,16 @@ in
       sources."compress-commons-1.2.2"
       sources."crc32-stream-2.0.0"
       sources."crc-3.5.0"
-      sources."bytes-3.0.0"
+      sources."bytes-1.0.0"
       sources."content-type-1.0.4"
       sources."depd-1.1.1"
       sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
       sources."on-finished-2.3.0"
-      sources."raw-body-2.3.2"
+      sources."raw-body-1.1.7"
       sources."type-is-1.6.15"
-      sources."setprototypeof-1.0.3"
-      sources."statuses-1.4.0"
+      sources."setprototypeof-1.1.0"
+      sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
@@ -28449,18 +26536,9 @@ in
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
       sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
+      sources."is-number-3.0.0"
       sources."isobject-2.1.0"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
+      sources."randomatic-1.1.7"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
@@ -28474,119 +26552,6 @@ in
       sources."binary-extensions-1.10.0"
       sources."set-immediate-shim-1.0.1"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.38"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      sources."nopt-4.0.1"
-      sources."npmlog-4.1.2"
-      sources."rc-1.2.2"
-      (sources."request-2.81.0" // {
-        dependencies = [
-          sources."form-data-2.1.4"
-          sources."qs-6.4.0"
-        ];
-      })
-      sources."hawk-3.1.3"
-      (sources."tar-pack-3.4.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."abbrev-1.1.1"
-      sources."osenv-0.1.4"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.4" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."aproba-1.2.0"
-      sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.1"
-      sources."signal-exit-3.0.2"
-      (sources."wide-align-1.1.2" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."deep-extend-0.4.2"
-      sources."ini-1.3.4"
-      sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."forever-agent-0.6.1"
-      sources."har-validator-4.2.1"
-      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."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."ajv-4.11.8"
-      sources."har-schema-1.0.5"
-      sources."co-4.6.0"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."punycode-1.4.1"
-      sources."hoek-2.16.3"
-      sources."boom-2.10.1"
-      sources."cryptiles-2.0.5"
-      sources."sntp-1.0.9"
-      sources."fstream-1.0.11"
-      sources."fstream-ignore-1.0.5"
-      sources."uid-number-0.0.6"
       sources."lru-cache-4.1.1"
       sources."shebang-command-1.2.0"
       sources."which-1.3.0"
@@ -28603,24 +26568,14 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      (sources."finalhandler-1.1.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."finalhandler-1.1.0"
       sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-2.0.2"
       sources."range-parser-1.2.0"
-      (sources."send-0.16.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."send-0.16.1"
       sources."serve-static-1.13.1"
       sources."utils-merge-1.0.1"
       sources."vary-1.1.2"
@@ -28640,9 +26595,11 @@ in
       sources."through-2.3.8"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
+      sources."signal-exit-3.0.2"
       sources."mimic-fn-1.1.0"
       sources."jschardet-1.6.0"
       sources."tmp-0.0.33"
+      sources."os-tmpdir-1.0.2"
       sources."escape-string-regexp-1.0.5"
       sources."is-promise-2.1.0"
       sources."lodash.assign-3.2.0"
@@ -28657,16 +26614,14 @@ in
       sources."lodash._getnative-3.9.1"
       sources."lodash.isarguments-3.1.0"
       sources."lodash.isarray-3.0.4"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."block-stream-0.0.9"
-      (sources."body-5.1.0" // {
-        dependencies = [
-          sources."raw-body-1.1.7"
-          sources."bytes-1.0.0"
-          sources."string_decoder-0.10.31"
-        ];
-      })
+      sources."fstream-1.0.11"
+      sources."mkdirp-0.5.1"
+      sources."body-5.1.0"
       sources."faye-websocket-0.10.0"
       sources."livereload-js-2.2.2"
+      sources."object-assign-4.1.1"
       sources."continuable-cache-0.3.1"
       sources."error-7.0.2"
       sources."safe-json-parse-1.0.1"
@@ -28725,7 +26680,7 @@ in
       sources."glob-5.0.15"
       (sources."handlebars-4.0.11" // {
         dependencies = [
-          sources."source-map-0.4.4"
+          sources."wordwrap-0.0.2"
         ];
       })
       (sources."js-yaml-3.10.0" // {
@@ -28733,11 +26688,7 @@ in
           sources."esprima-4.0.0"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."once-1.4.0"
       sources."resolve-1.1.7"
@@ -28747,7 +26698,7 @@ in
       sources."estraverse-1.9.3"
       sources."esutils-2.0.2"
       sources."optionator-0.8.2"
-      sources."source-map-0.2.0"
+      sources."source-map-0.5.7"
       sources."prelude-ls-1.1.2"
       sources."deep-is-0.1.3"
       sources."type-check-0.3.2"
@@ -28762,25 +26713,13 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      (sources."optimist-0.6.1" // {
-        dependencies = [
-          sources."wordwrap-0.0.3"
-        ];
-      })
-      (sources."uglify-js-2.8.29" // {
-        dependencies = [
-          sources."source-map-0.5.7"
-        ];
-      })
-      sources."minimist-0.0.10"
+      sources."optimist-0.6.1"
+      sources."uglify-js-2.8.29"
+      sources."minimist-0.0.8"
       sources."yargs-3.10.0"
       sources."uglify-to-browserify-1.0.2"
       sources."camelcase-1.2.1"
-      (sources."cliui-2.1.0" // {
-        dependencies = [
-          sources."wordwrap-0.0.2"
-        ];
-      })
+      sources."cliui-2.1.0"
       sources."decamelize-1.2.0"
       sources."window-size-0.1.0"
       sources."center-align-0.1.3"
@@ -28930,15 +26869,10 @@ in
       sources."date-now-0.1.4"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
-      sources."domelementtype-1.3.0"
+      sources."domelementtype-1.1.3"
       sources."readable-stream-1.1.14"
-      sources."entities-1.0.0"
-      (sources."dom-serializer-0.1.0" // {
-        dependencies = [
-          sources."domelementtype-1.1.3"
-          sources."entities-1.1.1"
-        ];
-      })
+      sources."entities-1.1.1"
+      sources."dom-serializer-0.1.0"
       sources."core-util-is-1.0.2"
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
@@ -29097,47 +27031,34 @@ in
   json-server = nodeEnv.buildNodePackage {
     name = "json-server";
     packageName = "json-server";
-    version = "0.12.0";
+    version = "0.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-0.12.0.tgz";
-      sha512 = "2iqk65hy94j010zlqsl4rzfkz4f9ic1pqbvsf5w1lrgmda9wmhxl5kmvnmwikjilmn6kz9kniqzl7rpq3xv3cmpx8rppb7ipk5ddhzj";
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.12.1.tgz";
+      sha512 = "3isg3ph43vqfq6m6pg0d1iy7gj2gc6jgym0gp3ng7p9fv7bf1q43isf3wbc7bc9w5swsxqjc3v304ic8iinilwrkwxgks1alaxjs3si";
     };
     dependencies = [
       sources."body-parser-1.18.2"
-      sources."chalk-1.1.3"
+      sources."chalk-2.3.0"
       sources."compression-1.7.1"
       sources."connect-pause-0.1.1"
       sources."cors-2.8.4"
       sources."errorhandler-1.5.0"
-      (sources."express-4.16.2" // {
-        dependencies = [
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.3.1"
-        ];
-      })
-      (sources."express-urlrewrite-1.2.0" // {
-        dependencies = [
-          sources."path-to-regexp-1.7.0"
-        ];
-      })
+      sources."express-4.16.2"
+      sources."express-urlrewrite-1.2.0"
       sources."json-parse-helpfulerror-1.0.3"
       sources."lodash-4.17.4"
-      sources."lodash-id-0.13.0"
+      sources."lodash-id-0.14.0"
       sources."lowdb-0.15.5"
       sources."method-override-2.3.10"
       sources."morgan-1.9.0"
+      sources."nanoid-1.0.1"
       sources."object-assign-4.1.1"
       sources."please-upgrade-node-3.0.1"
-      sources."pluralize-3.1.0"
+      sources."pluralize-7.0.0"
       sources."request-2.83.0"
       sources."server-destroy-1.0.1"
-      sources."shortid-2.2.8"
-      sources."update-notifier-1.0.3"
-      (sources."yargs-6.6.0" // {
-        dependencies = [
-          sources."camelcase-3.0.0"
-        ];
-      })
+      sources."update-notifier-2.3.0"
+      sources."yargs-10.0.3"
       sources."bytes-3.0.0"
       sources."content-type-1.0.4"
       sources."debug-2.6.9"
@@ -29150,19 +27071,19 @@ in
       sources."type-is-1.6.15"
       sources."ms-2.0.0"
       sources."inherits-2.0.3"
-      sources."setprototypeof-1.0.3"
-      sources."statuses-1.4.0"
+      sources."setprototypeof-1.1.0"
+      sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
       sources."mime-types-2.1.17"
       sources."mime-db-1.30.0"
-      sources."ansi-styles-2.2.1"
+      sources."ansi-styles-3.2.0"
       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.1.1"
+      sources."supports-color-4.5.0"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
       sources."accepts-1.3.4"
       sources."compressible-2.0.12"
       sources."on-headers-1.0.1"
@@ -29176,23 +27097,15 @@ in
       sources."cookie-signature-1.0.6"
       sources."encodeurl-1.0.1"
       sources."etag-1.8.1"
-      (sources."finalhandler-1.1.0" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."finalhandler-1.1.0"
       sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."parseurl-1.3.2"
-      sources."path-to-regexp-0.1.7"
+      sources."path-to-regexp-1.7.0"
       sources."proxy-addr-2.0.2"
       sources."range-parser-1.2.0"
-      (sources."send-0.16.1" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."send-0.16.1"
       sources."serve-static-1.13.1"
       sources."utils-merge-1.0.1"
       sources."forwarded-0.1.2"
@@ -29233,12 +27146,8 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
       sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
@@ -29255,111 +27164,92 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
-      sources."boxen-0.6.0"
-      (sources."configstore-2.1.0" // {
-        dependencies = [
-          sources."uuid-2.0.3"
-        ];
-      })
+      sources."boxen-1.2.2"
+      sources."configstore-3.1.1"
+      sources."import-lazy-2.1.0"
+      sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
-      sources."latest-version-2.0.0"
-      sources."lazy-req-1.1.0"
+      sources."latest-version-3.1.0"
       sources."semver-diff-2.1.0"
-      sources."xdg-basedir-2.0.0"
-      sources."ansi-align-1.1.0"
-      sources."camelcase-2.1.1"
+      sources."xdg-basedir-3.0.0"
+      sources."ansi-align-2.0.0"
+      sources."camelcase-4.1.0"
       sources."cli-boxes-1.0.0"
-      sources."filled-array-1.1.0"
-      sources."repeating-2.0.1"
       sources."string-width-1.0.2"
+      sources."term-size-1.2.0"
       sources."widest-line-1.0.0"
-      sources."is-finite-1.0.2"
-      sources."number-is-nan-1.0.1"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."strip-ansi-4.0.0"
+      sources."ansi-regex-3.0.0"
+      sources."execa-0.7.0"
+      sources."cross-spawn-5.1.0"
+      sources."get-stream-3.0.0"
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."strip-eof-1.0.0"
+      sources."lru-cache-4.1.1"
+      sources."shebang-command-1.2.0"
+      sources."which-1.3.0"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."shebang-regex-1.0.0"
+      sources."isexe-2.0.0"
+      sources."path-key-2.0.1"
       sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."dot-prop-3.0.0"
-      sources."mkdirp-0.5.1"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.4"
-      sources."write-file-atomic-1.3.4"
+      sources."number-is-nan-1.0.1"
+      sources."dot-prop-4.2.0"
+      sources."make-dir-1.1.0"
+      sources."unique-string-1.0.0"
+      sources."write-file-atomic-2.3.0"
       sources."is-obj-1.0.1"
-      sources."minimist-0.0.8"
-      sources."os-homedir-1.0.2"
+      sources."pify-3.0.0"
+      sources."crypto-random-string-1.0.0"
       sources."imurmurhash-0.1.4"
-      sources."slide-1.1.6"
-      sources."package-json-2.4.0"
-      sources."got-5.7.1"
+      sources."global-dirs-0.1.0"
+      sources."is-path-inside-1.0.0"
+      sources."ini-1.3.4"
+      sources."path-is-inside-1.0.2"
+      sources."package-json-4.0.1"
+      sources."got-6.7.1"
       sources."registry-auth-token-3.3.1"
       sources."registry-url-3.1.0"
       sources."semver-5.4.1"
       sources."create-error-class-3.0.2"
-      sources."duplexer2-0.1.4"
+      sources."duplexer3-0.1.4"
       sources."is-redirect-1.0.0"
       sources."is-retry-allowed-1.1.0"
-      sources."is-stream-1.1.0"
       sources."lowercase-keys-1.0.0"
-      sources."node-status-codes-1.0.0"
-      sources."parse-json-2.2.0"
-      sources."pinkie-promise-2.0.1"
-      sources."read-all-stream-3.1.0"
-      (sources."readable-stream-2.3.3" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-        ];
-      })
-      sources."timed-out-3.1.3"
-      sources."unzip-response-1.0.2"
+      sources."timed-out-4.0.1"
+      sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
-      sources."error-ex-1.3.1"
-      sources."is-arrayish-0.2.1"
-      sources."pinkie-2.0.4"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.3"
-      sources."util-deprecate-1.0.2"
       sources."prepend-http-1.0.4"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."rc-1.2.2"
       sources."deep-extend-0.4.2"
-      sources."ini-1.3.4"
+      sources."minimist-1.2.0"
       sources."strip-json-comments-2.0.1"
       sources."cliui-3.2.0"
       sources."decamelize-1.2.0"
+      sources."find-up-2.1.0"
       sources."get-caller-file-1.0.2"
-      sources."os-locale-1.4.0"
-      sources."read-pkg-up-1.0.1"
+      sources."os-locale-2.1.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."set-blocking-2.0.0"
-      sources."which-module-1.0.0"
+      sources."which-module-2.0.0"
       sources."y18n-3.2.1"
-      (sources."yargs-parser-4.2.1" // {
-        dependencies = [
-          sources."camelcase-3.0.0"
-        ];
-      })
+      sources."yargs-parser-8.0.0"
       sources."wrap-ansi-2.1.0"
+      sources."locate-path-2.0.0"
+      sources."p-locate-2.0.0"
+      sources."path-exists-3.0.0"
+      sources."p-limit-1.1.0"
       sources."lcid-1.0.0"
+      sources."mem-1.1.0"
       sources."invert-kv-1.0.0"
-      sources."find-up-1.1.2"
-      sources."read-pkg-1.1.0"
-      sources."path-exists-2.1.0"
-      sources."load-json-file-1.1.0"
-      sources."normalize-package-data-2.4.0"
-      sources."path-type-1.1.0"
-      sources."pify-2.3.0"
-      sources."strip-bom-2.0.0"
-      sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.5.0"
-      sources."is-builtin-module-1.0.0"
-      sources."validate-npm-package-license-3.0.1"
-      sources."builtin-modules-1.1.1"
-      sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.4"
-      sources."spdx-license-ids-1.2.2"
+      sources."mimic-fn-1.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -29412,27 +27302,13 @@ in
       sources."core-js-2.5.1"
       sources."di-0.0.1"
       sources."dom-serialize-2.2.1"
-      (sources."expand-braces-0.1.2" // {
-        dependencies = [
-          sources."braces-0.1.5"
-          sources."expand-range-0.1.1"
-          sources."is-number-0.1.1"
-          sources."repeat-string-0.2.2"
-        ];
-      })
+      sources."expand-braces-0.1.2"
       sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
       sources."http-proxy-1.16.2"
       sources."isbinaryfile-3.0.2"
       sources."lodash-3.10.1"
-      (sources."log4js-0.6.38" // {
-        dependencies = [
-          sources."readable-stream-1.0.34"
-          sources."semver-4.3.6"
-          sources."isarray-0.0.1"
-          sources."string_decoder-0.10.31"
-        ];
-      })
+      sources."log4js-0.6.38"
       sources."mime-1.4.1"
       sources."minimatch-3.0.4"
       sources."optimist-0.6.1"
@@ -29440,19 +27316,13 @@ in
       sources."range-parser-1.2.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
-      (sources."socket.io-1.7.3" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."object-assign-4.1.0"
-          sources."ms-0.7.2"
-        ];
-      })
+      sources."socket.io-1.7.3"
       sources."source-map-0.5.7"
       sources."tmp-0.0.31"
       sources."useragent-2.2.1"
       sources."bytes-3.0.0"
       sources."content-type-1.0.4"
-      sources."debug-2.6.9"
+      sources."debug-2.2.0"
       sources."depd-1.1.1"
       sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
@@ -29460,10 +27330,10 @@ in
       sources."qs-6.5.1"
       sources."raw-body-2.3.2"
       sources."type-is-1.6.15"
-      sources."ms-2.0.0"
+      sources."ms-0.7.1"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.4.0"
+      sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
@@ -29481,7 +27351,7 @@ in
       sources."normalize-path-2.1.1"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
-      sources."braces-1.8.5"
+      sources."braces-0.1.5"
       sources."expand-brackets-0.1.5"
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.1"
@@ -29491,24 +27361,15 @@ in
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.4"
       sources."arr-flatten-1.1.0"
-      sources."expand-range-1.8.2"
+      sources."expand-range-0.1.1"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
       sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
+      sources."is-number-0.1.1"
       sources."isobject-2.1.0"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
-      sources."repeat-string-1.6.1"
-      sources."isarray-1.0.0"
+      sources."randomatic-1.1.7"
+      sources."repeat-string-0.2.2"
+      sources."isarray-0.0.1"
       sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
@@ -29520,176 +27381,41 @@ in
       sources."is-primitive-2.0.0"
       sources."remove-trailing-separator-1.1.0"
       sources."binary-extensions-1.10.0"
-      sources."readable-stream-2.3.3"
+      sources."readable-stream-1.0.34"
       sources."set-immediate-shim-1.0.1"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.3"
+      sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.38"
-      sources."mkdirp-0.5.1"
-      sources."nopt-4.0.1"
-      sources."npmlog-4.1.2"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
-      (sources."request-2.81.0" // {
-        dependencies = [
-          sources."qs-6.4.0"
-        ];
-      })
-      sources."hawk-3.1.3"
-      sources."semver-5.4.1"
-      sources."tar-2.2.1"
-      sources."tar-pack-3.4.1"
-      sources."minimist-0.0.8"
-      sources."abbrev-1.1.1"
-      sources."osenv-0.1.4"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.4"
-      sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."aproba-1.2.0"
-      sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.1"
-      sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.2"
-      sources."ini-1.3.4"
-      sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
-      sources."har-validator-4.2.1"
-      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."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-4.11.8"
-      sources."har-schema-1.0.5"
-      sources."co-4.6.0"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."punycode-1.4.1"
-      sources."hoek-2.16.3"
-      sources."boom-2.10.1"
-      sources."cryptiles-2.0.5"
-      sources."sntp-1.0.9"
-      sources."block-stream-0.0.9"
-      sources."fstream-1.0.11"
-      sources."fstream-ignore-1.0.5"
-      sources."once-1.4.0"
-      sources."uid-number-0.0.6"
-      sources."wrappy-1.0.2"
-      (sources."finalhandler-1.0.6" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."finalhandler-1.0.6"
       sources."parseurl-1.3.2"
       sources."utils-merge-1.0.1"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."custom-event-1.0.1"
       sources."ent-2.2.0"
+      sources."extend-3.0.1"
       sources."void-elements-2.0.1"
       sources."array-slice-0.2.3"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
+      sources."once-1.4.0"
+      sources."wrappy-1.0.2"
       sources."eventemitter3-1.2.0"
       sources."requires-port-1.0.0"
+      sources."semver-4.3.6"
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."wordwrap-0.0.3"
-      (sources."engine.io-1.8.3" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."has-binary-0.1.7" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
-      (sources."socket.io-adapter-0.5.0" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."socket.io-client-1.7.3" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."socket.io-parser-2.3.1" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."component-emitter-1.1.2"
-          sources."isarray-0.0.1"
-          sources."ms-0.7.1"
-        ];
-      })
+      sources."minimist-0.0.10"
+      sources."engine.io-1.8.3"
+      sources."has-binary-0.1.7"
+      sources."object-assign-4.1.0"
+      sources."socket.io-adapter-0.5.0"
+      sources."socket.io-client-1.7.3"
+      sources."socket.io-parser-2.3.1"
       sources."accepts-1.3.3"
       sources."base64id-1.0.0"
       sources."engine.io-parser-1.3.2"
@@ -29705,13 +27431,8 @@ in
       sources."ultron-1.0.2"
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
-      sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.3" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
+      sources."component-emitter-1.1.2"
+      sources."engine.io-client-1.8.3"
       sources."indexof-0.0.1"
       sources."object-component-0.0.3"
       sources."parseuri-0.0.5"
@@ -29725,6 +27446,7 @@ in
       sources."better-assert-1.0.2"
       sources."callsite-1.0.0"
       sources."json3-3.3.2"
+      sources."os-tmpdir-1.0.2"
       sources."lru-cache-2.2.4"
     ];
     buildInputs = globalBuildInputs;
@@ -29746,11 +27468,7 @@ in
     };
     dependencies = [
       sources."express-3.21.2"
-      (sources."passport-0.4.0" // {
-        dependencies = [
-          sources."pause-0.0.1"
-        ];
-      })
+      sources."passport-0.4.0"
       sources."passport-google-oauth-1.0.0"
       sources."connect-restreamer-1.0.3"
       sources."xml2js-0.4.19"
@@ -29772,14 +27490,9 @@ in
       sources."parseurl-1.3.2"
       sources."proxy-addr-1.0.10"
       sources."range-parser-1.0.3"
-      (sources."send-0.13.0" // {
-        dependencies = [
-          sources."destroy-1.0.3"
-          sources."statuses-1.2.1"
-        ];
-      })
+      sources."send-0.13.2"
       sources."utils-merge-1.0.0"
-      sources."vary-1.0.1"
+      sources."vary-1.1.2"
       sources."basic-auth-connect-1.0.0"
       sources."body-parser-1.13.3"
       sources."bytes-2.1.0"
@@ -29787,65 +27500,25 @@ in
       sources."compression-1.5.2"
       sources."connect-timeout-1.6.2"
       sources."csurf-1.8.3"
-      (sources."errorhandler-1.4.3" // {
-        dependencies = [
-          sources."accepts-1.3.4"
-          sources."escape-html-1.0.3"
-          sources."negotiator-0.6.1"
-        ];
-      })
-      (sources."express-session-1.11.3" // {
-        dependencies = [
-          sources."uid-safe-2.0.0"
-        ];
-      })
+      sources."errorhandler-1.4.3"
+      sources."express-session-1.11.3"
       sources."finalhandler-0.4.0"
       sources."http-errors-1.3.1"
-      (sources."method-override-2.3.10" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."vary-1.1.2"
-          sources."ms-2.0.0"
-        ];
-      })
+      sources."method-override-2.3.10"
       sources."morgan-1.6.1"
       sources."multiparty-3.3.2"
       sources."on-headers-1.0.1"
-      sources."pause-0.1.0"
+      sources."pause-0.0.1"
       sources."qs-4.0.0"
-      (sources."response-time-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-        ];
-      })
-      (sources."serve-favicon-2.3.2" // {
-        dependencies = [
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."serve-index-1.7.3" // {
-        dependencies = [
-          sources."escape-html-1.0.3"
-        ];
-      })
-      (sources."serve-static-1.10.3" // {
-        dependencies = [
-          sources."escape-html-1.0.3"
-          sources."send-0.13.2"
-          sources."depd-1.1.1"
-          sources."statuses-1.2.1"
-        ];
-      })
+      sources."response-time-2.3.2"
+      sources."serve-favicon-2.3.2"
+      sources."serve-index-1.7.3"
+      sources."serve-static-1.10.3"
       sources."type-is-1.6.15"
       sources."vhost-3.0.2"
-      sources."iconv-lite-0.4.11"
+      sources."iconv-lite-0.4.13"
       sources."on-finished-2.3.0"
-      (sources."raw-body-2.1.7" // {
-        dependencies = [
-          sources."bytes-2.4.0"
-          sources."iconv-lite-0.4.13"
-        ];
-      })
+      sources."raw-body-2.1.7"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."accepts-1.2.13"
@@ -29857,19 +27530,19 @@ in
       sources."csrf-3.0.6"
       sources."rndm-1.2.0"
       sources."tsscmp-1.0.5"
-      sources."uid-safe-2.1.4"
+      sources."uid-safe-2.0.0"
       sources."random-bytes-1.0.0"
       sources."crc-3.3.0"
       sources."base64-url-1.2.1"
       sources."inherits-2.0.3"
-      sources."statuses-1.4.0"
+      sources."statuses-1.2.1"
       sources."readable-stream-1.1.14"
       sources."stream-counter-0.2.0"
       sources."core-util-is-1.0.2"
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
       sources."batch-0.5.3"
-      sources."destroy-1.0.4"
+      sources."destroy-1.0.3"
       sources."mime-1.3.4"
       sources."media-typer-0.3.0"
       sources."minimist-0.0.8"
@@ -29895,10 +27568,10 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "2.4.0";
+    version = "2.5.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-2.4.0.tgz";
-      sha512 = "0w40hmc0gkfhxzk4pfzd3wdiqb36jwr6g0ppmlp8zll9fj55sc63lm0yp3y3192gpwv5izwh4rd8qk97z2f41akp8lqb17f8d5hi6l6";
+      url = "https://registry.npmjs.org/lerna/-/lerna-2.5.1.tgz";
+      sha512 = "0bh7a9asvl8vb6szbr8h4h55xzyqmqap0yjqbvyqc9n8yygv5p1s81i1kqgxcbq41p37gf63gyjbws76sa44l11w5gxcgl279m9yga3";
     };
     dependencies = [
       sources."async-1.5.2"
@@ -29906,7 +27579,15 @@ in
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
       sources."command-join-2.0.0"
-      sources."conventional-changelog-cli-1.3.4"
+      (sources."conventional-changelog-cli-1.3.4" // {
+        dependencies = [
+          sources."read-pkg-1.1.0"
+          sources."yargs-3.10.0"
+          sources."load-json-file-1.1.0"
+          sources."find-up-1.1.2"
+          sources."path-exists-2.1.0"
+        ];
+      })
       sources."conventional-recommended-bump-1.0.2"
       sources."dedent-0.7.0"
       sources."execa-0.8.0"
@@ -29918,63 +27599,33 @@ in
       sources."globby-6.1.0"
       sources."graceful-fs-4.1.11"
       sources."hosted-git-info-2.5.0"
-      (sources."inquirer-3.3.0" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."inquirer-3.3.0"
       sources."is-ci-1.0.10"
-      (sources."load-json-file-3.0.0" // {
-        dependencies = [
-          sources."parse-json-3.0.0"
-          sources."strip-bom-3.0.0"
-        ];
-      })
+      sources."load-json-file-3.0.0"
       sources."lodash-4.17.4"
       sources."minimatch-3.0.4"
       sources."npmlog-4.1.2"
       sources."p-finally-1.0.0"
+      sources."package-json-4.0.1"
       sources."path-exists-3.0.0"
       sources."read-cmd-shim-1.0.1"
       (sources."read-pkg-2.0.0" // {
         dependencies = [
           sources."load-json-file-2.0.0"
-          sources."path-type-2.0.0"
-          sources."strip-bom-3.0.0"
         ];
       })
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
       sources."semver-5.4.1"
       sources."signal-exit-3.0.2"
-      (sources."strong-log-transformer-1.0.6" // {
-        dependencies = [
-          sources."minimist-0.1.0"
-        ];
-      })
-      (sources."temp-write-3.3.0" // {
-        dependencies = [
-          sources."uuid-3.1.0"
-        ];
-      })
+      sources."strong-log-transformer-1.0.6"
+      sources."temp-write-3.3.0"
       sources."write-file-atomic-2.3.0"
-      (sources."write-json-file-2.3.0" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
+      sources."write-json-file-2.3.0"
       sources."write-pkg-3.1.0"
       (sources."yargs-8.0.2" // {
         dependencies = [
-          sources."camelcase-4.1.0"
-          (sources."cliui-3.2.0" // {
-            dependencies = [
-              sources."string-width-1.0.2"
-            ];
-          })
-          sources."read-pkg-up-2.0.0"
-          sources."is-fullwidth-code-point-1.0.0"
+          sources."execa-0.7.0"
         ];
       })
       sources."ansi-styles-3.2.0"
@@ -29984,29 +27635,20 @@ in
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
       sources."mkdirp-0.5.1"
-      sources."minimist-0.0.8"
-      sources."strip-ansi-3.0.1"
+      sources."minimist-0.1.0"
+      sources."strip-ansi-4.0.0"
       sources."wcwidth-1.0.1"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-3.0.0"
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
       sources."add-stream-1.0.0"
       sources."conventional-changelog-1.1.6"
-      (sources."meow-3.7.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."meow-3.7.0"
       sources."tempfile-1.1.1"
       sources."conventional-changelog-angular-1.5.1"
       sources."conventional-changelog-atom-0.1.1"
       sources."conventional-changelog-codemirror-0.2.0"
-      (sources."conventional-changelog-core-1.9.2" // {
-        dependencies = [
-          sources."read-pkg-1.1.0"
-          sources."load-json-file-1.1.0"
-        ];
-      })
+      sources."conventional-changelog-core-1.9.2"
       sources."conventional-changelog-ember-0.2.8"
       sources."conventional-changelog-eslint-0.2.0"
       sources."conventional-changelog-express-0.2.0"
@@ -30026,14 +27668,7 @@ in
       sources."git-remote-origin-url-2.0.0"
       sources."git-semver-tags-1.2.2"
       sources."normalize-package-data-2.4.0"
-      (sources."read-pkg-up-1.0.1" // {
-        dependencies = [
-          sources."find-up-1.1.2"
-          sources."read-pkg-1.1.0"
-          sources."path-exists-2.1.0"
-          sources."load-json-file-1.1.0"
-        ];
-      })
+      sources."read-pkg-up-2.0.0"
       sources."through2-2.0.3"
       sources."conventional-commits-filter-1.0.0"
       sources."handlebars-4.0.11"
@@ -30042,22 +27677,13 @@ in
       sources."is-subset-0.1.1"
       sources."modify-values-1.0.0"
       sources."optimist-0.6.1"
-      sources."source-map-0.4.4"
-      (sources."uglify-js-2.8.29" // {
-        dependencies = [
-          sources."source-map-0.5.7"
-          sources."yargs-3.10.0"
-        ];
-      })
-      sources."wordwrap-0.0.3"
+      sources."source-map-0.5.7"
+      sources."uglify-js-2.8.29"
+      sources."wordwrap-0.0.2"
       sources."amdefine-1.0.1"
       sources."uglify-to-browserify-1.0.2"
-      sources."camelcase-1.2.1"
-      (sources."cliui-2.1.0" // {
-        dependencies = [
-          sources."wordwrap-0.0.2"
-        ];
-      })
+      sources."camelcase-4.1.0"
+      sources."cliui-3.2.0"
       sources."decamelize-1.2.0"
       sources."window-size-0.1.0"
       sources."center-align-0.1.3"
@@ -30083,7 +27709,7 @@ in
       sources."lodash._reinterpolate-3.0.0"
       sources."lodash.templatesettings-4.1.0"
       sources."gitconfiglocal-1.0.0"
-      sources."pify-2.3.0"
+      sources."pify-3.0.0"
       sources."ini-1.3.4"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
@@ -30091,10 +27717,10 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."path-type-1.1.0"
+      sources."path-type-2.0.0"
       sources."parse-json-2.2.0"
       sources."pinkie-promise-2.0.1"
-      sources."strip-bom-2.0.0"
+      sources."strip-bom-3.0.0"
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."pinkie-2.0.4"
@@ -30107,11 +27733,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      (sources."camelcase-keys-2.1.0" // {
-        dependencies = [
-          sources."camelcase-2.1.1"
-        ];
-      })
+      sources."camelcase-keys-2.1.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."object-assign-4.1.1"
@@ -30124,7 +27746,7 @@ in
       sources."repeating-2.0.1"
       sources."is-finite-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."uuid-2.0.3"
+      sources."uuid-3.1.0"
       sources."concat-stream-1.6.0"
       sources."typedarray-0.0.6"
       sources."cross-spawn-5.1.0"
@@ -30164,12 +27786,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."string-width-1.0.2"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."mimic-fn-1.1.0"
@@ -30184,57 +27801,46 @@ in
       sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.4"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.4" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."is-fullwidth-code-point-1.0.0"
-        ];
-      })
+      sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.2.0"
       sources."has-unicode-2.0.1"
-      (sources."wide-align-1.1.2" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."is-fullwidth-code-point-1.0.0"
-        ];
-      })
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
+      sources."got-6.7.1"
+      sources."registry-auth-token-3.3.1"
+      sources."registry-url-3.1.0"
+      sources."create-error-class-3.0.2"
+      sources."duplexer3-0.1.4"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."lowercase-keys-1.0.0"
+      sources."timed-out-4.0.1"
+      sources."unzip-response-2.0.1"
+      sources."url-parse-lax-1.0.0"
+      sources."capture-stack-trace-1.0.0"
+      sources."prepend-http-1.0.4"
+      sources."rc-1.2.2"
+      sources."deep-extend-0.4.2"
+      sources."strip-json-comments-2.0.1"
       sources."byline-5.0.0"
       sources."duplexer-0.1.1"
       sources."moment-2.19.1"
-      (sources."make-dir-1.1.0" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
+      sources."make-dir-1.1.0"
       sources."temp-dir-1.0.0"
       sources."imurmurhash-0.1.4"
       sources."detect-indent-5.0.0"
       sources."sort-keys-2.0.0"
       sources."is-plain-obj-1.1.0"
       sources."get-caller-file-1.0.2"
-      (sources."os-locale-2.1.0" // {
-        dependencies = [
-          sources."execa-0.7.0"
-        ];
-      })
+      sources."os-locale-2.1.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."which-module-2.0.0"
       sources."y18n-3.2.1"
-      (sources."yargs-parser-7.0.0" // {
-        dependencies = [
-          sources."camelcase-4.1.0"
-        ];
-      })
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."is-fullwidth-code-point-1.0.0"
-        ];
-      })
+      sources."yargs-parser-7.0.0"
+      sources."wrap-ansi-2.1.0"
       sources."lcid-1.0.0"
       sources."mem-1.1.0"
       sources."invert-kv-1.0.0"
@@ -30258,7 +27864,11 @@ in
     dependencies = [
       sources."through2-2.0.3"
       sources."vinyl-1.2.0"
-      sources."vinyl-fs-2.4.4"
+      (sources."vinyl-fs-2.4.4" // {
+        dependencies = [
+          sources."through2-0.6.5"
+        ];
+      })
       sources."readable-stream-2.3.3"
       sources."xtend-4.0.1"
       sources."core-util-is-1.0.2"
@@ -30272,16 +27882,13 @@ in
       sources."clone-stats-0.0.1"
       sources."replace-ext-0.0.1"
       sources."duplexify-3.5.1"
-      (sources."glob-stream-5.3.5" // {
+      sources."glob-stream-5.3.5"
+      sources."graceful-fs-4.1.11"
+      (sources."gulp-sourcemaps-1.6.0" // {
         dependencies = [
-          sources."through2-0.6.5"
-          sources."readable-stream-1.0.34"
-          sources."isarray-0.0.1"
-          sources."string_decoder-0.10.31"
+          sources."through2-2.0.3"
         ];
       })
-      sources."graceful-fs-4.1.11"
-      sources."gulp-sourcemaps-1.6.0"
       sources."is-valid-glob-0.3.0"
       sources."lazystream-1.0.0"
       sources."lodash.isequal-4.5.0"
@@ -30290,7 +27897,11 @@ in
       sources."object-assign-4.1.1"
       sources."strip-bom-2.0.0"
       sources."strip-bom-stream-1.0.0"
-      sources."through2-filter-2.0.0"
+      (sources."through2-filter-2.0.0" // {
+        dependencies = [
+          sources."through2-2.0.3"
+        ];
+      })
       sources."vali-date-1.0.0"
       sources."end-of-stream-1.4.0"
       sources."stream-shift-1.0.0"
@@ -30298,13 +27909,8 @@ in
       sources."wrappy-1.0.2"
       sources."extend-3.0.1"
       sources."glob-5.0.15"
-      sources."glob-parent-3.1.0"
-      (sources."micromatch-2.3.11" // {
-        dependencies = [
-          sources."is-extglob-1.0.0"
-          sources."is-glob-2.0.1"
-        ];
-      })
+      sources."glob-parent-2.0.0"
+      sources."micromatch-2.3.11"
       sources."ordered-read-streams-0.3.0"
       sources."to-absolute-glob-0.1.1"
       sources."unique-stream-2.2.1"
@@ -30314,46 +27920,28 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."is-glob-3.1.0"
+      sources."is-glob-2.0.1"
       sources."path-dirname-1.0.2"
-      sources."is-extglob-2.1.1"
+      sources."is-extglob-1.0.0"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
       sources."expand-brackets-0.1.5"
-      (sources."extglob-0.3.2" // {
-        dependencies = [
-          sources."is-extglob-1.0.0"
-        ];
-      })
+      sources."extglob-0.3.2"
       sources."filename-regex-2.0.1"
       sources."kind-of-3.2.2"
       sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
-      (sources."parse-glob-3.0.4" // {
-        dependencies = [
-          sources."is-extglob-1.0.0"
-          sources."is-glob-2.0.1"
-        ];
-      })
+      sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.4"
       sources."arr-flatten-1.1.0"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
       sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
+      sources."is-number-3.0.0"
       sources."isobject-2.1.0"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
+      sources."randomatic-1.1.7"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
@@ -30361,13 +27949,7 @@ in
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
-      (sources."glob-base-0.3.0" // {
-        dependencies = [
-          sources."glob-parent-2.0.0"
-          sources."is-glob-2.0.1"
-          sources."is-extglob-1.0.0"
-        ];
-      })
+      sources."glob-base-0.3.0"
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
@@ -30399,39 +27981,14 @@ in
     dependencies = [
       sources."body-parser-1.18.2"
       sources."chokidar-1.7.0"
-      (sources."express-4.16.2" // {
-        dependencies = [
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."express-4.16.2"
       sources."markdown-it-8.4.0"
       sources."markdown-it-emoji-1.4.0"
       sources."markdown-it-github-headings-1.0.1"
       sources."markdown-it-task-checkbox-1.0.4"
       sources."minimist-1.2.0"
       sources."opn-5.1.0"
-      (sources."request-2.83.0" // {
-        dependencies = [
-          sources."aws-sign2-0.7.0"
-          sources."form-data-2.3.1"
-          sources."har-validator-5.0.3"
-          sources."hawk-6.0.2"
-          sources."http-signature-1.2.0"
-          sources."performance-now-2.1.0"
-          sources."ajv-5.3.0"
-          sources."har-schema-2.0.0"
-          sources."hoek-4.2.0"
-          sources."boom-4.3.1"
-          (sources."cryptiles-3.1.2" // {
-            dependencies = [
-              sources."boom-5.2.0"
-            ];
-          })
-          sources."sntp-2.1.0"
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."request-2.83.0"
       sources."socket.io-2.0.4"
       sources."bytes-3.0.0"
       sources."content-type-1.0.4"
@@ -30445,8 +28002,8 @@ in
       sources."type-is-1.6.15"
       sources."ms-2.0.0"
       sources."inherits-2.0.3"
-      sources."setprototypeof-1.0.3"
-      sources."statuses-1.4.0"
+      sources."setprototypeof-1.1.0"
+      sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
@@ -30478,20 +28035,11 @@ in
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
       sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
+      sources."is-number-3.0.0"
       sources."isobject-2.1.0"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
+      sources."randomatic-1.1.7"
       sources."repeat-string-1.6.1"
-      sources."isarray-1.0.0"
+      sources."isarray-2.0.1"
       sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
@@ -30512,125 +28060,11 @@ in
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.0.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.7.0"
-      (sources."node-pre-gyp-0.6.38" // {
-        dependencies = [
-          sources."request-2.81.0"
-          sources."qs-6.4.0"
-        ];
-      })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      sources."nopt-4.0.1"
-      sources."npmlog-4.1.2"
-      sources."rc-1.2.2"
-      sources."hawk-3.1.3"
-      sources."rimraf-2.6.2"
-      sources."semver-5.4.1"
-      sources."tar-2.2.1"
-      sources."tar-pack-3.4.1"
-      sources."abbrev-1.1.1"
-      sources."osenv-0.1.4"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.4"
-      sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."aproba-1.2.0"
-      sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.1"
-      sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.2"
-      sources."ini-1.3.4"
-      sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
-      sources."har-validator-4.2.1"
-      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."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-4.11.8"
-      sources."har-schema-1.0.5"
-      sources."co-4.6.0"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."punycode-1.4.1"
-      sources."hoek-2.16.3"
-      sources."boom-2.10.1"
-      sources."cryptiles-2.0.5"
-      sources."sntp-1.0.9"
-      sources."glob-7.1.2"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."once-1.4.0"
-      sources."wrappy-1.0.2"
-      sources."block-stream-0.0.9"
-      sources."fstream-1.0.11"
-      sources."fstream-ignore-1.0.5"
-      sources."uid-number-0.0.6"
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
       sources."cookie-0.3.1"
@@ -30638,11 +28072,7 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      (sources."finalhandler-1.1.0" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."finalhandler-1.1.0"
       sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -30650,11 +28080,7 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-2.0.2"
       sources."range-parser-1.2.0"
-      (sources."send-0.16.1" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."send-0.16.1"
       sources."serve-static-1.13.1"
       sources."utils-merge-1.0.1"
       sources."vary-1.1.2"
@@ -30674,38 +28100,64 @@ in
       sources."emoji-regex-6.1.1"
       sources."html-entities-1.2.1"
       sources."is-wsl-1.1.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.6.0"
+      sources."caseless-0.12.0"
+      sources."combined-stream-1.0.5"
+      sources."extend-3.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.1"
+      sources."har-validator-5.0.3"
+      sources."hawk-6.0.2"
+      sources."http-signature-1.2.0"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."json-stringify-safe-5.0.1"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-2.1.0"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.3"
+      sources."tunnel-agent-0.6.0"
+      sources."uuid-3.1.0"
+      sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."ajv-5.3.0"
+      sources."har-schema-2.0.0"
+      sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
-      (sources."engine.io-3.1.3" // {
-        dependencies = [
-          sources."accepts-1.3.3"
-        ];
-      })
+      sources."hoek-4.2.0"
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
+      sources."sntp-2.1.0"
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
+      sources."extsprintf-1.3.0"
+      sources."json-schema-0.2.3"
+      sources."verror-1.10.0"
+      sources."asn1-0.2.3"
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
+      sources."jsbn-0.1.1"
+      sources."tweetnacl-0.14.5"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."punycode-1.4.1"
+      sources."engine.io-3.1.3"
       sources."socket.io-adapter-1.1.1"
       sources."socket.io-client-2.0.4"
-      (sources."socket.io-parser-3.1.2" // {
-        dependencies = [
-          sources."isarray-2.0.1"
-        ];
-      })
+      sources."socket.io-parser-3.1.2"
       sources."base64id-1.0.0"
       sources."engine.io-parser-2.1.1"
-      (sources."ws-2.3.1" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."ws-2.3.1"
       sources."uws-0.14.5"
       sources."after-0.8.2"
       sources."arraybuffer.slice-0.0.6"
       sources."base64-arraybuffer-0.1.5"
       sources."blob-0.0.4"
-      (sources."has-binary2-1.0.2" // {
-        dependencies = [
-          sources."isarray-2.0.1"
-        ];
-      })
+      sources."has-binary2-1.0.2"
       sources."ultron-1.1.0"
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
@@ -30742,12 +28194,7 @@ in
     dependencies = [
       sources."chokidar-1.7.0"
       sources."colors-1.1.2"
-      (sources."connect-3.5.1" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
-        ];
-      })
+      sources."connect-3.5.1"
       sources."cors-2.8.4"
       sources."event-stream-3.3.4"
       sources."faye-websocket-0.11.1"
@@ -30785,18 +28232,9 @@ in
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
       sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
+      sources."is-number-3.0.0"
       sources."isobject-2.1.0"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
+      sources."randomatic-1.1.7"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-buffer-1.1.6"
@@ -30823,129 +28261,11 @@ in
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.38"
-      sources."mkdirp-0.5.1"
-      sources."nopt-4.0.1"
-      sources."npmlog-4.1.2"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
-      sources."request-2.81.0"
-      sources."hawk-3.1.3"
-      sources."rimraf-2.6.2"
-      sources."semver-5.4.1"
-      sources."tar-2.2.1"
-      sources."tar-pack-3.4.1"
-      sources."minimist-0.0.8"
-      sources."abbrev-1.1.1"
-      sources."osenv-0.1.4"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.4"
-      sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."aproba-1.2.0"
-      sources."has-unicode-2.0.1"
-      sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.2"
-      sources."ini-1.3.4"
-      sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
-      sources."har-validator-4.2.1"
-      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.17"
-      sources."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
-      sources."qs-6.4.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-4.11.8"
-      sources."har-schema-1.0.5"
-      sources."co-4.6.0"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."punycode-1.4.1"
-      sources."hoek-2.16.3"
-      sources."boom-2.10.1"
-      sources."cryptiles-2.0.5"
-      sources."sntp-1.0.9"
-      sources."glob-7.1.2"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."once-1.4.0"
-      sources."wrappy-1.0.2"
-      sources."block-stream-0.0.9"
-      sources."fstream-1.0.11"
       sources."debug-2.6.9"
-      sources."fstream-ignore-1.0.5"
-      sources."uid-number-0.0.6"
-      sources."ms-2.0.0"
-      (sources."finalhandler-0.5.1" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
-        ];
-      })
+      sources."finalhandler-0.5.1"
       sources."parseurl-1.3.2"
       sources."utils-merge-1.0.0"
+      sources."ms-2.0.0"
       sources."escape-html-1.0.3"
       sources."on-finished-2.3.0"
       sources."statuses-1.3.1"
@@ -30965,6 +28285,7 @@ in
       sources."apache-crypt-1.2.1"
       sources."apache-md5-1.1.2"
       sources."bcryptjs-2.4.3"
+      sources."uuid-3.1.0"
       sources."unix-crypt-td-js-1.0.0"
       sources."basic-auth-2.0.0"
       sources."depd-1.1.1"
@@ -30980,7 +28301,9 @@ in
       sources."setprototypeof-1.0.3"
       sources."accepts-1.3.4"
       sources."batch-0.6.1"
+      sources."mime-types-2.1.17"
       sources."negotiator-0.6.1"
+      sources."mime-db-1.30.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -31143,10 +28466,10 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.3.0";
+    version = "1.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.3.0.tgz";
-      sha1 = "e830a3bc5880dd22ae47be71a147f776542850cc";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.4.0.tgz";
+      sha1 = "f5fc42590aedb8934e8e7fb6641a91c05fcd9337";
     };
     dependencies = [
       sources."optparse-1.0.5"
@@ -31154,26 +28477,21 @@ in
       sources."npm-registry-client-8.4.0"
       (sources."npmconf-2.1.2" // {
         dependencies = [
-          sources."once-1.3.3"
           sources."semver-4.3.6"
         ];
       })
       sources."tar-3.1.15"
       sources."temp-0.8.3"
-      (sources."fs.extra-1.3.2" // {
-        dependencies = [
-          sources."mkdirp-0.3.5"
-        ];
-      })
+      sources."fs.extra-1.3.2"
       sources."findit-2.0.0"
       sources."base64-js-1.2.1"
       sources."slasp-0.0.4"
-      sources."nijs-0.0.23"
+      sources."nijs-0.0.25"
       sources."concat-stream-1.6.0"
       sources."graceful-fs-4.1.11"
       sources."normalize-package-data-2.4.0"
       sources."npm-package-arg-5.1.2"
-      sources."once-1.4.0"
+      sources."once-1.3.3"
       sources."request-2.83.0"
       sources."retry-0.10.1"
       sources."slide-1.1.6"
@@ -31231,12 +28549,8 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
       sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
@@ -31271,7 +28585,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."config-chain-1.1.11"
       sources."ini-1.3.4"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.3.5"
       sources."nopt-3.0.6"
       sources."uid-number-0.0.5"
       sources."proto-list-1.2.4"
@@ -31281,11 +28595,7 @@ in
       sources."minizlib-1.0.4"
       sources."yallist-3.0.2"
       sources."rimraf-2.2.8"
-      (sources."fs-extra-0.6.4" // {
-        dependencies = [
-          sources."mkdirp-0.3.5"
-        ];
-      })
+      sources."fs-extra-0.6.4"
       sources."walk-2.3.9"
       sources."ncp-0.4.2"
       sources."jsonfile-1.0.1"
@@ -31387,12 +28697,8 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
       sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
@@ -31430,7 +28736,11 @@ in
     };
     dependencies = [
       sources."async-0.9.2"
-      sources."biased-opener-0.2.8"
+      (sources."biased-opener-0.2.8" // {
+        dependencies = [
+          sources."yargs-1.3.3"
+        ];
+      })
       sources."debug-2.6.9"
       sources."express-4.16.2"
       sources."glob-5.0.15"
@@ -31439,7 +28749,12 @@ in
       sources."semver-4.3.6"
       sources."serve-favicon-2.4.5"
       sources."strong-data-uri-1.0.4"
-      sources."v8-debug-1.0.1"
+      (sources."v8-debug-1.0.1" // {
+        dependencies = [
+          sources."semver-5.4.1"
+          sources."glob-7.1.2"
+        ];
+      })
       sources."v8-profiler-5.7.0"
       sources."which-1.3.0"
       sources."ws-1.1.4"
@@ -31448,29 +28763,17 @@ in
       sources."minimist-1.2.0"
       sources."x-default-browser-0.3.1"
       sources."headless-0.1.7"
-      sources."lodash-2.4.2"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."lodash-3.10.1"
+      sources."mkdirp-0.5.1"
       sources."osenv-0.1.4"
       sources."plist-1.2.0"
-      (sources."win-detect-browsers-1.0.2" // {
-        dependencies = [
-          sources."yargs-1.3.3"
-        ];
-      })
+      sources."win-detect-browsers-1.0.2"
       sources."uid-0.0.2"
-      sources."rimraf-2.2.8"
+      sources."rimraf-2.6.2"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."base64-js-0.0.8"
-      (sources."xmlbuilder-4.0.0" // {
-        dependencies = [
-          sources."lodash-3.10.1"
-        ];
-      })
+      sources."xmlbuilder-4.0.0"
       sources."xmldom-0.1.27"
       sources."util-deprecate-1.0.2"
       sources."after-0.8.2"
@@ -31540,12 +28843,12 @@ in
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-2.0.2"
-      sources."qs-6.5.1"
+      sources."qs-6.4.0"
       sources."range-parser-1.2.0"
       sources."safe-buffer-5.1.1"
       sources."send-0.16.1"
       sources."serve-static-1.13.1"
-      sources."setprototypeof-1.1.0"
+      sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."type-is-1.6.15"
       sources."utils-merge-1.0.1"
@@ -31554,11 +28857,7 @@ in
       sources."negotiator-0.6.1"
       sources."mime-db-1.30.0"
       sources."bytes-3.0.0"
-      (sources."http-errors-1.6.2" // {
-        dependencies = [
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
       sources."raw-body-2.3.2"
       sources."inherits-2.0.3"
@@ -31581,28 +28880,14 @@ in
       sources."strip-json-comments-2.0.1"
       sources."truncate-1.0.5"
       sources."nan-2.7.0"
-      (sources."node-pre-gyp-0.6.38" // {
-        dependencies = [
-          sources."rimraf-2.6.2"
-          sources."semver-5.4.1"
-          sources."glob-7.1.2"
-        ];
-      })
+      sources."node-pre-gyp-0.6.39"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      (sources."request-2.81.0" // {
-        dependencies = [
-          sources."qs-6.4.0"
-        ];
-      })
+      sources."request-2.81.0"
       sources."hawk-3.1.3"
+      sources."detect-libc-1.0.2"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.4.1" // {
-        dependencies = [
-          sources."rimraf-2.6.2"
-          sources."glob-7.1.2"
-        ];
-      })
+      sources."tar-pack-3.4.1"
       sources."abbrev-1.1.1"
       sources."are-we-there-yet-1.1.4"
       sources."console-control-strings-1.1.0"
@@ -31647,35 +28932,15 @@ in
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
@@ -31711,27 +28976,24 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.38";
+    version = "0.6.39";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz";
-      sha1 = "e92a20f83416415bb4086f6d1fb78b3da73d113d";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz";
+      sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis";
     };
     dependencies = [
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."rc-1.2.2"
       sources."request-2.81.0"
       sources."hawk-3.1.3"
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
+      sources."detect-libc-1.0.2"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.1"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.0"
       sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
@@ -31790,35 +29052,15 @@ in
       sources."co-4.6.0"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
@@ -31871,11 +29113,7 @@ in
       sources."lodash.defaults-3.1.2"
       sources."minimatch-3.0.4"
       sources."ps-tree-1.1.0"
-      (sources."touch-3.1.0" // {
-        dependencies = [
-          sources."nopt-1.0.10"
-        ];
-      })
+      sources."touch-3.1.0"
       sources."undefsafe-0.0.3"
       sources."update-notifier-2.3.0"
       sources."anymatch-1.3.2"
@@ -31905,18 +29143,9 @@ in
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
       sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
+      sources."is-number-3.0.0"
       sources."isobject-2.1.0"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
+      sources."randomatic-1.1.7"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-buffer-1.1.6"
@@ -31939,120 +29168,6 @@ in
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.38"
-      sources."mkdirp-0.5.1"
-      sources."nopt-4.0.1"
-      sources."npmlog-4.1.2"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
-      sources."request-2.81.0"
-      sources."hawk-3.1.3"
-      sources."rimraf-2.6.2"
-      sources."semver-5.4.1"
-      sources."tar-2.2.1"
-      sources."tar-pack-3.4.1"
-      sources."minimist-0.0.8"
-      sources."abbrev-1.1.1"
-      sources."osenv-0.1.4"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.4"
-      sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."aproba-1.2.0"
-      sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.1"
-      sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.2"
-      sources."ini-1.3.4"
-      sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
-      sources."har-validator-4.2.1"
-      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.17"
-      sources."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
-      sources."qs-6.4.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-4.11.8"
-      sources."har-schema-1.0.5"
-      sources."co-4.6.0"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."punycode-1.4.1"
-      sources."hoek-2.16.3"
-      sources."boom-2.10.1"
-      sources."cryptiles-2.0.5"
-      sources."sntp-1.0.9"
-      sources."glob-7.1.2"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."once-1.4.0"
-      sources."wrappy-1.0.2"
-      sources."block-stream-0.0.9"
-      sources."fstream-1.0.11"
-      sources."fstream-ignore-1.0.5"
-      sources."uid-number-0.0.6"
       sources."ms-2.0.0"
       sources."lodash.assign-3.2.0"
       sources."lodash.restparam-3.6.1"
@@ -32076,14 +29191,9 @@ in
       sources."pause-stream-0.0.11"
       sources."split-0.3.3"
       sources."stream-combiner-0.0.4"
-      (sources."boxen-1.2.2" // {
-        dependencies = [
-          sources."string-width-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."nopt-1.0.10"
+      sources."abbrev-1.1.1"
+      sources."boxen-1.2.2"
       sources."chalk-2.3.0"
       sources."configstore-3.1.1"
       sources."import-lazy-2.1.0"
@@ -32092,24 +29202,22 @@ in
       sources."latest-version-3.1.0"
       sources."semver-diff-2.1.0"
       sources."xdg-basedir-3.0.0"
-      (sources."ansi-align-2.0.0" // {
-        dependencies = [
-          sources."string-width-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."ansi-align-2.0.0"
       sources."camelcase-4.1.0"
       sources."cli-boxes-1.0.0"
+      sources."string-width-1.0.2"
       sources."term-size-1.2.0"
       sources."widest-line-1.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."ansi-regex-2.1.1"
       sources."execa-0.7.0"
       sources."cross-spawn-5.1.0"
       sources."get-stream-3.0.0"
       sources."is-stream-1.1.0"
       sources."npm-run-path-2.0.2"
       sources."p-finally-1.0.0"
+      sources."signal-exit-3.0.2"
       sources."strip-eof-1.0.0"
       sources."lru-cache-4.1.1"
       sources."shebang-command-1.2.0"
@@ -32119,6 +29227,8 @@ in
       sources."shebang-regex-1.0.0"
       sources."isexe-2.0.0"
       sources."path-key-2.0.1"
+      sources."code-point-at-1.1.0"
+      sources."number-is-nan-1.0.1"
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."supports-color-4.5.0"
@@ -32135,11 +29245,13 @@ in
       sources."imurmurhash-0.1.4"
       sources."global-dirs-0.1.0"
       sources."is-path-inside-1.0.0"
+      sources."ini-1.3.4"
       sources."path-is-inside-1.0.2"
       sources."package-json-4.0.1"
       sources."got-6.7.1"
       sources."registry-auth-token-3.3.1"
       sources."registry-url-3.1.0"
+      sources."semver-5.4.1"
       sources."create-error-class-3.0.2"
       sources."duplexer3-0.1.4"
       sources."is-redirect-1.0.0"
@@ -32150,6 +29262,10 @@ in
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
       sources."prepend-http-1.0.4"
+      sources."rc-1.2.2"
+      sources."deep-extend-0.4.2"
+      sources."minimist-1.2.0"
+      sources."strip-json-comments-2.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -32177,17 +29293,8 @@ in
       sources."cookie-parser-1.4.3"
       sources."cors-2.8.3"
       sources."cron-1.2.1"
-      (sources."express-4.15.3" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
-      (sources."express-session-1.15.2" // {
-        dependencies = [
-          sources."debug-2.6.3"
-          sources."ms-0.7.2"
-        ];
-      })
+      sources."express-4.15.3"
+      sources."express-session-1.15.2"
       sources."follow-redirects-1.2.4"
       sources."fs-extra-1.0.0"
       sources."fs.notify-0.0.4"
@@ -32198,12 +29305,12 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonata-1.2.6"
       sources."media-typer-0.3.0"
-      sources."mqtt-2.9.0"
-      (sources."multer-1.3.0" // {
+      (sources."mqtt-2.9.0" // {
         dependencies = [
-          sources."object-assign-3.0.0"
+          sources."ws-3.2.0"
         ];
       })
+      sources."multer-1.3.0"
       sources."mustache-2.3.0"
       sources."nopt-3.0.6"
       sources."oauth2orize-1.8.0"
@@ -32216,60 +29323,39 @@ in
       sources."sentiment-2.1.0"
       sources."uglify-js-3.0.20"
       sources."when-3.7.8"
-      (sources."ws-1.1.1" // {
-        dependencies = [
-          sources."ultron-1.0.2"
-        ];
-      })
+      sources."ws-1.1.1"
       sources."xml2js-0.4.17"
       sources."node-red-node-feedparser-0.1.8"
-      sources."node-red-node-email-0.1.24"
-      (sources."node-red-node-twitter-0.1.11" // {
+      (sources."node-red-node-email-0.1.24" // {
         dependencies = [
-          sources."request-2.83.0"
-          sources."aws-sign2-0.7.0"
-          sources."caseless-0.12.0"
-          sources."form-data-2.3.1"
-          sources."har-validator-5.0.3"
-          sources."hawk-6.0.2"
-          sources."http-signature-1.2.0"
-          sources."qs-6.5.1"
-          sources."tunnel-agent-0.6.0"
-          sources."hoek-4.2.0"
-          sources."boom-4.3.1"
-          (sources."cryptiles-3.1.2" // {
-            dependencies = [
-              sources."boom-5.2.0"
-            ];
-          })
-          sources."sntp-2.1.0"
-          sources."assert-plus-1.0.0"
+          sources."clone-1.0.2"
         ];
       })
+      sources."node-red-node-twitter-0.1.11"
       sources."node-red-node-rbe-0.1.13"
-      sources."bcrypt-1.0.3"
+      (sources."bcrypt-1.0.3" // {
+        dependencies = [
+          sources."nopt-4.0.1"
+        ];
+      })
       sources."bytes-2.4.0"
       sources."content-type-1.0.4"
-      sources."debug-2.6.7"
+      sources."debug-2.6.3"
       sources."depd-1.1.1"
       sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.15"
       sources."on-finished-2.3.0"
-      sources."qs-6.4.0"
+      sources."qs-6.5.1"
       sources."type-is-1.6.15"
-      sources."ms-2.0.0"
+      sources."ms-0.7.2"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.4.0"
+      sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."mime-types-2.1.17"
       sources."mime-db-1.30.0"
       sources."css-select-1.2.0"
-      (sources."dom-serializer-0.1.0" // {
-        dependencies = [
-          sources."domelementtype-1.1.3"
-        ];
-      })
+      sources."dom-serializer-0.1.0"
       sources."entities-1.1.1"
       sources."htmlparser2-3.9.2"
       sources."lodash.assignin-4.2.0"
@@ -32308,12 +29394,7 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      (sources."finalhandler-1.0.6" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."finalhandler-1.0.6"
       sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -32321,11 +29402,7 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.3" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."send-0.15.3"
       sources."serve-static-1.12.3"
       sources."utils-merge-1.0.0"
       sources."negotiator-0.6.1"
@@ -32340,7 +29417,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
-      sources."async-0.1.22"
+      sources."async-2.5.0"
       sources."retry-0.6.1"
       sources."cookies-0.7.1"
       sources."i18next-client-1.10.3"
@@ -32358,11 +29435,7 @@ in
       sources."pump-1.0.2"
       sources."reinterval-1.1.0"
       sources."split2-2.2.0"
-      (sources."websocket-stream-5.1.1" // {
-        dependencies = [
-          sources."ws-3.2.0"
-        ];
-      })
+      sources."websocket-stream-5.1.1"
       sources."xtend-4.0.1"
       sources."leven-1.0.2"
       sources."typedarray-0.0.6"
@@ -32402,29 +29475,13 @@ in
       sources."json-stable-stringify-1.0.1"
       sources."through2-filter-2.0.0"
       sources."jsonify-0.0.0"
-      sources."bl-1.2.1"
+      sources."bl-1.1.2"
       sources."async-limiter-1.0.0"
-      sources."ultron-1.1.0"
+      sources."ultron-1.0.2"
       sources."append-field-0.1.0"
-      (sources."busboy-0.2.14" // {
-        dependencies = [
-          sources."readable-stream-1.1.14"
-          sources."isarray-0.0.1"
-          sources."string_decoder-0.10.31"
-        ];
-      })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      (sources."dicer-0.2.5" // {
-        dependencies = [
-          sources."readable-stream-1.1.14"
-          sources."isarray-0.0.1"
-          sources."string_decoder-0.10.31"
-        ];
-      })
+      sources."busboy-0.2.14"
+      sources."mkdirp-0.5.1"
+      sources."dicer-0.2.5"
       sources."streamsearch-0.1.2"
       sources."abbrev-1.1.1"
       sources."uid2-0.0.3"
@@ -32434,47 +29491,29 @@ in
       sources."source-map-0.5.7"
       sources."graceful-readlink-1.0.1"
       sources."options-0.0.6"
-      sources."sax-1.2.4"
+      sources."sax-0.6.1"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
-      (sources."feedparser-1.1.3" // {
-        dependencies = [
-          sources."sax-0.6.1"
-          sources."readable-stream-1.0.34"
-          sources."isarray-0.0.1"
-          sources."string_decoder-0.10.31"
-        ];
-      })
-      (sources."request-2.74.0" // {
-        dependencies = [
-          sources."bl-1.1.2"
-          sources."qs-6.2.3"
-          sources."readable-stream-2.0.6"
-          sources."string_decoder-0.10.31"
-        ];
-      })
-      sources."addressparser-0.1.3"
+      sources."feedparser-1.1.3"
+      sources."request-2.83.0"
+      sources."addressparser-1.0.1"
       sources."array-indexofobject-0.0.1"
-      sources."aws-sign2-0.6.0"
+      sources."aws-sign2-0.7.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."forever-agent-0.6.1"
-      (sources."form-data-1.0.1" // {
-        dependencies = [
-          sources."async-2.5.0"
-        ];
-      })
-      sources."har-validator-2.0.6"
-      sources."hawk-3.1.3"
-      sources."http-signature-1.1.1"
+      sources."form-data-2.3.1"
+      sources."har-validator-5.0.3"
+      sources."hawk-6.0.2"
+      sources."http-signature-1.2.0"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."node-uuid-1.4.8"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
       sources."is-my-json-valid-2.16.1"
@@ -32490,39 +29529,19 @@ in
       sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
-      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.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."hoek-4.2.0"
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
+      sources."sntp-2.1.0"
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
@@ -32531,43 +29550,20 @@ in
       sources."nodemailer-1.11.0"
       sources."poplib-0.1.7"
       sources."mailparser-0.6.2"
-      (sources."imap-0.8.19" // {
-        dependencies = [
-          sources."readable-stream-1.1.14"
-          sources."isarray-0.0.1"
-          sources."string_decoder-0.10.31"
-        ];
-      })
+      sources."imap-0.8.19"
       sources."libmime-1.2.0"
       sources."mailcomposer-2.1.0"
-      sources."needle-0.11.0"
+      sources."needle-0.10.0"
       sources."nodemailer-direct-transport-1.1.0"
-      (sources."nodemailer-smtp-transport-1.1.0" // {
-        dependencies = [
-          sources."clone-1.0.2"
-        ];
-      })
+      sources."nodemailer-smtp-transport-1.1.0"
       sources."libbase64-0.1.0"
       sources."libqp-1.1.0"
-      (sources."buildmail-2.0.0" // {
-        dependencies = [
-          sources."addressparser-0.3.2"
-          sources."needle-0.10.0"
-        ];
-      })
+      sources."buildmail-2.0.0"
       sources."smtp-connection-1.3.8"
       sources."nodemailer-wellknown-0.1.10"
-      (sources."optimist-0.6.1" // {
-        dependencies = [
-          sources."minimist-0.0.10"
-        ];
-      })
+      sources."optimist-0.6.1"
       sources."wordwrap-0.0.3"
-      (sources."mimelib-0.3.1" // {
-        dependencies = [
-          sources."addressparser-1.0.1"
-        ];
-      })
+      sources."mimelib-0.3.1"
       sources."encoding-0.1.12"
       sources."uue-3.1.0"
       sources."utf7-1.0.2"
@@ -32583,29 +29579,7 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."nan-2.6.2"
-      (sources."node-pre-gyp-0.6.36" // {
-        dependencies = [
-          sources."nopt-4.0.1"
-          sources."request-2.83.0"
-          sources."aws-sign2-0.7.0"
-          sources."caseless-0.12.0"
-          sources."form-data-2.3.1"
-          sources."har-validator-5.0.3"
-          sources."hawk-6.0.2"
-          sources."http-signature-1.2.0"
-          sources."qs-6.5.1"
-          sources."tunnel-agent-0.6.0"
-          sources."hoek-4.2.0"
-          sources."boom-4.3.1"
-          (sources."cryptiles-3.1.2" // {
-            dependencies = [
-              sources."boom-5.2.0"
-            ];
-          })
-          sources."sntp-2.1.0"
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."node-pre-gyp-0.6.36"
       sources."npmlog-4.1.2"
       sources."rc-1.2.2"
       sources."rimraf-2.6.2"
@@ -32673,35 +29647,23 @@ in
       sources."js-yaml-2.1.0"
       sources."hooks-0.2.1"
       sources."mongodb-1.2.14"
-      sources."ms-0.1.0"
-      sources."sliced-0.0.3"
+      sources."ms-2.0.0"
+      sources."sliced-0.0.4"
       sources."muri-0.3.1"
-      (sources."mpromise-0.2.1" // {
-        dependencies = [
-          sources."sliced-0.0.4"
-        ];
-      })
+      sources."mpromise-0.2.1"
       sources."mpath-0.1.1"
       sources."bson-0.1.8"
-      (sources."connect-2.7.6" // {
-        dependencies = [
-          sources."buffer-crc32-0.1.1"
-        ];
-      })
-      sources."commander-0.6.1"
+      sources."connect-2.7.6"
+      sources."commander-2.1.0"
       sources."range-parser-0.0.4"
       sources."mkdirp-0.3.5"
       sources."cookie-0.0.5"
-      sources."buffer-crc32-0.2.13"
+      sources."buffer-crc32-0.1.1"
       sources."fresh-0.1.0"
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-3.1.0" // {
-        dependencies = [
-          sources."ms-2.0.0"
-        ];
-      })
+      sources."debug-3.1.0"
       sources."qs-0.5.1"
       sources."formidable-1.0.11"
       sources."bytes-0.2.0"
@@ -32725,14 +29687,10 @@ in
       sources."base64id-0.1.0"
       sources."redis-0.7.3"
       sources."uglify-js-1.2.5"
-      (sources."ws-0.4.32" // {
-        dependencies = [
-          sources."commander-2.1.0"
-        ];
-      })
+      sources."ws-0.4.32"
       sources."xmlhttprequest-1.4.2"
       sources."active-x-obfuscator-0.0.1"
-      sources."nan-1.0.0"
+      sources."nan-2.3.5"
       sources."tinycolor-0.0.1"
       sources."options-0.0.6"
       sources."zeparser-0.0.5"
@@ -32752,11 +29710,7 @@ in
       sources."xoauth2-0.1.8"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
-      (sources."raw-socket-1.5.1" // {
-        dependencies = [
-          sources."nan-2.3.5"
-        ];
-      })
+      sources."raw-socket-1.5.1"
       sources."argparse-0.1.16"
       sources."esprima-1.0.4"
       sources."underscore-1.7.0"
@@ -32777,429 +29731,6 @@ in
       url = "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz";
       sha512 = "3chqlcr8vp121jxny46vi43cm5r0p31l7a24jbbq5jz4zzi0bvp0isk0i8xqylllcas38b75a9nl9p9pj0azbmbqf1bcyf793q8wxik";
     };
-    dependencies = [
-      sources."JSONStream-1.3.1"
-      sources."abbrev-1.1.1"
-      sources."ansi-regex-3.0.0"
-      sources."ansicolors-0.3.2"
-      sources."ansistyles-0.1.3"
-      sources."aproba-1.2.0"
-      sources."archy-1.0.0"
-      sources."bluebird-3.5.1"
-      sources."cacache-9.2.9"
-      sources."call-limit-1.1.0"
-      sources."chownr-1.0.1"
-      sources."cli-table2-0.2.0"
-      sources."cmd-shim-2.0.2"
-      (sources."columnify-1.5.4" // {
-        dependencies = [
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."config-chain-1.1.11"
-      sources."detect-indent-5.0.0"
-      sources."dezalgo-1.0.3"
-      sources."editor-1.0.0"
-      sources."fs-vacuum-1.2.10"
-      sources."fs-write-stream-atomic-1.0.10"
-      sources."glob-7.1.2"
-      sources."graceful-fs-4.1.11"
-      sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.5.0"
-      sources."iferr-0.1.5"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
-      sources."ini-1.3.4"
-      sources."init-package-json-1.10.1"
-      sources."is-cidr-1.0.0"
-      sources."lazy-property-1.0.0"
-      sources."libnpx-9.6.0"
-      sources."lockfile-1.0.3"
-      sources."lodash._baseuniq-4.6.0"
-      sources."lodash.clonedeep-4.5.0"
-      sources."lodash.union-4.6.0"
-      sources."lodash.uniq-4.5.0"
-      sources."lodash.without-4.4.0"
-      sources."lru-cache-4.1.1"
-      sources."meant-1.0.1"
-      sources."mississippi-1.3.0"
-      sources."mkdirp-0.5.1"
-      sources."move-concurrently-1.0.1"
-      (sources."node-gyp-3.6.2" // {
-        dependencies = [
-          sources."nopt-3.0.6"
-          sources."semver-5.3.0"
-          sources."tar-2.2.1"
-        ];
-      })
-      sources."nopt-4.0.1"
-      sources."normalize-package-data-2.4.0"
-      sources."npm-cache-filename-1.0.2"
-      sources."npm-install-checks-3.0.0"
-      sources."npm-lifecycle-1.0.3"
-      sources."npm-package-arg-5.1.2"
-      sources."npm-packlist-1.1.10"
-      sources."npm-profile-2.0.5"
-      sources."npm-registry-client-8.5.0"
-      sources."npm-user-validate-1.0.0"
-      sources."npmlog-4.1.2"
-      sources."once-1.4.0"
-      sources."opener-1.4.3"
-      sources."osenv-0.1.4"
-      sources."pacote-6.0.4"
-      sources."path-is-inside-1.0.2"
-      sources."promise-inflight-1.0.1"
-      sources."qrcode-terminal-0.11.0"
-      sources."query-string-5.0.1"
-      sources."qw-1.0.1"
-      sources."read-1.0.7"
-      sources."read-cmd-shim-1.0.1"
-      sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.12"
-      sources."read-package-tree-5.1.6"
-      sources."readable-stream-2.3.3"
-      sources."request-2.83.0"
-      sources."retry-0.10.1"
-      sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
-      sources."semver-5.4.1"
-      sources."sha-2.0.1"
-      sources."slide-1.1.6"
-      sources."sorted-object-2.0.1"
-      (sources."sorted-union-stream-2.1.3" // {
-        dependencies = [
-          sources."from2-1.3.0"
-          sources."readable-stream-1.1.14"
-          sources."isarray-0.0.1"
-          sources."string_decoder-0.10.31"
-        ];
-      })
-      sources."ssri-4.1.6"
-      sources."strip-ansi-4.0.0"
-      (sources."tar-4.0.2" // {
-        dependencies = [
-          sources."yallist-3.0.2"
-        ];
-      })
-      sources."text-table-0.2.0"
-      sources."uid-number-0.0.6"
-      sources."umask-1.1.0"
-      sources."unique-filename-1.1.0"
-      sources."unpipe-1.0.0"
-      sources."update-notifier-2.2.0"
-      sources."uuid-3.1.0"
-      sources."validate-npm-package-name-3.0.0"
-      sources."which-1.3.0"
-      sources."worker-farm-1.5.1"
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-2.1.0"
-      sources."debuglog-1.0.1"
-      sources."imurmurhash-0.1.4"
-      sources."lodash._baseindexof-3.1.0"
-      sources."lodash._bindcallback-3.0.1"
-      sources."lodash._cacheindexof-3.0.2"
-      sources."lodash._createcache-3.1.2"
-      sources."lodash._getnative-3.9.1"
-      sources."lodash.restparam-3.6.1"
-      sources."readdir-scoped-modules-1.0.2"
-      sources."validate-npm-package-license-3.0.1"
-      sources."jsonparse-1.3.1"
-      sources."through-2.3.8"
-      sources."y18n-3.2.1"
-      sources."lodash-3.10.1"
-      (sources."string-width-1.0.2" // {
-        dependencies = [
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."colors-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."wcwidth-1.0.1"
-      sources."defaults-1.0.3"
-      sources."clone-1.0.2"
-      sources."proto-list-1.2.4"
-      sources."asap-2.0.6"
-      sources."fs.realpath-1.0.0"
-      sources."minimatch-3.0.4"
-      sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
-      sources."promzard-0.3.0"
-      sources."cidr-regex-1.0.6"
-      sources."dotenv-4.0.0"
-      (sources."yargs-8.0.2" // {
-        dependencies = [
-          sources."string-width-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
-      sources."camelcase-4.1.0"
-      (sources."cliui-3.2.0" // {
-        dependencies = [
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."decamelize-1.2.0"
-      sources."get-caller-file-1.0.2"
-      sources."os-locale-2.1.0"
-      sources."read-pkg-up-2.0.0"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
-      sources."set-blocking-2.0.0"
-      sources."which-module-2.0.0"
-      sources."yargs-parser-7.0.0"
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."execa-0.7.0"
-      sources."lcid-1.0.0"
-      sources."mem-1.1.0"
-      sources."cross-spawn-5.1.0"
-      sources."get-stream-3.0.0"
-      sources."is-stream-1.1.0"
-      sources."npm-run-path-2.0.2"
-      sources."p-finally-1.0.0"
-      sources."signal-exit-3.0.2"
-      sources."strip-eof-1.0.0"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."path-key-2.0.1"
-      sources."invert-kv-1.0.0"
-      sources."mimic-fn-1.1.0"
-      sources."find-up-2.1.0"
-      sources."read-pkg-2.0.0"
-      sources."locate-path-2.0.0"
-      sources."p-locate-2.0.0"
-      sources."path-exists-3.0.0"
-      sources."p-limit-1.1.0"
-      sources."load-json-file-2.0.0"
-      sources."path-type-2.0.0"
-      sources."parse-json-2.2.0"
-      sources."pify-2.3.0"
-      sources."strip-bom-3.0.0"
-      sources."error-ex-1.3.1"
-      sources."is-arrayish-0.2.1"
-      sources."lodash._createset-4.0.3"
-      sources."lodash._root-3.0.1"
-      sources."pseudomap-1.0.2"
-      sources."yallist-2.1.2"
-      sources."concat-stream-1.6.0"
-      sources."duplexify-3.5.1"
-      sources."end-of-stream-1.4.0"
-      sources."flush-write-stream-1.0.2"
-      sources."from2-2.3.0"
-      sources."parallel-transform-1.1.0"
-      sources."pump-1.0.2"
-      sources."pumpify-1.3.5"
-      sources."stream-each-1.2.2"
-      sources."through2-2.0.3"
-      sources."typedarray-0.0.6"
-      sources."stream-shift-1.0.0"
-      sources."cyclist-0.2.2"
-      sources."xtend-4.0.1"
-      sources."minimist-0.0.8"
-      sources."copy-concurrently-1.0.5"
-      sources."run-queue-1.0.3"
-      sources."fstream-1.0.11"
-      sources."block-stream-0.0.9"
-      sources."is-builtin-module-1.0.0"
-      sources."builtin-modules-1.1.1"
-      sources."ignore-walk-3.0.1"
-      sources."npm-bundled-1.0.3"
-      sources."make-fetch-happen-2.5.0"
-      sources."agentkeepalive-3.3.0"
-      sources."http-cache-semantics-3.8.0"
-      sources."http-proxy-agent-2.0.0"
-      sources."https-proxy-agent-2.1.0"
-      sources."node-fetch-npm-2.0.2"
-      sources."promise-retry-1.1.1"
-      sources."socks-proxy-agent-3.0.1"
-      sources."humanize-ms-1.2.1"
-      sources."ms-2.0.0"
-      sources."agent-base-4.1.1"
-      sources."debug-2.6.9"
-      sources."es6-promisify-5.0.0"
-      sources."es6-promise-4.1.1"
-      sources."encoding-0.1.12"
-      sources."json-parse-better-errors-1.0.1"
-      sources."iconv-lite-0.4.19"
-      sources."err-code-1.1.2"
-      sources."socks-1.1.10"
-      sources."ip-1.1.5"
-      sources."smart-buffer-1.1.15"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.4" // {
-        dependencies = [
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."delegates-1.0.0"
-      sources."object-assign-4.1.1"
-      sources."wide-align-1.1.2"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."npm-pick-manifest-1.0.4"
-      sources."protoduck-4.0.0"
-      sources."genfun-4.0.1"
-      sources."decode-uri-component-0.2.0"
-      sources."strict-uri-encode-1.1.0"
-      sources."mute-stream-0.0.7"
-      sources."util-extend-1.0.3"
-      sources."slash-1.0.0"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.3"
-      sources."util-deprecate-1.0.2"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
-      sources."is-typedarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.17"
-      sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
-      sources."qs-6.5.1"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-5.3.0"
-      sources."har-schema-2.0.0"
-      sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."fast-json-stable-stringify-2.0.0"
-      sources."json-schema-traverse-0.3.1"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
-      sources."sntp-2.1.0"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
-      sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."punycode-1.4.1"
-      sources."stream-iterate-1.2.0"
-      (sources."minipass-2.2.1" // {
-        dependencies = [
-          sources."yallist-3.0.2"
-        ];
-      })
-      sources."minizlib-1.0.4"
-      sources."unique-slug-2.0.0"
-      (sources."boxen-1.2.2" // {
-        dependencies = [
-          sources."chalk-2.3.0"
-          sources."string-width-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."ansi-styles-2.2.1"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."configstore-3.1.1"
-      sources."import-lazy-2.1.0"
-      sources."is-npm-1.0.0"
-      sources."latest-version-3.1.0"
-      sources."semver-diff-2.1.0"
-      sources."xdg-basedir-3.0.0"
-      (sources."ansi-align-2.0.0" // {
-        dependencies = [
-          sources."string-width-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
-      sources."cli-boxes-1.0.0"
-      sources."term-size-1.2.0"
-      sources."widest-line-1.0.0"
-      sources."ansi-styles-3.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.5.0"
-      sources."color-convert-1.9.0"
-      sources."color-name-1.1.3"
-      sources."has-flag-2.0.0"
-      (sources."has-ansi-2.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."dot-prop-4.2.0"
-      (sources."make-dir-1.1.0" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
-      sources."unique-string-1.0.0"
-      sources."is-obj-1.0.1"
-      sources."crypto-random-string-1.0.0"
-      sources."package-json-4.0.1"
-      sources."got-6.7.1"
-      sources."registry-auth-token-3.3.1"
-      sources."registry-url-3.1.0"
-      sources."create-error-class-3.0.2"
-      sources."duplexer3-0.1.4"
-      sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
-      sources."lowercase-keys-1.0.0"
-      sources."timed-out-4.0.1"
-      sources."unzip-response-2.0.1"
-      sources."url-parse-lax-1.0.0"
-      sources."capture-stack-trace-1.0.0"
-      sources."prepend-http-1.0.4"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
-      sources."deep-extend-0.4.2"
-      sources."strip-json-comments-2.0.1"
-      sources."builtins-1.0.3"
-      sources."isexe-2.0.0"
-      sources."errno-0.1.4"
-      sources."prr-0.0.0"
-      sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.4"
-      sources."spdx-license-ids-1.2.2"
-    ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "a package manager for JavaScript";
@@ -33227,33 +29758,22 @@ in
       })
       (sources."npmconf-0.1.1" // {
         dependencies = [
-          sources."inherits-1.0.2"
-          sources."once-1.1.1"
           sources."semver-2.3.2"
         ];
       })
-      (sources."tar-0.1.17" // {
-        dependencies = [
-          sources."inherits-1.0.2"
-        ];
-      })
-      (sources."temp-0.6.0" // {
-        dependencies = [
-          sources."rimraf-2.1.4"
-          sources."graceful-fs-1.2.3"
-        ];
-      })
+      sources."tar-0.1.17"
+      sources."temp-0.6.0"
       sources."fs.extra-1.3.2"
       sources."findit-1.2.0"
       sources."coffee-script-1.12.7"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
       sources."request-2.83.0"
-      sources."graceful-fs-2.0.3"
+      sources."graceful-fs-1.2.3"
       sources."slide-1.1.6"
       sources."chownr-0.0.2"
       sources."mkdirp-0.3.5"
-      sources."rimraf-2.6.2"
+      sources."rimraf-2.2.8"
       sources."retry-0.6.0"
       sources."couch-login-0.1.20"
       sources."npmlog-4.1.2"
@@ -33288,12 +29808,8 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
       sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
@@ -33316,7 +29832,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."minimatch-3.0.4"
-      sources."once-1.4.0"
+      sources."once-1.1.1"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
       sources."brace-expansion-1.1.8"
@@ -33343,30 +29859,17 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.1.1"
-      (sources."config-chain-1.1.11" // {
-        dependencies = [
-          sources."ini-1.3.4"
-        ];
-      })
+      sources."config-chain-1.1.11"
       sources."osenv-0.0.3"
       sources."nopt-2.2.1"
-      sources."ini-1.1.0"
+      sources."ini-1.3.4"
       sources."proto-list-1.2.4"
       sources."abbrev-1.1.1"
       sources."block-stream-0.0.9"
-      (sources."fstream-0.1.31" // {
-        dependencies = [
-          sources."graceful-fs-3.0.11"
-          sources."mkdirp-0.5.1"
-        ];
-      })
+      sources."fstream-0.1.31"
       sources."natives-1.1.0"
       sources."minimist-0.0.8"
-      (sources."fs-extra-0.6.4" // {
-        dependencies = [
-          sources."rimraf-2.2.8"
-        ];
-      })
+      sources."fs-extra-0.6.4"
       sources."walk-2.3.9"
       sources."ncp-0.4.2"
       sources."jsonfile-1.0.1"
@@ -33399,11 +29902,7 @@ in
       sources."json-parse-helpfulerror-1.0.3"
       sources."lodash-4.17.4"
       sources."node-alias-1.0.4"
-      (sources."npm-3.10.10" // {
-        dependencies = [
-          sources."semver-5.3.0"
-        ];
-      })
+      sources."npm-3.10.10"
       (sources."npmi-2.0.1" // {
         dependencies = [
           sources."semver-4.3.6"
@@ -33414,301 +29913,32 @@ in
       (sources."snyk-1.47.0" // {
         dependencies = [
           sources."update-notifier-0.5.0"
-          sources."latest-version-1.0.1"
-          sources."repeating-1.1.3"
-          sources."package-json-1.2.0"
-          sources."got-3.3.1"
-          sources."object-assign-3.0.0"
-          sources."timed-out-2.0.0"
         ];
       })
       sources."spawn-please-0.3.0"
       (sources."update-notifier-2.3.0" // {
         dependencies = [
-          sources."boxen-1.2.2"
           sources."chalk-2.3.0"
-          sources."configstore-3.1.1"
-          sources."latest-version-3.1.0"
-          sources."xdg-basedir-3.0.0"
-          sources."camelcase-4.1.0"
-          sources."string-width-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
-          sources."dot-prop-4.2.0"
-          sources."write-file-atomic-2.3.0"
-          sources."package-json-4.0.1"
-          sources."got-6.7.1"
-          sources."timed-out-4.0.1"
-          sources."unzip-response-2.0.1"
         ];
       })
-      sources."ansi-styles-2.2.1"
+      sources."ansi-styles-3.2.0"
       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.1.1"
+      sources."strip-ansi-4.0.0"
+      sources."supports-color-4.5.0"
+      sources."ansi-regex-3.0.0"
       sources."colors-1.0.3"
       sources."path-exists-2.1.0"
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
       sources."jju-1.3.0"
-      sources."abbrev-1.0.9"
-      sources."ansicolors-0.3.2"
-      sources."ansistyles-0.1.3"
-      sources."aproba-1.0.4"
-      sources."archy-1.0.0"
-      sources."asap-2.0.6"
-      sources."chownr-1.0.1"
-      sources."cmd-shim-2.0.2"
-      sources."columnify-1.5.4"
-      sources."config-chain-1.1.11"
-      sources."dezalgo-1.0.3"
-      sources."editor-1.0.0"
-      sources."fs-vacuum-1.2.10"
-      sources."fs-write-stream-atomic-1.0.10"
-      sources."fstream-1.0.11"
-      sources."fstream-npm-1.2.1"
-      sources."glob-7.1.2"
-      sources."graceful-fs-4.1.11"
-      sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.1.5"
-      sources."iferr-0.1.5"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
-      sources."ini-1.3.4"
-      (sources."init-package-json-1.9.6" // {
-        dependencies = [
-          sources."validate-npm-package-name-3.0.0"
-        ];
-      })
-      sources."lockfile-1.0.3"
-      sources."lodash._baseuniq-4.6.0"
-      sources."lodash.clonedeep-4.5.0"
-      sources."lodash.union-4.6.0"
-      sources."lodash.uniq-4.5.0"
-      sources."lodash.without-4.4.0"
-      sources."mkdirp-0.5.1"
-      (sources."node-gyp-3.4.0" // {
-        dependencies = [
-          sources."npmlog-3.1.2"
-        ];
-      })
-      sources."nopt-3.0.6"
-      sources."normalize-git-url-3.0.2"
-      sources."normalize-package-data-2.3.8"
-      sources."npm-cache-filename-1.0.2"
-      sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-4.2.1"
-      (sources."npm-registry-client-7.2.1" // {
-        dependencies = [
-          sources."npmlog-3.1.2"
-        ];
-      })
-      sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.2" // {
-        dependencies = [
-          sources."gauge-2.7.4"
-        ];
-      })
-      sources."once-1.4.0"
-      sources."opener-1.4.3"
-      sources."osenv-0.1.4"
-      sources."path-is-inside-1.0.2"
-      sources."read-1.0.7"
-      sources."read-cmd-shim-1.0.1"
-      sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.12"
-      sources."read-package-tree-5.1.6"
-      (sources."readable-stream-2.1.5" // {
-        dependencies = [
-          sources."string_decoder-0.10.31"
-        ];
-      })
-      sources."realize-package-specifier-3.0.3"
-      sources."request-2.75.0"
-      sources."retry-0.10.1"
-      sources."rimraf-2.5.4"
-      sources."sha-2.0.1"
-      sources."slide-1.1.6"
-      sources."sorted-object-2.0.1"
-      sources."tar-2.2.1"
-      sources."text-table-0.2.0"
-      sources."uid-number-0.0.6"
-      sources."umask-1.1.0"
-      sources."unique-filename-1.1.0"
-      sources."unpipe-1.0.0"
-      (sources."validate-npm-package-name-2.2.2" // {
-        dependencies = [
-          sources."builtins-0.0.7"
-        ];
-      })
-      sources."which-1.2.14"
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.2.0"
-      sources."debuglog-1.0.1"
-      sources."imurmurhash-0.1.4"
-      sources."lodash._baseindexof-3.1.0"
-      sources."lodash._bindcallback-3.0.1"
-      sources."lodash._cacheindexof-3.0.2"
-      sources."lodash._createcache-3.1.2"
-      sources."lodash._getnative-3.9.1"
-      sources."lodash.restparam-3.6.1"
-      sources."readdir-scoped-modules-1.0.2"
-      sources."validate-npm-package-license-3.0.1"
-      sources."wcwidth-1.0.1"
-      sources."defaults-1.0.3"
-      sources."clone-1.0.2"
-      sources."proto-list-1.2.4"
-      sources."fstream-ignore-1.0.5"
-      sources."minimatch-3.0.4"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
-      sources."fs.realpath-1.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."promzard-0.3.0"
-      sources."builtins-1.0.3"
-      sources."lodash._createset-4.0.3"
-      sources."lodash._root-3.0.1"
-      sources."minimist-0.0.8"
-      sources."path-array-1.0.1"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
-      sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."has-color-0.1.7"
-      sources."object-assign-4.1.1"
-      sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."array-index-1.0.0"
-      sources."debug-2.6.9"
-      sources."es6-symbol-3.1.1"
-      sources."ms-2.0.0"
-      sources."d-1.0.0"
-      sources."es5-ext-0.10.35"
-      sources."es6-iterator-2.0.3"
-      sources."is-builtin-module-1.0.0"
-      sources."builtin-modules-1.1.1"
-      (sources."concat-stream-1.6.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-        ];
-      })
-      sources."typedarray-0.0.6"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.1"
-      sources."string_decoder-1.0.3"
-      sources."util-deprecate-1.0.2"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."mute-stream-0.0.7"
-      sources."util-extend-1.0.3"
-      sources."json-parse-better-errors-1.0.1"
-      sources."slash-1.0.0"
-      sources."buffer-shims-1.0.0"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.6.0"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-          sources."string_decoder-0.10.31"
-        ];
-      })
-      sources."caseless-0.11.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
-      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.17"
-      sources."node-uuid-1.4.8"
-      sources."oauth-sign-0.8.2"
-      sources."qs-6.2.3"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.4.3"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."is-my-json-valid-2.16.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      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.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."punycode-1.4.1"
-      sources."block-stream-0.0.9"
-      sources."unique-slug-2.0.0"
-      sources."isexe-2.0.0"
-      sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.4"
-      sources."spdx-license-ids-1.2.2"
+      sources."abbrev-1.1.1"
       sources."ansi-escapes-1.4.0"
-      (sources."configstore-1.4.0" // {
-        dependencies = [
-          sources."uuid-2.0.3"
-        ];
-      })
+      sources."configstore-3.1.1"
+      sources."debug-2.6.9"
       sources."es6-promise-3.3.1"
       sources."hasbin-1.2.3"
-      (sources."inquirer-1.0.3" // {
-        dependencies = [
-          sources."mute-stream-0.0.6"
-        ];
-      })
+      sources."inquirer-1.0.3"
       sources."needle-2.0.1"
       sources."open-0.0.5"
       sources."os-name-1.0.3"
@@ -33717,75 +29947,69 @@ in
       sources."snyk-gradle-plugin-1.2.0"
       sources."snyk-module-1.8.1"
       sources."snyk-mvn-plugin-1.1.0"
-      (sources."snyk-nuget-plugin-1.0.0" // {
-        dependencies = [
-          sources."es6-promise-4.1.1"
-        ];
-      })
+      sources."snyk-nuget-plugin-1.0.0"
       sources."snyk-policy-1.7.1"
       sources."snyk-python-plugin-1.4.0"
-      (sources."snyk-recursive-readdir-2.0.0" // {
-        dependencies = [
-          sources."minimatch-3.0.2"
-        ];
-      })
+      sources."snyk-recursive-readdir-2.0.0"
       sources."snyk-resolve-1.0.0"
       (sources."snyk-resolve-deps-1.7.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."update-notifier-0.6.3"
         ];
       })
       sources."snyk-sbt-plugin-1.2.0"
       sources."snyk-tree-1.0.0"
       sources."snyk-try-require-1.2.0"
-      (sources."tempfile-1.1.1" // {
-        dependencies = [
-          sources."uuid-2.0.3"
-        ];
-      })
+      sources."tempfile-1.1.1"
       sources."then-fs-2.0.0"
       sources."undefsafe-0.0.3"
-      (sources."url-0.11.0" // {
-        dependencies = [
-          sources."punycode-1.3.2"
-        ];
-      })
-      sources."uuid-3.1.0"
-      sources."xdg-basedir-2.0.0"
-      sources."async-1.5.2"
+      sources."url-0.11.0"
+      sources."uuid-2.0.3"
+      sources."graceful-fs-4.1.11"
+      sources."mkdirp-0.5.1"
+      sources."object-assign-3.0.0"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.4"
+      sources."write-file-atomic-2.3.0"
+      sources."xdg-basedir-3.0.0"
+      sources."minimist-1.2.0"
+      sources."os-homedir-1.0.2"
+      sources."imurmurhash-0.1.4"
+      sources."slide-1.1.6"
+      sources."ms-2.0.0"
+      sources."async-0.9.2"
       sources."cli-cursor-1.0.2"
       sources."cli-width-2.2.0"
       sources."figures-1.7.0"
+      sources."mute-stream-0.0.6"
       sources."run-async-2.3.0"
       sources."rx-4.1.0"
+      sources."string-width-2.1.1"
       sources."through-2.3.8"
       sources."restore-cursor-1.0.1"
       sources."exit-hook-1.1.1"
       sources."onetime-1.1.0"
       sources."is-promise-2.1.0"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."number-is-nan-1.0.1"
       sources."iconv-lite-0.4.19"
-      (sources."osx-release-1.1.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."osx-release-1.1.0"
       sources."win-release-1.1.1"
-      (sources."nconf-0.7.2" // {
-        dependencies = [
-          sources."async-0.9.2"
-        ];
-      })
-      sources."yargs-3.15.0"
-      sources."camelcase-1.2.1"
-      sources."cliui-2.1.0"
+      sources."nconf-0.7.2"
+      sources."path-is-absolute-1.0.1"
+      sources."ini-1.3.4"
+      sources."yargs-4.8.1"
+      sources."camelcase-4.1.0"
+      sources."cliui-3.2.0"
       sources."decamelize-1.2.0"
-      sources."window-size-0.1.4"
+      sources."window-size-0.2.0"
       sources."center-align-0.1.3"
       sources."right-align-0.1.3"
       sources."wordwrap-0.0.2"
       sources."align-text-0.1.4"
-      sources."lazy-cache-1.0.4"
-      sources."kind-of-3.2.2"
+      sources."lazy-cache-0.2.7"
+      sources."kind-of-2.0.1"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.6"
@@ -33794,20 +30018,12 @@ in
       sources."clone-deep-0.3.0"
       sources."for-own-1.0.0"
       sources."is-plain-object-2.0.4"
-      (sources."shallow-clone-0.1.2" // {
-        dependencies = [
-          sources."kind-of-2.0.1"
-          sources."lazy-cache-0.2.7"
-        ];
-      })
-      sources."for-in-1.0.2"
+      sources."shallow-clone-0.1.2"
+      sources."for-in-0.1.8"
       sources."isobject-3.0.1"
       sources."is-extendable-0.1.1"
-      (sources."mixin-object-2.0.1" // {
-        dependencies = [
-          sources."for-in-0.1.8"
-        ];
-      })
+      sources."mixin-object-2.0.1"
+      sources."hosted-git-info-2.5.0"
       sources."xml2js-0.4.19"
       sources."zip-1.2.0"
       sources."sax-1.2.4"
@@ -33816,35 +30032,32 @@ in
       sources."base64-js-0.0.2"
       sources."to-utf8-0.0.1"
       sources."js-yaml-3.10.0"
+      sources."lodash.clonedeep-4.5.0"
       sources."argparse-1.0.9"
       sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
-      (sources."clite-0.3.0" // {
-        dependencies = [
-          sources."update-notifier-0.6.3"
-          sources."yargs-4.8.1"
-          sources."configstore-2.1.0"
-          sources."uuid-2.0.3"
-          sources."cliui-3.2.0"
-          sources."window-size-0.2.0"
-        ];
-      })
+      sources."minimatch-3.0.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
+      sources."ansicolors-0.3.2"
+      sources."clite-0.3.0"
       sources."lru-cache-4.1.1"
       sources."lodash.defaults-4.2.0"
       sources."lodash.defaultsdeep-4.6.0"
       sources."lodash.mergewith-4.6.0"
-      sources."boxen-0.3.1"
+      sources."boxen-1.2.2"
       sources."is-npm-1.0.0"
-      sources."latest-version-2.0.0"
+      sources."latest-version-3.1.0"
       sources."semver-diff-2.1.0"
       sources."filled-array-1.1.0"
-      sources."repeating-2.0.1"
+      sources."repeating-1.1.3"
       sources."widest-line-1.0.0"
       sources."is-finite-1.0.2"
-      sources."dot-prop-3.0.0"
+      sources."dot-prop-4.2.0"
       sources."is-obj-1.0.1"
-      sources."package-json-2.4.0"
-      sources."got-5.7.1"
+      sources."package-json-4.0.1"
+      sources."got-6.7.1"
       sources."registry-auth-token-3.3.1"
       sources."registry-url-3.1.0"
       sources."create-error-class-3.0.2"
@@ -33856,18 +30069,22 @@ in
       sources."node-status-codes-1.0.0"
       sources."parse-json-2.2.0"
       sources."read-all-stream-3.1.0"
-      sources."timed-out-3.1.3"
-      sources."unzip-response-1.0.2"
+      sources."readable-stream-2.3.3"
+      sources."timed-out-4.0.1"
+      sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
+      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."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
+      sources."util-deprecate-1.0.2"
       sources."prepend-http-1.0.4"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."rc-1.2.2"
       sources."deep-extend-0.4.2"
       sources."strip-json-comments-2.0.1"
       sources."get-caller-file-1.0.2"
@@ -33876,42 +30093,44 @@ in
       sources."read-pkg-up-1.0.1"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
+      sources."set-blocking-2.0.0"
       sources."which-module-1.0.0"
       sources."y18n-3.2.1"
-      (sources."yargs-parser-2.4.1" // {
-        dependencies = [
-          sources."camelcase-3.0.0"
-        ];
-      })
+      sources."yargs-parser-2.4.1"
       sources."wrap-ansi-2.1.0"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
       sources."read-pkg-1.1.0"
       sources."load-json-file-1.1.0"
+      sources."normalize-package-data-2.4.0"
       sources."path-type-1.1.0"
-      sources."pify-2.3.0"
+      sources."pify-3.0.0"
       sources."strip-bom-2.0.0"
       sources."is-utf8-0.2.1"
+      sources."is-builtin-module-1.0.0"
+      sources."validate-npm-package-license-3.0.1"
+      sources."builtin-modules-1.1.1"
+      sources."spdx-correct-1.0.2"
+      sources."spdx-expression-parse-1.0.4"
+      sources."spdx-license-ids-1.2.2"
       sources."pseudomap-1.0.2"
       sources."yallist-2.1.2"
+      sources."archy-1.0.0"
       sources."promise-7.3.1"
+      sources."asap-2.0.6"
       sources."string-length-1.0.1"
       sources."duplexify-3.5.1"
       sources."infinity-agent-2.0.3"
       sources."nested-error-stacks-1.0.2"
       sources."end-of-stream-1.4.0"
       sources."stream-shift-1.0.0"
+      sources."once-1.4.0"
+      sources."wrappy-1.0.2"
+      sources."punycode-1.3.2"
       sources."querystring-0.2.0"
       sources."import-lazy-2.1.0"
       sources."is-installed-globally-0.1.0"
-      (sources."ansi-align-2.0.0" // {
-        dependencies = [
-          sources."string-width-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."ansi-align-2.0.0"
       sources."cli-boxes-1.0.0"
       sources."term-size-1.2.0"
       sources."execa-0.7.0"
@@ -33919,22 +30138,22 @@ in
       sources."get-stream-3.0.0"
       sources."npm-run-path-2.0.2"
       sources."p-finally-1.0.0"
+      sources."signal-exit-3.0.2"
       sources."strip-eof-1.0.0"
       sources."shebang-command-1.2.0"
+      sources."which-1.3.0"
       sources."shebang-regex-1.0.0"
+      sources."isexe-2.0.0"
       sources."path-key-2.0.1"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
-      (sources."make-dir-1.1.0" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
+      sources."make-dir-1.1.0"
       sources."unique-string-1.0.0"
       sources."crypto-random-string-1.0.0"
       sources."global-dirs-0.1.0"
       sources."is-path-inside-1.0.0"
+      sources."path-is-inside-1.0.2"
       sources."duplexer3-0.1.4"
     ];
     buildInputs = globalBuildInputs;
@@ -34010,16 +30229,15 @@ in
       (sources."express-4.16.2" // {
         dependencies = [
           sources."content-type-1.0.4"
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.3.1"
         ];
       })
-      sources."express-handlebars-3.0.0"
-      (sources."finalhandler-1.1.0" // {
+      (sources."express-handlebars-3.0.0" // {
         dependencies = [
-          sources."statuses-1.3.1"
+          sources."async-1.5.2"
+          sources."yargs-3.10.0"
         ];
       })
+      sources."finalhandler-1.1.0"
       sources."js-yaml-3.10.0"
       sources."mediawiki-title-0.6.4"
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
@@ -34028,15 +30246,10 @@ in
       sources."request-2.83.0"
       sources."semver-5.4.1"
       sources."serve-favicon-2.4.5"
-      sources."service-runner-2.3.0"
+      sources."service-runner-2.4.0"
       sources."simplediff-0.1.1"
       sources."uuid-3.1.0"
-      (sources."yargs-7.1.0" // {
-        dependencies = [
-          sources."camelcase-3.0.0"
-          sources."cliui-3.2.0"
-        ];
-      })
+      sources."yargs-7.1.0"
       sources."asap-2.0.6"
       sources."is-arguments-1.0.2"
       sources."bytes-3.0.0"
@@ -34048,10 +30261,10 @@ in
       sources."qs-6.5.1"
       sources."raw-body-2.3.2"
       sources."type-is-1.6.15"
-      sources."ms-2.0.0"
+      sources."ms-0.7.3"
       sources."inherits-2.0.3"
-      sources."setprototypeof-1.0.3"
-      sources."statuses-1.4.0"
+      sources."setprototypeof-1.1.0"
+      sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
@@ -34064,11 +30277,11 @@ in
       sources."vary-1.1.2"
       sources."busboy-0.2.14"
       sources."dicer-0.2.5"
-      sources."readable-stream-1.1.14"
+      sources."readable-stream-2.3.3"
       sources."streamsearch-0.1.2"
       sources."core-util-is-1.0.2"
-      sources."isarray-0.0.1"
-      sources."string_decoder-0.10.31"
+      sources."isarray-1.0.0"
+      sources."string_decoder-1.0.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
       sources."cookie-0.3.1"
@@ -34083,11 +30296,7 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-2.0.2"
       sources."range-parser-1.2.0"
-      (sources."send-0.16.1" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."send-0.16.1"
       sources."serve-static-1.13.1"
       sources."utils-merge-1.0.1"
       sources."forwarded-0.1.2"
@@ -34096,11 +30305,7 @@ in
       sources."mime-1.4.1"
       sources."glob-6.0.4"
       sources."graceful-fs-4.1.11"
-      (sources."handlebars-4.0.11" // {
-        dependencies = [
-          sources."async-1.5.2"
-        ];
-      })
+      sources."handlebars-4.0.11"
       sources."object.assign-4.0.4"
       sources."promise-7.3.1"
       sources."inflight-1.0.6"
@@ -34112,23 +30317,14 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."optimist-0.6.1"
-      sources."source-map-0.4.4"
-      (sources."uglify-js-2.8.29" // {
-        dependencies = [
-          sources."source-map-0.5.7"
-          sources."yargs-3.10.0"
-        ];
-      })
-      sources."wordwrap-0.0.3"
-      sources."minimist-0.0.10"
+      sources."source-map-0.5.7"
+      sources."uglify-js-2.8.29"
+      sources."wordwrap-0.0.2"
+      sources."minimist-0.0.8"
       sources."amdefine-1.0.1"
       sources."uglify-to-browserify-1.0.2"
-      sources."camelcase-1.2.1"
-      (sources."cliui-2.1.0" // {
-        dependencies = [
-          sources."wordwrap-0.0.2"
-        ];
-      })
+      sources."camelcase-3.0.0"
+      sources."cliui-3.2.0"
       sources."decamelize-1.2.0"
       sources."window-size-0.1.0"
       sources."center-align-0.1.3"
@@ -34173,12 +30369,8 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
       sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
@@ -34198,70 +30390,32 @@ in
       sources."bunyan-1.8.12"
       sources."bunyan-syslog-udp-0.1.0"
       sources."gelf-stream-1.1.1"
-      sources."hot-shots-4.7.1"
-      (sources."limitation-0.2.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
+      sources."hot-shots-4.8.0"
+      sources."limitation-0.2.0"
       sources."dnscache-1.0.1"
       sources."dtrace-provider-0.8.5"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.19.1"
       sources."nan-2.7.0"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.1"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
       sources."gelfling-0.3.1"
-      (sources."kad-git+https://github.com/gwicke/kad.git#master" // {
-        dependencies = [
-          sources."ms-0.7.3"
-        ];
-      })
+      sources."kad-git+https://github.com/gwicke/kad.git#master"
       sources."clarinet-0.11.0"
       sources."colors-1.1.2"
       sources."hat-0.0.3"
-      (sources."kad-fs-0.0.4" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
+      sources."kad-fs-0.0.4"
       sources."kad-localstorage-0.0.7"
-      (sources."kad-memstore-0.0.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
+      sources."kad-memstore-0.0.1"
       sources."lodash-3.10.1"
       sources."merge-1.2.0"
-      (sources."msgpack5-3.6.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
+      sources."msgpack5-3.6.0"
+      sources."dom-storage-2.0.2"
+      sources."bl-1.2.1"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
-      sources."dom-storage-2.0.2"
-      (sources."bl-1.2.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
       sources."lodash.clone-4.3.2"
       sources."lodash._baseclone-4.5.7"
       sources."get-caller-file-1.0.2"
@@ -34273,11 +30427,7 @@ in
       sources."string-width-1.0.2"
       sources."which-module-1.0.0"
       sources."y18n-3.2.1"
-      (sources."yargs-parser-5.0.0" // {
-        dependencies = [
-          sources."camelcase-3.0.0"
-        ];
-      })
+      sources."yargs-parser-5.0.0"
       sources."strip-ansi-3.0.1"
       sources."wrap-ansi-2.1.0"
       sources."ansi-regex-2.1.1"
@@ -34327,38 +30477,20 @@ in
     dependencies = [
       sources."airplayer-2.0.0"
       sources."clivas-0.2.0"
-      (sources."inquirer-1.2.3" // {
-        dependencies = [
-          sources."lodash-4.17.4"
-        ];
-      })
+      sources."inquirer-1.2.3"
       sources."keypress-0.2.1"
       sources."mime-1.4.1"
       sources."network-address-1.1.2"
       sources."numeral-1.5.6"
       sources."open-0.0.5"
-      (sources."optimist-0.6.1" // {
-        dependencies = [
-          sources."minimist-0.0.10"
-        ];
-      })
-      (sources."parse-torrent-5.8.3" // {
-        dependencies = [
-          sources."get-stdin-5.0.1"
-        ];
-      })
+      sources."optimist-0.6.1"
+      sources."parse-torrent-5.8.3"
       sources."pump-1.0.2"
       sources."range-parser-1.2.0"
       sources."rc-1.2.2"
       (sources."torrent-stream-1.0.3" // {
         dependencies = [
-          sources."end-of-stream-0.1.5"
           sources."parse-torrent-4.1.0"
-          sources."once-1.3.3"
-          sources."magnet-uri-4.2.3"
-          sources."parse-torrent-file-2.1.4"
-          sources."thirty-two-0.0.2"
-          sources."bencode-0.7.0"
         ];
       })
       sources."winreg-1.2.3"
@@ -34382,15 +30514,15 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.0.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
       sources."xmldom-0.1.27"
-      sources."lodash-3.10.1"
+      sources."lodash-4.17.4"
       sources."consume-http-header-1.0.0"
-      sources."once-1.4.0"
+      sources."once-1.3.3"
       sources."consume-until-1.0.0"
       sources."http-headers-3.0.1"
       sources."buffer-indexof-1.1.1"
@@ -34415,7 +30547,7 @@ in
       sources."multicast-dns-6.1.1"
       sources."multicast-dns-service-types-1.1.0"
       sources."dns-packet-1.2.2"
-      sources."thunky-0.1.0"
+      sources."thunky-1.0.2"
       sources."ip-1.1.5"
       sources."meow-3.7.0"
       sources."camelcase-keys-2.1.0"
@@ -34457,7 +30589,7 @@ in
       sources."strip-indent-1.0.1"
       sources."repeating-2.0.1"
       sources."is-finite-1.0.2"
-      sources."get-stdin-4.0.1"
+      sources."get-stdin-5.0.1"
       sources."ansi-escapes-1.4.0"
       sources."cli-cursor-1.0.2"
       sources."cli-width-2.2.0"
@@ -34478,45 +30610,33 @@ in
       sources."is-promise-2.1.0"
       sources."wordwrap-0.0.3"
       sources."blob-to-buffer-1.2.6"
-      sources."magnet-uri-5.1.7"
-      sources."parse-torrent-file-4.0.3"
+      sources."magnet-uri-4.2.3"
+      sources."parse-torrent-file-2.1.4"
       sources."simple-get-2.7.0"
-      sources."thirty-two-1.0.2"
+      sources."thirty-two-0.0.2"
       sources."uniq-1.0.1"
-      sources."bencode-1.0.0"
+      sources."bencode-0.8.0"
       sources."simple-sha1-2.1.0"
       sources."rusha-0.8.6"
       sources."decompress-response-3.3.0"
       sources."simple-concat-1.0.0"
       sources."mimic-response-1.0.0"
-      sources."end-of-stream-1.4.0"
+      sources."end-of-stream-0.1.5"
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
       sources."bitfield-0.1.0"
-      sources."bncode-0.5.3"
-      (sources."fs-chunk-store-1.6.5" // {
-        dependencies = [
-          sources."mkdirp-0.5.1"
-          sources."thunky-1.0.2"
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."bncode-0.2.3"
+      sources."fs-chunk-store-1.6.5"
       sources."hat-0.0.3"
       sources."immediate-chunk-store-1.0.8"
       sources."ip-set-1.0.1"
-      sources."mkdirp-0.3.5"
+      sources."mkdirp-0.5.1"
       sources."peer-wire-swarm-0.12.1"
       sources."rimraf-2.6.2"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.1"
-      (sources."random-access-file-1.8.1" // {
-        dependencies = [
-          sources."mkdirp-0.5.1"
-          sources."thunky-1.0.2"
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."random-access-file-1.8.1"
       sources."randombytes-2.0.5"
       sources."run-parallel-1.1.6"
       sources."buffer-alloc-unsafe-1.0.0"
@@ -34524,14 +30644,7 @@ in
       sources."ms-2.0.0"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
-      (sources."peer-wire-protocol-0.7.0" // {
-        dependencies = [
-          sources."readable-stream-1.1.14"
-          sources."bncode-0.2.3"
-          sources."isarray-0.0.1"
-          sources."string_decoder-0.10.31"
-        ];
-      })
+      sources."peer-wire-protocol-0.7.0"
       sources."speedometer-0.1.4"
       sources."utp-0.0.7"
       sources."cyclist-0.1.1"
@@ -34543,24 +30656,12 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      (sources."bittorrent-dht-6.4.2" // {
-        dependencies = [
-          sources."bencode-0.7.0"
-        ];
-      })
-      (sources."bittorrent-tracker-7.7.0" // {
-        dependencies = [
-          sources."bencode-0.8.0"
-        ];
-      })
+      sources."bittorrent-dht-6.4.2"
+      sources."bittorrent-tracker-7.7.0"
       sources."re-emitter-1.1.3"
       sources."buffer-equals-1.0.4"
-      sources."k-bucket-0.6.0"
-      (sources."k-rpc-3.7.0" // {
-        dependencies = [
-          sources."k-bucket-2.0.1"
-        ];
-      })
+      sources."k-bucket-2.0.1"
+      sources."k-rpc-3.7.0"
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
       sources."k-rpc-socket-1.7.1"
@@ -34569,21 +30670,12 @@ in
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
       sources."simple-peer-6.4.4"
-      (sources."simple-websocket-4.3.1" // {
-        dependencies = [
-          sources."ws-2.3.1"
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."simple-websocket-4.3.1"
       sources."string2compact-1.2.2"
-      (sources."ws-1.1.4" // {
-        dependencies = [
-          sources."ultron-1.0.2"
-        ];
-      })
+      sources."ws-2.3.1"
       sources."ipaddr.js-1.5.4"
       sources."get-browser-rtc-1.0.2"
-      sources."ultron-1.1.0"
+      sources."ultron-1.0.2"
       sources."addr-to-ip-port-1.4.2"
       sources."options-0.0.6"
     ];
@@ -34615,23 +30707,16 @@ in
       sources."pump-1.0.2"
       sources."range-parser-1.2.0"
       sources."read-torrent-1.3.0"
-      (sources."socket.io-1.7.4" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
+      sources."socket.io-1.7.4"
       (sources."torrent-stream-1.0.3" // {
         dependencies = [
-          sources."end-of-stream-0.1.5"
           sources."mkdirp-0.3.5"
-          sources."once-1.3.3"
         ];
       })
       sources."fluent-ffmpeg-2.1.2"
-      sources."multiparty-4.1.3"
+      sources."multiparty-3.3.2"
       sources."on-finished-2.3.0"
-      sources."qs-6.5.1"
+      sources."qs-0.5.6"
       sources."type-is-1.6.15"
       sources."fd-slicer-1.0.1"
       sources."pend-1.2.0"
@@ -34640,18 +30725,13 @@ in
       sources."mime-types-2.1.17"
       sources."mime-db-1.30.0"
       sources."basic-auth-1.0.4"
-      (sources."connect-2.30.2" // {
-        dependencies = [
-          sources."multiparty-3.3.2"
-          sources."qs-4.0.0"
-        ];
-      })
+      sources."connect-2.30.2"
       sources."content-disposition-0.5.0"
       sources."content-type-1.0.4"
       sources."commander-2.6.0"
-      sources."cookie-0.1.3"
+      sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."debug-2.2.0"
+      sources."debug-2.6.9"
       sources."depd-1.0.1"
       sources."escape-html-1.0.2"
       sources."etag-1.7.0"
@@ -34660,134 +30740,70 @@ in
       sources."methods-1.1.2"
       sources."parseurl-1.3.2"
       sources."proxy-addr-1.0.10"
-      (sources."send-0.13.0" // {
-        dependencies = [
-          sources."destroy-1.0.3"
-          sources."range-parser-1.0.3"
-          sources."statuses-1.2.1"
-        ];
-      })
+      sources."send-0.13.2"
       sources."utils-merge-1.0.0"
-      sources."vary-1.0.1"
+      sources."vary-1.1.2"
       sources."basic-auth-connect-1.0.0"
-      (sources."body-parser-1.13.3" // {
-        dependencies = [
-          sources."qs-4.0.0"
-        ];
-      })
+      sources."body-parser-1.13.3"
       sources."bytes-2.1.0"
       sources."cookie-parser-1.3.5"
       sources."compression-1.5.2"
       sources."connect-timeout-1.6.2"
       sources."csurf-1.8.3"
-      (sources."errorhandler-1.4.3" // {
-        dependencies = [
-          sources."accepts-1.3.4"
-          sources."escape-html-1.0.3"
-          sources."negotiator-0.6.1"
-        ];
-      })
-      (sources."express-session-1.11.3" // {
-        dependencies = [
-          sources."uid-safe-2.0.0"
-        ];
-      })
+      sources."errorhandler-1.4.3"
+      sources."express-session-1.11.3"
       sources."finalhandler-0.4.0"
       sources."http-errors-1.3.1"
-      (sources."method-override-2.3.10" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."vary-1.1.2"
-          sources."ms-2.0.0"
-        ];
-      })
+      sources."method-override-2.3.10"
       sources."morgan-1.6.1"
       sources."on-headers-1.0.1"
       sources."pause-0.1.0"
-      (sources."response-time-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-        ];
-      })
-      (sources."serve-favicon-2.3.2" // {
-        dependencies = [
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."serve-index-1.7.3" // {
-        dependencies = [
-          sources."escape-html-1.0.3"
-        ];
-      })
-      (sources."serve-static-1.10.3" // {
-        dependencies = [
-          sources."escape-html-1.0.3"
-          sources."send-0.13.2"
-          sources."depd-1.1.1"
-          sources."range-parser-1.0.3"
-          sources."statuses-1.2.1"
-        ];
-      })
+      sources."response-time-2.3.2"
+      sources."serve-favicon-2.3.2"
+      sources."serve-index-1.7.3"
+      sources."serve-static-1.10.3"
       sources."vhost-3.0.2"
-      sources."iconv-lite-0.4.11"
-      (sources."raw-body-2.1.7" // {
-        dependencies = [
-          sources."bytes-2.4.0"
-          sources."iconv-lite-0.4.13"
-        ];
-      })
+      sources."iconv-lite-0.4.13"
+      sources."raw-body-2.1.7"
       sources."unpipe-1.0.0"
-      sources."accepts-1.2.13"
+      sources."accepts-1.3.3"
       sources."compressible-2.0.12"
-      sources."negotiator-0.5.3"
-      sources."ms-0.7.1"
+      sources."negotiator-0.6.1"
+      sources."ms-2.0.0"
       sources."csrf-3.0.6"
       sources."rndm-1.2.0"
       sources."tsscmp-1.0.5"
-      sources."uid-safe-2.1.4"
+      sources."uid-safe-2.0.0"
       sources."random-bytes-1.0.0"
       sources."crc-3.3.0"
       sources."base64-url-1.2.1"
       sources."inherits-2.0.3"
-      sources."statuses-1.4.0"
-      sources."readable-stream-1.1.14"
+      sources."statuses-1.2.1"
+      sources."readable-stream-2.3.3"
       sources."stream-counter-0.2.0"
       sources."core-util-is-1.0.2"
-      sources."isarray-0.0.1"
-      sources."string_decoder-0.10.31"
+      sources."isarray-1.0.0"
+      sources."string_decoder-1.0.3"
       sources."batch-0.5.3"
-      sources."destroy-1.0.4"
-      sources."mime-1.3.4"
+      sources."destroy-1.0.3"
+      sources."mime-1.2.11"
       sources."forwarded-0.1.2"
       sources."ipaddr.js-1.0.5"
-      sources."minimist-0.0.8"
-      sources."end-of-stream-1.4.0"
-      sources."once-1.4.0"
+      sources."minimist-1.2.0"
+      sources."end-of-stream-0.1.5"
+      sources."once-1.3.3"
       sources."wrappy-1.0.2"
-      sources."magnet-uri-2.0.1"
-      (sources."parse-torrent-4.1.0" // {
-        dependencies = [
-          sources."magnet-uri-4.2.3"
-        ];
-      })
-      (sources."request-2.16.6" // {
-        dependencies = [
-          sources."mime-1.2.11"
-          sources."qs-0.5.6"
-        ];
-      })
+      sources."magnet-uri-4.2.3"
+      sources."parse-torrent-4.1.0"
+      sources."request-2.16.6"
       sources."xtend-4.0.1"
       sources."thirty-two-0.0.2"
       sources."parse-torrent-file-2.1.4"
       sources."flatten-0.0.1"
-      sources."bencode-0.7.0"
+      sources."bencode-0.8.0"
       sources."simple-sha1-2.1.0"
       sources."rusha-0.8.6"
-      (sources."form-data-0.0.10" // {
-        dependencies = [
-          sources."mime-1.2.11"
-        ];
-      })
+      sources."form-data-0.0.10"
       sources."hawk-0.10.2"
       sources."node-uuid-1.4.8"
       sources."cookie-jar-0.2.0"
@@ -34803,54 +30819,26 @@ in
       sources."boom-0.3.8"
       sources."cryptiles-0.1.3"
       sources."sntp-0.1.4"
-      (sources."engine.io-1.8.4" // {
-        dependencies = [
-          sources."accepts-1.3.3"
-          sources."debug-2.3.3"
-          sources."cookie-0.3.1"
-          sources."negotiator-0.6.1"
-          sources."ms-0.7.2"
-        ];
-      })
+      sources."engine.io-1.8.4"
       sources."has-binary-0.1.7"
       sources."object-assign-4.1.0"
-      (sources."socket.io-adapter-0.5.0" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."socket.io-client-1.7.4" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."socket.io-parser-2.3.1" // {
-        dependencies = [
-          sources."component-emitter-1.1.2"
-        ];
-      })
+      sources."socket.io-adapter-0.5.0"
+      sources."socket.io-client-1.7.4"
+      sources."socket.io-parser-2.3.1"
       sources."base64id-1.0.0"
       sources."engine.io-parser-1.3.2"
-      sources."ws-1.1.4"
+      sources."ws-2.3.1"
       sources."after-0.8.2"
       sources."arraybuffer.slice-0.0.6"
       sources."base64-arraybuffer-0.1.5"
       sources."blob-0.0.4"
       sources."wtf-8-1.0.0"
       sources."options-0.0.6"
-      sources."ultron-1.0.2"
+      sources."ultron-1.1.0"
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
-      sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.4" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ws-1.1.2"
-          sources."ms-0.7.2"
-        ];
-      })
+      sources."component-emitter-1.1.2"
+      sources."engine.io-client-1.8.4"
       sources."indexof-0.0.1"
       sources."object-component-0.0.3"
       sources."parseuri-0.0.5"
@@ -34865,8 +30853,12 @@ in
       sources."callsite-1.0.0"
       sources."json3-3.3.2"
       sources."bitfield-0.1.0"
-      sources."bncode-0.5.3"
-      sources."fs-chunk-store-1.6.5"
+      sources."bncode-0.2.3"
+      (sources."fs-chunk-store-1.6.5" // {
+        dependencies = [
+          sources."mkdirp-0.5.1"
+        ];
+      })
       sources."hat-0.0.3"
       sources."immediate-chunk-store-1.0.8"
       sources."ip-set-1.0.1"
@@ -34874,24 +30866,15 @@ in
       sources."rimraf-2.6.2"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.1"
-      (sources."random-access-file-1.8.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-        ];
-      })
+      sources."random-access-file-1.8.1"
       sources."randombytes-2.0.5"
       sources."run-parallel-1.1.6"
       sources."thunky-1.0.2"
       sources."buffer-alloc-unsafe-1.0.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.0.1"
       sources."ip-1.1.5"
       sources."fifo-0.1.4"
-      (sources."peer-wire-protocol-0.7.0" // {
-        dependencies = [
-          sources."bncode-0.2.3"
-        ];
-      })
+      sources."peer-wire-protocol-0.7.0"
       sources."speedometer-0.1.4"
       sources."utp-0.0.7"
       sources."cyclist-0.1.1"
@@ -34904,49 +30887,21 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."bittorrent-dht-6.4.2"
-      (sources."bittorrent-tracker-7.7.0" // {
-        dependencies = [
-          sources."bencode-0.8.0"
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."bittorrent-tracker-7.7.0"
       sources."re-emitter-1.1.3"
       sources."buffer-equals-1.0.4"
-      sources."k-bucket-0.6.0"
-      (sources."k-rpc-3.7.0" // {
-        dependencies = [
-          sources."k-bucket-2.0.1"
-        ];
-      })
+      sources."k-bucket-2.0.1"
+      sources."k-rpc-3.7.0"
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      (sources."k-rpc-socket-1.7.1" // {
-        dependencies = [
-          sources."bencode-1.0.0"
-        ];
-      })
+      sources."k-rpc-socket-1.7.1"
       sources."bn.js-4.11.8"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
       sources."simple-get-2.7.0"
-      (sources."simple-peer-6.4.4" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      (sources."simple-websocket-4.3.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."ws-2.3.1"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-          sources."safe-buffer-5.0.1"
-          sources."ultron-1.1.0"
-        ];
-      })
+      sources."simple-peer-6.4.4"
+      sources."simple-websocket-4.3.1"
       sources."string2compact-1.2.2"
       sources."uniq-1.0.1"
       sources."decompress-response-3.3.0"
@@ -35039,35 +30994,15 @@ in
       sources."async-2.5.0"
       sources."lodash-4.17.4"
       sources."mime-db-1.30.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
@@ -35129,49 +31064,36 @@ in
     dependencies = [
       (sources."browserify-13.3.0" // {
         dependencies = [
-          (sources."concat-stream-1.5.2" // {
-            dependencies = [
-              sources."readable-stream-2.0.6"
-            ];
-          })
-        ];
-      })
-      (sources."browserify-incremental-3.1.1" // {
-        dependencies = [
-          sources."JSONStream-0.10.0"
-          sources."jsonparse-0.0.5"
+          sources."concat-stream-1.5.2"
         ];
       })
+      sources."browserify-incremental-3.1.1"
       sources."concat-stream-1.6.0"
       sources."glob-7.1.2"
       sources."minimatch-3.0.4"
-      sources."node-static-0.7.10"
+      (sources."node-static-0.7.10" // {
+        dependencies = [
+          sources."wordwrap-0.0.3"
+        ];
+      })
       sources."read-1.0.7"
       sources."string-stream-0.0.7"
       sources."temp-0.8.3"
       sources."through-2.3.8"
       sources."tree-kill-1.2.0"
-      (sources."watchpack-1.4.0" // {
-        dependencies = [
-          sources."async-2.5.0"
-        ];
-      })
+      sources."watchpack-1.4.0"
       sources."which-1.3.0"
       sources."wordwrap-1.0.0"
-      sources."JSONStream-1.3.1"
+      sources."JSONStream-0.10.0"
       sources."assert-1.4.1"
       sources."browser-pack-6.0.2"
-      (sources."browser-resolve-1.11.2" // {
-        dependencies = [
-          sources."resolve-1.1.7"
-        ];
-      })
+      sources."browser-resolve-1.11.2"
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
       sources."cached-path-relative-1.0.1"
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
-      sources."crypto-browserify-3.11.1"
+      sources."crypto-browserify-3.12.0"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."domain-browser-1.1.7"
@@ -35181,62 +31103,33 @@ in
       sources."htmlescape-1.1.1"
       sources."https-browserify-0.0.1"
       sources."inherits-2.0.3"
-      (sources."insert-module-globals-7.0.1" // {
-        dependencies = [
-          sources."concat-stream-1.5.2"
-          sources."readable-stream-2.0.6"
-        ];
-      })
-      (sources."labeled-stream-splicer-2.0.0" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
-      (sources."module-deps-4.1.1" // {
-        dependencies = [
-          (sources."concat-stream-1.5.2" // {
-            dependencies = [
-              sources."readable-stream-2.0.6"
-            ];
-          })
-        ];
-      })
+      sources."insert-module-globals-7.0.1"
+      sources."labeled-stream-splicer-2.0.0"
+      sources."module-deps-4.1.1"
       sources."os-browserify-0.1.2"
       sources."parents-1.0.1"
       sources."path-browserify-0.0.0"
       sources."process-0.11.10"
-      sources."punycode-1.4.1"
+      sources."punycode-1.3.2"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.3.3" // {
-        dependencies = [
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      sources."resolve-1.5.0"
+      sources."readable-stream-2.3.3"
+      sources."resolve-1.1.7"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
       sources."stream-http-2.7.2"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.3"
       sources."subarg-1.0.0"
       sources."syntax-error-1.3.0"
       sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
-      (sources."url-0.11.0" // {
-        dependencies = [
-          sources."punycode-1.3.2"
-        ];
-      })
-      (sources."util-0.10.3" // {
-        dependencies = [
-          sources."inherits-2.0.1"
-        ];
-      })
+      sources."url-0.11.0"
+      sources."util-0.10.3"
       sources."vm-browserify-0.0.4"
       sources."xtend-4.0.1"
-      sources."jsonparse-1.3.1"
+      sources."jsonparse-0.0.5"
       sources."combine-source-map-0.7.2"
       sources."umd-3.0.1"
       sources."convert-source-map-1.1.3"
@@ -35261,6 +31154,7 @@ in
       sources."pbkdf2-3.0.14"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.5"
+      sources."randomfill-1.0.3"
       sources."browserify-aes-1.1.1"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.3"
@@ -35270,7 +31164,7 @@ in
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
       sources."md5.js-1.3.4"
-      sources."hash-base-3.0.4"
+      sources."hash-base-2.0.2"
       sources."bn.js-4.11.8"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
@@ -35280,11 +31174,7 @@ in
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.2"
-      (sources."ripemd160-2.0.1" // {
-        dependencies = [
-          sources."hash-base-2.0.2"
-        ];
-      })
+      sources."ripemd160-2.0.1"
       sources."sha.js-2.4.9"
       sources."miller-rabin-4.0.1"
       sources."function-bind-1.1.1"
@@ -35304,11 +31194,11 @@ in
       sources."array-map-0.0.0"
       sources."builtin-status-codes-3.0.0"
       sources."to-arraybuffer-1.0.1"
-      sources."minimist-1.2.0"
+      sources."minimist-0.0.10"
       sources."querystring-0.2.0"
       sources."indexof-0.0.1"
       sources."browserify-cache-api-3.0.1"
-      sources."async-1.5.2"
+      sources."async-2.5.0"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
@@ -35317,12 +31207,7 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      (sources."optimist-0.6.1" // {
-        dependencies = [
-          sources."wordwrap-0.0.3"
-          sources."minimist-0.0.10"
-        ];
-      })
+      sources."optimist-0.6.1"
       sources."colors-1.1.2"
       sources."mime-1.4.1"
       sources."mute-stream-0.0.7"
@@ -35356,18 +31241,9 @@ in
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
       sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
+      sources."is-number-3.0.0"
       sources."isobject-2.1.0"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
+      sources."randomatic-1.1.7"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
@@ -35381,123 +31257,6 @@ in
       sources."binary-extensions-1.10.0"
       sources."set-immediate-shim-1.0.1"
       sources."nan-2.7.0"
-      (sources."node-pre-gyp-0.6.38" // {
-        dependencies = [
-          sources."rimraf-2.6.2"
-        ];
-      })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      sources."nopt-4.0.1"
-      sources."npmlog-4.1.2"
-      sources."rc-1.2.2"
-      sources."request-2.81.0"
-      sources."hawk-3.1.3"
-      sources."semver-5.4.1"
-      sources."tar-2.2.1"
-      (sources."tar-pack-3.4.1" // {
-        dependencies = [
-          sources."rimraf-2.6.2"
-        ];
-      })
-      sources."abbrev-1.1.1"
-      sources."osenv-0.1.4"
-      sources."os-homedir-1.0.2"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.4"
-      sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."aproba-1.2.0"
-      sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.1"
-      sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.2"
-      sources."ini-1.3.4"
-      sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
-      sources."har-validator-4.2.1"
-      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.17"
-      sources."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
-      sources."qs-6.4.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      (sources."ajv-4.11.8" // {
-        dependencies = [
-          sources."json-stable-stringify-1.0.1"
-        ];
-      })
-      sources."har-schema-1.0.5"
-      sources."co-4.6.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."hoek-2.16.3"
-      sources."boom-2.10.1"
-      sources."cryptiles-2.0.5"
-      sources."sntp-1.0.9"
-      sources."block-stream-0.0.9"
-      sources."fstream-1.0.11"
-      sources."debug-2.6.9"
-      sources."fstream-ignore-1.0.5"
-      sources."uid-number-0.0.6"
-      sources."ms-2.0.0"
       sources."isexe-2.0.0"
     ];
     buildInputs = globalBuildInputs;
@@ -35518,11 +31277,7 @@ in
     };
     dependencies = [
       sources."commoner-0.10.8"
-      (sources."jstransform-10.1.0" // {
-        dependencies = [
-          sources."source-map-0.1.31"
-        ];
-      })
+      sources."jstransform-10.1.0"
       sources."commander-2.11.0"
       sources."detective-4.5.0"
       sources."glob-5.0.15"
@@ -35546,7 +31301,7 @@ in
       sources."minimist-0.0.8"
       sources."ast-types-0.9.6"
       sources."esprima-3.1.3"
-      sources."source-map-0.5.7"
+      sources."source-map-0.1.31"
       sources."base62-0.1.1"
       sources."esprima-fb-13001.1001.0-dev-harmony-fb"
       sources."amdefine-1.0.1"
@@ -35576,18 +31331,7 @@ in
           sources."commander-1.3.2"
         ];
       })
-      (sources."everyauth-0.4.5" // {
-        dependencies = [
-          sources."connect-2.3.9"
-          sources."debug-0.5.0"
-          sources."qs-0.4.2"
-          sources."cookie-0.0.4"
-          sources."bytes-0.1.0"
-          sources."send-0.0.3"
-          sources."fresh-0.1.0"
-          sources."mime-1.2.6"
-        ];
-      })
+      sources."everyauth-0.4.5"
       sources."string-1.6.1"
       sources."util-0.4.9"
       sources."crypto-0.0.3"
@@ -35596,22 +31340,18 @@ in
       sources."sax-1.2.4"
       sources."coffee-script-1.6.3"
       sources."node-uuid-1.4.1"
-      (sources."connect-2.11.0" // {
-        dependencies = [
-          sources."methods-0.0.1"
-        ];
-      })
+      sources."connect-2.3.9"
       sources."range-parser-0.0.4"
       sources."mkdirp-0.3.5"
-      sources."cookie-0.1.0"
+      sources."cookie-0.0.4"
       sources."buffer-crc32-0.2.1"
-      sources."fresh-0.2.0"
-      sources."methods-0.1.0"
-      sources."send-0.1.4"
+      sources."fresh-0.1.0"
+      sources."methods-0.0.1"
+      sources."send-0.0.3"
       sources."cookie-signature-1.0.1"
-      sources."debug-3.1.0"
-      sources."qs-0.6.5"
-      sources."bytes-0.2.1"
+      sources."debug-0.5.0"
+      sources."qs-6.5.1"
+      sources."bytes-0.1.0"
       sources."pause-0.0.1"
       sources."uid2-0.0.3"
       sources."raw-body-0.0.3"
@@ -35624,16 +31364,11 @@ in
       sources."string_decoder-0.10.31"
       sources."inherits-2.0.3"
       sources."keypress-0.1.0"
-      sources."mime-1.2.11"
+      sources."mime-1.2.6"
       sources."ms-2.0.0"
-      sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"
-      sources."request-2.9.203"
-      (sources."openid-2.0.6" // {
-        dependencies = [
-          sources."request-2.83.0"
-          sources."qs-6.5.1"
-        ];
-      })
+      sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master"
+      sources."request-2.83.0"
+      sources."openid-2.0.6"
       sources."node-swt-0.1.1"
       sources."node-wsfederation-0.1.1"
       sources."formidable-1.0.11"
@@ -35668,12 +31403,8 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
       sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
@@ -35727,11 +31458,7 @@ in
       sources."bluebird-3.5.1"
       sources."boxen-1.2.1"
       sources."chalk-2.1.0"
-      (sources."clipboardy-1.1.4" // {
-        dependencies = [
-          sources."execa-0.6.3"
-        ];
-      })
+      sources."clipboardy-1.1.4"
       sources."dargs-5.1.0"
       sources."detect-port-1.2.1"
       sources."filesize-3.5.10"
@@ -35740,22 +31467,14 @@ in
       sources."ip-1.1.5"
       sources."micro-9.0.0"
       sources."micro-compress-1.0.0"
-      (sources."mime-types-2.1.17" // {
-        dependencies = [
-          sources."mime-db-1.30.0"
-        ];
-      })
+      sources."mime-types-2.1.17"
       sources."node-version-1.1.0"
       sources."openssl-self-signed-certificate-1.1.6"
       sources."opn-5.1.0"
       sources."path-type-3.0.0"
-      (sources."send-0.16.1" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."send-0.16.1"
       sources."update-notifier-2.3.0"
-      sources."camelcase-4.1.0"
+      sources."camelcase-1.2.1"
       sources."mri-1.1.0"
       sources."pkginfo-0.4.1"
       sources."string-similarity-1.2.0"
@@ -35763,20 +31482,13 @@ in
       sources."safe-buffer-5.1.1"
       sources."ansi-align-2.0.0"
       sources."cli-boxes-1.0.0"
-      sources."string-width-2.1.1"
+      sources."string-width-1.0.2"
       sources."term-size-1.2.0"
-      (sources."widest-line-1.0.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."strip-ansi-4.0.0"
-      sources."ansi-regex-3.0.0"
-      sources."execa-0.7.0"
+      sources."widest-line-1.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."ansi-regex-2.1.1"
+      sources."execa-0.6.3"
       sources."cross-spawn-5.1.0"
       sources."get-stream-3.0.0"
       sources."is-stream-1.1.0"
@@ -35808,26 +31520,14 @@ in
       sources."universalify-0.1.1"
       sources."async-1.5.2"
       sources."optimist-0.6.1"
-      sources."source-map-0.4.4"
-      (sources."uglify-js-2.8.29" // {
-        dependencies = [
-          sources."source-map-0.5.7"
-        ];
-      })
-      sources."wordwrap-0.0.3"
-      sources."minimist-0.0.10"
+      sources."source-map-0.5.7"
+      sources."uglify-js-2.8.29"
+      sources."wordwrap-0.0.2"
+      sources."minimist-1.2.0"
       sources."amdefine-1.0.1"
-      (sources."yargs-3.10.0" // {
-        dependencies = [
-          sources."camelcase-1.2.1"
-        ];
-      })
+      sources."yargs-3.10.0"
       sources."uglify-to-browserify-1.0.2"
-      (sources."cliui-2.1.0" // {
-        dependencies = [
-          sources."wordwrap-0.0.2"
-        ];
-      })
+      sources."cliui-2.1.0"
       sources."decamelize-1.2.0"
       sources."window-size-0.1.0"
       sources."center-align-0.1.3"
@@ -35847,14 +31547,14 @@ in
       sources."depd-1.1.1"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.4.0"
+      sources."statuses-1.3.1"
       sources."compression-1.7.1"
       sources."accepts-1.3.4"
       sources."compressible-2.0.12"
       sources."on-headers-1.0.1"
       sources."vary-1.1.2"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.31.0"
+      sources."mime-db-1.30.0"
       sources."is-wsl-1.1.0"
       sources."pify-3.0.0"
       sources."destroy-1.0.4"
@@ -35899,11 +31599,7 @@ in
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
       sources."prepend-http-1.0.4"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."rc-1.2.2"
       sources."deep-extend-0.4.2"
       sources."strip-json-comments-2.0.1"
     ];
@@ -35926,47 +31622,39 @@ in
     dependencies = [
       sources."express-5.0.0-alpha.6"
       sources."express-json5-0.1.0"
-      (sources."body-parser-1.18.2" // {
-        dependencies = [
-          sources."bytes-3.0.0"
-          sources."iconv-lite-0.4.19"
-          sources."qs-6.5.1"
-          sources."raw-body-2.3.2"
-        ];
-      })
-      (sources."compression-1.7.1" // {
-        dependencies = [
-          sources."bytes-3.0.0"
-        ];
-      })
+      sources."body-parser-1.18.2"
+      sources."compression-1.7.1"
       sources."commander-2.11.0"
       sources."js-yaml-3.10.0"
       sources."cookies-0.7.1"
-      (sources."request-2.83.0" // {
-        dependencies = [
-          sources."qs-6.5.1"
-        ];
-      })
+      sources."request-2.83.0"
       sources."async-0.9.2"
       sources."es6-shim-0.21.1"
       sources."semver-4.3.6"
       sources."minimatch-1.0.0"
-      sources."bunyan-1.8.12"
-      sources."handlebars-2.0.0"
+      (sources."bunyan-1.8.12" // {
+        dependencies = [
+          sources."minimatch-3.0.4"
+        ];
+      })
+      (sources."handlebars-2.0.0" // {
+        dependencies = [
+          sources."async-0.2.10"
+        ];
+      })
       sources."highlight.js-8.9.1"
       sources."lunr-0.7.2"
-      sources."render-readme-1.3.1"
+      (sources."render-readme-1.3.1" // {
+        dependencies = [
+          sources."readable-stream-2.3.3"
+        ];
+      })
       sources."jju-1.3.0"
       sources."JSONStream-1.3.1"
       sources."mkdirp-0.5.1"
       sources."sinopia-htpasswd-0.4.5"
       sources."http-errors-1.6.2"
-      (sources."readable-stream-1.1.14" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-          sources."string_decoder-0.10.31"
-        ];
-      })
+      sources."readable-stream-1.1.14"
       sources."fs-ext-0.6.0"
       sources."crypt3-0.2.0"
       sources."accepts-1.3.4"
@@ -35989,20 +31677,15 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.5"
-      sources."qs-6.5.0"
+      sources."qs-6.5.1"
       sources."range-parser-1.2.0"
-      (sources."router-1.3.2" // {
-        dependencies = [
-          sources."setprototypeof-1.1.0"
-          sources."utils-merge-1.0.1"
-        ];
-      })
+      sources."router-1.3.2"
       sources."send-0.15.6"
       sources."serve-static-1.12.6"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."type-is-1.6.15"
-      sources."utils-merge-1.0.0"
+      sources."utils-merge-1.0.1"
       sources."vary-1.1.2"
       sources."mime-types-2.1.17"
       sources."negotiator-0.6.1"
@@ -36015,9 +31698,9 @@ in
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."media-typer-0.3.0"
-      sources."raw-body-1.3.4"
-      sources."bytes-1.0.0"
-      sources."iconv-lite-0.4.8"
+      sources."raw-body-2.3.2"
+      sources."bytes-3.0.0"
+      sources."iconv-lite-0.4.19"
       sources."compressible-2.0.12"
       sources."on-headers-1.0.1"
       sources."safe-buffer-5.1.1"
@@ -36053,12 +31736,8 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
       sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
@@ -36084,11 +31763,7 @@ in
       sources."nan-2.7.0"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
-      (sources."glob-6.0.4" // {
-        dependencies = [
-          sources."minimatch-3.0.4"
-        ];
-      })
+      sources."glob-6.0.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."once-1.4.0"
@@ -36097,11 +31772,7 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."optimist-0.3.7"
-      (sources."uglify-js-2.3.6" // {
-        dependencies = [
-          sources."async-0.2.10"
-        ];
-      })
+      sources."uglify-js-2.3.6"
       sources."wordwrap-0.0.3"
       sources."source-map-0.1.43"
       sources."amdefine-1.0.1"
@@ -36111,25 +31782,17 @@ in
       sources."linkify-it-1.2.4"
       sources."mdurl-1.0.1"
       sources."uc.micro-1.0.3"
-      (sources."htmlparser2-3.9.2" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-        ];
-      })
+      sources."htmlparser2-3.9.2"
       sources."lodash.escaperegexp-4.1.2"
       sources."srcset-1.0.0"
       sources."xtend-4.0.1"
-      sources."domelementtype-1.3.0"
+      sources."domelementtype-1.1.3"
       sources."domhandler-2.4.1"
       sources."domutils-1.6.2"
-      (sources."dom-serializer-0.1.0" // {
-        dependencies = [
-          sources."domelementtype-1.1.3"
-        ];
-      })
-      sources."isarray-1.0.0"
+      sources."dom-serializer-0.1.0"
+      sources."isarray-0.0.1"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.3"
+      sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."array-uniq-1.0.3"
       sources."number-is-nan-1.0.1"
@@ -36202,11 +31865,8 @@ in
       (sources."restify-4.0.3" // {
         dependencies = [
           sources."lru-cache-2.7.3"
-          (sources."vasync-1.6.3" // {
-            dependencies = [
-              sources."verror-1.6.0"
-            ];
-          })
+          sources."vasync-1.6.3"
+          sources."assert-plus-1.0.0"
         ];
       })
       sources."bunyan-1.5.1"
@@ -36216,64 +31876,46 @@ in
           sources."assert-plus-0.1.2"
           sources."clone-0.1.5"
           sources."dashdash-1.10.1"
-          (sources."http-signature-1.2.0" // {
-            dependencies = [
-              sources."assert-plus-1.0.0"
-            ];
-          })
-          sources."once-1.3.0"
-          (sources."vasync-1.4.3" // {
-            dependencies = [
-              (sources."jsprim-0.3.0" // {
-                dependencies = [
-                  sources."verror-1.3.3"
-                ];
-              })
-            ];
-          })
-          sources."verror-1.1.0"
-          sources."extsprintf-1.0.0"
-          sources."json-schema-0.2.2"
+          sources."vasync-1.4.3"
         ];
       })
-      sources."cmdln-3.2.1"
-      sources."dashdash-1.7.3"
-      (sources."vasync-1.6.2" // {
+      (sources."cmdln-3.2.1" // {
         dependencies = [
-          sources."verror-1.1.0"
-          sources."extsprintf-1.0.0"
+          sources."assert-plus-1.0.0"
         ];
       })
+      sources."dashdash-1.7.3"
+      sources."vasync-1.6.2"
       sources."abbrev-1.1.1"
       sources."backoff-2.5.0"
       sources."csv-0.4.6"
       sources."escape-regexp-component-1.0.2"
       sources."formidable-1.1.1"
-      sources."http-signature-0.11.0"
+      (sources."http-signature-1.2.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."keep-alive-agent-0.0.1"
       sources."mime-1.4.1"
       sources."negotiator-0.5.3"
       sources."node-uuid-1.4.8"
-      sources."once-1.4.0"
+      sources."once-1.3.0"
       sources."qs-3.1.0"
       sources."semver-4.3.6"
       sources."spdy-1.32.5"
       sources."tunnel-agent-0.4.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.1.0"
       sources."dtrace-provider-0.6.0"
       sources."precond-0.2.3"
       sources."csv-generate-0.0.6"
       sources."csv-parse-1.3.3"
       sources."stream-transform-0.1.2"
       sources."csv-stringify-0.0.8"
-      sources."asn1-0.1.11"
+      sources."asn1-0.2.3"
       sources."ctype-0.5.3"
       sources."wrappy-1.0.2"
-      sources."extsprintf-1.2.0"
+      sources."extsprintf-1.0.0"
       sources."core-util-is-1.0.2"
       sources."nan-2.7.0"
       sources."mv-2.1.1"
@@ -36290,25 +31932,18 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."sshpk-agent-1.2.1"
-      (sources."sshpk-1.7.1" // {
+      (sources."sshpk-agent-1.2.1" // {
         dependencies = [
-          sources."asn1-0.2.3"
-          sources."assert-plus-0.2.0"
-          (sources."dashdash-1.14.1" // {
-            dependencies = [
-              sources."assert-plus-1.0.0"
-            ];
-          })
+          sources."assert-plus-0.1.5"
         ];
       })
-      (sources."jsprim-1.4.1" // {
+      (sources."sshpk-1.7.1" // {
         dependencies = [
-          sources."assert-plus-1.0.0"
-          sources."extsprintf-1.3.0"
+          sources."assert-plus-0.2.0"
         ];
       })
-      sources."json-schema-0.2.3"
+      sources."jsprim-0.3.0"
+      sources."json-schema-0.2.2"
       sources."readable-stream-2.3.3"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -36423,10 +32058,10 @@ in
   svgo = nodeEnv.buildNodePackage {
     name = "svgo";
     packageName = "svgo";
-    version = "1.0.1";
+    version = "1.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/svgo/-/svgo-1.0.1.tgz";
-      sha512 = "2higmngdwd7fgjzcgy9drv5wgm201dza97l73s7arcwjvc725vkvwfqrzcs96agl989ya0mmi1k96d5k3hy6b9cb12jj5qz0dyy4h2q";
+      url = "https://registry.npmjs.org/svgo/-/svgo-1.0.2.tgz";
+      sha512 = "24id7imdbzwz7ac17zrc6m4ayb9dahbjijns7j791abhm4rf3xyjbvqwwkd9c6fidpjgbigjym8di2xs5n3924gd5nbr6mmv7hikjhj";
     };
     dependencies = [
       sources."coa-2.0.0"
@@ -36449,12 +32084,8 @@ in
       sources."css-what-2.1.0"
       sources."domutils-1.5.1"
       sources."nth-check-1.0.1"
-      (sources."dom-serializer-0.1.0" // {
-        dependencies = [
-          sources."domelementtype-1.1.3"
-        ];
-      })
-      sources."domelementtype-1.3.0"
+      sources."dom-serializer-0.1.0"
+      sources."domelementtype-1.1.3"
       sources."entities-1.1.1"
       sources."mdn-data-1.0.0"
       sources."source-map-0.5.7"
@@ -36563,30 +32194,27 @@ in
       sources."log-update-1.0.2"
       sources."minimist-1.2.0"
       sources."promise-finally-3.0.0"
-      sources."typings-core-2.3.3"
+      (sources."typings-core-2.3.3" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
       (sources."update-notifier-2.3.0" // {
         dependencies = [
           sources."chalk-2.3.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
         ];
       })
       sources."wordwrap-1.0.0"
       sources."xtend-4.0.1"
-      sources."ansi-styles-2.2.1"
+      sources."ansi-styles-3.2.0"
       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."supports-color-4.5.0"
       sources."ansi-regex-2.1.1"
       sources."slice-ansi-1.0.0"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
-      sources."is-fullwidth-code-point-2.0.0"
+      sources."string-width-1.0.2"
+      sources."is-fullwidth-code-point-1.0.0"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
@@ -36606,11 +32234,7 @@ in
       sources."jspm-config-0.3.4"
       sources."lockfile-1.0.3"
       sources."make-error-cause-1.2.2"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.1"
       sources."object.pick-1.3.0"
       sources."parse-json-2.2.0"
       sources."popsicle-9.1.0"
@@ -36673,7 +32297,7 @@ in
       sources."https-proxy-agent-1.0.0"
       sources."agent-base-2.1.1"
       sources."extend-3.0.1"
-      sources."semver-5.0.3"
+      sources."semver-5.4.1"
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
@@ -36690,13 +32314,7 @@ in
       sources."is-plain-obj-1.1.0"
       sources."nopt-1.0.10"
       sources."abbrev-1.1.1"
-      (sources."boxen-1.2.2" // {
-        dependencies = [
-          sources."chalk-2.3.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
-        ];
-      })
+      sources."boxen-1.2.2"
       sources."import-lazy-2.1.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
@@ -36706,15 +32324,7 @@ in
       sources."camelcase-4.1.0"
       sources."cli-boxes-1.0.0"
       sources."term-size-1.2.0"
-      (sources."widest-line-1.0.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."is-fullwidth-code-point-1.0.0"
-        ];
-      })
-      sources."color-convert-1.9.0"
-      sources."color-name-1.1.3"
-      sources."has-flag-2.0.0"
+      sources."widest-line-1.0.0"
       sources."execa-0.7.0"
       sources."cross-spawn-5.1.0"
       sources."get-stream-3.0.0"
@@ -36732,14 +32342,13 @@ in
       sources."path-key-2.0.1"
       sources."code-point-at-1.1.0"
       sources."number-is-nan-1.0.1"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
       sources."global-dirs-0.1.0"
       sources."is-path-inside-1.0.0"
       sources."path-is-inside-1.0.2"
-      (sources."package-json-4.0.1" // {
-        dependencies = [
-          sources."semver-5.4.1"
-        ];
-      })
+      sources."package-json-4.0.1"
       sources."got-6.7.1"
       sources."registry-auth-token-3.3.1"
       sources."registry-url-3.1.0"
@@ -36785,10 +32394,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.2.0";
+    version = "1.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.2.0.tgz";
-      sha512 = "3qbjszm2whg22ljrg0knwzn1d2ry9mxkpqsbh7pmnjgfzyalqjc8h8s7v8iyb71gavj78d6gmlk0dkhdlsr2hgcai9ndjs6vad8p6gg";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.2.1.tgz";
+      sha512 = "1425ggdafx6gjjx9qfpq05vbk5mfn3abm1jxkx2rps0nqab9pa6nqnyixr3dz7qd2bhi431pjjf848riaprx5c2xr3y7vxrn166dwfc";
     };
     dependencies = [
       sources."async-2.5.0"
@@ -36798,18 +32407,13 @@ in
       sources."color-2.0.0"
       sources."cookie-parser-1.4.3"
       sources."crossroads-0.12.2"
-      sources."diff2html-2.3.2"
-      (sources."express-4.15.5" // {
+      (sources."diff2html-2.3.2" // {
         dependencies = [
-          sources."qs-6.5.0"
-          sources."statuses-1.3.1"
-        ];
-      })
-      (sources."express-session-1.15.6" // {
-        dependencies = [
-          sources."utils-merge-1.0.1"
+          sources."mkdirp-0.3.0"
         ];
       })
+      sources."express-4.15.5"
+      sources."express-session-1.15.6"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
       sources."ignore-3.3.7"
@@ -36817,65 +32421,31 @@ in
       (sources."keen.io-0.1.3" // {
         dependencies = [
           sources."superagent-0.21.0"
-          sources."qs-1.2.0"
-          sources."mime-1.2.11"
-          sources."methods-1.0.1"
+          sources."async-0.9.2"
         ];
       })
       sources."knockout-3.4.2"
       sources."lodash-4.17.4"
-      (sources."memorystore-1.6.0" // {
-        dependencies = [
-          sources."debug-3.1.0"
-        ];
-      })
+      sources."memorystore-1.6.0"
       sources."mkdirp-0.5.1"
       sources."moment-2.18.1"
       sources."node-cache-4.1.1"
-      (sources."npm-5.4.2" // {
-        dependencies = [
-          sources."nopt-4.0.1"
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
+      sources."npm-5.4.2"
       sources."npm-registry-client-8.4.0"
       sources."octicons-3.5.0"
       sources."open-0.0.5"
       sources."os-homedir-1.0.2"
       sources."passport-0.4.0"
       sources."passport-local-1.0.0"
-      (sources."raven-2.1.2" // {
-        dependencies = [
-          sources."uuid-3.0.0"
-        ];
-      })
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."raven-2.1.2"
+      sources."rc-1.2.2"
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
       sources."serve-static-1.12.6"
       sources."signals-1.0.0"
       sources."snapsvg-0.5.1"
       sources."socket.io-2.0.4"
-      (sources."superagent-3.5.2" // {
-        dependencies = [
-          sources."component-emitter-1.2.1"
-          sources."cookiejar-2.1.1"
-          sources."extend-3.0.1"
-          sources."form-data-2.3.1"
-          sources."formidable-1.1.1"
-          sources."readable-stream-2.3.3"
-          sources."combined-stream-1.0.5"
-          sources."delayed-stream-1.0.0"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
+      sources."superagent-3.5.2"
       (sources."temp-0.8.3" // {
         dependencies = [
           sources."rimraf-2.2.8"
@@ -36900,7 +32470,7 @@ in
       sources."ms-2.0.0"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.4.0"
+      sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
@@ -36910,29 +32480,21 @@ in
       sources."color-string-1.5.2"
       sources."color-name-1.1.3"
       sources."simple-swizzle-0.2.2"
-      sources."is-arrayish-0.3.1"
+      sources."is-arrayish-0.2.1"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."diff-3.4.0"
-      (sources."hogan.js-3.0.2" // {
-        dependencies = [
-          sources."mkdirp-0.3.0"
-        ];
-      })
+      sources."hogan.js-3.0.2"
       sources."whatwg-fetch-2.0.3"
       sources."nopt-1.0.10"
       sources."abbrev-1.1.1"
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      (sources."finalhandler-1.0.6" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."finalhandler-1.0.6"
       sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -36940,18 +32502,14 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.6" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
-      sources."utils-merge-1.0.0"
+      sources."send-0.15.6"
+      sources."utils-merge-1.0.1"
       sources."vary-1.1.2"
       sources."negotiator-0.6.1"
       sources."forwarded-0.1.2"
       sources."ipaddr.js-1.4.0"
       sources."destroy-1.0.4"
-      sources."mime-1.3.4"
+      sources."mime-1.4.1"
       sources."crc-3.4.4"
       sources."on-headers-1.0.1"
       sources."uid-safe-2.1.5"
@@ -36961,542 +32519,140 @@ in
       sources."editions-1.3.3"
       sources."typechecker-4.4.1"
       sources."underscore-1.5.2"
-      sources."formidable-1.0.14"
-      sources."component-emitter-1.1.2"
-      sources."cookiejar-2.0.1"
+      sources."formidable-1.1.1"
+      sources."component-emitter-1.2.1"
+      sources."cookiejar-2.1.1"
       sources."reduce-component-1.0.1"
-      sources."extend-1.2.1"
-      (sources."form-data-0.1.3" // {
-        dependencies = [
-          sources."mime-1.2.11"
-          sources."async-0.9.2"
-        ];
-      })
-      sources."readable-stream-1.0.27-1"
-      sources."combined-stream-0.0.7"
-      sources."delayed-stream-0.0.5"
+      sources."extend-3.0.1"
+      sources."form-data-2.3.1"
+      sources."readable-stream-2.3.3"
+      sources."combined-stream-1.0.5"
+      sources."delayed-stream-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."isarray-0.0.1"
-      sources."string_decoder-0.10.31"
+      sources."isarray-2.0.1"
+      sources."string_decoder-1.0.3"
       sources."lru-cache-4.1.1"
       sources."pseudomap-1.0.2"
       sources."yallist-2.1.2"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.0"
       sources."clone-2.1.1"
-      sources."JSONStream-1.3.1"
-      sources."ansi-regex-3.0.0"
-      sources."ansicolors-0.3.2"
-      sources."ansistyles-0.1.3"
-      sources."aproba-1.1.2"
-      sources."archy-1.0.0"
-      sources."cacache-9.2.9"
-      sources."call-limit-1.1.0"
-      sources."chownr-1.0.1"
-      sources."cmd-shim-2.0.2"
-      (sources."columnify-1.5.4" // {
-        dependencies = [
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."config-chain-1.1.11"
-      sources."detect-indent-5.0.0"
-      sources."dezalgo-1.0.3"
-      sources."editor-1.0.0"
-      sources."fs-vacuum-1.2.10"
-      (sources."fs-write-stream-atomic-1.0.10" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      sources."glob-7.1.2"
+      sources."concat-stream-1.6.0"
       sources."graceful-fs-4.1.11"
-      sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.5.0"
-      sources."iferr-0.1.5"
-      sources."inflight-1.0.6"
-      sources."ini-1.3.4"
-      sources."init-package-json-1.10.1"
-      sources."lazy-property-1.0.0"
-      (sources."libnpx-9.6.0" // {
-        dependencies = [
-          sources."yargs-8.0.2"
-        ];
-      })
-      sources."lockfile-1.0.3"
-      sources."lodash._baseuniq-4.6.0"
-      sources."lodash.clonedeep-4.5.0"
-      sources."lodash.union-4.6.0"
-      sources."lodash.uniq-4.5.0"
-      sources."lodash.without-4.4.0"
-      sources."meant-1.0.1"
-      sources."mississippi-1.3.0"
-      sources."move-concurrently-1.0.1"
-      (sources."node-gyp-3.6.2" // {
-        dependencies = [
-          sources."nopt-3.0.6"
-          sources."semver-5.3.0"
-          sources."tar-2.2.1"
-        ];
-      })
       sources."normalize-package-data-2.4.0"
-      sources."npm-cache-filename-1.0.2"
-      sources."npm-install-checks-3.0.0"
-      sources."npm-lifecycle-1.0.3"
       sources."npm-package-arg-5.1.2"
-      sources."npm-packlist-1.1.10"
-      sources."npm-user-validate-1.0.0"
-      sources."npmlog-4.1.2"
       sources."once-1.4.0"
-      sources."opener-1.4.3"
-      sources."osenv-0.1.4"
-      sources."pacote-6.0.4"
-      sources."path-is-inside-1.0.2"
-      sources."promise-inflight-1.0.1"
-      sources."read-1.0.7"
-      sources."read-cmd-shim-1.0.1"
-      sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.12"
-      sources."read-package-tree-5.1.6"
-      (sources."request-2.81.0" // {
-        dependencies = [
-          sources."combined-stream-1.0.5"
-          sources."extend-3.0.1"
-          sources."form-data-2.1.4"
-          sources."qs-6.4.0"
-          sources."delayed-stream-1.0.0"
-        ];
-      })
+      sources."request-2.83.0"
       sources."retry-0.10.1"
-      sources."safe-buffer-5.1.1"
-      (sources."sha-2.0.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
       sources."slide-1.1.6"
-      sources."sorted-object-2.0.1"
-      (sources."sorted-union-stream-2.1.3" // {
-        dependencies = [
-          sources."from2-1.3.0"
-          sources."readable-stream-1.1.14"
-        ];
-      })
       sources."ssri-4.1.6"
-      sources."strip-ansi-4.0.0"
-      (sources."tar-4.0.2" // {
-        dependencies = [
-          sources."yallist-3.0.2"
-        ];
-      })
-      sources."text-table-0.2.0"
-      sources."uid-number-0.0.6"
-      sources."umask-1.1.0"
-      sources."unique-filename-1.1.0"
-      sources."update-notifier-2.2.0"
-      sources."uuid-3.1.0"
-      sources."validate-npm-package-name-3.0.0"
-      sources."which-1.3.0"
-      sources."worker-farm-1.5.1"
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-2.1.0"
-      sources."debuglog-1.0.1"
-      sources."imurmurhash-0.1.4"
-      sources."lodash._baseindexof-3.1.0"
-      sources."lodash._bindcallback-3.0.1"
-      sources."lodash._cacheindexof-3.0.2"
-      sources."lodash._createcache-3.1.2"
-      sources."lodash._getnative-3.9.1"
-      sources."lodash.restparam-3.6.1"
-      sources."readdir-scoped-modules-1.0.2"
-      sources."validate-npm-package-license-3.0.1"
-      sources."jsonparse-1.3.1"
-      sources."through-2.3.8"
-      sources."y18n-3.2.1"
-      sources."wcwidth-1.0.1"
-      (sources."defaults-1.0.3" // {
-        dependencies = [
-          sources."clone-1.0.2"
-        ];
-      })
-      sources."proto-list-1.2.4"
-      sources."asap-2.0.6"
+      sources."npmlog-4.1.2"
+      sources."typedarray-0.0.6"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.0.1"
       sources."util-deprecate-1.0.2"
-      sources."fs.realpath-1.0.0"
-      sources."minimatch-3.0.4"
-      sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
-      sources."promzard-0.3.0"
-      sources."dotenv-4.0.0"
-      sources."camelcase-4.1.0"
-      (sources."cliui-3.2.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."decamelize-1.2.0"
-      sources."get-caller-file-1.0.2"
-      sources."os-locale-2.1.0"
-      sources."read-pkg-up-2.0.0"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
-      sources."set-blocking-2.0.0"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
-      sources."which-module-2.0.0"
-      sources."yargs-parser-7.0.0"
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."execa-0.7.0"
-      sources."lcid-1.0.0"
-      sources."mem-1.1.0"
-      sources."cross-spawn-5.1.0"
-      sources."get-stream-3.0.0"
-      sources."is-stream-1.1.0"
-      sources."npm-run-path-2.0.2"
-      sources."p-finally-1.0.0"
-      sources."signal-exit-3.0.2"
-      sources."strip-eof-1.0.0"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."path-key-2.0.1"
-      sources."invert-kv-1.0.0"
-      sources."mimic-fn-1.1.0"
-      sources."find-up-2.1.0"
-      sources."read-pkg-2.0.0"
-      sources."locate-path-2.0.0"
-      sources."p-locate-2.0.0"
-      sources."path-exists-3.0.0"
-      sources."p-limit-1.1.0"
-      sources."load-json-file-2.0.0"
-      sources."path-type-2.0.0"
-      sources."parse-json-2.2.0"
-      sources."pify-2.3.0"
-      sources."strip-bom-3.0.0"
-      (sources."error-ex-1.3.1" // {
-        dependencies = [
-          sources."is-arrayish-0.2.1"
-        ];
-      })
-      sources."lodash._createset-4.0.3"
-      sources."lodash._root-3.0.1"
-      (sources."concat-stream-1.6.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      (sources."duplexify-3.5.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      sources."end-of-stream-1.4.0"
-      (sources."flush-write-stream-1.0.2" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      (sources."from2-2.3.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      (sources."parallel-transform-1.1.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      sources."pump-1.0.2"
-      sources."pumpify-1.3.5"
-      sources."stream-each-1.2.2"
-      (sources."through2-2.0.3" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      sources."typedarray-0.0.6"
-      sources."stream-shift-1.0.0"
-      sources."cyclist-0.2.2"
-      sources."xtend-4.0.1"
-      sources."copy-concurrently-1.0.5"
-      sources."run-queue-1.0.3"
-      sources."fstream-1.0.11"
-      sources."block-stream-0.0.9"
+      sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
+      sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
-      sources."ignore-walk-3.0.1"
-      sources."npm-bundled-1.0.3"
-      (sources."are-we-there-yet-1.1.4" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.4" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."delegates-1.0.0"
-      sources."object-assign-4.1.1"
-      (sources."wide-align-1.1.2" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
+      sources."spdx-correct-1.0.2"
+      sources."spdx-expression-parse-1.0.4"
+      sources."spdx-license-ids-1.2.2"
+      sources."osenv-0.1.4"
+      sources."validate-npm-package-name-3.0.0"
       sources."os-tmpdir-1.0.2"
-      sources."make-fetch-happen-2.5.0"
-      sources."npm-pick-manifest-1.0.4"
-      sources."promise-retry-1.1.1"
-      sources."protoduck-4.0.0"
-      sources."agentkeepalive-3.3.0"
-      sources."http-cache-semantics-3.8.0"
-      sources."http-proxy-agent-2.0.0"
-      sources."https-proxy-agent-2.1.0"
-      sources."node-fetch-npm-2.0.2"
-      sources."socks-proxy-agent-3.0.1"
-      sources."humanize-ms-1.2.1"
-      sources."agent-base-4.1.1"
-      sources."es6-promisify-5.0.0"
-      sources."es6-promise-4.1.1"
-      sources."encoding-0.1.12"
-      sources."json-parse-better-errors-1.0.1"
-      sources."socks-1.1.10"
-      sources."ip-1.1.5"
-      sources."smart-buffer-1.1.15"
-      sources."err-code-1.1.2"
-      sources."genfun-4.0.1"
-      sources."mute-stream-0.0.7"
-      sources."util-extend-1.0.3"
-      sources."slash-1.0.0"
-      sources."aws-sign2-0.6.0"
+      sources."builtins-1.0.3"
+      sources."wrappy-1.0.2"
+      sources."aws-sign2-0.7.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."forever-agent-0.6.1"
-      sources."har-validator-4.2.1"
-      sources."hawk-3.1.3"
-      sources."http-signature-1.1.1"
+      sources."har-validator-5.0.3"
+      sources."hawk-6.0.2"
+      sources."http-signature-1.2.0"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
-      sources."json-stringify-safe-5.0.1"
-      sources."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-4.11.8"
-      sources."har-schema-1.0.5"
-      sources."co-4.6.0"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      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.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."json-stringify-safe-5.0.1"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-2.1.0"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.3"
+      sources."tunnel-agent-0.6.0"
+      sources."uuid-3.0.0"
+      sources."asynckit-0.4.0"
+      sources."ajv-5.3.0"
+      sources."har-schema-2.0.0"
+      sources."co-4.6.0"
+      sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."json-schema-traverse-0.3.1"
+      sources."hoek-4.2.0"
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
+      sources."sntp-2.1.0"
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
-      (sources."stream-iterate-1.2.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.3"
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
-        ];
-      })
-      (sources."minipass-2.2.1" // {
-        dependencies = [
-          sources."yallist-3.0.2"
-        ];
-      })
-      sources."minizlib-1.0.4"
-      sources."unique-slug-2.0.0"
-      (sources."boxen-1.2.2" // {
-        dependencies = [
-          sources."chalk-2.3.0"
-        ];
-      })
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."ansi-styles-2.2.1"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."configstore-3.1.1"
-      sources."import-lazy-2.1.0"
-      sources."is-npm-1.0.0"
-      sources."latest-version-3.1.0"
-      sources."semver-diff-2.1.0"
-      sources."xdg-basedir-3.0.0"
-      sources."ansi-align-2.0.0"
-      sources."cli-boxes-1.0.0"
-      sources."term-size-1.2.0"
-      (sources."widest-line-1.0.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."ansi-styles-3.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.5.0"
-      sources."has-flag-2.0.0"
-      (sources."has-ansi-2.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."dot-prop-4.2.0"
-      (sources."make-dir-1.1.0" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
-      sources."unique-string-1.0.0"
-      sources."is-obj-1.0.1"
-      sources."crypto-random-string-1.0.0"
-      sources."package-json-4.0.1"
-      sources."got-6.7.1"
-      sources."registry-auth-token-3.3.1"
-      sources."registry-url-3.1.0"
-      sources."create-error-class-3.0.2"
-      sources."duplexer3-0.1.4"
-      sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
-      sources."lowercase-keys-1.0.0"
-      sources."timed-out-4.0.1"
-      sources."unzip-response-2.0.1"
-      sources."url-parse-lax-1.0.0"
-      sources."capture-stack-trace-1.0.0"
-      sources."prepend-http-1.0.4"
-      sources."builtins-1.0.3"
-      sources."isexe-2.0.0"
-      sources."errno-0.1.4"
-      sources."prr-0.0.0"
-      sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.4"
-      sources."spdx-license-ids-1.2.2"
+      sources."are-we-there-yet-1.1.4"
+      sources."console-control-strings-1.1.0"
+      sources."gauge-2.7.4"
+      sources."set-blocking-2.0.0"
+      sources."delegates-1.0.0"
+      sources."aproba-1.2.0"
+      sources."has-unicode-2.0.1"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
+      sources."string-width-1.0.2"
+      sources."strip-ansi-4.0.0"
+      sources."wide-align-1.1.2"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."number-is-nan-1.0.1"
+      sources."ansi-regex-3.0.0"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
       sources."stack-trace-0.0.9"
+      sources."timed-out-4.0.1"
       sources."deep-extend-0.4.2"
+      sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
+      sources."glob-7.1.2"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."minimatch-3.0.4"
+      sources."path-is-absolute-1.0.1"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
       sources."eve-0.5.4"
-      (sources."engine.io-3.1.3" // {
-        dependencies = [
-          sources."accepts-1.3.3"
-        ];
-      })
+      sources."engine.io-3.1.3"
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.0.4" // {
-        dependencies = [
-          sources."component-emitter-1.2.1"
-        ];
-      })
-      (sources."socket.io-parser-3.1.2" // {
-        dependencies = [
-          sources."component-emitter-1.2.1"
-          sources."isarray-2.0.1"
-        ];
-      })
+      sources."socket.io-client-2.0.4"
+      sources."socket.io-parser-3.1.2"
       sources."base64id-1.0.0"
       sources."engine.io-parser-2.1.1"
-      (sources."ws-2.3.1" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."ws-2.3.1"
       sources."uws-0.14.5"
       sources."after-0.8.2"
       sources."arraybuffer.slice-0.0.6"
       sources."base64-arraybuffer-0.1.5"
       sources."blob-0.0.4"
-      (sources."has-binary2-1.0.2" // {
-        dependencies = [
-          sources."isarray-2.0.1"
-        ];
-      })
+      sources."has-binary2-1.0.2"
       sources."ultron-1.1.0"
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
-      (sources."engine.io-client-3.1.3" // {
-        dependencies = [
-          sources."component-emitter-1.2.1"
-        ];
-      })
+      sources."engine.io-client-3.1.3"
       sources."has-cors-1.1.0"
       sources."indexof-0.0.1"
       sources."object-component-0.0.3"
@@ -37511,6 +32667,46 @@ in
       sources."colors-1.0.3"
       sources."cycle-1.0.3"
       sources."eyes-0.1.8"
+      sources."camelcase-4.1.0"
+      sources."cliui-3.2.0"
+      sources."decamelize-1.2.0"
+      sources."get-caller-file-1.0.2"
+      sources."os-locale-2.1.0"
+      sources."read-pkg-up-2.0.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."which-module-2.0.0"
+      sources."y18n-3.2.1"
+      sources."yargs-parser-7.0.0"
+      sources."wrap-ansi-2.1.0"
+      sources."execa-0.7.0"
+      sources."lcid-1.0.0"
+      sources."mem-1.1.0"
+      sources."cross-spawn-5.1.0"
+      sources."get-stream-3.0.0"
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
+      sources."strip-eof-1.0.0"
+      sources."shebang-command-1.2.0"
+      sources."which-1.3.0"
+      sources."shebang-regex-1.0.0"
+      sources."isexe-2.0.0"
+      sources."path-key-2.0.1"
+      sources."invert-kv-1.0.0"
+      sources."mimic-fn-1.1.0"
+      sources."find-up-2.1.0"
+      sources."read-pkg-2.0.0"
+      sources."locate-path-2.0.0"
+      sources."p-locate-2.0.0"
+      sources."path-exists-3.0.0"
+      sources."p-limit-1.1.0"
+      sources."load-json-file-2.0.0"
+      sources."path-type-2.0.0"
+      sources."parse-json-2.2.0"
+      sources."pify-2.3.0"
+      sources."strip-bom-3.0.0"
+      sources."error-ex-1.3.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -37536,29 +32732,22 @@ in
       (sources."phantomjs-1.9.20" // {
         dependencies = [
           sources."kew-0.7.0"
+          sources."mkdirp-0.5.0"
         ];
       })
       sources."tmp-0.0.33"
       sources."follow-redirects-0.0.3"
-      (sources."config-chain-1.1.11" // {
-        dependencies = [
-          sources."ini-1.3.4"
-        ];
-      })
+      sources."config-chain-1.1.11"
       sources."inherits-2.0.3"
       sources."once-1.3.3"
       sources."osenv-0.0.3"
       sources."nopt-2.2.1"
       sources."semver-2.3.2"
-      sources."ini-1.1.0"
+      sources."ini-1.3.4"
       sources."proto-list-1.2.4"
       sources."wrappy-1.0.2"
       sources."abbrev-1.1.1"
-      (sources."extract-zip-1.5.0" // {
-        dependencies = [
-          sources."mkdirp-0.5.0"
-        ];
-      })
+      sources."extract-zip-1.5.0"
       sources."fs-extra-0.26.7"
       sources."hasha-2.2.0"
       sources."progress-1.1.8"
@@ -37616,35 +32805,15 @@ in
       sources."async-2.5.0"
       sources."lodash-4.17.4"
       sources."mime-db-1.30.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
@@ -37708,31 +32877,18 @@ in
       sources."loader-utils-1.1.0"
       sources."memory-fs-0.4.1"
       sources."mkdirp-0.5.1"
-      (sources."node-libs-browser-2.0.0" // {
-        dependencies = [
-          sources."string_decoder-0.10.31"
-        ];
-      })
+      sources."node-libs-browser-2.0.0"
       sources."source-map-0.5.7"
       sources."supports-color-4.5.0"
       sources."tapable-0.2.8"
-      sources."uglifyjs-webpack-plugin-0.4.6"
-      sources."watchpack-1.4.0"
-      sources."webpack-sources-1.0.1"
-      (sources."yargs-8.0.2" // {
+      (sources."uglifyjs-webpack-plugin-0.4.6" // {
         dependencies = [
-          sources."camelcase-4.1.0"
-          (sources."cliui-3.2.0" // {
-            dependencies = [
-              sources."string-width-1.0.2"
-            ];
-          })
-          sources."string-width-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
+          sources."yargs-3.10.0"
         ];
       })
+      sources."watchpack-1.4.0"
+      sources."webpack-sources-1.0.1"
+      sources."yargs-8.0.2"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
       sources."fast-json-stable-stringify-2.0.0"
@@ -37756,11 +32912,11 @@ in
       sources."readable-stream-2.3.3"
       sources."prr-0.0.0"
       sources."core-util-is-1.0.2"
-      sources."inherits-2.0.3"
+      sources."inherits-2.0.1"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."safe-buffer-5.1.1"
-      sources."string_decoder-1.0.3"
+      sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."minimist-0.0.8"
       sources."assert-1.4.1"
@@ -37768,29 +32924,21 @@ in
       sources."buffer-4.9.1"
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
-      sources."crypto-browserify-3.11.1"
+      sources."crypto-browserify-3.12.0"
       sources."domain-browser-1.1.7"
       sources."events-1.1.1"
       sources."https-browserify-0.0.1"
       sources."os-browserify-0.2.1"
       sources."path-browserify-0.0.0"
       sources."process-0.11.10"
-      sources."punycode-1.4.1"
+      sources."punycode-1.3.2"
       sources."querystring-es3-0.2.1"
       sources."stream-browserify-2.0.1"
       sources."stream-http-2.7.2"
       sources."timers-browserify-2.0.4"
       sources."tty-browserify-0.0.0"
-      (sources."url-0.11.0" // {
-        dependencies = [
-          sources."punycode-1.3.2"
-        ];
-      })
-      (sources."util-0.10.3" // {
-        dependencies = [
-          sources."inherits-2.0.1"
-        ];
-      })
+      sources."url-0.11.0"
+      sources."util-0.10.3"
       sources."vm-browserify-0.0.4"
       sources."pako-0.2.9"
       sources."base64-js-1.2.1"
@@ -37805,6 +32953,7 @@ in
       sources."pbkdf2-3.0.14"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.5"
+      sources."randomfill-1.0.3"
       sources."browserify-aes-1.1.1"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.3"
@@ -37813,7 +32962,7 @@ in
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
       sources."md5.js-1.3.4"
-      sources."hash-base-3.0.4"
+      sources."hash-base-2.0.2"
       sources."bn.js-4.11.8"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
@@ -37823,11 +32972,7 @@ in
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.2"
-      (sources."ripemd160-2.0.1" // {
-        dependencies = [
-          sources."hash-base-2.0.2"
-        ];
-      })
+      sources."ripemd160-2.0.1"
       sources."sha.js-2.4.9"
       sources."miller-rabin-4.0.1"
       sources."builtin-status-codes-3.0.0"
@@ -37837,14 +32982,10 @@ in
       sources."querystring-0.2.0"
       sources."indexof-0.0.1"
       sources."has-flag-2.0.0"
-      (sources."uglify-js-2.8.29" // {
-        dependencies = [
-          sources."yargs-3.10.0"
-        ];
-      })
+      sources."uglify-js-2.8.29"
       sources."uglify-to-browserify-1.0.2"
-      sources."camelcase-1.2.1"
-      sources."cliui-2.1.0"
+      sources."camelcase-4.1.0"
+      sources."cliui-3.2.0"
       sources."decamelize-1.2.0"
       sources."window-size-0.1.0"
       sources."center-align-0.1.3"
@@ -37882,18 +33023,9 @@ in
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
       sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
+      sources."is-number-3.0.0"
       sources."isobject-2.1.0"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
+      sources."randomatic-1.1.7"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
@@ -37910,134 +33042,23 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.38"
-      sources."nopt-4.0.1"
-      sources."npmlog-4.1.2"
-      (sources."rc-1.2.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
-      sources."request-2.81.0"
-      sources."hawk-3.1.3"
-      sources."rimraf-2.6.2"
-      sources."semver-5.4.1"
-      sources."tar-2.2.1"
-      sources."tar-pack-3.4.1"
-      sources."abbrev-1.1.1"
-      sources."osenv-0.1.4"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.4"
-      sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."aproba-1.2.0"
-      sources."has-unicode-2.0.1"
-      sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.2"
-      sources."ini-1.3.4"
-      sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
-      (sources."har-validator-4.2.1" // {
-        dependencies = [
-          sources."ajv-4.11.8"
-        ];
-      })
-      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.17"
-      sources."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
-      sources."qs-6.4.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."har-schema-1.0.5"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."hoek-2.16.3"
-      sources."boom-2.10.1"
-      sources."cryptiles-2.0.5"
-      sources."sntp-1.0.9"
-      sources."glob-7.1.2"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."once-1.4.0"
-      sources."wrappy-1.0.2"
-      sources."block-stream-0.0.9"
-      sources."fstream-1.0.11"
-      sources."debug-2.6.9"
-      sources."fstream-ignore-1.0.5"
-      sources."uid-number-0.0.6"
-      sources."ms-2.0.0"
       sources."source-list-map-2.0.0"
       sources."get-caller-file-1.0.2"
       sources."os-locale-2.1.0"
       sources."read-pkg-up-2.0.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
+      sources."set-blocking-2.0.0"
+      sources."string-width-1.0.2"
       sources."which-module-2.0.0"
       sources."y18n-3.2.1"
-      (sources."yargs-parser-7.0.0" // {
-        dependencies = [
-          sources."camelcase-4.1.0"
-        ];
-      })
+      sources."yargs-parser-7.0.0"
+      sources."strip-ansi-4.0.0"
       sources."wrap-ansi-2.1.0"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."number-is-nan-1.0.1"
+      sources."ansi-regex-3.0.0"
       sources."execa-0.7.0"
       sources."lcid-1.0.0"
       sources."mem-1.1.0"
@@ -38046,6 +33067,7 @@ in
       sources."is-stream-1.1.0"
       sources."npm-run-path-2.0.2"
       sources."p-finally-1.0.0"
+      sources."signal-exit-3.0.2"
       sources."strip-eof-1.0.0"
       sources."lru-cache-4.1.1"
       sources."shebang-command-1.2.0"
@@ -38073,6 +33095,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
+      sources."semver-5.4.1"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
       sources."spdx-correct-1.0.2"
@@ -38099,6 +33122,10 @@ in
       (sources."addons-linter-0.27.0" // {
         dependencies = [
           sources."yargs-8.0.2"
+          sources."babel-runtime-6.26.0"
+          sources."source-map-support-0.4.18"
+          sources."regenerator-runtime-0.11.0"
+          sources."tmp-0.0.33"
         ];
       })
       sources."babel-polyfill-6.20.0"
@@ -38110,36 +33137,13 @@ in
       sources."es6-error-4.0.2"
       sources."es6-promisify-5.0.0"
       sources."event-to-promise-0.8.0"
-      (sources."firefox-profile-0.5.0" // {
-        dependencies = [
-          sources."async-2.1.5"
-        ];
-      })
-      (sources."fx-runner-1.0.8" // {
-        dependencies = [
-          sources."commander-2.9.0"
-          sources."lodash-3.10.1"
-          sources."which-1.2.4"
-          sources."isexe-1.1.2"
-        ];
-      })
-      (sources."git-rev-sync-1.9.1" // {
-        dependencies = [
-          sources."shelljs-0.7.7"
-        ];
-      })
+      sources."firefox-profile-0.5.0"
+      sources."fx-runner-1.0.8"
+      sources."git-rev-sync-1.9.1"
       sources."minimatch-3.0.4"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.1"
       sources."mz-2.6.0"
-      (sources."node-firefox-connect-1.2.0" // {
-        dependencies = [
-          sources."es6-promise-2.3.0"
-        ];
-      })
+      sources."node-firefox-connect-1.2.0"
       sources."open-0.0.5"
       sources."node-notifier-5.1.2"
       sources."parse-json-2.2.0"
@@ -38150,78 +33154,24 @@ in
           sources."babel-polyfill-6.16.0"
           sources."es6-error-4.0.0"
           sources."mz-2.5.0"
-          sources."request-2.79.0"
           sources."source-map-support-0.4.6"
           sources."regenerator-runtime-0.9.6"
-          sources."aws-sign2-0.6.0"
-          sources."caseless-0.11.0"
-          sources."form-data-2.1.4"
-          sources."har-validator-2.0.6"
-          sources."hawk-3.1.3"
-          sources."http-signature-1.1.1"
-          sources."qs-6.3.2"
-          sources."tunnel-agent-0.4.3"
-          sources."chalk-1.1.3"
-          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."source-map-support-0.5.0" // {
-        dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
-      (sources."stream-to-promise-2.2.0" // {
-        dependencies = [
-          sources."end-of-stream-1.1.0"
-          sources."once-1.3.3"
         ];
       })
+      sources."source-map-support-0.5.0"
+      sources."stream-to-promise-2.2.0"
       sources."tmp-0.0.30"
       sources."watchpack-1.3.0"
-      (sources."update-notifier-2.2.0" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-        ];
-      })
+      sources."update-notifier-2.2.0"
       (sources."yargs-6.6.0" // {
         dependencies = [
           sources."camelcase-3.0.0"
-          sources."os-locale-1.4.0"
-          sources."read-pkg-up-1.0.1"
-          sources."string-width-1.0.2"
-          sources."which-module-1.0.0"
-          sources."yargs-parser-4.2.1"
-          sources."find-up-1.1.2"
-          sources."read-pkg-1.1.0"
-          sources."path-exists-2.1.0"
-          sources."load-json-file-1.1.0"
-          sources."path-type-1.1.0"
-          sources."strip-bom-2.0.0"
-        ];
-      })
-      (sources."zip-dir-1.0.2" // {
-        dependencies = [
-          sources."async-1.5.2"
-        ];
-      })
-      sources."ajv-5.2.3"
-      (sources."babel-register-6.26.0" // {
-        dependencies = [
-          sources."babel-runtime-6.26.0"
-          sources."source-map-support-0.4.18"
-          sources."regenerator-runtime-0.11.0"
-        ];
-      })
-      (sources."chalk-2.1.0" // {
-        dependencies = [
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
         ];
       })
+      sources."zip-dir-1.0.2"
+      sources."ajv-4.11.8"
+      sources."babel-register-6.26.0"
+      sources."chalk-2.3.0"
       sources."cheerio-1.0.0-rc.2"
       sources."columnify-1.5.4"
       sources."common-tags-1.4.0"
@@ -38229,58 +33179,18 @@ in
       sources."doctoc-1.3.0"
       (sources."dispensary-0.10.19" // {
         dependencies = [
+          sources."source-map-support-0.5.0"
           sources."yargs-9.0.1"
         ];
       })
-      (sources."eslint-4.8.0" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
-      (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // {
-        dependencies = [
-          sources."eslint-3.19.0"
-          sources."chalk-1.1.3"
-          sources."inquirer-0.12.0"
-          sources."pluralize-1.2.1"
-          sources."progress-1.1.8"
-          (sources."table-3.8.3" // {
-            dependencies = [
-              sources."string-width-2.1.1"
-            ];
-          })
-          sources."ansi-escapes-1.4.0"
-          sources."cli-cursor-1.0.2"
-          sources."figures-1.7.0"
-          sources."run-async-0.1.0"
-          sources."rx-lite-3.1.2"
-          sources."string-width-1.0.2"
-          sources."restore-cursor-1.0.1"
-          sources."onetime-1.1.0"
-          sources."ajv-4.11.8"
-          sources."ajv-keywords-1.5.1"
-          sources."slice-ansi-0.0.4"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
-      sources."esprima-3.1.3"
+      sources."eslint-3.19.0"
+      sources."eslint-plugin-no-unsafe-innerhtml-1.0.16"
+      sources."esprima-4.0.0"
       sources."first-chunk-stream-2.0.0"
       sources."jed-1.1.1"
-      sources."pino-4.8.2"
-      (sources."postcss-6.0.11" // {
-        dependencies = [
-          sources."supports-color-4.5.0"
-        ];
-      })
-      (sources."relaxed-json-1.0.1" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-        ];
-      })
+      sources."pino-4.9.0"
+      sources."postcss-6.0.11"
+      sources."relaxed-json-1.0.1"
       sources."semver-5.4.1"
       sources."strip-bom-stream-3.0.0"
       sources."whatwg-url-6.3.0"
@@ -38291,46 +33201,17 @@ in
       sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      (sources."babel-core-6.26.0" // {
-        dependencies = [
-          sources."babel-runtime-6.26.0"
-          sources."regenerator-runtime-0.11.0"
-        ];
-      })
+      sources."babel-core-6.26.0"
       sources."core-js-2.5.1"
       sources."home-or-tmp-2.0.0"
-      sources."lodash-4.17.4"
-      (sources."babel-code-frame-6.26.0" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-        ];
-      })
-      (sources."babel-generator-6.26.0" // {
-        dependencies = [
-          sources."babel-runtime-6.26.0"
-          sources."regenerator-runtime-0.11.0"
-        ];
-      })
+      sources."lodash-3.10.1"
+      sources."babel-code-frame-6.26.0"
+      sources."babel-generator-6.26.0"
       sources."babel-helpers-6.24.1"
       sources."babel-messages-6.23.0"
-      (sources."babel-template-6.26.0" // {
-        dependencies = [
-          sources."babel-runtime-6.26.0"
-          sources."regenerator-runtime-0.11.0"
-        ];
-      })
-      (sources."babel-traverse-6.26.0" // {
-        dependencies = [
-          sources."babel-runtime-6.26.0"
-          sources."regenerator-runtime-0.11.0"
-        ];
-      })
-      (sources."babel-types-6.26.0" // {
-        dependencies = [
-          sources."babel-runtime-6.26.0"
-          sources."regenerator-runtime-0.11.0"
-        ];
-      })
+      sources."babel-template-6.26.0"
+      sources."babel-traverse-6.26.0"
+      sources."babel-types-6.26.0"
       sources."babylon-6.18.0"
       sources."convert-source-map-1.5.0"
       sources."debug-2.6.9"
@@ -38338,14 +33219,14 @@ in
       sources."path-is-absolute-1.0.1"
       sources."private-0.1.8"
       sources."slash-1.0.0"
-      sources."source-map-0.5.7"
+      sources."source-map-0.6.1"
       sources."esutils-2.0.2"
       sources."js-tokens-3.0.2"
-      sources."ansi-styles-2.2.1"
+      sources."ansi-styles-3.2.0"
       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."supports-color-4.5.0"
       sources."ansi-regex-2.1.1"
       sources."detect-indent-4.0.0"
       sources."jsesc-1.3.0"
@@ -38357,18 +33238,14 @@ in
       sources."invariant-2.2.2"
       sources."loose-envify-1.3.1"
       sources."to-fast-properties-1.0.3"
-      sources."ms-2.0.0"
+      sources."ms-0.7.3"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
       sources."css-select-1.2.0"
-      (sources."dom-serializer-0.1.0" // {
-        dependencies = [
-          sources."domelementtype-1.1.3"
-        ];
-      })
+      sources."dom-serializer-0.1.0"
       sources."entities-1.1.1"
       sources."htmlparser2-3.9.2"
       sources."parse5-3.0.2"
@@ -38398,7 +33275,7 @@ in
       sources."emoji-regex-6.1.3"
       sources."remark-5.1.0"
       sources."structured-source-3.0.2"
-      sources."traverse-0.6.6"
+      sources."traverse-0.4.6"
       sources."remark-parse-1.1.0"
       sources."remark-stringify-1.1.0"
       sources."unified-4.2.1"
@@ -38427,49 +33304,45 @@ in
       sources."character-entities-html4-1.1.1"
       sources."bail-1.0.2"
       sources."has-1.0.1"
-      sources."once-1.4.0"
+      sources."once-1.3.3"
       sources."trough-1.0.1"
       sources."vfile-1.4.0"
       sources."function-bind-1.1.1"
       sources."wrappy-1.0.2"
       sources."boundary-1.0.1"
       sources."array-from-2.1.1"
-      sources."async-2.5.0"
+      sources."async-1.5.2"
       sources."natural-compare-lite-1.4.0"
-      sources."request-2.83.0"
+      sources."request-2.79.0"
       sources."sha.js-2.4.9"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
+      sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
+      sources."form-data-2.1.4"
+      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.17"
       sources."oauth-sign-0.8.2"
       sources."performance-now-2.1.0"
-      sources."qs-6.5.1"
+      sources."qs-6.3.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
+      sources."tunnel-agent-0.4.3"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."har-schema-2.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
-      sources."sntp-2.1.0"
-      sources."assert-plus-1.0.0"
+      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.4.1"
       sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
@@ -38483,33 +33356,19 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.30.0"
-      sources."punycode-1.4.1"
-      (sources."cliui-3.2.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-        ];
-      })
+      sources."punycode-2.1.0"
+      sources."cliui-3.2.0"
       sources."get-caller-file-1.0.2"
-      sources."os-locale-2.1.0"
-      sources."read-pkg-up-2.0.0"
+      sources."os-locale-1.4.0"
+      sources."read-pkg-up-1.0.1"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."set-blocking-2.0.0"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
-      sources."which-module-2.0.0"
+      sources."string-width-1.0.2"
+      sources."which-module-1.0.0"
       sources."y18n-3.2.1"
-      sources."yargs-parser-7.0.0"
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-        ];
-      })
+      sources."yargs-parser-4.2.1"
+      sources."wrap-ansi-2.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."execa-0.7.0"
@@ -38532,18 +33391,18 @@ in
       sources."path-key-2.0.1"
       sources."invert-kv-1.0.0"
       sources."mimic-fn-1.1.0"
-      sources."find-up-2.1.0"
-      sources."read-pkg-2.0.0"
+      sources."find-up-1.1.2"
+      sources."read-pkg-1.1.0"
       sources."locate-path-2.0.0"
       sources."p-locate-2.0.0"
-      sources."path-exists-3.0.0"
+      sources."path-exists-2.1.0"
       sources."p-limit-1.1.0"
-      sources."load-json-file-2.0.0"
+      sources."load-json-file-1.1.0"
       sources."normalize-package-data-2.4.0"
-      sources."path-type-2.0.0"
+      sources."path-type-1.1.0"
       sources."graceful-fs-4.1.11"
       sources."pify-2.3.0"
-      sources."strip-bom-3.0.0"
+      sources."strip-bom-2.0.0"
       sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
@@ -38562,36 +33421,23 @@ in
       sources."glob-7.1.2"
       sources."ignore-3.3.7"
       sources."imurmurhash-0.1.4"
-      (sources."inquirer-3.3.0" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."inquirer-0.12.0"
       sources."is-resolvable-1.0.0"
-      (sources."js-yaml-3.10.0" // {
-        dependencies = [
-          sources."esprima-4.0.0"
-        ];
-      })
+      sources."js-yaml-3.10.0"
       sources."levn-0.3.0"
       sources."natural-compare-1.4.0"
       sources."optionator-0.8.2"
       sources."path-is-inside-1.0.2"
-      sources."pluralize-7.0.0"
-      sources."progress-2.0.0"
+      sources."pluralize-1.2.1"
+      sources."progress-1.1.8"
       sources."strip-json-comments-2.0.1"
-      sources."table-4.0.2"
+      sources."table-3.8.3"
       sources."text-table-0.2.0"
       sources."typedarray-0.0.6"
       sources."esrecurse-4.2.0"
       sources."object-assign-4.1.1"
-      sources."acorn-5.2.1"
-      (sources."acorn-jsx-3.0.1" // {
-        dependencies = [
-          sources."acorn-3.3.0"
-        ];
-      })
+      sources."acorn-3.3.0"
+      sources."acorn-jsx-3.0.1"
       sources."flat-cache-1.3.0"
       sources."circular-json-0.3.3"
       sources."del-2.2.2"
@@ -38600,7 +33446,7 @@ in
       sources."is-path-cwd-1.0.0"
       sources."is-path-in-cwd-1.0.0"
       sources."pinkie-promise-2.0.1"
-      sources."rimraf-2.6.2"
+      sources."rimraf-2.4.5"
       sources."array-union-1.0.2"
       sources."arrify-1.0.1"
       sources."array-uniq-1.0.3"
@@ -38608,22 +33454,18 @@ in
       sources."pinkie-2.0.4"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."ansi-escapes-3.0.0"
-      sources."cli-cursor-2.1.0"
+      sources."ansi-escapes-1.4.0"
+      sources."cli-cursor-1.0.2"
       sources."cli-width-2.2.0"
-      (sources."external-editor-2.0.5" // {
-        dependencies = [
-          sources."tmp-0.0.33"
-        ];
-      })
-      sources."figures-2.0.0"
-      sources."mute-stream-0.0.7"
-      sources."run-async-2.3.0"
-      sources."rx-lite-4.0.8"
+      sources."external-editor-2.0.5"
+      sources."figures-1.7.0"
+      sources."mute-stream-0.0.5"
+      sources."run-async-0.1.0"
+      sources."rx-lite-3.1.2"
       sources."rx-lite-aggregates-4.0.8"
       sources."through-2.3.8"
-      sources."restore-cursor-2.0.0"
-      sources."onetime-2.0.1"
+      sources."restore-cursor-1.0.1"
+      sources."onetime-1.1.0"
       sources."iconv-lite-0.4.19"
       sources."jschardet-1.6.0"
       sources."is-promise-2.1.0"
@@ -38635,15 +33477,11 @@ in
       sources."deep-is-0.1.3"
       sources."wordwrap-1.0.0"
       sources."fast-levenshtein-2.0.6"
-      sources."ajv-keywords-2.1.1"
-      (sources."slice-ansi-1.0.0" // {
-        dependencies = [
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
+      sources."ajv-keywords-1.5.1"
+      sources."slice-ansi-0.0.4"
       sources."escope-3.6.0"
       sources."is-my-json-valid-2.16.1"
-      sources."shelljs-0.7.8"
+      sources."shelljs-0.7.7"
       sources."user-home-2.0.0"
       sources."es6-map-0.1.5"
       sources."es6-weak-map-2.0.2"
@@ -38653,11 +33491,7 @@ in
       sources."es6-set-0.1.5"
       sources."es6-symbol-3.1.1"
       sources."event-emitter-0.3.5"
-      (sources."readline2-1.0.1" // {
-        dependencies = [
-          sources."mute-stream-0.0.5"
-        ];
-      })
+      sources."readline2-1.0.1"
       sources."exit-hook-1.1.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -38668,38 +33502,29 @@ in
       sources."resolve-1.5.0"
       sources."path-parse-1.0.5"
       sources."fast-json-parse-1.0.3"
-      sources."fast-safe-stringify-1.2.0"
+      sources."fast-safe-stringify-1.2.1"
       sources."flatstr-1.0.5"
       sources."pump-1.0.2"
       sources."quick-format-unescaped-1.1.1"
       sources."split2-2.2.0"
-      sources."end-of-stream-1.4.0"
+      sources."end-of-stream-1.1.0"
       sources."through2-2.0.3"
-      sources."commander-2.11.0"
+      sources."commander-2.9.0"
       sources."strip-bom-buf-1.0.0"
       sources."is-utf8-0.2.1"
       sources."lodash.sortby-4.7.0"
-      (sources."tr46-1.0.1" // {
-        dependencies = [
-          sources."punycode-2.1.0"
-        ];
-      })
+      sources."tr46-1.0.1"
       sources."webidl-conversions-4.0.2"
       sources."fd-slicer-1.0.1"
       sources."buffer-crc32-0.2.13"
       sources."pend-1.2.0"
       sources."dtrace-provider-0.8.5"
-      (sources."mv-2.1.1" // {
-        dependencies = [
-          sources."rimraf-2.4.5"
-          sources."glob-6.0.4"
-        ];
-      })
+      sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.19.1"
       sources."nan-2.7.0"
       sources."ncp-2.0.0"
-      sources."es6-promise-4.1.1"
+      sources."es6-promise-2.3.0"
       sources."adm-zip-0.4.7"
       sources."archiver-1.3.0"
       sources."fs-extra-2.1.2"
@@ -38739,11 +33564,7 @@ in
       sources."thenify-3.3.0"
       sources."firefox-client-0.3.0"
       sources."colors-0.5.1"
-      (sources."js-select-0.6.0" // {
-        dependencies = [
-          sources."traverse-0.4.6"
-        ];
-      })
+      sources."js-select-0.6.0"
       sources."JSONSelect-0.2.1"
       sources."growly-1.3.0"
       sources."shellwords-0.1.1"
@@ -38753,23 +33574,11 @@ in
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
       sources."deepcopy-0.6.3"
-      (sources."jsonwebtoken-7.1.9" // {
-        dependencies = [
-          sources."ms-0.7.3"
-        ];
-      })
-      (sources."joi-6.10.1" // {
-        dependencies = [
-          sources."hoek-2.16.3"
-        ];
-      })
+      sources."jsonwebtoken-7.1.9"
+      sources."joi-6.10.1"
       sources."jws-3.1.4"
       sources."lodash.once-4.1.1"
-      (sources."topo-1.1.0" // {
-        dependencies = [
-          sources."hoek-2.16.3"
-        ];
-      })
+      sources."topo-1.1.0"
       sources."isemail-1.2.0"
       sources."base64url-2.0.0"
       sources."jwa-1.1.5"
@@ -38801,18 +33610,9 @@ in
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
       sources."fill-range-2.2.3"
-      sources."is-number-2.1.0"
+      sources."is-number-3.0.0"
       sources."isobject-2.1.0"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
+      sources."randomatic-1.1.7"
       sources."is-buffer-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.5"
@@ -38824,52 +33624,6 @@ in
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.10.0"
       sources."set-immediate-shim-1.0.1"
-      (sources."node-pre-gyp-0.6.38" // {
-        dependencies = [
-          sources."request-2.81.0"
-          sources."hawk-3.1.3"
-          sources."aws-sign2-0.6.0"
-          sources."form-data-2.1.4"
-          sources."har-validator-4.2.1"
-          sources."http-signature-1.1.1"
-          sources."performance-now-0.2.0"
-          sources."qs-6.4.0"
-          sources."ajv-4.11.8"
-          sources."har-schema-1.0.5"
-          sources."assert-plus-0.2.0"
-          sources."hoek-2.16.3"
-          sources."boom-2.10.1"
-          sources."cryptiles-2.0.5"
-          sources."sntp-1.0.9"
-        ];
-      })
-      sources."nopt-4.0.1"
-      sources."npmlog-4.1.2"
-      sources."rc-1.2.2"
-      sources."tar-2.2.1"
-      sources."tar-pack-3.4.1"
-      sources."abbrev-1.1.1"
-      sources."osenv-0.1.4"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.4" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-        ];
-      })
-      sources."delegates-1.0.0"
-      sources."aproba-1.2.0"
-      sources."has-unicode-2.0.1"
-      (sources."wide-align-1.1.2" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-        ];
-      })
-      sources."deep-extend-0.4.2"
-      sources."block-stream-0.0.9"
-      sources."fstream-1.0.11"
-      sources."fstream-ignore-1.0.5"
-      sources."uid-number-0.0.6"
       sources."boxen-1.2.2"
       sources."configstore-3.1.1"
       sources."import-lazy-2.1.0"
@@ -38880,17 +33634,9 @@ in
       sources."ansi-align-2.0.0"
       sources."cli-boxes-1.0.0"
       sources."term-size-1.2.0"
-      (sources."widest-line-1.0.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-        ];
-      })
+      sources."widest-line-1.0.0"
       sources."dot-prop-4.2.0"
-      (sources."make-dir-1.1.0" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
+      sources."make-dir-1.1.0"
       sources."unique-string-1.0.0"
       sources."write-file-atomic-2.3.0"
       sources."is-obj-1.0.1"
@@ -38909,6 +33655,8 @@ in
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
       sources."prepend-http-1.0.4"
+      sources."rc-1.2.2"
+      sources."deep-extend-0.4.2"
       sources."jszip-2.6.1"
       sources."pako-1.0.6"
     ];
@@ -38973,32 +33721,15 @@ in
       (sources."inquirer-3.3.0" // {
         dependencies = [
           sources."chalk-2.3.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
-          sources."ansi-regex-3.0.0"
         ];
       })
       (sources."insight-0.8.4" // {
         dependencies = [
           sources."async-1.5.2"
-          (sources."configstore-1.4.0" // {
-            dependencies = [
-              sources."uuid-2.0.3"
-            ];
-          })
+          sources."configstore-1.4.0"
           sources."inquirer-0.10.1"
-          sources."write-file-atomic-1.3.4"
-          sources."xdg-basedir-2.0.0"
-          sources."ansi-escapes-1.4.0"
-          sources."cli-cursor-1.0.2"
-          sources."cli-width-1.1.1"
           sources."figures-1.7.0"
           sources."lodash-3.10.1"
-          sources."run-async-0.1.0"
-          sources."rx-lite-3.1.2"
-          sources."restore-cursor-1.0.1"
-          sources."onetime-1.1.0"
         ];
       })
       sources."lodash-4.17.4"
@@ -39010,91 +33741,55 @@ in
       (sources."npm-keyword-4.2.0" // {
         dependencies = [
           sources."got-5.7.1"
-          sources."timed-out-3.1.3"
-          sources."unzip-response-1.0.2"
         ];
       })
       sources."opn-4.0.2"
       (sources."package-json-2.4.0" // {
         dependencies = [
           sources."got-5.7.1"
-          sources."timed-out-3.1.3"
-          sources."unzip-response-1.0.2"
         ];
       })
       sources."parse-help-0.1.1"
-      (sources."read-pkg-up-2.0.0" // {
-        dependencies = [
-          sources."find-up-2.1.0"
-          sources."read-pkg-2.0.0"
-          sources."load-json-file-2.0.0"
-          sources."path-type-2.0.0"
-          sources."pify-2.3.0"
-          sources."strip-bom-3.0.0"
-        ];
-      })
+      sources."read-pkg-up-2.0.0"
       sources."root-check-1.0.0"
       sources."sort-on-2.0.0"
       sources."string-length-1.0.1"
       (sources."tabtab-1.3.2" // {
         dependencies = [
           sources."inquirer-1.2.3"
-          sources."ansi-escapes-1.4.0"
-          sources."cli-cursor-1.0.2"
-          sources."external-editor-1.1.1"
           sources."figures-1.7.0"
-          sources."mute-stream-0.0.6"
-          sources."string-width-1.0.2"
-          sources."restore-cursor-1.0.1"
-          sources."onetime-1.1.0"
-          sources."tmp-0.0.29"
-          sources."is-fullwidth-code-point-1.0.0"
         ];
       })
       sources."titleize-1.0.0"
       (sources."update-notifier-2.3.0" // {
         dependencies = [
           sources."chalk-2.3.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
+          sources."package-json-4.0.1"
         ];
       })
       sources."user-home-2.0.0"
-      (sources."yeoman-character-1.1.0" // {
-        dependencies = [
-          sources."supports-color-3.2.3"
-          sources."has-flag-1.0.0"
-        ];
-      })
+      sources."yeoman-character-1.1.0"
       sources."yeoman-doctor-2.1.0"
       (sources."yeoman-environment-2.0.5" // {
         dependencies = [
           sources."chalk-2.3.0"
-          sources."debug-3.1.0"
-          sources."log-symbols-2.1.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
         ];
       })
-      (sources."yosay-2.0.1" // {
-        dependencies = [
-          sources."ansi-styles-3.2.0"
-        ];
-      })
-      sources."ansi-styles-2.2.1"
+      sources."yosay-2.0.1"
+      sources."ansi-styles-3.2.0"
       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."supports-color-4.5.0"
       sources."ansi-regex-2.1.1"
       sources."dot-prop-4.2.0"
       sources."graceful-fs-4.1.11"
       sources."make-dir-1.1.0"
       sources."unique-string-1.0.0"
-      sources."write-file-atomic-2.3.0"
+      sources."write-file-atomic-1.3.4"
       sources."xdg-basedir-3.0.0"
       sources."is-obj-1.0.1"
-      sources."pify-3.0.0"
+      sources."pify-2.3.0"
       sources."crypto-random-string-1.0.0"
       sources."imurmurhash-0.1.4"
       sources."signal-exit-3.0.2"
@@ -39105,19 +33800,12 @@ in
       sources."yallist-2.1.2"
       sources."shebang-regex-1.0.0"
       sources."isexe-2.0.0"
-      sources."execa-0.6.3"
+      sources."execa-0.7.0"
       sources."filter-obj-1.1.0"
       sources."mem-1.1.0"
       sources."p-any-1.1.0"
       sources."p-try-1.0.0"
-      (sources."passwd-user-2.1.0" // {
-        dependencies = [
-          sources."execa-0.4.0"
-          sources."pify-2.3.0"
-          sources."npm-run-path-1.0.0"
-          sources."path-key-1.0.0"
-        ];
-      })
+      sources."passwd-user-2.1.0"
       sources."rc-1.2.2"
       sources."get-stream-3.0.0"
       sources."is-stream-1.1.0"
@@ -39129,7 +33817,7 @@ in
       sources."p-some-2.0.0"
       sources."aggregate-error-1.0.0"
       sources."clean-stack-1.3.0"
-      sources."indent-string-3.2.0"
+      sources."indent-string-2.1.0"
       sources."cross-spawn-async-2.2.5"
       sources."object-assign-4.1.1"
       sources."deep-extend-0.4.2"
@@ -39142,57 +33830,43 @@ in
       sources."is-retry-allowed-1.1.0"
       sources."lowercase-keys-1.0.0"
       sources."safe-buffer-5.1.1"
-      sources."timed-out-4.0.1"
-      sources."unzip-response-2.0.1"
+      sources."timed-out-3.1.3"
+      sources."unzip-response-1.0.2"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
       sources."prepend-http-1.0.4"
       sources."decamelize-1.2.0"
-      sources."ansi-escapes-3.0.0"
-      sources."cli-cursor-2.1.0"
+      sources."ansi-escapes-1.4.0"
+      sources."cli-cursor-1.0.2"
       sources."cli-width-2.2.0"
-      sources."external-editor-2.0.5"
-      sources."mute-stream-0.0.7"
+      sources."external-editor-1.1.1"
+      sources."mute-stream-0.0.6"
       sources."run-async-2.3.0"
-      sources."rx-lite-4.0.8"
+      sources."rx-lite-3.1.2"
       sources."rx-lite-aggregates-4.0.8"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."string-width-1.0.2"
       sources."through-2.3.8"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
-      sources."restore-cursor-2.0.0"
-      sources."onetime-2.0.1"
+      sources."restore-cursor-1.0.1"
+      sources."onetime-1.1.0"
       sources."iconv-lite-0.4.19"
       sources."jschardet-1.6.0"
-      sources."tmp-0.0.33"
+      sources."tmp-0.0.29"
       sources."os-tmpdir-1.0.2"
       sources."is-promise-2.1.0"
-      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
       sources."lodash.debounce-3.1.1"
       sources."os-name-1.0.3"
       sources."request-2.83.0"
       sources."tough-cookie-2.3.3"
       sources."uuid-3.1.0"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
       sources."slide-1.1.6"
-      (sources."readline2-1.0.1" // {
-        dependencies = [
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."mute-stream-0.0.5"
-        ];
-      })
+      sources."readline2-1.0.1"
       sources."exit-hook-1.1.1"
       sources."code-point-at-1.1.0"
       sources."number-is-nan-1.0.1"
@@ -39230,12 +33904,8 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
       sources."sntp-2.1.0"
       sources."assert-plus-1.0.0"
       sources."jsprim-1.4.1"
@@ -39257,13 +33927,9 @@ in
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."normalize-package-data-2.4.0"
-      (sources."redent-1.0.0" // {
-        dependencies = [
-          sources."indent-string-2.1.0"
-        ];
-      })
+      sources."redent-1.0.0"
       sources."trim-newlines-1.0.0"
-      sources."camelcase-2.1.1"
+      sources."camelcase-4.1.0"
       sources."currently-unhandled-0.4.1"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.5.0"
@@ -39273,21 +33939,13 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."find-up-1.1.2"
-      sources."read-pkg-1.1.0"
-      sources."path-exists-2.1.0"
+      sources."find-up-2.1.0"
+      sources."read-pkg-2.0.0"
+      sources."path-exists-3.0.0"
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
-      (sources."load-json-file-1.1.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
-      (sources."path-type-1.1.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
+      sources."load-json-file-2.0.0"
+      sources."path-type-2.0.0"
       sources."parse-json-2.2.0"
       sources."strip-bom-2.0.0"
       sources."error-ex-1.3.1"
@@ -39312,11 +33970,7 @@ in
       sources."clone-regexp-1.0.0"
       sources."is-regexp-1.0.0"
       sources."is-supported-regexp-flag-1.0.0"
-      (sources."locate-path-2.0.0" // {
-        dependencies = [
-          sources."path-exists-3.0.0"
-        ];
-      })
+      sources."locate-path-2.0.0"
       sources."p-locate-2.0.0"
       sources."p-limit-1.1.0"
       sources."downgrade-root-1.2.2"
@@ -39325,7 +33979,7 @@ in
       sources."is-root-1.0.0"
       sources."is-docker-1.1.0"
       sources."arrify-1.0.1"
-      sources."debug-2.6.9"
+      sources."debug-3.1.0"
       sources."npmlog-2.0.4"
       sources."ms-2.0.0"
       sources."rx-4.1.0"
@@ -39341,50 +33995,22 @@ in
       sources."lodash.pad-4.5.1"
       sources."lodash.padend-4.6.1"
       sources."lodash.padstart-4.6.1"
-      (sources."boxen-1.2.2" // {
-        dependencies = [
-          sources."camelcase-4.1.0"
-          sources."chalk-2.3.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.5.0"
-        ];
-      })
+      sources."boxen-1.2.2"
       sources."import-lazy-2.1.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
-      (sources."latest-version-3.1.0" // {
-        dependencies = [
-          sources."package-json-4.0.1"
-        ];
-      })
+      sources."latest-version-3.1.0"
       sources."semver-diff-2.1.0"
       sources."ansi-align-2.0.0"
       sources."cli-boxes-1.0.0"
-      (sources."term-size-1.2.0" // {
-        dependencies = [
-          sources."execa-0.7.0"
-        ];
-      })
-      (sources."widest-line-1.0.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."is-fullwidth-code-point-1.0.0"
-        ];
-      })
+      sources."term-size-1.2.0"
+      sources."widest-line-1.0.0"
       sources."global-dirs-0.1.0"
       sources."is-path-inside-1.0.0"
       sources."path-is-inside-1.0.2"
-      (sources."bin-version-check-2.1.0" // {
-        dependencies = [
-          sources."semver-4.3.6"
-        ];
-      })
-      (sources."each-async-1.1.1" // {
-        dependencies = [
-          sources."onetime-1.1.0"
-        ];
-      })
-      sources."log-symbols-1.0.2"
+      sources."bin-version-check-2.1.0"
+      sources."each-async-1.1.1"
+      sources."log-symbols-2.1.0"
       sources."object-values-1.0.0"
       sources."twig-0.8.9"
       sources."bin-version-1.0.4"
@@ -39400,11 +34026,7 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."diff-3.4.0"
-      (sources."globby-6.1.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
+      sources."globby-6.1.0"
       sources."grouped-queue-0.3.3"
       sources."is-scoped-1.0.0"
       sources."mem-fs-1.1.3"
@@ -39418,11 +34040,7 @@ in
       sources."scoped-regex-1.0.0"
       sources."through2-2.0.3"
       sources."vinyl-1.2.0"
-      (sources."vinyl-file-2.0.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
+      sources."vinyl-file-2.0.0"
       sources."xtend-4.0.1"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
@@ -39431,12 +34049,7 @@ in
       sources."first-chunk-stream-2.0.0"
       sources."pad-component-0.0.1"
       sources."taketalk-1.0.0"
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."is-fullwidth-code-point-1.0.0"
-        ];
-      })
+      sources."wrap-ansi-2.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-- 
GitLab


From 3e9daece1d1ed6919061f965bc9acea5c6f68a3b Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Fri, 3 Nov 2017 21:36:43 +0000
Subject: [PATCH 610/877] nixos/cc-wrapper: Fix bug if dynamicLinker not found

If a dynamic linker for target is not found the generated script fails
due to unbound variable error (due to "set -u"). Correct by specifying
default value with dynamicLinker:- and not generating ldflagsBefore if
no linker is found.

This problem was found when cross compiling to mingw32 targets
---
 pkgs/build-support/cc-wrapper/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 489fb02dcb5..80f794cbdde 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -286,7 +286,7 @@ stdenv.mkDerivation {
         *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
       esac
 
-      if [ -n "$dynamicLinker" ]; then
+      if [ -n "''${dynamicLinker:-}" ]; then
         echo $dynamicLinker > $out/nix-support/dynamic-linker
 
     '' + (if targetPlatform.isDarwin then ''
@@ -296,7 +296,9 @@ stdenv.mkDerivation {
           echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
         fi
 
-        local ldflagsBefore=(-dynamic-linker "$dynamicLinker")
+     if [ -n "''${dynamicLinker:-}" ]; then
+             local ldflagsBefore=(-dynamic-linker "$dynamicLinker")
+     fi
     '') + ''
       fi
 
-- 
GitLab


From a2895b9084a8531f072b05e59b7099202af07044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Jos=C3=A9=20Ruiz-Henestrosa=20Ruiz?=
 <ruizh.cj@gmail.com>
Date: Fri, 3 Nov 2017 22:40:44 +0100
Subject: [PATCH 611/877] fava: changed SHA256 hash and version

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

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 7bc549dd0fc..5fe20d80857 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -1,14 +1,14 @@
 { stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.3";
+  version = "1.5";
   name = "fava-${version}";
 
   src = fetchFromGitHub {
     owner = "beancount";
     repo = "fava";
     rev = "v${version}";
-    sha256 = "0g0aj0qcmpny6dipi00nks7h3mf5a4jfd6bxjm1rb5807wswcpg8";
+    sha256 = "03wgggc2lzma1d57l1l4z8q7dsqxlg90alg2p1734jhavskfqw63";
   };
 
   assets = fetchzip {
-- 
GitLab


From 15ea14e5bf7f7aec0624e3a79687199592185093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Jos=C3=A9=20Ruiz-Henestrosa=20Ruiz?=
 <ruizh.cj@gmail.com>
Date: Fri, 3 Nov 2017 23:49:58 +0100
Subject: [PATCH 612/877] fava: 1.3 -> 1.5, refactor

---
 pkgs/applications/office/fava/default.nix | 42 +++++++----------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 5fe20d80857..56a93e99009 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -1,42 +1,26 @@
-{ stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }:
+{ stdenv, python3, beancount }:
 
-python3Packages.buildPythonApplication rec {
+let
+  inherit (python3.pkgs) buildPythonApplication fetchPypi;
+in
+buildPythonApplication rec {
+  pname = "fava";
   version = "1.5";
-  name = "fava-${version}";
+  name = "${pname}-${version}";
 
-  src = fetchFromGitHub {
-    owner = "beancount";
-    repo = "fava";
-    rev = "v${version}";
-    sha256 = "03wgggc2lzma1d57l1l4z8q7dsqxlg90alg2p1734jhavskfqw63";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0d3jncidzvfsxjplzg4cmflqr4mxrbrlj5bh6fpxj529pialpkk6";
   };
 
-  assets = fetchzip {
-    url = "https://github.com/beancount/fava/releases/download/v${version}/fava-${version}.tar.gz";
-    sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz";
-  };
-
-  checkInputs = with python3Packages; [ pytest ];
-
-  checkPhase = ''
-    # pyexcel is optional
-    # the other 2 tests fail due non-unicode locales
-    PATH=$out/bin:$PATH pytest tests \
-      --ignore tests/test_util_excel.py \
-      --ignore tests/test_cli.py \
-      --ignore tests/test_translations.py \
-  '';
-
-  postInstall = ''
-    cp -r $assets/fava/static/gen $out/${python3.sitePackages}/fava/static
-  '';
+  doCheck = false;
 
-  propagatedBuildInputs = with python3Packages;
+  propagatedBuildInputs = with python3.pkgs;
     [ flask dateutil pygments wheel markdown2 flaskbabel tornado
       click beancount ];
 
   meta = {
-    homepage = https://github.com/aumayr/fava;
+    homepage = https://beancount.github.io/fava;
     description = "Web interface for beancount";
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
-- 
GitLab


From 4f7c0aed38d0dc3f7f8650d89949b1914b54aef1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 3 Nov 2017 22:48:50 +0000
Subject: [PATCH 613/877] ocaml: init at 4.06.0

---
 pkgs/development/compilers/ocaml/4.06.nix | 9 +++++++++
 pkgs/top-level/ocaml-packages.nix         | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/ocaml/4.06.nix

diff --git a/pkgs/development/compilers/ocaml/4.06.nix b/pkgs/development/compilers/ocaml/4.06.nix
new file mode 100644
index 00000000000..b913d169e97
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/4.06.nix
@@ -0,0 +1,9 @@
+import ./generic.nix {
+  major_version = "4";
+  minor_version = "06";
+  patch_version = "0";
+  sha256 = "1dy542yfnnw10zvh5s9qzswliq11mg7l0bcyss3501qw3vwvadhj";
+
+  # If the executable is stipped it does not work
+  dontStrip = true;
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 7555cf5efd7..d41d5b97f18 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -990,7 +990,9 @@ in rec
 
   ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { }) (self: super: { });
 
-  ocamlPackages_latest = ocamlPackages_4_05;
+  ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }) (self: super: { });
+
+  ocamlPackages_latest = ocamlPackages_4_06;
 
   ocamlPackages = ocamlPackages_4_04;
 }
-- 
GitLab


From 66c0193e6b4e7a6a5d8c1f84c34da8e3b04fd7c3 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 3 Nov 2017 19:29:52 -0400
Subject: [PATCH 614/877] qt5: fix cmake cleanup on darwin

This fixes the case where the `find` command does not return any
files.
---
 pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
index ce1dada0c47..3f6a00dc1a1 100644
--- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
+++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
@@ -3,7 +3,7 @@ qtQmlPrefix=@qtQmlPrefix@
 qtDocPrefix=@qtDocPrefix@
 
 _qtRmCMakeLink() {
-    find "${!outputLib}" -name "*.cmake" -type l | xargs rm
+    find "${!outputLib}" -name "*.cmake" -type l -delete
 }
 
 postInstallHooks+=(_qtRmCMakeLink)
-- 
GitLab


From 0ce1067b18af17a8a7a36b4570814adbbb8e516c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 3 Nov 2017 23:45:18 +0000
Subject: [PATCH 615/877] ocamlPackages.num: init at 1.1

---
 .../development/ocaml-modules/num/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/num/default.nix

diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix
new file mode 100644
index 00000000000..d46bff5b3d5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/num/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib }:
+
+stdenv.mkDerivation rec {
+	version = "1.1";
+	name = "ocaml${ocaml.version}-num-${version}";
+	src = fetchFromGitHub {
+		owner = "ocaml";
+		repo = "num";
+		rev = "v${version}";
+		sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0";
+	};
+
+	patches = [ (fetchpatch {
+			url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch";
+			sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b";
+		})
+	];
+
+	buildInputs = [ ocaml findlib ];
+
+	createFindlibDestdir = true;
+
+	meta = {
+		description = "Legacy Num library for arbitrary-precision integer and rational arithmetic";
+		license = stdenv.lib.licenses.lgpl21;
+		inherit (ocaml.meta) platforms;
+		inherit (src.meta) homepage;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d41d5b97f18..a56343713fe 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -387,6 +387,10 @@ let
       lwt = ocaml_lwt;
     };
 
+    num = if lib.versionOlder "4.06" ocaml.version
+      then callPackage ../development/ocaml-modules/num {}
+      else null;
+
     ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
 
     comparelib = callPackage ../development/ocaml-modules/comparelib { };
-- 
GitLab


From 57f6b8722945dae5612b0b087f785ef825297152 Mon Sep 17 00:00:00 2001
From: John Boehr <jbboehr@gmail.com>
Date: Fri, 3 Nov 2017 16:58:01 -0700
Subject: [PATCH 616/877] php: fix ldap paths when header exists on host system

Fixes #20491
---
 pkgs/development/interpreters/php/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index be9aab50cb9..c967ed2b862 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -50,7 +50,7 @@ let
 
         ldap = {
           configureFlags = [
-            "--with-ldap"
+            "--with-ldap=/invalid/path"
             "LDAP_DIR=${openldap.dev}"
             "LDAP_INCDIR=${openldap.dev}/include"
             "LDAP_LIBDIR=${openldap.out}/lib"
-- 
GitLab


From 6b7321c42c93f667c7360712de3b1dc576394b65 Mon Sep 17 00:00:00 2001
From: Michal 'BlessJah' Marzuchowski <michal.marzuchowski@live.com>
Date: Fri, 3 Nov 2017 21:02:05 +0100
Subject: [PATCH 617/877] gotools: 20160519 -> 20170807

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

diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index 3408c90cda6..e9a7e7ac891 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "gotools-${version}";
-  version = "20160519-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
+  version = "20170807-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "5d2fd3ccab986d52112bf301d47a819783339d0e";
 
   goPackagePath = "golang.org/x/tools";
   goPackageAliases = [ "code.google.com/p/go.tools" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://go.googlesource.com/tools";
-    sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
+    sha256 = "0r3fp7na6pg0bc5xfycjvv951f0vma1qfnpw5zy6l75yxm5r47kn";
   };
 
   goDeps = ./deps.nix;
-- 
GitLab


From c3e7e2249b459733ed22a2e07d940c1623381de1 Mon Sep 17 00:00:00 2001
From: Michal 'BlessJah' Marzuchowski <michal.marzuchowski@live.com>
Date: Fri, 3 Nov 2017 21:02:21 +0100
Subject: [PATCH 618/877] mtail: init at 3.0.0-rc4

---
 pkgs/servers/monitoring/mtail/default.nix     | 26 +++++++++
 pkgs/servers/monitoring/mtail/deps.nix        | 56 +++++++++++++++++++
 .../servers/monitoring/mtail/fix-gopath.patch | 13 +++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 97 insertions(+)
 create mode 100644 pkgs/servers/monitoring/mtail/default.nix
 create mode 100644 pkgs/servers/monitoring/mtail/deps.nix
 create mode 100644 pkgs/servers/monitoring/mtail/fix-gopath.patch

diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix
new file mode 100644
index 00000000000..5044aef2bb5
--- /dev/null
+++ b/pkgs/servers/monitoring/mtail/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchFromGitHub, gotools, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "mtail-${version}";
+  version = "3.0.0-rc4";
+  goPackagePath = "github.com/google/mtail";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "mtail";
+    rev = "v${version}";
+    sha256 = "1n7pqvid48ayn15qfpgpbsx0iqg24x08wphzpc08mlfw47gq7jg3";
+  };
+
+  buildInputs = [ gotools ];
+  goDeps = ./deps.nix;
+  patches = [ ./fix-gopath.patch ];
+  preBuild = "go generate -x ./go/src/github.com/google/mtail/vm/";
+
+
+  meta = with lib; {
+    license = licenses.asl20;
+    homepage = "https://github.com/google/mtail";
+    description = "Tool for extracting metrics from application logs";
+  };
+}
diff --git a/pkgs/servers/monitoring/mtail/deps.nix b/pkgs/servers/monitoring/mtail/deps.nix
new file mode 100644
index 00000000000..6de3c8b6e13
--- /dev/null
+++ b/pkgs/servers/monitoring/mtail/deps.nix
@@ -0,0 +1,56 @@
+[
+  rec {
+    goPackagePath = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://${goPackagePath}.git";
+      rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  rec {
+    goPackagePath = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://${goPackagePath}.git";
+      rev = "5660eeed305fe5f69c8fc6cf899132a459a97064";
+      sha256 = "0rpwvjp9xfmy2yvbmy810qamjhimr56zydvx7hb1gjn3b7jp4rhd";
+    };
+  }
+  rec {
+    goPackagePath = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://${goPackagePath}.git";
+      rev = "v1.4.2";
+      sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3";
+    };
+  }
+  rec {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://${goPackagePath}.git";
+      rev = "v0.8.0";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "95c6576299259db960f6c5b9b69ea52422860fce";
+      sha256 = "1fhq8bianb9a1iccpr92mi2hix9zvm10n0f7syx6vfbxdw32i316";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "3ba1a4dc141f5236b19ccbf2f67cb63d1a688d46";
+      sha256 = "07sbakmman41p5hmdbf4y2wak0gh7k1z88m0zb72acsypp4179h1";
+    };
+  }
+]
diff --git a/pkgs/servers/monitoring/mtail/fix-gopath.patch b/pkgs/servers/monitoring/mtail/fix-gopath.patch
new file mode 100644
index 00000000000..9421d194a9e
--- /dev/null
+++ b/pkgs/servers/monitoring/mtail/fix-gopath.patch
@@ -0,0 +1,13 @@
+diff --git a/vm/compiler.go b/vm/compiler.go
+index c55266b..a46417c 100644
+--- a/vm/compiler.go
++++ b/vm/compiler.go
+@@ -2,7 +2,7 @@
+ // This file is available under the Apache license.
+ 
+ // Build the parser:
+-//go:generate $GOPATH/bin/goyacc -v y.output -o parser.go -p mtail parser.y
++//go:generate goyacc -v y.output -o parser.go -p mtail parser.y
+ 
+ package vm
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0212bd2c95..6fe97f504db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2971,6 +2971,8 @@ with pkgs;
 
   mkcast = callPackage ../applications/video/mkcast { };
 
+  mtail = callPackage ../servers/monitoring/mtail { };
+
   multitail = callPackage ../tools/misc/multitail { };
 
   mxt-app = callPackage ../misc/mxt-app { };
-- 
GitLab


From 50ad5f1c36414c7468de9fbb4478ca24f1b81b87 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 4 Nov 2017 12:46:00 +0800
Subject: [PATCH 619/877] audacity: 2.1.3 -> 2.2.0

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

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 07385e2a8b8..26e58c023b8 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -7,12 +7,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.1.3";
+  version = "2.2.0";
   name = "audacity-${version}";
 
   src = fetchurl {
     url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
-    sha256 = "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b";
+    sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry";
   };
   patches = [
     (fetchpatch {
-- 
GitLab


From 07cb41b1836c9304982bccb7b60d3a6f490b1836 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 4 Nov 2017 12:50:16 +0800
Subject: [PATCH 620/877] firefox-beta-bin: 57.0b13 -> 57.0b14

---
 .../browsers/firefox-bin/beta_sources.nix     | 762 +++++++++---------
 1 file changed, 381 insertions(+), 381 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 23316dc3aeb..16b59debdd4 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,955 +1,955 @@
 {
-  version = "57.0b13";
+  version = "57.0b14";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ach/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ach/firefox-57.0b14.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "051daa6d23e8d9559135f89a871372ae69ebb46c143265f72d85a55c5edbdc927fd2be25869815cce3ecb4bc5a4245f6bd3cfec2317e727c632437f377552793";
+      sha512 = "07c3398805092ba5d252adcdb690a144f8143a8827e70e3be3cb71175735c9c37c9d0edb93936f8cd1af16ad7a6f988b8e8fe9eaed7e36bbb85abab0137893b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/af/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/af/firefox-57.0b14.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "b9b936333fc86f3ebf34dfc05d5277a6a2552b427fa26a1e29c9fed93fbcd76c533c3543b3356ac61da808eb5154d83d40888c19a37003dce88c4da64fdec7f6";
+      sha512 = "fd954a1ddae090d6bd2c76922d4ec53ef249749c27996fbeb1276d2d82284540a000ad4fe6efbd690bb5e73b6923016d5c9c98d34ac5748c29791187417dd8c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/an/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/an/firefox-57.0b14.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "ed028a38d5360890f57617f8e0d9e02c578f7e786e78de8f2b8a3b96d0915d3369dc398da71d387761f56f6371d3047c63f0d39131e7dc7cdaa9cd6c8dd22abc";
+      sha512 = "c57c10028a99df1694897966f54aa6f8b85a6b2d0ed23699542a7a2bbe458e26d622e2de398bf7559bc33e7e4172d23d5aff8402048174a39804247dd8516e0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ar/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ar/firefox-57.0b14.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "ede95e488ee234430c3694a14c75ab116a29b91d9a1ec4b0676f687ce5a175122758815dbec69e2aaab0ab8ac91181fd4e0fdac545dddc0b1e3b4e7c81ccb648";
+      sha512 = "a4417b95c1bec25f148c57c42895e84024153065536a303f8eef7a0d9a7d39d4de8bf287f3af815e8ccb7ec7ec797f098416f78775acc8d778c91975d6268014";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/as/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/as/firefox-57.0b14.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "9e27132b8b1d0665cc88951ff24b316142bede88677dfbf6bd43ab147db8dd2b7ec44e830d152a2af48805e2a2de1b8858f4ceb0e8ff96d65c7cb769c0463d92";
+      sha512 = "5b624b9d0a4ee345d5c7b79913a8cdb48acebae32f088479c0745acee925d58c826b5125186ffa7c017ff3524983bfa06fe5061ee9423c37fb6f0e7323cac85c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ast/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ast/firefox-57.0b14.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "4e458e8dc02a226e40314bbce9771330a378536c7176e5f2e9ccfd0f0998d61ce33b234228226156abcd87aac88c01c740ccd7b0590863f6f1da44bea3b43af6";
+      sha512 = "efb5ac3daa79a88425401f2bf5df6c0fba90fefd21840723cedc8ebae149816198b727dae67c3f74406c47e01dd2365d1eeb92c39a549f1acba4ba65dab704b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/az/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/az/firefox-57.0b14.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "90a283a92da98ebc422f78deb01793888f9df97bdbb17f5e0f9045ac5f61eb2e4ae9ae706026f043535c2399fa476509af9d358093a92cdc344883e40bc4ed03";
+      sha512 = "703332727a0db4a51a39859209ce76120cbdde5a00d32a931e118e478dbb5f4a4e8f3d06abfa9bc97bf66a411f533c23b7375599fc0a7f0c13c9d7f518cb8990";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/be/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/be/firefox-57.0b14.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "b16136b9d37ab3a563b9c90be7520430a89c204bab6d9e616939ce88f4d56c395a7670911361f746b9ac62e802e4b791b60ea1e77335c56fe80a0bd27c00fb14";
+      sha512 = "d8ad4ba538e2e3f86ad8564e2418cbd34f33d4e89233fa6638acf10a3e10eafc0b81d6c20b585b872c5c00bb6fa2af1ea4097c19de01446a6811e4843c99fbf2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bg/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bg/firefox-57.0b14.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "7ad46009c3101e05b0285862f61067e68c50a202c4889efd138438721487ad21ae68228b9fa82162730fe41be297206831d5b4f8587c3243397427192f4351ca";
+      sha512 = "cb6af38306ab8bcd9229cf1dbcfaaf310108c31e28dbae6b9fc21a4cbdd82baf9fa785a9a94bdacb779c8679721903bc721a0e7ca2a1a09995fa97f1486a8232";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bn-BD/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-BD/firefox-57.0b14.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "24650ce5b04485512f7af58b0c0428f9aa442d28d614a2dfc2e427e33b35e442d0310ce3212a0750bbc0e5ab79aab848218c140edc49b7be456fc2f7f33b01a3";
+      sha512 = "1739ab1c4c1a7387dab56fb89762b26d8cf279c14a7bbfb1f7f888e9c2c714eaec84aba12f1384defc7974e207b506e206f980a8a68be7f274cccf7232f30e32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bn-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-IN/firefox-57.0b14.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "9c48ad3e4081edf3c1b973f161fb9741f2f37a125ba5e63599698100c26f529c727fcb828696ac3b1f54fa299502cb4c537f15be6c696eaf51452c1cd0eac61f";
+      sha512 = "358f8e3c1e9774fabd6bd8faff4cd2903c0e0cae6e5e6ee6f2ceb228ce7d489ed9112eb729a4f7d0ea25c377a2a54772279ea1343cec449b949688dfe19a69a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/br/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/br/firefox-57.0b14.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "022d5dc1a4e4906375ca2b425d86636ba6cb91b5bc60459938e9e77341c886c4aa7285f4b52e7be221149519bd3bf72d1b4540a7c62cc347e2beac9de3d6c953";
+      sha512 = "df0c34c951d81d500a0720c2a9cfda76831564dc45d2e34d37b677702414b2f53710fe4eb7f63257658fd058ffa648a904aaad4d864a325a1b1e1ddfee2faf32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/bs/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bs/firefox-57.0b14.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "9e4e388f43404eb98e68349ae95bf40631fbf33670d4a9200f60d9ab25f8dc2501d4fe1aaf6f95d9ade80d790b1ba53b78ead54f2cac45d7a2c2d85e505a1455";
+      sha512 = "091cffc15f609bfab74061f13c526d4c13946e7b79d3a190ced0ffe2fb9aed457e1e1780d9c152699f4b42aa920d9bc77701eb944d9f9671b70da3278fabde8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ca/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ca/firefox-57.0b14.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "3c7e6f9c11ddf88900af2eccf8a22524f6cf74e5ac27464f8b4ad19849ac30220bc6eac03d79e22c349eba9e170ec379071b258d6bc80e9178dd1ddfe0aec965";
+      sha512 = "cd485d1202daeee2e24ca812350ce348ba93a0bf389741b13ad6aa6a81ae4c57007ea0b312e401fed8c268c8a86b5ccbf62ee25d2c1d8d787f16e92467f3c136";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cak/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cak/firefox-57.0b14.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "e5f9e7bf7145f2b33a0c59de6c576f82bb857ebe85335f218cd03ba005816c3e8e8fff03d5b6534885d796ea523696423c70035e62bb6a32bae4e4b7c1d79c71";
+      sha512 = "c5573576cc70d776f3d40a2451295ad8a6230b0de280b0a2a3dae7ecc2c1fcc2eee5fd5e4df91a2b1c9a63411263a4a55f0bfa605a0688cbfb10c341dfe4eaa0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cs/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cs/firefox-57.0b14.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "7e527e7bd04cd6107ec92d27f0705ebcf8da8117c84e61e13c2026dadd2ac3a888c9e3bb86f51026f19b10d06365bb41d48bc4fcbb08d09a88b3bb01e9637967";
+      sha512 = "771141fa3d846651448b158d8ad583a45dd2fc05ca5e3ff2ca19687431a140744707260b3ad9e304bb2062757ef333815f69e10a48e72308a802f9088e24b22b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/cy/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cy/firefox-57.0b14.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "287df6655c9793da325681baa13fc4c0b9a5975f0b13be38d8875838a762b2f435839ef5893c6b6a3439c225994fc64060f69edf349d2a9d4fd2d225e95fd1c7";
+      sha512 = "7fd6f5eb9473b3ee68a7a2a98128c205df6654bab21e4c19f6ecc1e427dcdca3b93e9ff22239ebb652a545a3cb8892782e34cb876ada78d604bc48816960f897";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/da/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/da/firefox-57.0b14.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "8d03dae91a9cfe20091a2222eeb0bd41f3b3541c5ef6520a17a32187974daf8584e1d69017cfb99d2d18224ffb287f586bdf1ed678981a6b6a3d16ba9ba4a2e2";
+      sha512 = "30df907a7e99f41f9291d2e677e124363a8c2f702e90db870e2ccc1bbabec2266f0c64fa3daac66c5da1543056d1e3e1e8458dd4627cecfc0a9090ab0aee13ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/de/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/de/firefox-57.0b14.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "ef084c0d0efcb77cdef1ffc0cb994ae6c6a9484c36282c7d9914b2d3e8599c8f2e9623cfef1e890a7d4c4feb6fba1c091937877ae8ea1d654a9bc824b5c8bf12";
+      sha512 = "bce375636ad043e2a9e331ecf84154f5e329217b6c1697ddcf17301115f39c6f35b88083cbec132f92fc30d93b414a8a913ddf02ff0c406295047d5d11a7a3e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/dsb/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/dsb/firefox-57.0b14.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "e08b193db4230efae96862a6a9b62200c42b03667c3d5a905938375391d99eca37716cbea561341ae76547be0b5ee94475f9ca9faec64fc178be92236a4ac91b";
+      sha512 = "0b75a555b9b02759b4315d3f77d78e71f2106db1b2901457b54e7a487b9f35a0aed3b6f47e7363257b2bbcd42104783fe14bc4171d658515b72fb61bdf9b0fd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/el/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/el/firefox-57.0b14.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "db49f80f7c08322307dc5cd225d2dc10a3179ce4ce25723264679c1c78454fe1c701ebf218a34704946a1e7d042349d0fedfae5b70b1c68b5100ad7cd4ae4900";
+      sha512 = "f4592a580dd7fa207943d071c92816c1f6583f579e8a8fb6564da6e95c0edff1c7dac24c581e25f874b354b55aabdb8fba17a2f4d9677b653e957a66360fabc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-GB/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-GB/firefox-57.0b14.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "b2cc8bc706e89390b500e6e8e3bd548417af1b0500aec7ed1c0ad79245941e20343cbcce80b03a2c885c7134c069e9f3d459739e6ea2a62c217a9f4ddb8851a7";
+      sha512 = "56731ee2e83a591201471bd6236a247a3a5713607344ae8a5c03efcad4f69eeec010dd89c1fdd6329325768a4b9a83ecbc278fc503a8d61244523748d0a8fd06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-US/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-US/firefox-57.0b14.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "621828144f0421ac2a3d5af1cf62a337d23409d26032d4c2518e99b0d04caebe1efc67c50f2b692612facfd5927cb0b51d9acceeecf9fc4c2129e6a899c9ddb9";
+      sha512 = "cbe3a6ae2dc8d89ebd935d2c58d3f735ce08f45418c31f1faa9f75d75255a07fa87d9b7d53f571bfd876701b566e27cb8bd761cd167749e2019b1f3bc1fb569f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/en-ZA/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-ZA/firefox-57.0b14.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "4dc4822fbc6d3027b9ba0b93b126e5223675c69c9e36c22e85681ca02c97fcfb9f9ef7dfa281dabec32b93ef8cb619ccb74ca18a3ebaf55f64c5547f5cb97c08";
+      sha512 = "f5c32cbea6753f4325c7cfdc99bacc4565b58b0ffb7cdc8db6d559922b8402493b502e7a05fda4e08746d48dfa50ca7b70ac27e152ceed3fadb9d2af2ac0f639";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/eo/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eo/firefox-57.0b14.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "8eafe225337ad597afdb9a90caef3a252f9f467b6d0988f63d92ea35f5d284431c1ad1a29350d9cdd83f5108649d4cf05de50706025f8b2e2db55955bbc8f964";
+      sha512 = "89d278965fb4c7899abdf17f2fd1dbde201c959b623c46ba4db51628a3a09c5e054a614b8657f7f190ca5e9cdecced24f126978425bb38d14c84770958466bb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-AR/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-AR/firefox-57.0b14.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "f9837bc84534f1d35aac94c0775fee981b9c7e5031bdd2c78b5609406a73cefa5797282aaf122e2eb772fae7baa0dc0714413c1b6d7255145fef540c31b89183";
+      sha512 = "d21ed37e2d6461f31519d08040b271e9a6d476e7132f5db406fa3eb3fdce67384af376a89d740426fba12a5602c20a4d315c0e337f0707ed7b91d739b648ad63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-CL/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-CL/firefox-57.0b14.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "e7fd613944dfdeafeee8877b77cb78844b1bfd1d5469dcfdbd90b6a0ea08c98f4fd9423dd18ae1333b90b5717f800a446f8d237de34a8131cf89db602b72a846";
+      sha512 = "bd0dd077e732c996de27e5fabd22933aa1c1ff448425bc757be909ccfdf7a8a2f32944721a248e4998bf9d455fcce13c22a89dbb780c3a61d8fb06745075b122";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-ES/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-ES/firefox-57.0b14.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "b571a99b0e11c8b4fc202cc720f2f0850b54978bb98ca9a6fff2cfdb6c853c74ccb8f9b49cb14649cefeca5768ee408e6ab8028bf005be0def9c519ca8d14108";
+      sha512 = "7abe774d7c2baa9e055c382fbe4612244e9ce5c778185e86c1b4e8422ab8af4f99a949bc8560109e6995d8101f8563e6251643a5c6e4ff1ca9675b064e1da580";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/es-MX/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-MX/firefox-57.0b14.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "fa46b9751f8548ea3724867a2d41cf9aa62a7416fa06ab63a4f59e24c45a5bddb84f982049d1cdb4d0ef3318aef46fb25f494cfc3be203165ba125234c9619ec";
+      sha512 = "4f4c6a5cb3fb25a030a44f3b7c60d6a1af77b083ca4cd04711ed4663e276f03ac92f4b8be697554af7a4721641fc7588b005e27f2ed2c5c1efb947a64cfae8a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/et/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/et/firefox-57.0b14.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "21b6cb415d45f53f8c5bd63a463be60ed05f55604d55dcfd0587fe023653d4736f1945f1f5d96bd97718b8ef492fb2901fe883ed522db4d9edc805af0c118013";
+      sha512 = "f23d6cdaac6a412c28c633fcd304833bb341c159090575b8f8cd7bed6068a3ca3497cae072d831b1ac40ebc98853fec978a09009d3eaa5c1f6aa6bd4f8c3b956";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/eu/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eu/firefox-57.0b14.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "9e341110f6c2d52182faa95f032090b2904d734efb7f4472f87ba77b6604287ebe21c7b1502f71e107e285578cb6c0da6dd95b45fd27bc28a16c14735725d22b";
+      sha512 = "1f7f209e1faafd254e607c7bfceb5b1913c59361d55bfde394d2af4f745e0be54b7d119cf71a88c577dc76f0ca9a96fa52cdb38b27ed5dd6d270eef5efca2501";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fa/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fa/firefox-57.0b14.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "15085dcd3803767b4161fb6b3e55af4c29dfc573ff2ed24dad02eaf001e657e3ec8466e827df472cbb89a442e33641ad422f11b7d663f1944a0f5d2fb94bb305";
+      sha512 = "e175dfa91bda0daac8854d999cf3770332d61dc11ba338ba8a9c42718e7d470e07dab656a3a13ff25f4295df648196549b4a3f4b273061c278f03e0a76815213";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ff/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ff/firefox-57.0b14.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "ccb9d489fb9211c9cabe344c65ba165f0aaa4e1217e4c60860c96e7d938532d1602a4c6d885ab5c934c744957a060cdcfa4203c8d93bdefb4f25bf938a4cc1a6";
+      sha512 = "243c09586248988625ae347ad10b691cb5f93ad78562c3223a244403a5ad41b138289a992edfce91a8744f45ff8a2feb008ef3dfeca608fa2cf44e39746bf794";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fi/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fi/firefox-57.0b14.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "306668c5cd48f4c0c81e2a160a6703c43ab93d79cec7c9b754425faac9441edd5cddc1bd67d743e577a5c7aa2db39dfb2b5a290e983713c8de780e6596a720d1";
+      sha512 = "66ac96ceef9d36ab4c16a288da714c9bb9dd72b12cd814dcdb3740135ce6d19f18ee564c31050b619a1af207d086674ea4f60ee01de3a18eb854f35af5d3fb8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fr/firefox-57.0b14.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "099fcd14b1cc7429c7cc4330aa7a397c32acd28006732d272a89c2a6f5c7b1a0a0529734e24fad308c26fdef6418aac2d1b386d7e7dec8ea19a12490cfe53e50";
+      sha512 = "7a9398f8753c0b3d6777a5dab4c28fbacc493883e5326fcac0cb0a0f62509169768355a5c5db377afa6a1ec79676b8de53ccabc49666ac9830d588ad2c8bd8eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/fy-NL/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fy-NL/firefox-57.0b14.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "688f6d9ccb1a130181e154ed75ffa71069348f82bc20ac649e5aabf69b31a65ba022b3a28d2149a63941bb6287dc8e14946e2f7d9d5ce8f89432c2a32f5095a9";
+      sha512 = "b309d91af97a94246c9450eea61f81cd8f6e8564bd089caab7e1238df4855aea54568ae8d40c3c59e09729779623f1f488e2b18f05094ad79d7d773a82196eee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ga-IE/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ga-IE/firefox-57.0b14.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "fdebffe1190222cd5b3955e54aa49286166366d910f1b4471ee36372abb7d515b22a48fbf2799abed4943b2a3203c983d0906cac6b5652f507c58778e8d98ff4";
+      sha512 = "f3b699c8cddca58a8610aade833b470e006a804606ecf13f166239f32ec7fdf0ae57e6f91d3a104efd08fa9cb34c7d78026753d0cc235cabad8aed8ae85ccb22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gd/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gd/firefox-57.0b14.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "5a957ebc86c7e305afb0e0f9e91f2c73b52b7ed2b65ca8c372cbc0666a86e809494e7deaf5ac4caaedd60400e8a82dd9e3773ec3aee04daebffc7c91a2586b08";
+      sha512 = "261b14e52513485a14d4c92f580a9deb228dd730f77911dde25785b8eb7974a1fc6d39b6d377a3dabf3f488f9d29892aed86c38a115aa4c9660b27a229a512f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gl/firefox-57.0b14.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "024ae0ddc5fe5590ef8ed4153e298b5a05dba17fd5a4d6ec78777969841cbd284908d7c19c36f6290efbc5ce1248c3f24c0cf4418f524166c1407199a6b5de90";
+      sha512 = "6028afc50364a4bc0e21fcf82181b3d6ab44a985d7ed55fc090544d25c0bd65ba8737e1b653e9cf860f201c6c3aded33693c2ee7cb7229b899007e9a607a39fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gn/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gn/firefox-57.0b14.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "e6b36e68cb07c4563b350e4af1fe511ddd69ec05fe027809f5561a788b2fcd95c88bc8eb8d67618bb1769f10d11a75898374a433185de49e09554eb948b2aab3";
+      sha512 = "a189db0e527b1a69d1f42b23b5898224313f73b269ece12bcafdaa9204cecc2424660ff3543098cd6036ca17c724436fc6cce9fa7f38376dbd35c943f56cb559";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/gu-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gu-IN/firefox-57.0b14.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "c8e3f732c6e91893f07821a2cd9d18e3c5effe7551434cc311455366faa5891afdd25b6d83b5e4c314f3d4f5c01e499c5d4823b332a120bc07c979dae8f171fb";
+      sha512 = "59c9e99ce0da07aefa433b76a961cf8b9294b30c4c3198ac7c8cee5d430c89a10058f614f0955ef768d1e0c12e583fb98612caad4cd48389454b9878bbb08667";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/he/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/he/firefox-57.0b14.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "a7192f190a83f5d3d1f300a072eea4396397fe02623daf9bfcd6a73ad2b8e89884723d9596f0be2d3da655fd937469f08d65e39037e3b7168edd28c8c23c10d6";
+      sha512 = "101f7135364f544517674f8c0bae2d16aa600798ec7755f4e02d0827df6920a60c19fb0d2ab3dc20febe1e9dfecd192a64fddfb2697b825ac940de530383ad7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hi-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hi-IN/firefox-57.0b14.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "30a355f58c9419472ede2713101721509a8c86c6c363693c256553cd64800572cf0eb000c8b2bcdfa788ea8876cbf6b7e8a86282ae1726eff4bde93dc8b33a1f";
+      sha512 = "dfabec31fc6170e3390a313a6f201ee51930c1e1c884a5e1b0b2107a2a3c1d19753c91404146dbbad9dc572f9828e3196e6fc1002a9b318b3648b1dffe2a9cf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hr/firefox-57.0b14.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "fff70e068a744e89e28ede72398d60b83decbc908c6776b23d8e532b4630a9526411a62572882a596241a7b6b6550766f3ccf99a5d044d7fc14afa52772ee270";
+      sha512 = "2dec6c07adeda8008e3d85b6552f29f882b1bb9b89a5e03422126067ebf9eda03e0272f31464c42f8b9deaea174c26b1571c1c416f1fab63a7e67cc0bfc2c136";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hsb/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hsb/firefox-57.0b14.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "aec6950ed6cd9b357bdb63e5edbcab7b42e76a72e44ec370380d2b5717db585da8060620eba7290880020b1e6325f134f001163f2ce7719c50b83e6a5a2fbc91";
+      sha512 = "b5dce6117e1c964a612708263adc5533d8a063ad6586030fda1a214c6df887995f7ae7782039f063786bb332732857781392c16c646c29d9ffc53fc3c8cac8fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hu/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hu/firefox-57.0b14.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "912b23344f96d37bdf66775ad933ac769e19818ccd178a6ad97b815228670c053111dd623fb98de382e2c2d414414fd9fc276f4aee5a00a439dfe235452fb16a";
+      sha512 = "fe5654e089d50c099aa3cc9279c0a4a3e975a3e10d15b9b832249d082f95d461cbaa51f5851c3f4a680419e293fc9137b1ddf275ad376e073090db37ed92d888";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/hy-AM/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hy-AM/firefox-57.0b14.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "04b2e8ae9de10cdc2aff751c5954f190ec749fea27ab265343b73d762e6e9ef6d96a7136cd9354988ac791ba7bf32661b5658fb490f1d80907505923bd7a70d2";
+      sha512 = "9678679c8bdd32131fb7397a88098028a955624a68d59746d073671298a3ecbd8d2933675ba564fed0650f44add7fc1135f441a3edf2ea932cfe6fe5b2ef5d13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/id/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/id/firefox-57.0b14.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "834087d98921683d0ae7216b6264c7dd7b77568b59e4739a7464f065328d3efa8256f03e9343177673ef5257db142466e3803936ec30a8f6902999a71c0ad163";
+      sha512 = "c863c503ecbd71f17c311f99d94a86af12a57bc1ce0beed6fd0d0ccc5c814c25e5636de9127610b768fb947a0ee48ea585e1a205e1646ab20d2f6c2044b67618";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/is/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/is/firefox-57.0b14.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "2a8f3b35f7c1f8adc40504c3460139ae7959ca9657f899fab9e73eaeff5d983996a33d284d058599406d4d46ca941cd9969a7e6152650f6ecf6165329bf2f350";
+      sha512 = "7fe2398dfc0da2bd215867414d765729e2b30620930ee1f50b98a348f6e6fc098c952d0c5ee200dbb51a84ec82f4ee2fe8b01c4a6fc879d2ebebd95f39f825ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/it/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/it/firefox-57.0b14.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "6b04fbe6ad821a68d7bb968836d047fa08308a571fef1d5ef82d4719841a7b517362f706f4251d4d60fb084c06af9ebc671a8c131e5a403a21ad9190d84c5789";
+      sha512 = "043b409173d097ce49eda0e16144b3f50ba7f7a83ed679f8fd09c26d18914681e15b68308ec6c65aa09f26afd195b6f8e5afb4e2276a5717b716280450dc403b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ja/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ja/firefox-57.0b14.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "9dfae62887b03ab6a963547c1f4c4332bbc4469bce62318fbdc439130c65677e9e0328942b49b37d251aee45b56f474aa5e1ef487244ec61561217f1e7f2bcc4";
+      sha512 = "9c4391e27831ae034624f22e8643922324b7940f2b6c739d1c6b5c47449b83f2c8756b11efca47a42820a867248efc023876e1218327f1c8e80cda0c960734a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ka/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ka/firefox-57.0b14.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "8f1ae26d22d02bd3a1aa21cbcd750e6003f13fdd1aadc85114485cccf59f300b962a729016c3dd1611b8f32333422318ca806b7dac1a790c11749c909908840e";
+      sha512 = "490c43518d3cf1320d9a3e8f28c70908b31a5f9ed01b211f4e53aef67baa279eaf129f06ec6c21efe2fd4a89364f55ccda95847f058cb2f83fd1f92c466263dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kab/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kab/firefox-57.0b14.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "28a00d36928bb60a2c65eb9e3866b8ec1fbe76973fcdcad78a6f00aa601e4990c1ea96c37984171577400dd511937011957e51e4996fa64db0600c0c3cadb810";
+      sha512 = "bffa144bd5c6c0d3fcf9c8d44c679f22af1127734ac8934a5cad4d5e6726978133cc99c61dde870143fcfa0b07c146c4d7a84117178e01083a0c37d9b4810184";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kk/firefox-57.0b14.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "76361b378b4b2bd2a1e31caa344491868188155caa57317f46c9f89b9a77df5ea65f2d4f8ddd2e8cc574e602fc163c4d671de932938ffbb64a1e68a7fb51bd51";
+      sha512 = "5b49760338013954ffcc3ae2c9c79b0d9ebd92f1a148188249559723bf23338a7b606b26f5326b48e2acb15e7ce023f4dd2a536c0cbf5b7af8eacfc33f3be670";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/km/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/km/firefox-57.0b14.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "abd176c702ab4f1e829e23a4fc4bedba45724ad119d84cd18a6d7d2c8487aed690702709312f5806f2fbe82076215e55e3e4de3cc8cb56b33079d4ab7e2921c1";
+      sha512 = "7ea92ede74eda15d9a77b6b22a02a634364b60bff135da5356991644f474a47c16283670d24f2cc28d112c97f3b49fcfacb1c618f9caa16fb013c3c650b50feb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/kn/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kn/firefox-57.0b14.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "62056efe59a3acb2fdd04eaa343372b7b2e1f974485ca7f122d6cd9d7d67159f2a4361aa01c68cd11a93cc56d807068842b735b74e596b5d218c952f5e318658";
+      sha512 = "e3d3ad10a374421603068c420e2c5c28ee8a9f9b822df556a1237eccc54a778ca572e09795aa9022cfa373652cf2913c621c2fab82484f7eba77f56305ed6aab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ko/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ko/firefox-57.0b14.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "d1772efaaa2e2f42bb01d5ac39187accf59a235327d5d159866c5b80d7d54a867aa496d63fbf23737d52b976f0be8c35bf5f6045f0d69eb5d5af5e67b6202eef";
+      sha512 = "a681d5e49952f1e671e0c86854102979e052b84140002b968f791f4a325858985751a3872446ae2495802ea0c1df884291c8559a573cdb236cadb7cd706ce718";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lij/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lij/firefox-57.0b14.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "a45f3f8181906382f3df68abfba8682fb43db58fd7b6846eb3b64eb67e6d57971cb83ed6c74785e19807be06dbfcb7b003c67b800292cffcbb1b42c812bb034e";
+      sha512 = "b33522bc78b07958a3b5b80bc0833673b1516652de2a165f5bc7ef54575a21af20a922e207be02c4531f64503e97279dca4ad4833d2eb86a6c04f3fd1fdae7f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lt/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lt/firefox-57.0b14.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "101d43ee97cb635073ea9bea836ac0aaec514fb5b4eb9b821df0f48d527b89745907f557a96339c19ebd152639d9a4bd745396bcc97c94e69579b177f9c1d7ce";
+      sha512 = "ec27a8aabc0736b410509a9fb9706627e06316b34a241639ae27108ba3c4945b4ae675fd85da390ae053603a0a13a124c0638c11c0750c665c8226446435bfec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/lv/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lv/firefox-57.0b14.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "74afad1dea785fefa379c7eee2efd0f38673a632b9232102a02e8fa7591f89b0c58447362205b23638b54fbdfce90a813c111344ab4569f57b21bf3e3894b4c8";
+      sha512 = "bc4b125320ba7033946a290e0d974cd4a4f517ae9c9e2a24d86d28307476fbcb4372ec0cfc567d984e90d105cf692a08100bcec81e4ab615fff19ec0ced0096f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mai/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mai/firefox-57.0b14.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "4b87cc59533c6b9d3f131ba533314f5c622efba35084a8ca6b67c4c63b55833a8a3ad9a72ac1371dea86e39691a6670a3d38952120ef8e3af712a72fbf69caa4";
+      sha512 = "2aca4d6ce673fcb71a8c6228e243157e597573d152d05bebdf8b9df3bdb479dcce1708cdaf2462902c5ed0b7eac83a9dca523bc55a6bf6b2a9fd1d4582a3d68b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mk/firefox-57.0b14.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "dd85e3305ef45f319211492163215f2f4140091d33422cf9bd01540493b13c9fb923a0c64aacb2639682a79cf6163fbb6e559aa29fd6dbe28f22c7cc0a1398ca";
+      sha512 = "22fd8e59aad75508702ea3fd37af4261f864a76e943cf6d07789d4f1d094d7e0d5e76e5d4c92b6dc642e0f30047d4515d8520bab667c05c16aa4ffb60f0fa168";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ml/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ml/firefox-57.0b14.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "19487b16d24a71463b1227a450648ad0f7a0dc08b6a0ba69b99d87387bb2c011f7139031eb09127bcef5c5e28be90b8bed4de449af4b2180e900cef4c7e26218";
+      sha512 = "f96568186cf49bde7ceaf36805277c0cf4d75da2d5930227e625e2abddd5b740df4207ce53abac24c77dc755f52132204b945fcd7706de4e3075505635eae9fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/mr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mr/firefox-57.0b14.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "7a71d953b192d2453698318f7fcfec7e4a1a08f893094891b446add05a0a570df3db76a1054c296d723855e4190dc2b2cf84c953fa97486a8bcdeeaaed707bf9";
+      sha512 = "82fbe7593e52299dbebe38fb97126b91f57e48968c7235d8adba93776ea6c6883dd8eb5df3345cae55d156a7bde2004f1f446339e46de90c85f1525eb1334147";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ms/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ms/firefox-57.0b14.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "8970064b77ede1f1b52a974bfc7bf543a203943a3aad2f42952669e48e1ddb092ac47d41704364802129501a5e0106e5158d6650a4ae7a84ff07916ff61af07c";
+      sha512 = "3ece240f01f8322a86d1b8861be25e895fdbfc9a024406727400e0d6cee8efe88a11cbd6799e4b7d0d8396cad80a6a7438d4f0e3b641f94396a7d2e80be06e02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/my/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/my/firefox-57.0b14.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "3681f7a89ff3f099c5a387c9bc32880e3935a68edaf004d97ce492a271491e40b06d28e9afe732163f94d0f882a777ce8655ec0d9aa61b5a3be53792661857dc";
+      sha512 = "9e670ecd9628c8822f634031dc7b6ea2610687df8967591ff44a3fc2922fc11bf84575811e9e0f51997764d67c357de5020619e3f637e31c3421e64b533930dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nb-NO/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nb-NO/firefox-57.0b14.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "10d807437bb0f40095486c6495be4460bd9f10747243576503faa78b3212b71a893b4dcc1bdbeac2cef0ffceda288687033d05db9e76576e6ed049ebcd0a547c";
+      sha512 = "298d7d24c92a5f56f00d7d615ffcaa1b483882f5845f3de4bc8be2811ec6b5808a2bb813ee9d9b8aaac84a6c6f7bc600b45b7c22480e6c4c111fbe815d46e70f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nl/firefox-57.0b14.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "31fb0e57141696f5ee310fff881e811e23c9c1d182c898cb8be142db54ac268dcfcb8a0e865ff5759984ced5e0cc9b87f64b6b27f5ae82c04b3011c7460694a0";
+      sha512 = "c59787d50bb14ecee498e9c454e3ab79571656160761e95a53b41ae8196093f6dec3f435d9a69f064b9c4aff0bef332e2d5334153d98c8984041e26c82ef04a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/nn-NO/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nn-NO/firefox-57.0b14.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "386d209088359eddfe3d68eb2466b491139e9f372a424e8509e531ebed8901fc098eaedfb11a2d606f22a940a2520b2da7ae9c6ad8a1e6dc24e5b4efce39b63c";
+      sha512 = "c7c9965a5810bcaac0f1b0d08ab6a9d660a00e40368369998101c2cf043837459e6e65078906c0278564412655a76987f30b671bd90edb25820362c3a846b1eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/or/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/or/firefox-57.0b14.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "8bc59e0d4ac62b1409616512ba15ff15bce172e27f161407bfd11668399692a53d362e0198b6c0b137d979609b6b534ed63e1875747111af0faed895133f4b4e";
+      sha512 = "bbdad4aa7743a1af3c31eb81003612d0729ceeea5a0303f129f24e352219007b55f40a931a0140fe1b1b4cff694572d1141779238881376e77f30a3f3675512f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pa-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pa-IN/firefox-57.0b14.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "b25496c3795ec349989b6fac8cbf055974dbee73287e9550b9266ef475a979f7589c8b318a9c05f4c324e69333b943382f2ebfedd0cc8c8b6d77f823537cef0c";
+      sha512 = "99f5ba6937e08c2cb0f05be9b8f2e87e1f27d5ad610540b3011cc2fcd11c2a7a84a1cdaea9b6133d1c9a38311eaa13221ba57bdb444c9aa343c446abc41c986b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pl/firefox-57.0b14.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "762e795c44733f161b2849a7057afd2b47021312324565c39d51a3b06634761518284eac7d34927c7e650c1e43179cb88b80396ca91592603ce737988c197533";
+      sha512 = "956648b1f331356f8ee31158758fa0ca7cc7685aa7b20c1833d87828f5f4d695fb3fdbebc55f4862c0f76afe72ea6035261c9ebaaec2561d728d61a4bf53ca9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pt-BR/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-BR/firefox-57.0b14.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "a278133a771f43cf8fd48ca4fc06e324ef3d9187518ba1405c371004b94e608c3cff839dbda184b6c23c6818f8cc55b192bc9118f19e8fbafd6af0b2f0d6b611";
+      sha512 = "528a30c7ec5c7485d0a64b6787e0c14c66f832b2289884ff234799631f4e9c6d620c3312ca3d1872e28c80c7a192b8e0e4d0b9d88dbad610268e9d3fb37b3a05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/pt-PT/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-PT/firefox-57.0b14.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "f56e9591b8eb311484d814723a9d7eeb66914cae8d9b74cbe12f8824eba898f5fdf072e3cf0384deef3087826225bddc31c9a92e11906a05f6505524a6e9c7e4";
+      sha512 = "c70eb4dd653d035fbcb7de8bcc78cc1855f7d6dde8296a825d733a26e9c44e38c8e77ad54c63f806f12b90c601508bd6376aa620a1e0948c0b265dde3c2443ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/rm/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/rm/firefox-57.0b14.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "b0021b2b2c26aff1ef7bc043b64ba39e4152ed3ecb981cb8876d4c15af9e157b30cf9cf92481f76a4071f9407312a8a02a20cfe7223a4f20ad9cea46ffad3343";
+      sha512 = "c9b9f0e3ea90fe7e2d5c2907d82e7ea5abd5f30212f1fc5e726dfe72adbe3835107cc836e310ee4bcbbcb6ed6a08bc8bea06d3bda08d1fe7a08ae20b6a22bbdf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ro/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ro/firefox-57.0b14.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "dca26a56abe6f6000e755a5df7d62245bea47964ef47bd0c5ad0283eb6b04c235e225e66bb54c979460188ef9a1c870d9d53b2c185e6dee2a37a36880cfca6e2";
+      sha512 = "6246be75562143b57f27de69e39f9c82c7aea3e60d515cbab0ed5e32228f5b33abd61cb2fa7f3c4e73c65a6dab5ed446a0eaaa94767e0196d5b337e6b5a410a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ru/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ru/firefox-57.0b14.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "26eb37a11bd7b484617d29432c67eb62c84f4a7aa1575234d284e39a23edf1f679532f818f7f4c64273d70bb400e52f327498ccc8226304e0e859fc7daa38dec";
+      sha512 = "467a4adb72e27ea95d324f52007e18c3ea307b7ff158a4e58bba69859f5369fca8e7243329e2bacf590f35315402af10d8071c34886a7fdc3cfd6e0548653aba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/si/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/si/firefox-57.0b14.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "a7eba6aa32b73a64b7b21447d7ebbfc25ac21c9cc353d06fa9eb1e6b5e43f2673f125abdc662e8296a8254c96e97e8684a8408d712bb201eb1b9ee494aebcc23";
+      sha512 = "47b11ccc3bdc373f3591ee73b84edcb9afe915f1bdf5b7abe65eb2ea675da44316a4ee5087c0c4e69a90dc337d43e201ac15b98d04a0ad970f8017d737e4f738";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sk/firefox-57.0b14.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "da4a7e40f4063f11434616a1130640b663d1c73aeac6a8638a281174df890f0dec105fd8e5e0200dadf8898bce7adccfca5b059f35773abf4c642ea1d25ffbf6";
+      sha512 = "c7696394b76668733814f1b2cc1c41cbfd962d4d58e424c041fd419b3da2559b1f4057a8aee328e0698ec8b350e7909ce5da3770f287ba485dfbcbeb3d1de9ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sl/firefox-57.0b14.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "6d00fcd3f71520a5924772f0b04f091a3abaea2b481bc2f2eca793330a8a9600a7eab38c7b1a9bc575cfa40c74fad56c6f3847ec8edbfed3364a8b7522e23c1c";
+      sha512 = "aea6c90fe73f9aa1340de0ba8207089deebdfea21d5fbd5d5c0ada6df26a4acb4349eee4a7ce09f9088439cf059fb7fcd6169cb1c34c83a33c909bdb3ed7af43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/son/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/son/firefox-57.0b14.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "0484c6de79a605e94192369aad55850b6897ecdc44912204fac58a23ecbedb8991ea3f670c3794d1cb1f311578db41ec518ae030e16e5266b2d802120bf151b1";
+      sha512 = "6d3a9b05ea14ad1281c51d99757475b6642a5411b7b409f2acba695c3c0a5719f4feaecd0c56713899475501fad3413fe46f4a3efd482111aae2395df22b1e25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sq/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sq/firefox-57.0b14.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "c5704bbea312df025d1e439563b358ae5115c0e91b82755c8a895194a04a5ca349da96aac99db11627912c5440a9e675c8bcc14456fb14bd4461c373781c2151";
+      sha512 = "9e7639f9fce27b4c3b3fa265e0662b31360313569f1fad798c89ad1eca1944827c3aae23c283f4e153d3f81a73d235b5fac56598cc02dfe2dcb38aca806203a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sr/firefox-57.0b14.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "27a3bff0a5ddbcd0905fc9ba69ea733d6a6c14da78d1bac0448b6804b8cfa8668890f2a1e617b17e1a642b59795c11b82d1ac4192863f23dc82adbafe2078714";
+      sha512 = "d84980d2b454f33a33fdd9b44ea7e2c41a73a351492fa7bd951a8e4ec288a7aa4d12ae362443a664abfb554693e8a8f5428843b28ed48429de3d32575f94ea74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/sv-SE/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sv-SE/firefox-57.0b14.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "e762be3b52075b4050719634f9e68ae86faf55295803535c046b2abf05ad6f695a0695311705b2293f79c1c8ce69d69b39609f27be6d0af9b625c0d9368449a0";
+      sha512 = "b26deb242735a3fa662687efbb8a293e76561821540ad701091a8b7033c9c1047459fac955815790ed026e4f69a51d2b0396a21102a79623b72f5ef8cbbd06e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ta/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ta/firefox-57.0b14.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "cc0570a17d2325faadc7b1ae313241935588dcb1de8d6a1224a583fec6511a34d2a7ac786bce894f1a4b8b0b92d2d4392d8b4f7d0a0db9d31378191cf1ac8dc2";
+      sha512 = "1e98d86b9df418542dd15a204ed70732dc8111d8fdf34edbfee8217460e04467a822b66804e9876e28f15e9167ec5a6dc1551c4159c136006392feb7ca218009";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/te/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/te/firefox-57.0b14.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "3f6c7e8612cd483e209c95ff594ebcb0fcab2b03d3687c6a2cd8832bf512b85257e0ee5af2aa1426c6b3471c6d00910447cee91d5b45d5a5aefed0beeaad781b";
+      sha512 = "d22b7c8b45d37631434007b196c63044a860912826cb301a218b0aebab5ae8283370924a703cebb16a98a589336e024b31ad580b6fb57ccf3ed53f238e361704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/th/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/th/firefox-57.0b14.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "2576defc0da691c1a3a58387cef996e031683de1d0a1a0f928692b5982b61e53cf01953d473539e8afb5173d674d9e1ce82fa785307525a65e9af062924ff0c0";
+      sha512 = "8a806b68e3e5d4ba884bb9f72bf07c2bcdcf33a8111236fe837a41738e997116d092ffe73e4028dd7429c4bb0f097270fec7a20ff3b5bb316fde0a90af92d22e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/tr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/tr/firefox-57.0b14.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "bf5b69d5d47c21bcf32ed5e9277d59d09cbdefc73f750b957feaf0f8aceb184425ea6d87e731aeee01bdd74ac42243eab0d781261d63db26bb57ffc3f530bb8b";
+      sha512 = "9b1e73d28f5f1fc352f830aa59612170b72dffd7ae060a8f2422ce14ec46f9e646fe625ce36dc4d380fb58ba0300c68a83f2d8aa8282100f6ff33a43ca79d807";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/uk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uk/firefox-57.0b14.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "eeae9bc7f51c8827c07bc140883c672455088aa9cbb5c4473399f612847ded8e95f61b6c0a295c598c2a943e641812fa75173f26cb46922fd0d962af7ebf9d53";
+      sha512 = "96d471b413e980ced87be210faccd8cb6b796c17b871cf785c34f10ebc04c4c76ce4756bec0dbe121b689bab2f777e54eef6ea43750e31c1c83524d0825d0fc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/ur/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ur/firefox-57.0b14.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "36d2c5bcad4aadb2aa381e2a8f0d69256268d337088639a031af86fe4958529e0f32cf11c5703c39999dd247023134ea80201c351963639160875547e4728b00";
+      sha512 = "0724b881cd4aa040b249882d41cf55260d6aca1f4876c89a42f717f00cecf40b32fa60451685b7a182d2ebb11dd08af7e0327bb5c9fe94b2a6f03ba8c9b4d02c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/uz/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uz/firefox-57.0b14.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "a245b8eeb1cf93dd51e85425c129e0a88c3b9d312bbd502a5125f603259f3ee97eef76489a5f9939f09d3bf1b134deb3391689a54d607bca125138761378602a";
+      sha512 = "bedf1751786c828779fb719edfaec466a299ec706e40dda5f886bffe911d425b82e9f9a3cbf5a0deadff7ee77fd63c73f38ce3462aa7203316fc0569a4423927";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/vi/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/vi/firefox-57.0b14.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "b1e2fde3c1d08870153a83e921231aa2fb34238b450aa6ce7b79b180b5902ae7bbb2a2dc689a119cd0d8b3d9f9907223c08894634810c48b629d74c2521683e4";
+      sha512 = "3ed1b4f71d75d0e863da048edf60ee3cbcc5239d4a8ebaf69fa6d3a8e8be20e556dc838155d7b99ab2776ffed60e578ce253c8e6f57491dc84ef3b68049cf929";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/xh/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/xh/firefox-57.0b14.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "36345b203efe934147e96548c25ac4cfa21b7eb4cd0a849c7e35ed8e99d36687ac3ac5657a42fad30113192b364b6577dbcf47b854244f02659cb89ac4553519";
+      sha512 = "23db4e5df5432094b7f31a688b84d23304c7890d0ef99cd9c992d7a108a08199b6f6f94bf3574668b9b0a915ac49d2c0e8c6b0c37ecb145da3f5e2a5660d6d9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/zh-CN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-CN/firefox-57.0b14.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "b5a8464db5ffe2eba9e33de952e4a44077f0af332ceefe562805a5f285a42c5bdeedf4ccb3bb4598b9eca7875ed1f2144a2b54b652250c8a5dd98b0a76535243";
+      sha512 = "bf08e65cf257f789dee34891818f94368fe89bb500138ffc72855da7acc62cc08a4eec3f4d32a637f59fd0eaf072994ba4d5691da300d75738e3274e4db3ff45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-x86_64/zh-TW/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-TW/firefox-57.0b14.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "5967f8d5d89ea780dc7475ed50709a7b269f08eaae74c200df97e2b914e01466af1e3cf58fda4eb44f417e384dea03906d7855d612df3dcca7aeec58040ad30a";
+      sha512 = "6b924c8ad6b86cf07b6b2f01a6138636391acc519c469b7c1dd96ee5c707e1b81c656fe87df31519413ad60e56e06da46c0f762b26249426428dafa0420a5b97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ach/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ach/firefox-57.0b14.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "d32fbe4ed3824f2ece3987ceec2ab408032eb5d352a035b2db3c279a5c368a125ec234e3ab24728d4251838a2b60c13d3db3028cf48e3d2b2ed4c5b54ea47238";
+      sha512 = "56d847a9417a134af10f53ac5630f7b4a7108b177444327df97511494e2a28a279990ad37d48fe1fc482f34b45db66f1c8d458162f253faef3ea2e66e42e7166";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/af/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/af/firefox-57.0b14.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "fc5222c5df35584fbb18099913f8389f2c8b2f25b41f0e753d3e5f5ec78b5294fe5c88da0ac477e0363f31d7af96ec121b89325a0765cacec0e7ae3e03762d09";
+      sha512 = "98d55bc29423eaa62b1c5f179887ac95e8aa228ded6e077cc645660a048ee3e42da7966adb9dad5f168477262638456bd9509aeaabfb2a754f0435b60e9b3a46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/an/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/an/firefox-57.0b14.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "e97bd96f4d22d6893d4f89bb9e2b53eac8a68d30b46352cf296ff36ee02d60d3982c02c84c97c803b0216f86d3c7998101f91745b109e29d8c7d0c61e324a8a6";
+      sha512 = "0478d738826d3d9b0898ab93e25527b4dae789652a65a7b16ec5796b8e48e575387fa3b7474d7092ad851e107c03f9c58d8dbe738277371f2e881c56c9f727f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ar/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ar/firefox-57.0b14.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "55741f17e8698e02731b431c8b20a2d702255e37171f027ed779243056aaca35fd863a80109679c5fb920d0a2026bdc3db6759f1b3fdfaacf237e4b20bc7e9cc";
+      sha512 = "4c884b86e8ef6b554d85151f1eb780edbee0bee6b60f2ae3b30ff9be74591c4f4df07e5834d0ca5cad456c574abac712a8e856e07892df652f7db510618d231a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/as/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/as/firefox-57.0b14.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "0e14c33b6f328cf931a7f9c42d5fe1d7fbcb8736381232c69920a45111410da3d09c1f5667e7206628d70a7caf1404c304bf9f4ec8a5ccc3342103b3ebcf3757";
+      sha512 = "a58c8f47fea197a5b9a397f8e58f73e381ffae3426c83872407481f079b62a585230d2f389245d5eca6308e8832fc95d8dbb7da97d25551faa44c20f6e032bfc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ast/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ast/firefox-57.0b14.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "a2d51ee57a7cef66d862c593bb1e52311593a21ae0a25d2b9c14a64065906de26770c61665dbb0d55930241302940d697c982e050750fc04a5c89ae1ca1b419e";
+      sha512 = "fa4f10093602f03b759502d76ed1d7636ca2fb0f83174869e3cdaec3503fae625e6d49a07c011dfdf6964aca7e8ba81861677cb387ab8c638a5a671864451dd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/az/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/az/firefox-57.0b14.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "b9fa717fe7d861152d2117f1d69a7ae264f18c7e1bcd4e71df7404277db6376a93021e070edf73fffe1b00b3f7031d8c555df645efe63571d8831922d0212d05";
+      sha512 = "8560bb32c0c3aec695d86d1c0ab6491ba0c2dfd0a936e7cddfb8d3cd35890db31ea233afc74d19974fa693614bfe7728e69b8d1ee47a34331b07674b0b57f118";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/be/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/be/firefox-57.0b14.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "670dc2d6d9d35947d181dfa1c11bb84cc65aebd268cdea059997fef685619757d3d7c6025a12d00fc5364f258a64fe1b08a69357a2d31fff7bfbd0ca07cdbd4f";
+      sha512 = "026e1ecbddc4972cbf1a2a930fa1488b4e649ca7c811ad243a3c068f8cd6b57e5a73d193a3feb4cb49f012dfe3b5af9002f30609cd1551abc1ccc5e89476440f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bg/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bg/firefox-57.0b14.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "99deb263d7111123582ef53bbb1919497a6ce6c73cc160b4e26f5adc22f46e383208ae25acb5b4bf6dbac4d9a4f801ce70e170b0e6e5c9a03593eb2db8edb601";
+      sha512 = "9d145f71f46e12f071e8e181f6511d20a6ca5f1f1950cb076ca25b929893da7546b950450f7fcb41021c4591238738f9b8797395a86c599a907f0df687cf0282";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bn-BD/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-BD/firefox-57.0b14.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "34132da469314d9fe9295b835ec2b8b79816611eda646c04f7e064bbee5cfb2cc42f92e14a2eac60239c44205be4f3239eefbd1cad6700520ca3fd4bcc1d127a";
+      sha512 = "846001c844e9ee3d9305eb5be18438af65d5920363f19935a60b503d4a31c0fecf1d7e6fd286cb7ee4b7e26455496b1d27fbf6ccdf2d2a432ec2e2472ebc9c75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bn-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-IN/firefox-57.0b14.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "9cd206c11d28b866004174532a253ad49c06f2c6cf9b2004b15bb14bf597e776cadfebec4b3935a323b98dcfd3590bf5a3b289a9f7952a8a438a7e90884cc0af";
+      sha512 = "712ae023c09681b1ee9f41240d12a1641df5c4fd7eeff15d157c379e5b5779c65b93719b238fb121fdb9e5ce10809b21125a6eae23a77e1806daa0b2b13e4372";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/br/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/br/firefox-57.0b14.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "f30fe67e71b5c3c0e3f352653395094a31cbc52574a9dfbf5d5ccafcca528ca0a5b164cc75d5dc7d248eab74f0470cf8547fced782c979fb1e9ba4e177ca2b6b";
+      sha512 = "b99c48b8971dfdd0e642cf76cf890706402079122311b1b6af77d658b03acf87feb67918cb83e5435cbf0746e2c2a7c49bf7283969685d0b4bd616d4ec3066b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/bs/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bs/firefox-57.0b14.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "b2a546259e46cb58d44a61fa78e53632fdf0708921d80f329924180eb1a01dbcafe1372c8818280c0b40aafc7d4e6fa59d3f34b7e6a514f2adb1796d4274c093";
+      sha512 = "2203e66bcf453f22848df010cade83d6982178c8ccc023e05ff8fa60aa3f7e583f9d8e33a313fb70a696e149773d567be8228084708ca8d01b3cabc431a7576d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ca/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ca/firefox-57.0b14.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "0f256326b5338228098ec31b8182e2d5d85418c9ace5fae1ef5cde37704d2f333172e4db7497f36157fa530148585dc70c0bc1b677b9888ebf0ae850b4aba2af";
+      sha512 = "75ce6cb2bd7c1d79b4260dfc19237a1344fbefdff9775a7e557f9a31dd9fc6235f58ca8bb8430b80bf0f25c14be5dc2509e86b41b7ff7814e2fc1baa63f187a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cak/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cak/firefox-57.0b14.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "effb3d74d649b7adacdfbbd568b561f55ef277a9b7ffebbc27cad5ea0533a73918effa9997b9565d33635d8bb39658900f251cd071799fb15adffbd8022b4515";
+      sha512 = "b4f0a11030bad0cd177db357bc49b6f745cd429d3a8dd9bb09e99db1dffd32ce8c21a94c0b98b6db703fdbe16750b4574b3378dfd40a358bc0c7957fd2cbbe2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cs/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cs/firefox-57.0b14.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "494dc250f77d7933006121720aa6526534c7b90c17dcbdee6bad4e0a6f5224de661d3744862d5ce519a9ae4f36095af76d9b86d873d4db97991b1d27ff5ded8b";
+      sha512 = "5ee1dbd826801dc5b029c8eadcfe8d040f000527a6ff7f2a40713a137c59a144456adbb35cb202d7883d831486a0ad56079d07f681ce294a5e97825b7effd69c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/cy/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cy/firefox-57.0b14.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "910254333d2f47f4d2162cab76f84f2b9f1808d559d1eab0d1ac0c1673406869b3092eabe7f4107758dede9394b383ae98ccacfba768772d550630f34efe5c62";
+      sha512 = "7116bf1dbec5603d22546b1927a6038812c2abe1e9e7e1ae556919e62f04af422950efd808e28eb7f8b349a9d79bf01b9280d6a6aab94bda8c0f6e2a8968b841";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/da/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/da/firefox-57.0b14.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "f9fff4a380c84543212c610aed98fb0fdc4a0d2693bd87c3dc3188d7eda73615d028c7ff7c15db12425855105a1b5230a7f62d2eae84a893f07a4b8cdd47538c";
+      sha512 = "538ddf539a6d9dd22bc2dbf9f712773c1d7896ce2a49632d4acc2e5716dda95dc9d10393bacdf2fb7d24342c8a93c39eee139f32edfb429b0bbf7053b7bb3240";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/de/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/de/firefox-57.0b14.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "2e772ae4b2f5246c96e30811a322bceac788325c40463470152b495492e60e3084e0ce55473aab56c9be584992b6761e364902352616e70050b4b0e9467b1a79";
+      sha512 = "ff33af1ffb0549951baa32e423eac3828b15bbce18ee03cfcdffb57504fb0e592db2721f7008e84562e5c1ad297311a1b3d4fd5ab41e3d8346a2d1ca50e54c35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/dsb/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/dsb/firefox-57.0b14.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "8c6b05440d039b4ea3666b718f8cb59f91804ac2899e9d2e0a32a7622f800126e3b3bf9360a8e830cb70408cd7e4bc18f4eeb639dab403718ca6226576d262db";
+      sha512 = "6dce022b035bf9c5d76c45492e29617668e0000f5f3981e3f132ca1595bb54b504cffa92d220e118fbefe8088f3749f4d077c591a12657ce9266b88aab8019c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/el/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/el/firefox-57.0b14.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "9589eb08e3d128e1c22b639945790aea4ce2524eb3c16d581c615f18b3f1247240085fb3b6d9cf3b283029060a86c0747def43c3d89a1548d907edd50d0867e3";
+      sha512 = "b917927c48189bd26289fabe3a51f59965c8a421aa941732a50aa9aa3769ce085ee69bb04202c21699f5ebd6ec2cff75ea2446246d89916127be9418bb00f47b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-GB/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-GB/firefox-57.0b14.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "b1848e886919f8698fb8ab7272e49fad3ae1f5d98ce92b3b82c6117f79df56a8ee6bc2ea2cdc8987701b9a0fb4c2b1e1a58a9faceddb0366372a40139a1c7664";
+      sha512 = "17257657f8366c5efab1a0c47aeb6129e624c883222a6bc3bbb097bb49b531894cdbfd39898d0d83981a1609fd3ea5dd101419819a1f156668fd3cdb3758b8d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-US/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-US/firefox-57.0b14.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "327081605198481bb18bcc45a88c4388ec9091c6c10bc6a27ae58e133470651d50edb106f95499de4e38d7ce78eff68bf38f430371e4c490962e2cdd3ea55635";
+      sha512 = "c86cce7893fbaaf4d3b00b961b07a2f2d680ec07451b735449a501b2d9fcfb2fcbc0cb29150866805ad38f6a4aa1b6c4cd87f5872b8c735791953f3646600703";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/en-ZA/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-ZA/firefox-57.0b14.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "bb1432ab9e9f2e11fc2270501f25e3181aed4a782fb0337ea676e75c4db487a48bb1e3e44f0ea703c84c4dbe8d5c4e9a102c8cd1d45ff673bef7a5b884dfe707";
+      sha512 = "0b278c62b2185a4a6cafb7015062693a0dad610ada1123d07e162456e4d942f02a0566ce525e68b639fd152c420b925ee3e934fd3c42ba25524b18cdeeb9af5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/eo/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eo/firefox-57.0b14.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "8ff8c209c3aeacff538d2f265f8a6eb7621d27df237c33b9265d9246674d61f7905369fb2b7636920cdacaeb3d44be11dfc136de940658309f3285e62179f8ee";
+      sha512 = "a681db144a631e6584340febc3de05803921b757f7c1d39ad5b8ff3d119ed8b71a4d70a43ac1e3a121e04102770d2796103aa127886753b2bbea723e22df7000";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-AR/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-AR/firefox-57.0b14.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "4eea00d279524be9a682ae46cf602572e0e1469d1dc10e37b1b0a58868386930ddecfe0dc43f0d185ed9bedb29fb85eefaf87d83ffd00ce51db04d37e5fa78ce";
+      sha512 = "40f5a7d9ba055f7eef155601f8a57e566c0829f32c92df48ea2ecebf6e10dd80885881a98d18a693643e2c00f8734218a7ef8908652eba1c4d4288f95a34cde3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-CL/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-CL/firefox-57.0b14.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "c130ca1390f9859ec6d276f77889cd804a38e32551c898a17158b1b7b629f7f72a39afafbde38029438c465e3a0ca82cc80dd73905d84c0aabad8ebb35f2512c";
+      sha512 = "be1e5b8c6e184519d0b10fe67736d7635b6fe8ad71ab78014e53ce9a1f1342a83aa1b18f535ecde2406e8be7a8633ea58af9adb355ad2b19ce0879c62f70bd40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-ES/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-ES/firefox-57.0b14.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "6b515f16a2555f56c1cd8d4487efe2d4ba8107f3122b0dd81df9168768808d08314565a0a7bcfbbf4451d2a4e84559e84fcc730caa1641e801c6daae0ad517ef";
+      sha512 = "be0d2b2cb5f82fbaf10be63aa76a5ff9b9111b4caf0ef5222b3ad7d67d39f25dafc125352c00bd91bb1eef50a6f57e996f6a10618d50c5d1340604883bffecd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/es-MX/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-MX/firefox-57.0b14.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a3fa5b35773656152eb16efb6486d8e33ca29e0094de24e389e94a6e7fea761569c3ad48984f8bad255c8ee97f54bb5521444993f0a8ba7a3c922da66c1295f9";
+      sha512 = "439f679ddd8169d51e1c1f9ad32185fc9b33df0a1301af7bdf8982dbfc5410cf82edb4dfce3dedc214ab258d714da91661882e45b8220895aafcca171fa9bb02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/et/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/et/firefox-57.0b14.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "7a0a165105f5b1ff3f997fd400bc8d5a1bf976c1f4910d4c91be9827a5094dcbc03e8426e644766b4b255dacf861e88cb3c2b75131a9fbd89e2c0eca69718b36";
+      sha512 = "2b80629eba503ca034fc4e9d873707aaa7668b2d4563792e3500acf89b35153fbd7f6406d12497b1ff1423e7ddc3bb4e0f3f63cc759758e544145f31aaea5a03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/eu/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eu/firefox-57.0b14.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "7cd08c560ae83926226cc69a10691918b7c89cc10282cedcc57955b362546554e76b36af217a3187b11abe8472838f4cfb1a32095bb537b43f33920b37b5965a";
+      sha512 = "03047624365bb4fc5bae68a5bec91a396da7d404731cbe09d89baf3079be0c4a9a2c7ff73d231f39e98689d5c4dc7290d2401fe14cb564ea53d063f79d7c151c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fa/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fa/firefox-57.0b14.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "02b19d0f74413a92c998be3540f5f8d25ae2857e1eb9b4171083bdf392e5dc5ab0c6b58de54e75f221f731806fb8a6df070146564a3b294acaef76fcc8e633b5";
+      sha512 = "8758735d6bce447b8492f9a395da6f58c63537fcc946b17b8173554b6eaf32a41137011bbd44842b16e8053d55642feb880e9cd52dbe75fbd55dc592724a98a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ff/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ff/firefox-57.0b14.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "df7485cad8f46fd93ac6a013e5f362a19b1b603240ce50044169ffa4a4267102910c1d6bbce9a5d3675911acaf64dcf0ee3638090c0236ab664e9af5b4b567a8";
+      sha512 = "5d6a1b45f69135dce282fc411237db713538830b00f6361f86a95da199d56f2bb351de9e59fb1d61a4b617c79e8a80adce3c3e57ba837187d4c368b79e414dad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fi/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fi/firefox-57.0b14.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "26971b0778b87e3b0a617197356626bc3120b2214b406e01f5fe865430abfeb6dff471496548883e3e2355d32b1630fc85f501eb9934a9b6fd23270d47df5984";
+      sha512 = "f35de96ff1b8542206fb8e9942333397050a6e88bd0e6bca3c1e56fc4dc754dfac0b554b74188d316e6c820881ded2812efd9221b2c3d6497826ff29b89382ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fr/firefox-57.0b14.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "324c4cb614a8c50d9d7eabe6e2e3aa420398db7074a7d043c4a44c5785a640988c9d531aab92f51adfaebcbcb1e274f825024b09e302334241a16c622ed97f7f";
+      sha512 = "118d6ae69eb686ed1d791463bb2ba025749068017de94a9d002d22b195ccb9e0cf0d042e613ca88c310e685070612a070308971e12eeb318b26b2335b13a6a33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/fy-NL/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fy-NL/firefox-57.0b14.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "e5d8d67c5c549240264b7a02ff6c5f54295f04a26553a5a19d3b58f94bd3531c04d5402084fd6f40d63f9aebe2df7d8b50415d8575774f71df5a180e50d39728";
+      sha512 = "79a22424fddf0add63c3a3528a63ea4c0c9d39f3bf9e35e18fc9ad4a57be7e7f675087f1a491698868d5ce57cdd149aabddc224b7b3078ad3a81e6ee6dc35b2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ga-IE/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ga-IE/firefox-57.0b14.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "01c0998e8a32e6da0127680d17e71c173c21eaab66603ee6fee0ddf8698a16501d290b1ef9d375d4cf678606cb4a73c679434e22b309a592523d11ebcdfd9fab";
+      sha512 = "04b87f564be35d19135973a0e17c2db1670aa804ad8c76b40c8f3ccd670e0c64456d84cfec276dfc55dfa29db5fc0bc70826752bba756cdb597c7fc12da1d30e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gd/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gd/firefox-57.0b14.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "88eb2f45c0242400d62310e0efd492b27b6439750d01f0f567dcfa48398c0b2572c842c6155e370b0400b40c2dd88b7f2696daa4e42d0dd5440b4175a409517c";
+      sha512 = "f2a66ee64ef80dfaf2c16af952be22ba9c11b3a2859b6a861e04ccc2e7863ed5bb1421338c1ce30ad9ca4506d6223190ab5feb194ee445e9fb09a11aa99a465f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gl/firefox-57.0b14.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "d8c9f478d1859240b411ba6a819153d6d260216aa3bd4acdd043b0bd6e65630f02fe4b7f8dd549aef81190ac8358620487d5f2fb796797d220df70b3a597cbbb";
+      sha512 = "f59b462819ee53e8727863b3e4cc240b83ec5828860e3a0428b012eb4047ac837760157a7db60bd85486cfb9945185a2b8f637581e489d90bf140bef873dd9f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gn/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gn/firefox-57.0b14.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "572a00d95247c758bc81b0cb61c2fa659ee5412ee3ee948640549d6e737fd0ef622ac4e16715fcb269980461bea32ccbd2249448ae8b340ef26c322f5c504090";
+      sha512 = "17499a923e6f7d0e63e4ff0ebee17f02c99f614da02d0ff8a737a37ecdcf69ba1798139c1b824d187b67b443e54701b1046b59fc6bac3757f86fd6303a778c57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/gu-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gu-IN/firefox-57.0b14.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "34a4760f8748b6e6cd1856f5e99f04e320dbcd1cc3021e185abcd23c12e881e2eba31ef9253bda6677c767d5e7fe5aa0dc22f1145852dc58a7e24278a0c6dda2";
+      sha512 = "605ef03bab50ab1438be938bd8aadd917c742a5ac0bebd14dc8388a6e5cd844b52e0ef23670537dc50c2f3b4ca20814a9e559e667f3baaf292ce3fa16ded26a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/he/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/he/firefox-57.0b14.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "57a0b28a0f68d88298d25c62efa70898aa911c11f0733798739f40e546288856306e062033d24abb80964345c0f0224e2c5f3a15b01d89c4ed3584b1e931d91f";
+      sha512 = "51bb0b64426ed0d46bb2265b18138dd0d5fdc58c2782d3bff4dd8ae13bbfb354648b346e07bfe2795a4fc31cff2df54d94ceb42ba0342a59218eb5444e9fc12f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hi-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hi-IN/firefox-57.0b14.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "dc1db5ed5ca72c48729ef8d2a25cf608072fa7112e02b001943242ec027157e197828e85697561febc15740f52f9ecc6d666d5c83201ec8101a24ff66e8eb4dd";
+      sha512 = "74c921e0bcefd0c81616b8685ac3a0fc85129a950a917ec37c724fbd92df8099e79726639cf18235379ebd345f78de754e4b4e87d859e696aec6e780c607839d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hr/firefox-57.0b14.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "5488074d04fb6f592abde28e1ddd8e2d949a8744849f51192fbe0441a551b358ef8cf1cb78f69b5340c07b266d11783e2e722ad5574f255186c6bdf9762aed7f";
+      sha512 = "8c4b634cbacfe34a2031c1edf196201fbbf13f7bf22be2910f27788e56b0647598d805953b888869644f4ec3547a0813377d517676e732770684b057e5f76028";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hsb/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hsb/firefox-57.0b14.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "4bffd78e28363aca1d2b63e56ed44703bbbcb701b4d6e1c353f36939b86c3d7045b5104d7f3da920a8a6cd3b69d021b5d19f9727c5fddb8a86c594d15fae80e4";
+      sha512 = "59ed77d9722413d8d75c8474de28660fe59d8990deb3c1743fca4fb1c18529173e0e7bb171cdd98df961792ca6368b91db26d6ebeb461543473ee5ce8eb7da82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hu/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hu/firefox-57.0b14.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "6a5ee323244358ed68c96de80f9ce1741217cb002e33a8c93e8386773ab27f11b7bb58747daa4138e5b91b2bb4543e1dbfd14b90731cf5bf357376f4dbdd3a44";
+      sha512 = "de8d917b533941220763d011fc9b38f0c0f8f32f09d999fdbe985017a002c3375b592865420e58fdc4a3d56f73206ddbbac568fb506ccd2e3cf4d2507e8ed315";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/hy-AM/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hy-AM/firefox-57.0b14.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "28e0cfb93884fd78cc2f126f8c08714545c2550ae40de29e0dc1f3186fdc437592c6365eaa92135dcd1983009be7a5021001d2a7e703bfe6bc81f695ae662619";
+      sha512 = "ea76bd2eff30277dd06d606b0568dedb0f01c6330118da99fd6952f9bd5c8060a621687c66853b46554560b56f1ad2401e87e66bd44d1a85831805caf7ccebe2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/id/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/id/firefox-57.0b14.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "00136a82e957274eb9316778ff0f9aae66df21d6ecc64f67757816104aaf5cd6d83c0d9c0224214cd2d1c5a68c7bab75d439cb049035ed2a071255a415b337b3";
+      sha512 = "024ba211754ca36470ff316d626f46cfc2763b94dbfe027fec9dd628a0c617fbc9050ce7af336d22c962bcbb9190f1980b1381c5d3509485b4f7bb5780c6d15b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/is/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/is/firefox-57.0b14.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "6f22f0efac6858498c755fdcb848553a0e40bb80bc8dd6717d986e84ee5bb8cf7c608592eaeb6653f6454147cf73bfe57b5e62b581c2217b8546fd27fa9e5c79";
+      sha512 = "d53d4d7545bca63ce99dc691481b890846c33f5efb802734514ba493e1b31e3b4ee9632a4389dc388c77692ceefa9eab4e9f85de1298d0337a6756ceb27d55a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/it/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/it/firefox-57.0b14.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "6321ade81a09236ab3b3ddd024b3e5ad6404fd712ff6f23f72901018157f9a845c492ecccd1148cedc1911365c70c286a7d947cfc4afa534b274080e7bc6909a";
+      sha512 = "960bdeabd29fd9bfe72f9e2b5dcefc1c9577490636e9cacee964b8646ee29ce2cc4c9cb87a93f057e2a6371cb734920928bbab90e6c6738a19098e9e5a4dab75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ja/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ja/firefox-57.0b14.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "b652eb0aa3dfd71dd4d72e45fbf2713fed947b866f1fdf172a473d80cf3005706558a32d7a04b38766517f6ff571166ac5fdc1c8a5b89cacdeb91f9ebe98674f";
+      sha512 = "f9d889ff8a25259bcc28b1178ca511ad7cb0ad9d0882c8b3f6a04e98d5f4b63ad9b190cc66c184f93fc96e0f869bdb10cdabaeb7b9807d49c3f72b7c62efe3c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ka/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ka/firefox-57.0b14.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "38ca6189c55363040db09d55d6b6d525eb91aa4858a660fed3b400ebe5e4cbe723efd9735b77705a1caf811ad0f0a9a117701ce8414ef6109157357193c1a655";
+      sha512 = "1ece76f8237065e712b9835d0ea15f2b7318f420f8e4d6f73496bd1dd9cc5fbbb4125a04b4b4cc5c36bedaac39fb844a101653efbb5d0555bd13c3a4ea3e9d28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kab/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kab/firefox-57.0b14.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "bf581810fd19d073fb80dd3ea93b6b856614e4821d095800faacc3c17d63c53d7d65aed4b168a3cdcc29a155073af78d26f5967f29102ec4b1e29325c3686b67";
+      sha512 = "67d22ff37a79716869d7b59e95806c4a9b89bb2e256e0f1549fe5d3bc9fb3909f7d1c23111e8bb84a9cdfb4e029414908a79a8512c49847fb1d4b20263ccb43c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kk/firefox-57.0b14.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "aabff3d68e37a9b41f9345d8968608082c24e50e859a693d4642a52e534c5b8b7a5233469a1930fc54ecaf7b15aca486ad66b8cf3100fa62e474b4ff261b37cb";
+      sha512 = "b9cc2b1c31ea4bfbf17c2c7b0452bebb830cd3b8cedfcf2739360dba562119e0eede3b660a403420f367287e94e0bb34f072ea13b1cd1b58681302267f299464";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/km/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/km/firefox-57.0b14.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "e5bb4825d777bc6001d7d95140d03ac6c44c96eb602141be48c36ac82863dfd5bcfb25b529d61f80b8a939e692bf833886fbbc48c45ecc7e024952ddc5dee570";
+      sha512 = "afb6985ad592ad2d634c3f84b1d573bb87c59bad892f066ddc1bafb5cce7109c59403f3c1394b2f65da0fcd29ec897a3144ce1ed410f623354410c27e386ce06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/kn/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kn/firefox-57.0b14.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "1f5f4d4fe4b729ae2f08432a5d074354121c876c4cb0e7344e37b8d02e2aad38a0b16547d2987418acb98ecda10805dfd012448332c8f8e5d1f772cbf21554eb";
+      sha512 = "cc85e9d276e4833fc962554e44a54ba8f5d56c387c37ea78f2f8deb1b845eae8ecaba1761726e209275d24c4192bd61e409c9d87320c1315665c095fb5231a9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ko/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ko/firefox-57.0b14.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "19ef2c157469a3225c7ffb875e66f41a9d2828635b26f6dfa0062cb92c0841c53f2eecf77ba9b043e3e2f448b8a08de55c7f74fc6fdd3f7b4554d13ecfa746bb";
+      sha512 = "3934a012853c70b77fb02689141efcba7679e87d115d80d1c7f5945027f082986e679f146a6acbc97ff5b5be6b0d057e3b3f8dc292c4e66a37d5c3972fe865c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lij/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lij/firefox-57.0b14.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "4e5e6103793dd20efb49bb85dac4dbd208c0d164e69c5856bf9fba96350c3682d894af857d239e23f3c3e802f7300b5b915486421414fb6f9b8af86ee50e247e";
+      sha512 = "571334620261a36127ae1e7a03c6142ed22fe49a95e28534030882c47a7325ba8200b8350904fa0e501cbe0801c2bb1968b456e9982bef165d3db0e82ad34b89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lt/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lt/firefox-57.0b14.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "d01f311ee9f36aec032a5c4eca34a86ebcb54960fd29b03af00f2b289c2b4a38e232242d1e48847e2385e7ccabcc1c928ecb1e57f9001d181c350762d59ecc72";
+      sha512 = "3a7a0f09b52991a4d8cc6009c2fb91f3f908989d8178b4b9909bfd90f29db6ba11f29ffb35f3f1e578f96d6be10eb0fb337d28188dc792e6d024e42a5a16af8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/lv/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lv/firefox-57.0b14.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "d23ce47ecf7c790f38a9bd605150f403776b4e469be590a57b9de624fc10bfac2a3572470ff496899c2bd6ebd1799e9f4687b4e77e4714ab8228c26998760b21";
+      sha512 = "7e5153caca960317e039f8ad44f6eee4ac8f582ff2b957f70c9eb3d6967d62fb94e4b13611006d746bcb4611ec1b0a003bbf610d412f9e41f86a8ea19096b70c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mai/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mai/firefox-57.0b14.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "7d8baaa2d79f6e50afe9b915d461a4ca25ba777dbb0497d2fe0b1ed92eb30061061b3a29514351841f86366b91da0979b5bf270e290c477397f3201f1b517398";
+      sha512 = "07cbb84ad4537482ae8b1ddb00a86197552d3a80f6432779952bc9b1577c920de07e60f78272b1ee3889b031fff1c5a34e1c1a69d3fa0621fc53413242f80242";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mk/firefox-57.0b14.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "b1f35402ed051ba91294dbacb52aa451efd48300fe982d638d206c75c3b0f7871fede1d7467ac8d6ea4308c4967b0334873d72c4c731c69f343b92d56fa7bbd1";
+      sha512 = "230ba5c56d60d1ec08092e9f6ae396fa836df56dff1aaed933a706014318fb13328db5d6b0bc3dcc030daab5f906d7760bb3a6af3c03422f724d627ab8b9d48d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ml/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ml/firefox-57.0b14.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "32ea1f66ab87b299de4256cc25c6a67c0754e9fc8569f9c9693aee850c034bce1e77cfa6f8115015f085f74bddee99a7cf487cff09277f011dc51f9deb07b97c";
+      sha512 = "e4aff215ab6b3bbdbe08f7cc698f11b12bfdab232ddcf995681ef62dd9808789541e8ac7b9b71c003775b78451c06f79ebc45d5a85562385a2e449679db346f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/mr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mr/firefox-57.0b14.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "3cf3fc88a84de5dce220f89928f05b8f8b1d8ecef2f83d01a880f07d5a935886fc30341eafd941f31213301773f463fb4f4681cfb5e8311665f61c8f28a5c0d7";
+      sha512 = "b2b44d4a205e39d82b453a35569da1a3f428610551d322a1c57e64da42d96ca2f199e8e01769a24628506cbf3b621cd734923f9760305de8e480d51f360f79e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ms/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ms/firefox-57.0b14.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "a3b9dca6a332f939e6ac7b51956f34e893e1ab5e62e9c8e3afceeb6233d7d378b44fdd9f6dc46eecd73aa738df46534956545293604faccefc34591a7ee6e12c";
+      sha512 = "3646303c3858e4c2a7dbb555495f5f06b1867a04a37cb8ce95bdfd998e7bc96d8afb8c83b1df7d945bdc8327cc8d7be3f3bd7199efbe23e58cc3e38608ff8313";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/my/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/my/firefox-57.0b14.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "9daa4560c3c4424bfbce4f23bc414979dcc96359af3cb7c29f2a9c262aac81d96493cbf9f938b8b25ed0720801d0f87a11a7e5cfa83ba78e86e2fa0d2495fc45";
+      sha512 = "afbcd9f8dce81267614855d4d59da02f87d369c2c0af78e28ebf25de18ea4eaa1412999fcf3d414ebd030f9448d71e48500a4e90aae03b3905ba69f2670b17d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nb-NO/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nb-NO/firefox-57.0b14.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "d5ab3676fbc7c3d3bea1af43bff89c3290af5846eefb7bc51d6f946c8c2c7968332de918d5fb11c475e873e7e1a032213e75a00407092e51baa5f0d0a64fcf9e";
+      sha512 = "747dbaa1919c1cec14d4e085f8c8f284fc49508ce82cdf9a97538a85aeb9b901eb9e160e03346a769ef760bdb2108b33a25a967a527dfd3758f25cf11bad2e31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nl/firefox-57.0b14.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "6f1e8bb355f6ca1e8ced4b9b69de26d8cec4adcf2957a7422b98421fba4c3d7c3fe91596fc9ea06e15137f8bdff27153b9d068b7707c7f56b5357a7aa2ec6ffd";
+      sha512 = "d882e7c1a49ba670535f17fc9ea99e7be4505d6dbd5d90855e4614cef319c38718da445afc411f1951ec3fc5d9a3b8799c64459a7adb588a29a126d1cd16d8fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/nn-NO/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nn-NO/firefox-57.0b14.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "b9c27a5c824efc48e85fba2823d9288990fcec545fac3b1ef6c4617a624ad685b01d96d23ad8bd5eb1e7787849afc630560e08cb7fc617cf2e25c9cb9f2c1ffc";
+      sha512 = "8bc137f953b13a447dfd419b9ee0e4005134437892f214e49e18f98e080d5413d1dc655bf0bf417cd7c8a09811d3e7850967662b9d0be0d3b72cbc92db7e2307";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/or/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/or/firefox-57.0b14.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "50c0e9956bb17f6df5d342e0f43a4439510e80d4001f504d566d2856e885aeef2b54b57761943771f8a4ba6648209080290fbd6d556934e14565bee023c257ea";
+      sha512 = "34bbba4bf288f62654f88afc461155a27cc0316a920d7b8e42198054d5800360401c933624140cd569bb9864f9eeaa5616fe2530888e4717c964506ce66cce0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pa-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pa-IN/firefox-57.0b14.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "e01f2c4a9cb3f7e6adfcc3e58a5fb5485ab41ae01e302c93404e7b5a7bb1b30f351e364846853a2c6ac0ecddacc03806fea945338c050928c6e8eb6dd0a80600";
+      sha512 = "1403e23fb95cf8449a149ecd698e768897a3733718dc1f6eb4590685263e2a1b54aaa3e557a968cfe71c5172bbdf7d24f3eb9fcdbeb431e31a1a26c0b9738e9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pl/firefox-57.0b14.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "1bfbc1b9a401e0d9b912f5c91f1eb22b0b968d8bc75ddafa28390071431d17c4251b2624673aa068f59a451b7a9bab165690b5c87ba1dc952242287980c63dc8";
+      sha512 = "a2d99c00bdb839e4ce89d1bd6a0334bee4b6c6d426c3054257824c46abb1eb3c1f283aa0a4a030f1865fea350a7032cfcba86e231d11ce06ec3066f5ac4d47fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pt-BR/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-BR/firefox-57.0b14.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "75b83b22962b42160d5956db90e55f23c2f12335569f908b1ad1acce48704e9012b4d2c8b3575854e7a36ba9dee49f4b96391a4b6958fe80545501dd91609084";
+      sha512 = "5768a805aa0b7780b55fecbd9bd349c6cd78efcbb3595acc7cab18d3356835e53e63e58e352c30c79b349e0b0c80be59509fa684be21f541cc67aa320e654f44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/pt-PT/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-PT/firefox-57.0b14.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "4d9eca88e092531b87d8ddabda513f9a42a762f7af2511dbec25eb88fe791fa94bac3b08c7521227ddec2b049a4a55cd7d862144696702073bc13906b1f39f83";
+      sha512 = "ca4dc2c76af2db4d9a44f8ce9f29adf7188a799d00d2e8cb1bac807dc90930b06cc5329097ef771e4f070969cf42c3cfd65b32dfd3112f59efdb0071bc6292e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/rm/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/rm/firefox-57.0b14.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "44b3eaa4cde855738c221e7c1a3acc80d862f5159c13d946d67e47b382dfb4a5a6d360be961a03f605aae3e1c89e2a8a0d16f586646cdd1a3dec13f777b32577";
+      sha512 = "86af2317c04244c63f8182f46eb95abb1a113223c6d503c6b85c2fa9b596f44959e86323da0ad3a708f6c94aea4180246bb562f26c64a8c9b27d9a490d65a291";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ro/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ro/firefox-57.0b14.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "a9dc8a1b4f0b236f2660be71df78c41e055b0547d8ce9bc258798fd4483fe888040d2c04a0ab0bab4c95a712d22370d957513b5ed08f1e332803d7067bc37aee";
+      sha512 = "2120d05bdf2dd8a702726e232fb3f94838befaedeedcb7c651d8d07047759b885904220173bfaaaa6d55b71e52085ce23156ad030992e8ae3981d47b41de046e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ru/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ru/firefox-57.0b14.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "d2c42dee48f21e847de67efe353088ee949fc0af99ef510f5b76128933fd5432b2e0cced59ce0a0157e396b92beb645d78d758823582cc5dbb63718bf85d9b20";
+      sha512 = "221b4170254ed9acd7edb256ae560060f640c7e6c02236e1925e38489e387f839c14b5cdfa2a0e4a0173e8b98a2ab57b7733a6fa361172166097fc84b260bba3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/si/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/si/firefox-57.0b14.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "57be5923936b02cce924fa05994a6a887906104175e305043ea5a51e90cd35cc48c190ddbe2d060d64965b32c65296967dfc53a1e700d7defa078d02907069ef";
+      sha512 = "ea216290852677ae93bdbfee42b65473f9e00797175b7e36f4766a251fb302fd69009888f36efca7d04ef29fb0d66e75bbfddbf25f7f59dbe1d6767ffeb0c543";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sk/firefox-57.0b14.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "12a74e9df967e6a058fbf53baa842bf199190dcc3e5c81eb49da29267760034ea41abdd5b1610f4e06cb30e462cde4c74430d58ab7efe7ed755d19919550827c";
+      sha512 = "92071604add2392aa144caf61ad747d98be52c3fbb82c86f903772d470928f71748d8def2f367a8b6bfe04ac6769fc57f8de29210ae50bc45b75b94f5005b564";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sl/firefox-57.0b14.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "9053a6dd752ee19f8dc49a2bc41c1d91b6a0f77bca71cbdbbe46b645388320a12be4db14714c62c2306b1bab78059826a8fecdf0897ec52ce0fa8e743e25b83c";
+      sha512 = "94341abe0210c9632ebabc47325c55577e9e6a5f54b4cfb0ba9d19298dea1b3d6f70a68c3f82f6a4c371f8ddd6e088b18ea56282faeda0c824040e6c4cee0db1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/son/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/son/firefox-57.0b14.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "b8f6bbe404306f17ae982238d573302165c366beff14917e64dda7c07b6a2f4e1f9b2042a97b3cbfab02f5e7fb860287cbaa30536494506ded1ee51818d3093a";
+      sha512 = "537a57fb00d61b0566d9fd344919b65486f7c767c93d0aec9595467cf9a081d63c8ee7d3c7c3a3409ddb08d57f36ae078e3defc79826779954641c895079c1da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sq/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sq/firefox-57.0b14.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "6dd4c84f38d7c1d0ebff77737fec3ec669532fa9be785414a9f125cbf184c88185bfd4541818d696b93237d4acb0654d7c6f38e9a0ab7ea35a10369ccde1bcb8";
+      sha512 = "a4ad413f8bf4ea8333b3c182a5c02283886e395e58b6ac5a53a298afba0938ec38648b67af3009a44468ab6fa89b6684d86b4d83525f0dcbb470f078584b6dea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sr/firefox-57.0b14.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "984be4970c5224077e6e97c3137df1d62ccebb7fe78e3506ce4ae78e17d7961653feb276712735293d2ebf22a8ce8b0b91b28edc80b2413fea24dbf059eb1ad6";
+      sha512 = "15990e14d69bc0f043f7bcba54c5c27b7562c8fa68c5c14e7df695382303ee6ad40eb6b22319e8f9110b59f51209e0c8a6357e257862a50d8d515ea7f414ae74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/sv-SE/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sv-SE/firefox-57.0b14.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "d0fd4b307598fd42d76414f4f097d0ea3e2243ab8de536870be23687eb6ea64f226a54b3fee176451bcd9e1305c6aa4c60daeb72b3341102f670d4905f4efe27";
+      sha512 = "690e94fc46c94710e488b1a8cd096927756026d0d6ea49f983883092e32f9dc0d2fdbaf6efe4c236cf750873b7907807fcec6826d2ce8b2473d0c4ef5461a1e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ta/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ta/firefox-57.0b14.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "6b59fe4cde16c02c5b4867d48e6af4814794bf4a4f3b41e24cfb6e85d1e81f31446193c831b2ce50f30114260fda5e0a20ebe15fa23e1b962f07d66394f5d654";
+      sha512 = "839ac81dd6cde69b05e934a4bfb943fa5c65f86d4c7d64c58eb86e7911f81d93a85abc3ad732ae0baa9c7df76a906826a109ea15cb4ee85e802248b99b9ef1fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/te/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/te/firefox-57.0b14.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "a65e6b4d28f91764aadde1dd954d1e888a5bb24f356deba73c68fcc98d8be669a8f5147233af89881dbf20e40ba987326d15d5fcb857598e6718fdac4c5a59ce";
+      sha512 = "58b1225e50a0d3aef4b1d2da5d494b41e5ee41f53e2878a4945daf308d452348deed4cf87641aa51e9c061393c239109d02523596efb8ef7c675c885d80298aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/th/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/th/firefox-57.0b14.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "bc6d32c9054072fe931b703aec3c2a6a60d25dccd6e853eca5e716903a4694618e4cae79c9aafa52a2bd34133b6314b5eeecb92e56082c84dc10c47dd46be085";
+      sha512 = "6d0cd2b6cd315ca50445f3f87d1d2d2977bc34246481a58239f06a90253bbb810c0de488d064e80d3d2bcc475d34481c1f59ef0499ff59057b77c0cd67e71c7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/tr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/tr/firefox-57.0b14.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "31e923c48adbb9e2b87ab6d5bf9ceb951426ad8c523b8def49900875d2a66220c2800ca25ddd4fc0f8a007ca4c95f7a69311228b34c5a8429bb26ce9b0f43871";
+      sha512 = "291f0c8f1241120a4fe4c2754ac82f443ef6f0d354f8b71b25b2020948a4de5b7ddbc87bbe2fc08b09ab1ec491a34fbbc69e6d472dc0114e369a99f967bf27c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/uk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uk/firefox-57.0b14.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "5036b3bf40bbfb13eb99aec17d90e9a7a60bb39eab1bcd21fa62b1d12b47f4b9eca7980c762f67ff5406ddcb20777a6553fcb02e611b276f1cdd483c8b67c162";
+      sha512 = "a6db7a4daa79d614b2d7c94372aacc50b4068ad437b38aab72cce99aba668fb230d5b81691678e09efb645282118dedf25e0c94e9d9cd9ef6a692c43a288e119";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/ur/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ur/firefox-57.0b14.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "3605b5370f7158ffa54f5c5def6806885cc609b385b363e5a5c6442ff9262fd666e35b3f2256ad68b8f03a9e95282f3792ab83f49f0efb1e422b6dde56a85713";
+      sha512 = "cb69cf2aab416490b866e9b15b3706dfb81b003887456ad83907047424285f46d1a4b727766b78a633b33c6418c3f24dd9b53a90b151a1752709191328c0e227";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/uz/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uz/firefox-57.0b14.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "a15e00c34a831eb8b251f60a9e17f7cdb65ed097fe0182a576c5809ecd208938d38c99a711750f0fb7835565adfefb15acbabe3b66c2f03eff36bf05527b47d4";
+      sha512 = "bb29f30171804b14aed28e5953bdda7bc94e2e1d23eb9af54c36937f90ff7bfd068abe4c065690aeab2ea61df08a59a5ed808e1f41e7d055b81235f8662d35ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/vi/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/vi/firefox-57.0b14.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "fa4e9de86197c3a95cd0d048e16de89bafd9d4733d3f2c96d221aa5c3839b980ab92efde0d18347251edf718f8d37a3fb8c5afcbaf254f697e320420cb91cc96";
+      sha512 = "b91dade05c291572c257be0a33d685fb48079c4c1dceb95d6b51601430717c5bdd4f962b9047c2f2a22dad38578a041025ad59b424efd1260ddf6f9d9e4d92b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/xh/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/xh/firefox-57.0b14.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "19b4a96abda10b29ab9aada2d9ba70e259ba0a3082796def317e1869f27b6326fe03f9d909f6753f494caef08f0f24e41f5b8be16c5c84ccaf06cf354b926cf5";
+      sha512 = "771335861bfdb99f17ae6c8607e784e3901f637d8e4a06385bd2bab4797589377e8c1b875600e9d8434d6ce5a7003ba4ca154dced98228b85c6f70272c0b8616";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/zh-CN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-CN/firefox-57.0b14.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "dd7e4c7bf1af9975f043bcc2be140b6c667f6dd74c2acc5d31963f6963fa5e0d7dc672fcfaca7ebfe99fd14cbd78725d24dc9c490c9ed1e211bd9e154e51c311";
+      sha512 = "d48c546975b92cc5c130e50b9fb3c84116235aaaed6ae8e04e975d8ed3605540b9ad640bc995fed23e42d271b9b2b598613b14822358c7487852030c5802dca6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b13/linux-i686/zh-TW/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-TW/firefox-57.0b14.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "82b442aeb21b5b0fa7d48519ef5a1d3a6b57f2e013cc4e7a18b050cdd6632ec69e8383e58d0608515397a460a2bf339e03f3e11f780698d5b8e3cd4f3aa8f5fc";
+      sha512 = "9e731700c738f0db2390478ba293f78a98496c374cd871a0ae483c3911685f0cca1b89531c06177f739fda77ee94fba03f2d93ad4669ce219d215cac8429819a";
     }
     ];
 }
-- 
GitLab


From b7e3f5d9444c608b3d725e3ec689ea5265a0b74a Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 4 Nov 2017 12:50:43 +0800
Subject: [PATCH 621/877] firefox-devedition-bin: 57.0b13 -> 58.0b1

---
 .../firefox-bin/devedition_sources.nix        | 772 +++++++++---------
 1 file changed, 391 insertions(+), 381 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index db45ad95656..bd23ac6baf8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,955 +1,965 @@
 {
-  version = "57.0b13";
+  version = "58.0b1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ach/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ach/firefox-58.0b1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "cf01dfc2fa0995b24457e9aea6faafcafee48c900794845c08ae452fe920f75841db9e67302a7b23b6bf956baf0c79eb8bd2d63ea4a45b3f515a4745552756e3";
+      sha512 = "c76b0c8d0774eabdd49abdb211312da230ca467711ab3e4700bf683246986aef8bbae8eda45126bbb6c610db8bd5d12f8e35877956879fe02edb216f16449c58";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/af/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/af/firefox-58.0b1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "76be18af3bd07ce72f6ee1522d6b7e86f82d6449f178f07cc465c20afb9c453fb16b37aa6f301b4e83f9e7bc9affd8e76a52685be7a45db7fcedb50c99584630";
+      sha512 = "d72db113a55e6d70cf467c1aedf24df07d9f4f5d74f3c67f3474ba3c8f959a52164a345d19b6c43e5c7ddcceefd639a9153950f5f30c945f3ba87d15ea23a66b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/an/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/an/firefox-58.0b1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "3f544f11deed60cbf9cbd6bda27d68c7523ec087d71ff9eef74989b7185f5271d53e6ca7f6d463a64c11fda67692b609890dbfae73bacd164fb3cf7fbf327183";
+      sha512 = "ad347d9d9a8cac45a5f369a4fb8284893b60b7a94b2daf4d67273410b0ecacd53d0040f78aed43405b5a99e30cdff1eeb986b7c1ad13cbf3807dae915f4dfe9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ar/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ar/firefox-58.0b1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "48515a3ef14a0caf407fa69eb42e27915bf5a8ebec1de7e4f53d85fbcbc756fb763ab9e596e6580900fbf52854da1dadfa7f8920b43dc9d1a6e36b07b989fd82";
+      sha512 = "9eb1d698f2ad84a4e8046b511272fc88d66d5142c72dce817cfa00814f4bb5320c314bbcc36f74acd774bb9bec0ae57a09ab0c46def2fdf4e1f225d467c1987c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/as/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/as/firefox-58.0b1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "376e899b9ccfa0bdb2a77977bc302c01504fd309226e9d63e79d1b799503284c7cc0ff8636e63afc17fe2e611594965ac14334e0c65058e80fc471f3057d3d3e";
+      sha512 = "d9315adfac80bbdd4af955f7f7f19d14d3209d7fdb1df538dace2264b39901a94b5d79f8944ed1509de15168058eab44a43de46d2c90c1707853ff2e4401a116";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ast/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ast/firefox-58.0b1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "17fb3d94d037ab1be8912662c9cf79590ecdd2c17b227b38477f3aaf18b3fc6309c9a3dbdfeeaaec9134ed9d3de8a7810f905c68003db5efa6e733a8b22e8226";
+      sha512 = "3dc39b449c5eb3b877cfaff84534dc9d1acb3921d03ab2b520c5f02d1b8d2a09843976cb89954da1b99eab353e1960185580a70cb1d222dc42aed052361c4c28";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/az/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/az/firefox-58.0b1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "ef29f2265b91bee270c77afe9a0034c07138157c5be1cd3ad5a68ecb94cacf98a7c52de1985ba9dd51ae4e92df08a916249ebad24df4ba672d757d9cf95ee135";
+      sha512 = "6329d4265be5662d4e7286ee3147dd14896eae75738a6e29548fcd7daa86c1021a00e44508efa8ed686e58f1a927115f01e797472848b1782c90410031672227";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/be/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/be/firefox-58.0b1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "c002738e74b87b9423d8b6c8cc15fd6532adc4cb9558c0f059c2b0a1c821663c7cd8e741c5835d91daeadda8cba92938484bea5099e5b6d7c386590a69a513a1";
+      sha512 = "978062dcf2f6991c5e9f0a7b23ae65c1d3b79c526d27ac86be8f1190a866491857cc2f3d93f444a2c5654df327c53ebc05fc30e6c9e3ef2f766c55274202cc3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bg/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bg/firefox-58.0b1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "b85df314c69649277e4a33e8374f21cb22565396685b742c6566b1c138daca254770c1d5e87f6af1f27ec65ac247b3eb888a14734cefd7a40755ff100b803531";
+      sha512 = "eda16736abc407eba700e6cc6eb865e97091c89772df9d23d8514b2c05d1197c014586cf03e3732a839dc6ff0e031f85008c12144736145f7ef94b89b7761e41";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bn-BD/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bn-BD/firefox-58.0b1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "54bd6f4fc5b2a2a24bafcf19f48c3e4d104449af06ab9d68a58f6d02e29edda65024f32363988034246f989578bd37d7c7d9bdb567d5869767f908072ce8bc00";
+      sha512 = "fd5980c7127464fcb4153d52096df9b4fc784fea4a3216265451394fa73800207c9df91a098860819bd4aad1acb0c04965dd196d41b0dcca70071b51a20e4437";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bn-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bn-IN/firefox-58.0b1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "c4acb6c52ba7bdc1e34f7020293daa2a8d230e92c19c700d34df6dc7052fde2928d2e79d252e9f2aa7b148d61328e839c218e5df78104617cf15a0bad8450b4a";
+      sha512 = "f82ddf7e43f17d836a7c8e9fa5a9eaf1c8956ee9b879ece444bdb0a4e98380c07c45cb168cdfdf8080d26ff330c0d71921d6fc65d1e59a7bd4e89fea6c2ba7d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/br/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/br/firefox-58.0b1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "ceac213b63c36e6e3fc388cd725c52a77f223dd6864bf29a26c143d9b0631af62eb26d0a90efe737b08f2342096dbd32692fce7df281b6804dfed9798dc0a6d7";
+      sha512 = "6e98d54e5fcc89da576648c666a9788e1843c57879d3bcfe81e6f92c5a6386c7fb606e35a1d5b6d45a6c6208122f36f127754747b4b0a75b1b0ef9f8ebb1ec6d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/bs/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bs/firefox-58.0b1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "179d662409f89bd47bbbee8903577048cbb114788ddc462b4fdb25c3a5ec1f7c5c52a218ec1b22039098761dc25f6021a14972d89522b798d9fa0104af7c5cad";
+      sha512 = "1d418dc9092188a40ec3ad5b168685840fe3da5444222a076324f38d71d332cfe9cba0b6497287e231252f7db4017ed31d3f004fff7425d801babd485ab13807";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ca/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ca/firefox-58.0b1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "5b5b9558beb99619667c24a80341d74541f99a3cb9e3e958cbb53b7e7dc0e271071fd034fbcbcb909924a1712b6cb328c2de1c53f9d881a7f246fb2f92741f31";
+      sha512 = "8482b0b9552915cc839f560a6a884511e6470673684877fbff233e6af23067a9e5a04589a255f885f90efc1fa00ff826bd65e6b53d4993c4eba793b578d898cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cak/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cak/firefox-58.0b1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "c5628b6333a0d4cf59994e70a1dddaa9143d498c929ed9237a6fccb87e5c19dd50c562cdcb4933d92f0b16acc7a881246c51baf1ebaf65b1ad897a208a20801d";
+      sha512 = "1f701c6a9946686f92439b354476c96254c8a57def972966a6b3f54136f259bc377f1f95801abd1e2e42785c2650f62dd449f01a305147ea2f788eaffb348b88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cs/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cs/firefox-58.0b1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "e5262f2be60ca5ad641483e773aee80669f63383990ea217a9a35a26865e58102b962c94ad9d4a3526055fd5dc6d0963485d7614a7dd10c74fc28888adcb6a54";
+      sha512 = "11159a760106742340387a75637929eb1d7df32a811720ad509cdbd7c58cacb6b50621dba012bccf72f4960cb13fb19152512d9bcd83b2f17dcfffbf10d4976b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/cy/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cy/firefox-58.0b1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "5e77baf6c754a44ca730345ccdbe0bac033d8c547f033306ecf4ffcf3015a3f1c28d0d4542899f873e687dd90a4d6dd60bc970cef4c884598a1e919873e4e25d";
+      sha512 = "387d647ed24ec9d7f77a6dc38796868a6324db960f7b8077e2b53387a1837edbccad0675eb9d4bf7a68d2ecb7bc60fc8840217d49865a05b1c4f5235479a8a65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/da/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/da/firefox-58.0b1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "8903979b66612b7d8a856068a4ff1d4cd139ef96ca4fd1efe1abe1fa0af38a5965376b98522ef9ebefff28fee4ee6d3bc5d540e3db7f3047a6e0beda6b376f9e";
+      sha512 = "60e94f82dc68b5251b084e69be480e5fb281483d1355696328888d620f3b9e404abbb990c80d43a28acaf0df062948231fdd17ebf1dc9205cd1b74d962278bf0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/de/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/de/firefox-58.0b1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "dd2be7aa009dc3322a065ca242e35b73f35bb28f639146b189a3306689d018f4fa23f213cb075ff4306acaf07146e3b207bfe6a9ef8f8ba57e7a810e434da627";
+      sha512 = "a1699568157938780c4105888b528db7ef2277c8a5e1afc6a55382fe57b2009d7eb00351c2b993ebc3294df75bc452016a5c35e3428b4b548483a0fc4a1f2013";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/dsb/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/dsb/firefox-58.0b1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "15ab166ef554ce8d157cca1b11379f0542a2db0dc810f4520f56fe78b365f618fdac4d511e0fbae5f80ebbcfe18c03d9dcc3e02c49dd350cac7c01197573eced";
+      sha512 = "dea6a3e68356cfb47db8a6e7347437e88c9349113e73268964776ca8a1399671d648e426151cbec939b3b3b8691d8b2869536d853f0390d5ae4cfb982c2eef50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/el/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/el/firefox-58.0b1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "4ec1569340e2490a445970f75992f21f48d13411199f65df788e9e43327de8fcbffc64d628dd589471b9f7b0b5873a54c3583b2d5171ab531c602a2b22dff95f";
+      sha512 = "b0eba65b07508dd2f96846bdf7b4a71b6668d8ae38cbddcd842b7e08fbd1769087b32f05cee00d8a471adac7c63845ba93b34d906092c9778776066610c788d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-GB/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-GB/firefox-58.0b1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "1fa272fba658cea484b4f857c11daeb4abdd6e684040864d8eabf3d8671ed1019dc1dfc440d079e098fe7edae6258f39598b3d3da6301046d52460e31a409dad";
+      sha512 = "3fc478ed384adabde913525d2afcec4f3d029c85a102144b6ba7549543429530d3970edee5bf14ac069f122e2709dcac2462f572faa9c2ebffa322101929a914";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-US/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-US/firefox-58.0b1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "2106925dc8e912826332681de238dc5d72921bc9916488a242a0186a8550386e24a7eed6b67edd8126aadb42890b16c5572ff2ca6b1478720b00a5134267e27a";
+      sha512 = "5afe0a59430e9241a58af0926d5d73151355e9d64a8c8f562ca0369199824d10a1a4bc2de84102e96a8aa5921d83d9b630f49d9ed998ac4506dd481dc06264d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/en-ZA/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-ZA/firefox-58.0b1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "7c33f60a0126c8058127499c178af6cc3398fc63ca0b1d2fec0ddb469da437349e063c61d1cd573fa157eb24f447099d82a189ef4026be865585883e9e6e41f9";
+      sha512 = "c84deb7d082259e29dd2ae7964c0ab585d3bee0d2be7c1042babc122356d067792166eabf2fed8a55c7f688c23ee7f6125d7c89a3b0948546091a54b4a136ae1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/eo/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/eo/firefox-58.0b1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "ef54f0c7c7fa9ae8aa760f4dd5c65734dbea6bc88f09dfdb814dbd16f86d1444f81f72584c3729d922c8f85bf4b9d0e2816d1ff4dc2325d92b8df1ff76221407";
+      sha512 = "76c714ce1840b4dcab54bd675d74bd93fd8f76a45f90e526b2e0c55a2fd8882e6b8c9c8e4f559ec575338eeeea2ec7f3ff75629a276eda0051e898256b0f2add";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-AR/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-AR/firefox-58.0b1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "f19457ed569da5316d167691b59d8ad134e0b10394716612843e4f56adfc027631e8d927324c8ce04188e0e952c115967e63782e6fea8d461dd716458835aa26";
+      sha512 = "b049c2e42a4868da6eacd1d5c0d945203acd6d3ed3803d2257b504df4ea7288765b6b6922d3b73397b0fd8b54a990b0340d4722a0ee3171a55e3a566c5a2bbce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-CL/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-CL/firefox-58.0b1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "eed518d08ddfcd9be98d9905005b566821f1912816618c5ee1d3b76ee1972bc97e22e0fece4d35b64631db339916802d4c8e9c8416359fca0e77faea6127d53a";
+      sha512 = "48c2b419d67c26c6c6b5ce1e8b6d12dcd5bf8c084176d4c8afb3f45d17f50817a38a85e509fbc7cded4e00f659067c3e34080f58c22f74ba1e19e83cb58a415a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-ES/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-ES/firefox-58.0b1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "c26995c5de7f426baa55df935ad527b7a5c7490cdf2c3772ed680818e43ad102dec9aee510e17fc67fafa5c099216b3d23ffc7ac1f2021551e77047421ace60b";
+      sha512 = "2ae19907f1d812268b3c49247d902b061f9caced2fa87a19ef40c88de48cff7b68d26577b30ce7f1b8f94f0e1924f32205230bc503f226c4a85497da834ac740";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/es-MX/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-MX/firefox-58.0b1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "fb4df0e91cb7c1a7c6fceeab29cf90dfda6d977123367944ce59bde0ffca551c0c4853451735bace50f260ca5fafdfca5ee109ef0600efec5eceb20ff067a315";
+      sha512 = "e82f465b33114ad11628c06fbc0c0102e682d8e8277e3900888aa05481a3cbc4e707545ebf5b7fbd0eaef12e824135b437bd51676cc9299ddda1969c4d4bcf2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/et/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/et/firefox-58.0b1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "e7784770c0f40e3ce90b2e3ed200e7aa1143d62e47069c681646d5f406b299e50c45a4986880a7ed789ae3f6228307a07cc17e1c66d27b4b7864447af16ef956";
+      sha512 = "6c7802262a3042a78d25ed5774db69079ebea48e540847a70c0f8bdaec7e87aee5ca4ea31110ea54db14058d4f7f7a0fd12a5100e2c66f9f4c1b591d17abbcf9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/eu/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/eu/firefox-58.0b1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "987b47288aec5c78ea75d8afc5d0c0850783034342de05c7ee6ebdc951ae73a6185dea25e5959d3932938915d539610c10d8943e2b1f094ee8f97c20d9add806";
+      sha512 = "ae43f9ed41f67610a1394cd27225585904f1efec63b2b8149a16515eceff0e2921cf8ee18c1555d69972af8b0fda71180a2e6872e9abae3cebd642693aa281be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fa/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fa/firefox-58.0b1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "7ad730d4e8312d861cb0882b45dfcd4656cebccab5d89dd49e78533cf6de5c525b48dcfa3ec700cf14eea579be4ed2806e1673d73f7f32a6c078fa397cb9687a";
+      sha512 = "f5ca6891883c09f292a4939c0443bd5bda8b292e7f432d81c32d1fd5e5d4c15a7d649ea6d430a618b72522ffa53319c2b5a32c028ff2a619e0f68bfee7420dff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ff/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ff/firefox-58.0b1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "e1374f015fc8c5827ddc87d4d0c7c6ac7eecfef247c8f2e88c484c392160ef023695b11f8b02a526d266442cb54297769a647490257d54d7bc251cc6e03d7e03";
+      sha512 = "0a3e6d06e0e61c1bfba7ebca1a80fc7615210a148c48d89acc04f8b9ef2050a7ceb9aa7c92b9d888a376f668e4b6f1c0d40a752ba3de185548a3ac1630d9260d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fi/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fi/firefox-58.0b1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "f6cee8f460a52106d1b06f65b9ce17555aa18a9c5baa707bab16bf1cb458dbe6effa7278379d5d8e13394412f95a3472d793551ffd6788612a166216edc1c814";
+      sha512 = "5213bbbb4620cd718741f4c1f31e37addaa72bf3947a81255d556c6ebcfa2def8c830f4b9d73ef472acd28fd7efaff064fe96a67b1f276f6901353ed420bfe72";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fr/firefox-58.0b1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "a1b252852b88523945962152a93cd0367ff5110642681bfddaf7d1659a232eed751f86378f29d4c01d08462e1d2369e23ce18f38b2580e39316741216b440f31";
+      sha512 = "6e4c02cecae55b7930521384482b9b5edc8480fcc103ac762960a8af4230e7eb52ca5d17d3fd71fa559b49c5b2d0eee2bdce150f486969f77f71a483d8cd04f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/fy-NL/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fy-NL/firefox-58.0b1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "dfe5bdbdb642e21094be85c05aac9aaf24af22917d7d5f294f304ce2c5e53328eeb4d850e927b199b8f96ff573af4b22700890361edd14339581b5f3aaa4e9de";
+      sha512 = "7263eb28bbeab70a833e28984108dc125868b1f1fc0cf3c1d37c3e1694b0512c028368363c28a1c0a48e87cadba366f7ce91509783805a6fe6f8ad7e298b27f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ga-IE/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ga-IE/firefox-58.0b1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "aaf0169774f0aa05b458d69bcb340796d6ee242f69dfd69dfeaaaf0647635e9e81a5658c3641c62623dd6a57dabbc42ffa3bbcb31b12c6efbf132c95c86043c2";
+      sha512 = "c64a0c0889e10d6463e02323e386142113afaabeff1b772d5411dfc747e09803911b161fe4332d36becbcd45bf0f1b5e000aba2e099c5bcbfc39b3e5d300e072";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gd/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gd/firefox-58.0b1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "161d0be36d2d590215eba19230bc660d19e6c6d2659d0fb14075bbb42b9033612cbbfd086f07ad237960fa732d1a3b2b8e9a759d24d808c8d250f2e282db234b";
+      sha512 = "70ee658038c2c2d8c9c12cd45993daa5226d35a8ef974cdd14649cf5cd3a6abc149f56eaadefef01d98daca0b5686a65b17300b5cfcea704c9942cf827e29aaf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gl/firefox-58.0b1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "30bfcf0e3cef19fd751242eb523fd52c4ea96c829416348e36be3f3e48e9cc9d6be6e05c63461881a7289966b64f2abcae4ad004ab0ad32c91e99459bffc7df4";
+      sha512 = "73400f4ca91de506d18cefff5ac33847c1caf05770d0fac1481a58a3cd709eb96337f6f5f9a77635e18202f007f736e815fbe60ead23dd64a537ab6c67028c20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gn/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gn/firefox-58.0b1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "8500db008a57146706f1f6617d12a58ec238382551e45c31e140c2da499ee890fa48245518b87d53457488850a4103a204bf97d9a3edd8c92b802402b885863c";
+      sha512 = "c5310f699ebe8f28f0ae3b07b5569c202aba5f2641ae6a365c4bc581780d12b736b8cbd2f7dab7b4b5ab4a8853af3cf004b3306ab47b71c50f428f2471c6d2c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/gu-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gu-IN/firefox-58.0b1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "0a1ff4f35272bbc744f7a33317fc517d78fbca08b63edb91a0859d7c0c5a0bb5944ac574ab4c347f60f7dda4e8ad881e1a41696161336379ab3a40f7dd62c59d";
+      sha512 = "34e9331c90ab69f43867ed77520d820386a3c9e5b116b6e0851b7a264d6a632fe69080d2885819afaf7c434ecca8324a2a67b2af4d3dfb0dd737a6f147d41077";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/he/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/he/firefox-58.0b1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "56eff40d5dd8affe55b8e920d0778489186824a0b056d8413c3196ec66d4d4bceecdd5ee0a3c72d7a99ca93e9fce85b0ee51e3f79aac1ed968790293f0fe6959";
+      sha512 = "b3e2155264ddc8ebeab870e3c865aba4c7c04325e526134c0132efd503b825d4bfaea4389e39412e047b18eea1abd6249754c4571c690c6a4276f8a7ad627840";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hi-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hi-IN/firefox-58.0b1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "f61d90b6aedd17f3afd25fd11bfb730320fd5e9eb0a7cbf24f3b0c6a5665c01b40cce8b88f753f7680c01548c1d71c4bb3a94ee16c4a87e22010269e4e03d7bf";
+      sha512 = "03ba58309941b1a209e2d162374abbd46c4fdfae505ec6b51a20a41e306d8c0d5070ebd7eb882ff63010f41aaa11be589e91c567b2efde702732051eb31e3104";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hr/firefox-58.0b1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "d92b842aab0e1f4247842ca3fb9000f76ed2396b3e8bdb2f68de5b71956306bf30a58c20ed49a2c66b8551d89e65a21e9d50a69e78909aff4ac4ddab1af2c29e";
+      sha512 = "c41bab3259faddc4cda80d24f9b28bdb888078547c1fe63b7f7016748e930da158ce20707e78cd15342b6a38d37d0166094cfffbeef08f6266aee6ce80380783";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hsb/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hsb/firefox-58.0b1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "2be15782b4f478742ca0e2f00c6986a3efa10d63dd15f3f3ab249efa79aac8c0827c5f65ad38db55ec4789bb8e967cb9c397b8b5184d8ba91d5bb76b0e046648";
+      sha512 = "479436f7066df5ecda4e284a8b3b1d453385d9dda69b4b04cd1532f369dfc6ede9de9cae0218594b46dbf1feb0c44b8e5fdfe8084b9627524fd16ec3981fad68";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hu/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hu/firefox-58.0b1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "ffeafdf7b9792ce3d23f221d6b63671ac4a424f64e85996c7889f6257458d0902560b8b9133f133269191a1fc6b6d42fb0e2f1395aa1300e41c9096a6c8610c2";
+      sha512 = "4ded7381906f90f5660c81025d5ad1dd27e4c9bc49f464c84a05904d2c7a8c860f7576cc9f0f65e9666cc894084a539cece48f6242fad69d6f8f265f2b3f35b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/hy-AM/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hy-AM/firefox-58.0b1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "c6508a8049d2fd753c4ebca241db2a5a14a67843aa7203ae142144f7c1989aa28212224c3d09436710eb9049a8f6febb575bf6d7e301c1a7c568491e3d35b71a";
+      sha512 = "1e90907b9280b33faebaf770ee5e148f35a3d6d79f2c3d19b8d1834c84e09a6dabe965e3f9585dc357e145e0b8272225fc90c27ec507aad7dfda0aaf0c26db89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/id/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/id/firefox-58.0b1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "f217a62dfb40b9956ac0cba5ba96598ca04765135626fc29d12f5e2d547cb74ceeb77f7b02d41f56c2db50f0cf2b5ef46b16ee0b8d6f03fa90f97fa30939c23e";
+      sha512 = "f2eb5f44cbe8c20e6716bd2db644f54768c6ccdbac15acbdc8268f95383545b3f9d9e74092dedf886bd3dc02b56fc9f0f468d1cd1205ddc5fedd361b557213ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/is/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/is/firefox-58.0b1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "4861ee96ad8136ac16b47c1721a6e08a13de3b4fa4fbc25dc093e61137cc4137ff598c4c76364cdbc79a922e340318cfc735c0abfc54bf28b6b76ad5f30a4155";
+      sha512 = "d1397242c59aeca21ff98f8b3e158fb496c6813de0a73ea5454602888caf71dbcf33d2847a99a224fece4fd60e24b6b4c0c7d1b68f9df0088eddd6011e64c9b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/it/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/it/firefox-58.0b1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "7057172854e90d7b555b65ecc3c73cd254db1e5bbc679ebe84e840885017fc37af67fa1cc29960f7fc0b98fa6eea86e428662b3cf60df5f3c12149e36b368688";
+      sha512 = "468070735cbf093381640627ffe594efd0504e9a87ae2547fcb0d132e44d2ef3abb98861452f177d0d901ad8586b55c44189fff7b2dfb99d25a7d2055eb8410c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ja/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ja/firefox-58.0b1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "ce05d81cec4ebe23214c7f8cfcaa0571a78631c31b489a2a256ad2d4b71be9247fb05b9a1bdb4069ead050ca0a2ebbd5423035e544f362de9a6590633b407e1d";
+      sha512 = "7cef74da3ff145b1b02a6b60f8f4b4933f427fd5268c4fac0cff31d0d09ec75f123a97ef08d3b5e8ce2d45bf44ac0d3fcdae0d0ab844608998fc51fb1805986f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ka/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ka/firefox-58.0b1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "9fe9261290cfb4c39e6a6e2bca646232aa71c78b3953636a8c353da45bf8498250231809c5b2496a2bcbcc3aed82dac22b0dc41bd2195d259bc653c9126f16a9";
+      sha512 = "febbd32b794d70c4e1a41a793f69dafd230dddecaba329c65f34ff49cfe779d63e7bf53326a0a286206f51742199776190704c8e7c1f0fa0aa663a5cd2153f26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kab/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kab/firefox-58.0b1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "6c4644299a5e45b50c9039daf6e6440917556a7c77bbdcbc63075b29e6b477df71fe5110de8cdeecfc160c9d13b1848541ecf777e3d5b3504da04ae2ee86083d";
+      sha512 = "caedabf8a7cc8cc54e46b6e9d7933fa7b04953dc4fd19311d097c350a8219938d3819ea34fde869f24a0f932677411114955670b179c7037b4c61ddf6b2674d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kk/firefox-58.0b1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "afe910f21c844f1af11e8655ffcbd00d009db44751884463322b17cb2aac576155be821fad093f2b1d6169f63af9a8674e4a1389e7502d2263343dc776c3c2e5";
+      sha512 = "44f92252326591941edccbe19f62a46728fb332bb9c83c5a5904f62e9f886ef55c792cefda9ff47136c2e90ca01059f71679417a559eb257464b2a1ee3fbd261";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/km/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/km/firefox-58.0b1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "4b090f71b3b8c37e6944de298736a03a046ee1705ce6a30a35d75a66caa51503093f6e6287110756ee380a1524c56516e905dcf65f9af3f2f16b7c32a177a8f8";
+      sha512 = "a3f09ec1af9c65a046ad84fc25a67cf4d5c81d16e7700ff3923d192e73846789b256ffce375436f10c563f0d31bbde6af690f8d36545412c6911329cd1315f46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/kn/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kn/firefox-58.0b1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "7776e3a75daaf0334f7a121fad252f8ec132ec35e32d8dd19e6c3880a802215ddfa2b147efdd21946817ef506f80c69e92dda3ba66f065776029ca39dbeaf64b";
+      sha512 = "c8192e86a04c82b02a8232cee724a870e70990d0a706177c1937897dd82e8b4d1b87f3723e8227ad266ab4bb75393bb1bd799d3d094c5d63a38bfd356f8ab0c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ko/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ko/firefox-58.0b1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "dffc3101063aa5c945b5eefd7bf487841676ba1d6021f22129f74520b5cda357c9134c7d99eb01886c70386a7bd8608fa2042c389a154b535dbd2dab471d0c47";
+      sha512 = "87b23fd57f68d60e55a01303a7ea7e4cc49cc017416eb582ecc6ced589f841504425c60e5b2b45f9d7bc17cfc0c5b8a6aae36b08314583d011bda59f96dc687d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lij/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lij/firefox-58.0b1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "4e80affa66e0cccadc62289a68ee6ea7a4484e86432af7eab481c26c278a23ceaa37adc97af571cabb0380611fbeaa4841b679454f13c35f39de7a6d1178e058";
+      sha512 = "a96df7d83aa66c52e73682fec0d06433a32c75a9d60ec225be4a29768ab245e3263f253c15f5001615ebd9cb2bce19a8c7ad9994c17801ca59a573986f4c3f97";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lt/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lt/firefox-58.0b1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "3701dfe9d3489e30f12546860ae0816d7b740345ff668b93e639f73da15ae362543c9bc6308d62b4b176836a348bea37147c7168c0e92c422b626419c079e06b";
+      sha512 = "ad89134d5104eee908b67faf1cf6770d9c40091de1da2382f67f224e16527e63a705d7a1ed0a5fcdfbff68813bb3d6de4a17d69e150cd702cc886d761ab2749f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/lv/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lv/firefox-58.0b1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "bd32cceceb51dc5170c383c024b506eafc213b377bcd9d06ba38b4922fcf5360cf78b896af331dc04323f530b7ea4b39215bf57e41dae9510b928b40fd24c91c";
+      sha512 = "d28affbb7c92d56a3de7cdb06db345d73e0aa877b683b242ed88450471b7ca63e43e211e167041ddcfb10e408d6b7dacad09c102fa59465d337fd557ff8c6c1b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mai/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mai/firefox-58.0b1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "5670c0b03d5e999c04ca1136e67d565b546a9b2750c18c639a79ed7c51afe6e2e1bf349fc2d512639194f352558c1af8db114d0b58f0370e3014907ce1d42eb7";
+      sha512 = "4296967ff83a31e5470bd0fb354208030a5bc3b2fd7d8358f0de6df22bb50a2636188ba54194ea534dd34244e1e036f1d525bb6a397633b2c1749e78160c5eea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mk/firefox-58.0b1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "c8cdc24f00b91db14231b3cc870ad13050907b44222fb4d84268252b572ca70c5a4818240e2c09f4e2a67517e2b3827f079fe06a075216c6017aab100841416a";
+      sha512 = "bb6c4a0320911ee062ad5fd2d10c2b121fbed1bff2de3f7014b8d0e4b5962814e52bd6d8e96ac4c88aef07bfc18964dbc24659c32b475a18a888723327ce6b8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ml/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ml/firefox-58.0b1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "1dac139667d0c94413cd9b3262674bce3e0d72f9deaf9b9ae0c847b8073257ffe41cc1694fc6a12316811817b23c1b19747ee3031f397a1fe3d7a6f47f26642d";
+      sha512 = "c20dd470b07c46e105b4a3689797b25294a2f445825d7c3b9e55dca277fdb134003889f625fbf02807f56b04451223dc61b376337f0483f3b62e94e1b89d2382";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/mr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mr/firefox-58.0b1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "fc37de2c1e80b25953dbabb745231efa8fe8ecca2c70f8ae8f1508c92cd8b087649513a2e6e0d19f3fefc627ff0eea863f2bf686cc79fbfe9cbe9419085c1508";
+      sha512 = "d1baed0c6dddec7f0f8bc731e8928eea02d5e6fda10adba7a329cdbe08cc3afb8527c47756b9db07ab812cb6bdbd2439680e001b2614ce1e8afa23b5091ff642";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ms/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ms/firefox-58.0b1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "f610c6b7e44eb3ecdc5b28f181511f232e368c031e94ea63cd2ef34defb17f89b66397ef63e0c625cff4d67c04f208cf965bc41580b8f570b79d3e79e01f9a15";
+      sha512 = "c9162c9c22a07cbd8ac6a3aec1ee218925821e24c9f41965d11ce221b21cd99f77f8e91f0c7426d272c418de11d3d51ede0f89ac6710a9d05f50cd558e59f094";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/my/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/my/firefox-58.0b1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "ab3089727c9887b9867f0069c8eb9ef47e3f3d37b8381e5bfc32a1822ff34b3496cc1c81ff44de096717455059e1b5f7cd4f40c87f1b0168b4b9c14cabe3b4f9";
+      sha512 = "46b6758c2368780e6d0619a501d753ae51da65c55391aba72fb7eb2462c56afb5903afc04a274de68ee90afb98543f16536ab86cfc71219fecdcaf5b92fef41b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nb-NO/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nb-NO/firefox-58.0b1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "13faa2d26f5f20c0e571d6afc7f5e3f81f5dede9c3923ce96427f9256bfacefef886525bec56d6ea59d5f39f466f50f7718afd0850e3cbd1a0949f0beca585d2";
+      sha512 = "92f72a819c65e299e5f42bf08ddba7a87037da4bcf7f40f4a175c2813a4d16407e30fb767161a8bf33762848e5c1649293cfca40e77ac7f127d024593f9e936d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ne-NP/firefox-58.0b1.tar.bz2";
+      locale = "ne-NP";
+      arch = "linux-x86_64";
+      sha512 = "bd18c5c1c106cc37fc041722150131896665132427a5562acacf36772e6f77e34735a5c0799c8292feadd2ff5b91f5373937ac9f780b130c02707c63c9d10ace";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nl/firefox-58.0b1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "65c584e15f82c99417051a3ae14abd09b1a871a6371fbd6bf47300b4985ce34894a8dc34a9f50dbd106d7e0a3f196c870ff7fc28afab1ba4f5e7ccad3d281602";
+      sha512 = "f1b1ac149e1ee37cbf54e355364f6788c638f46f4ec82541728c6f641cfefc4c5369ec541723e91ed5c75abd8a86048780375370eca9aa6fd91beda1b153168e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/nn-NO/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nn-NO/firefox-58.0b1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "8abe9743e39fabf29eab41c9c02001389852805a548c645acf53a4cf4bef1c1d4103b528a3efca0614e5ef858cf358d26deb4c61a72b29bf93827f133def2685";
+      sha512 = "7c2f8035101ac0b197095d5c7cf1117bbb82727ff328b7752b0cba8d707a519c385f37d987190226b1fcf8256dfc70e103bbd558814e62b8dcdab1f2477dfc64";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/or/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/or/firefox-58.0b1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "8895fed23449529006c8f1c821fcd3d95de74fc368e8ade0a41abc39a16510ccdef3a45b9df87ea88598d3e46dbbf404fee545fd1c0f07498028ce55914b68c9";
+      sha512 = "1983452f6208949a0fd412712aae93f49f051d730b4f73ad95dc77086b745f39cc35e765f270f6d4c2094df10d99348c9aa745cf765e731a947ab99b48676921";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pa-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pa-IN/firefox-58.0b1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "c7367e682f0a37d99d5de03b5b7824596b74f8c79a2860e58b10cc1bce2e6f41e676cc39ec664817ea91a34c79aaf5a997cf7700d6484d5fb5271067e871943b";
+      sha512 = "1c86552ea21ae1c6a7d9745fa72e9e52754544b0f145e87cba1e5df6a719d524295331c6dd691ec5402cdc46fff14e68a7260da2ad7ebf56bdcdc8c9fc793fba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pl/firefox-58.0b1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "5b542121130b2df20c0d6789729254955d0192832c87a28d4e9d976313da09654ea9ab415f2bd9aacfc796b2aacba2321f13854cf68c3ddd9ff910939edb027e";
+      sha512 = "0b2df8461171913f2d6a3621c74ba497617e9512572e5fde0b5e0ae54f514e083b42134b38fc3e380be444196965a078fedd199ad3115070cb1d69f20f6540a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pt-BR/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pt-BR/firefox-58.0b1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "dcd06cc70ff67138b5b9431c84e4b771449920e5973753db1f203f72f8636c69fb91c217b04ab95773efe4f324a7c63baf32a58978534bbce6fec47e967d25e4";
+      sha512 = "86e7c61df3bc0c1cc00bd4eab4ae9a9d307490c6c871792d8afd27208fa93c5ae4b39564caced53102d8ec5f2c7275889c23378f6bfaf4f44c1244b5c661dcc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/pt-PT/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pt-PT/firefox-58.0b1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "85caa2576bc8258cc3f5f5077b6a9ba816624d772b54c7c62a0f2c82e7e75bd0abd29677e36d709cb55eebecc9d28bdd673dc29d07329602b788c7d7d3a4a57e";
+      sha512 = "36e9e0fbddafbed694acdb37e46a2665b1bdead88fddf7b4859e33d48e6dffc904106a3c760619886981aa6cd642153dd203110269834d6183d0a09de6f7c6d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/rm/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/rm/firefox-58.0b1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "82942a52ad073ccfc0f58e7b84b26b5394adb2bdf5f520ff946478a7299f2156e97e1ec5c8686dcd1d4b7e47ebd43eaefbb8fe2f68b0584f79ade7724981bfd2";
+      sha512 = "eb0e746a428912e1d15e20e2929fb6d3fd92b2954baa5e717e393fa0449d9c15e8396ae0c2aac50213b1320347869c923c5fe29153bce1182102971d69560946";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ro/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ro/firefox-58.0b1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "b45fa5a738d92fb5cedd06b42c5ae4599008f6abc05149e8f47bedd024470421cf8c5d3a56a111b590894c0941d5cef96476aaf0457a1f3e2a5112143572a8e7";
+      sha512 = "a38120e5e5aa2202ce215a938619323565ca00021cee6f66eb8d5ebd25164e3ec4fd2e4bb13a0c2d95c9b215adfe2f663f62170fc61dcd156d49615d2c1a5329";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ru/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ru/firefox-58.0b1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "0f7655a3f0f290a14027305916b7c4a73a2292e6140677cca137bbd9417473a9c286807f8279dc3e6d723af2c142bdd958f68c748a48fa42b8d0dcc5f88d9407";
+      sha512 = "acea191b728bf9be9c979be2b869dffb5d37649ebcc2511695c85daba41a8e7e3481fdbc474cd70017c75e08a054fa068a09ac52ba11cdc3803bdbfa4a94f548";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/si/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/si/firefox-58.0b1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "da2243a741a095132dda129af616e88fe4daca07e5a3d4ba65f18b9bd407636a3a312494a49cc1d48cf777650e44613dc69b49538d87616ca061264ba20e2447";
+      sha512 = "8f79244bea0d018ddedc32bbfd0fa057782d0bc88e99f82850f711dd753201f3903c588a1b065743750bdf09f6119e1af0720bccdb5f0e8e74c73e99ed267f6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sk/firefox-58.0b1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "3b09eb8284944e6bf490e071b64d3c373fc76f42d056635d4b3179068fba0064582ddd6deed1273fe429eacaeb3f786695824786f09d9ed1b35c4719f5dc97df";
+      sha512 = "6d54dffe631bd5cb1042daf577b6695d643d87f9fa332b24d7461b61c1871034195eb931726f2f35a76cfc5f3cffcbd44c34f9b5fff4ae9435b2518e8f6143c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sl/firefox-58.0b1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "47cb5682058b1240bf31f2358ee72598956227c3dc344c58d82ce61bae24ec68a6f5c06adf1f39e7f824ac365fffd52dd20e4cf93489b1f7de79fa88faa4d923";
+      sha512 = "85d6480d65f110bdb3bcc1c7187541d2c7a652629f57f42c5640c84f29632624fbbcd6ef70de804cdde9b903e1b6a81739297dbb7235b1cbc8877c77feab787f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/son/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/son/firefox-58.0b1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "738b5f57c0e7a36e5063ae7daf7dc51212098dcff77b26617a69e87392b26430414985a90ac81ed108f64d7b593e3a9e50d6dbd2eba79e4807309ef64ec351ab";
+      sha512 = "956ce25b91bc64e72a5160f185076d5afa51ed4a8a70ddbe20a0ad5ea372c9ded252ba5b29b355ecb7d7ffbf53f58da82f082f389dd178993059d911a3d8248c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sq/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sq/firefox-58.0b1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "7dfb54a4760e58880b2c0acef221c6822deb795f2dbf8e7d9e4d4949c750d1caea87ddbdf7ddce4d39388b318d470aa56d6bdfcbcb2a4f85f21ad0d2a6e76f82";
+      sha512 = "7b2429c1ad8ff0febea367d6f9b049fd9d29ee74be2418777dfee396949d54d05f976964d801b5a67a83bc34558e3a6940297fce135b76d0fa4df4bf220569fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sr/firefox-58.0b1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "7ff4cfcba96156775744f6332c8ecd931f4e33613ffb78b04ecef0f7cd26fc8131c8de34b5eee250b2860d8c5696899a9e87e1d6d1e34de1730845595d6062a7";
+      sha512 = "fa728c7049659aa6d2f0570ae037b20bc01eb15e8fa1315ff8766c7b4b93f2d7147ff8af5ed78a55ea73c57324b6c5882de77c905c984b55a3d1180e87444a8f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/sv-SE/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sv-SE/firefox-58.0b1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "7deb0438f37aff6fe17426fec316b2392823d6d6fbe98309921f305479475e8f8262f0f9566e9fa5d03ac90df65bbc6bf85f7082ea84836de7df016a85f81519";
+      sha512 = "9b1cd04b974a0952a5525f33ba8fa1195b6cf874849fc84ef8c037acf4af1497e7041057b8ea0b362f5bf57df944002f2cfb06d2004eb7114a2491d7bae2cca6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ta/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ta/firefox-58.0b1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "e30979bbaf5e66ba05800c23beb050c77658099aeb65819848fe282b00fd73b98e58cfb518f1db3e30132dd3ff5b3478c82db0177b7035952b6474157d9083df";
+      sha512 = "28578f38c1c6a38edaa5120dc772901ff7db0e752501ba5e949c6d64b2477e6c1edf59df1ead5356652f5f5f550c3520a75db65ab4c8ee430fa9c8fd62f76fb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/te/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/te/firefox-58.0b1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "3bc7727c833709281e998b9201f2bf8e6e327d746ca080c73eb1f95239a30ca55c349040ff5789cadb03454e7ef836ebc3f1f1e47a86a19f3db1aa290a213a54";
+      sha512 = "3317b9857651cdad4dd3886a4a778889f62df6981d40c9c28e4ca09cfe879adaad2502108d7085048ed233be4328a7bdc24d264cf7a5e0955b573e271054a01f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/th/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/th/firefox-58.0b1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "3ef644ae9d627f2fb46e5d1870f6b9dd71d9c8fce6ec74e027c67b3dfeec0015bd5b59e10e3b255387c86c25d7cf55ac7379d30589ab70548040452921a7f52a";
+      sha512 = "171da97ebff3276da07ea3ed3b3e9fd3a09e1ff7b443e0bc6f9a31098515eb48c604a5491cae701a9ee9e8d23f788a5e2bc095cadc9060a014aab3b157dee825";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/tr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/tr/firefox-58.0b1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "6b67d6386251e7bbac5fee1f0df49d34ac03856b0a22f717e62c1d246c218594b164863edba9f387c4acc3a3e6fd41dad80fac6816fcde672635b8e3f84265ce";
+      sha512 = "d33e3b109238f1ec24cb4301e89c039bb2a7002bda379aafb1a46fd3621268d10bfb446ff9c81f3d96101c11ae946e74b359970f588a4d40af360057f6bc2537";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/uk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/uk/firefox-58.0b1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "89c5585413f09f5aab57532aa261d56f5df5b4f466608aea0957856036d5e1cf59763c7864e41bb9feb1313149ed5dff973193dd8c91b77e80ec3ccc9132cbd7";
+      sha512 = "b28fb0f609d33dcb5d7d9331a3a89979779fa284fe1a0ceac6badfb4549ea830d181d52f2f8d25c888b448b0e7400bc99bf829e185fdc06680bf81efd5f9b843";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/ur/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ur/firefox-58.0b1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "e3cf517fb7f5894d14833a7febadc14caaabc05211deafc5c0e69604131fc5b566a2898f91117cd556c7d551392fbe0cf35ba4fee357ad53a40a756600371024";
+      sha512 = "1d15aa7b5ba212e0b2f7520f4a0c4c7f9d53be840a971852485ab3491b28c0d81f0425f32774cd90508eb74d42175f3ba76f3f20f21c182a276b21090062a9b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/uz/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/uz/firefox-58.0b1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "d290e74c418d37cca154f56fbafa4ac9e07ec9e035d513f6b652567f72512c350212748aca15c3baff9b2137309261287cfc947f2cfdf81715e59b83fe6c2b5d";
+      sha512 = "bc750432a94d68897a2a39b425946aeb65e3a9980ce05dbca143615360b45d7f8afd0523ba9bfc4769d41a52ebe554e74d81981391a36b0a812a2938bb0df91d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/vi/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/vi/firefox-58.0b1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "d83f34b3d40faad14a8e9a91e07cb24f2ddfff65923788e258a9fe2455fa812b1b7d35dfc07c628f41b3bbd6b9ffc81dc0d313bacf33c36f5bb85106dc3fbc52";
+      sha512 = "71088078c930889f1747f087d6424743df809fcf62c833470c3222002c1037e5a91d6a2c81e08d39527c673e4d5e807e40c85ae63a7917796af8e9f1e0ea6b6a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/xh/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/xh/firefox-58.0b1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "326fdc7d0082257b970a3b38aa7d25e57e558a204da939f061eb6bd43cdeb17c2d65b9f6ff38524c14d5225e3703949a4e6f01dafd926336d404742eb289b156";
+      sha512 = "c64f34d50755e61487d9280ec60659dd8fc883effe88d61d73416ce740ed5205bff1e107844f04c658aa495bde5add5d10fd8d171312913e2dabf351ade7b481";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/zh-CN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/zh-CN/firefox-58.0b1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "04048407183c8607d6ca06b446e6da8b1cbe253b58561cb9635843479a1963474c26db589828c5586da8b76387b34696e3b256da9f978db51a96fbf3f1157bdf";
+      sha512 = "3e86e76898a2587d079384ebff6a511c6d8a212a1a4632c224de9a1259020358d0ccb2acd1383949f0f6610c284dcb2a942c6aa483ce61d82a8bdb22a6d95ee1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-x86_64/zh-TW/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/zh-TW/firefox-58.0b1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "aa9ae37761cd9096029e5f83a81eddc0e21964fa637f3af41d4928675f02c2d4f0b7558dd79c374c6cfaaf74e464837e5d0bcb1c5eb55c68aab24d501b163ebf";
+      sha512 = "f560cfec6fb0999be49da6c27df85086a1dcb9f88d1467008c417ce47c596cc4616d5971eec40db5e112d1a57cb135ae12e9fafbc4d20b903c3e77dcf23eb826";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ach/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ach/firefox-58.0b1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "83e9e88b26a4c5e84560e4248a2c465f0d73a0044c34b219ade4207702abda9355eba16222fee6c825118f70e36298d802cc8bb6e8806ff4fa099f8ac2d8173f";
+      sha512 = "d322b206a5c7e8873d9c161984a95730b91ed900d81b9ef53b0464192cfa52dda02a684a6bb615bbb109f1f6d93f50236dd36147acb681fbb3be8e08332e6d5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/af/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/af/firefox-58.0b1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "d08c73098a6b95efc5ba120fe2d9e5c3ba1493333339e48e74346f82a4bd89bf65b1d3aa94f99f511d8716cc665cf5b4021da84aefc6ceb0a9b8fc5c21435447";
+      sha512 = "68b112350d8f8b4ca5499e04193ffb0a8871e8089bad80cec0e232f72aad4561ac9f44a33ef65b9014fce830a878cfa9975cc6408a70d7e62878453895e3e557";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/an/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/an/firefox-58.0b1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "c6b460a4b52586795c0d8a9ac51e7990b8a8b0245e91056b0b1ac8290643fae32116fb3769961981da81a7ceff4979b04c923d9bda01a49f93aa08172897a101";
+      sha512 = "69954435c30b30c77896cf195658e32465b93c7c2795f60ddcecf837b85aac4be27bf739250412bed286a9148754edaea29229593d0fd1f0dfdc02ac7918789f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ar/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ar/firefox-58.0b1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "346fe20b1b98c2ea7be7852252a844ccd87b2bc4c6097818198c79af5efcaf905f25157b8249be116afced8955bae9912c08d9decb7eca31050720adfb7856a2";
+      sha512 = "962d6b22c1513c2d1e148e30b93aaff1a768e6f7aad5e2d2fa3403e47db1712daf14a32be51b5e2de74e789bc7db3cb3a7d82d24392f0af10c2d313f899a69c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/as/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/as/firefox-58.0b1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "d7f92e268a5ab4b3eb6f6d42f775a35237a529feb19656b895fb33398749024b029a66e639db30c342a753501dfb8c97868a9726cac33419c3d58865fdd24895";
+      sha512 = "8f1278ec528108c4b93c734aecac9a1cc28f5c459a76aabcbb2f03cb467299db858c89e167e8b576b74f58950979cc7c4d4c1fc563151abd1b1c50c4d89ba2e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ast/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ast/firefox-58.0b1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "a54e7fcf922ee97824d21fdaa2183fa45709f6989f41a96f913c664fc43d0d45be071c4458b026f8a22a10eb18f2b618778ca560b95dd52a43ff4897680e4eba";
+      sha512 = "bc79681e1256efbb3ffaf0faeb53f8336c6c3be90f94fd815670563298adfc6e4bcad5936fd7988aca49d4ad069abbb0e9769458455b5b8d338c3d0d36a93d0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/az/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/az/firefox-58.0b1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "8299a0f1a33289485dc92a66600720289645e341eaf862678f6f0ea194c7f11b17a171ffb1f6d582a2810742f97085673bb8fbe58ce21b94e41b46bd1aa60e0f";
+      sha512 = "9a7360b36c18ef4668ded6eef44030e99e488e404e083bf63c1a47bda13ebe1b8674fdbbf39f2e4ceb3fba832c0e78ed3e280d036b6cbfae3b662a716dde8c23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/be/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/be/firefox-58.0b1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "6ff4d7d353c4c4273a59d09d1c642bee5245c79e62c9e6a5818785f0c22d02ed03613e93353d59793e214bee1fe34de73271a1ec84d9f74853fd821582bd8ca5";
+      sha512 = "083df6a06d92174d1f9b0c8348d668e8834e03b4c1cac657f7cb4981167926f4d851f7f6b2071c077b99a1f5a2f717d16531092cf01b8c01320afcc69043d990";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bg/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bg/firefox-58.0b1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b13a4e6ffbaae528136cfbdbe17f9ad8811cf2fd23d5764d583f63fb3ac2a76fc7ebfd51d8ec649e0f9e33fd618a5108b0cddd32fd25ac98bf83418086b9e364";
+      sha512 = "cc38cfa3f2f7bb99d4c4c25bc90d5756500ed3aadbd517e3bf6cb1e700cf8c5216cae2683e9ee801613375ba8442b75efff14fa17057c9e5cc0129a813a5260d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bn-BD/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bn-BD/firefox-58.0b1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "678021fce64a2725b8968d3090fe10caad1aac6a883a44c1a3fd7e2a5dcea9e9764f36249a299e9348bdaefe2bd9bdcfc3ae2d2bd864c5e66b022c8f61dc8947";
+      sha512 = "3137e5f268b52d400a67bcb9652a3d446879e5b68ce1ad5bfe0653e1f630dcab7294a9ac060c2a9238634df13274b948e95d3549065b471db6bc33e7ab03a8f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bn-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bn-IN/firefox-58.0b1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "801fefcae2eb5d6959fac142d2ce77c6522b842b63f0a2493652ffe682b4d261a91278cea7777cd4d32575765206a4f7ce81e2fd73afe6466e418c40d99a7400";
+      sha512 = "40c279e62742135fa246f2f005677cfebe2e1530ffa832c435d3b7248edcb9ab28c9f82ff5a9118f05da98a0b93de02f5d66059cbac935243b6b7824dccd10cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/br/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/br/firefox-58.0b1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "dd1e074400bf491b833e7ed1dc97d211371be17ff5ca1b3d8221965b5ed67e79594b94eef3a8a778f4fef679debdb106e5c18db4d75989d4e4e9e6c794f05631";
+      sha512 = "07fffb9c815a1a3299e3adf5016b2f9f4f405907f567124ba9e05dcfe7e098efffbf0cb4cc7b5ac3df171e9705331ea33cb02ce8c78d8c35766f13a328f52174";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/bs/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bs/firefox-58.0b1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "444c9c97b8aaaadfa6b725709c6f49580f22e004f3d9de2c5b50f0f6c60e1496743c12ecce2b0482f3ff56408cbca14753e58b17337db016f7d217a5d62a3940";
+      sha512 = "f7f591e6783fdcd7de3a5e33dc43580937f88381458ab774b86688a7c76943afe717026b75ad003c041df426e22638fb085ebb640f459110f5f37f195fee73c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ca/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ca/firefox-58.0b1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "e59c7ff93df39d6e6365e751ed9fb42170bb17f05cf88d8fd96decef6e7bd69fa60d7efda8ae3100e169bc401f3cbc26c94b67137e960f6684c8f219b934acc1";
+      sha512 = "0ad04e6f72ad6df7cba03008ca5053f162c94d0e0109fe3d2d49e80546561f010f890bff3fb632ebf91edcd71bfac3f743614759ef3207eb19f1278ae2283561";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cak/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cak/firefox-58.0b1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "d0e0fcbc207ea7cd1d69d80add30bcd6f31e0931129328d17760c6681d12d6442c0c1006121ea8a7199756208868d892250be6405ee4d43ba23750fc9b3d7789";
+      sha512 = "1be5b051151eec3e46d9d8a5da1a44569bf56ce160a49041be51ad25c5081d019014a7c2a2861e654c39f8fc918c308450827ad68f409161a07e15de44f14b1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cs/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cs/firefox-58.0b1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "9e7a35fdd318037a638eede7ae11c4c28b63e8c3893ccc38b50d25bcab229002a0f912e50719a358ebe6f30205f61187a3fe4ed3d93f04545542888bda18c279";
+      sha512 = "6362cbc640673f6c93c073f116fc98efaf5ec417a5f6754eaa28d750b4c239e12da5b89eadb7a1f163237daafea2b1fb3db211cf00d2062fc9272865472e4a04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/cy/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cy/firefox-58.0b1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "1a1edc73f902139e8696c2c6609c763664f61bc654b33d822b60a31140f7f52afafe3878516d705d90196f72aa38fca57e3a085d5d03651f1a8f344235e2f92f";
+      sha512 = "d72e0eeaa88a03af2f8d10b329d5d734841aa45f05f6c283e2774a7a80625c638b59bf579ab0609385557e911f319701a073e6982f5319df717f786e11475df0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/da/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/da/firefox-58.0b1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "6a5833ecde7edea045ab18325a55ffe19f55d0a18af879caaeeac3b00b7412e2f6b9330959068632f3d87b932f544a993c7d836a69f0ab0be310c07c46851b90";
+      sha512 = "7585f369e94b4f2f0ecc9f2ecfaa059c0295ee96e13cdd93f94a6558d99764bf20b248a47cb1ea97cd4f7f14c37bddebf4e1f1f396df5384795321656882d790";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/de/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/de/firefox-58.0b1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "c0e0954430d656565ce99d91c15ba7cc74da840034c4f70fb9ccb38ece341c86c500b27a3d1b57e8f5da4bb6484703dc98c6b8ad3d95972a9316a0c549de9814";
+      sha512 = "94610bb17c0164a9b39fecd5c108f08b44c98a7493f9db16305cfd1dce95eac8565d57dabf3335c674b92a45dd8590f95f4d0046bc132b724710cd1338d712de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/dsb/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/dsb/firefox-58.0b1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e5ddd864a5ff73edbf2152828b036095ef1197595cf5ab751cd8037d3fff11c9e119293d4adb427488c20e0bfa13c064c76d4720c709d4ce31eedd74395e8dd5";
+      sha512 = "1508bfb8bb5d2756ebe39a9e778b45baee849c6109022475e9106ab79a03ee49986421b809dab70d924fa0edc6613c877150de334738cb3f9a9c53ce3d524ce8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/el/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/el/firefox-58.0b1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "bde94744268cbceac403a4f166d7cd9d182c18cc8321af72d0197de00737b6f31f7d1a5513d1702d7f29df3d4eb7208d2a5086d6e0bb7a2d9b7fb33088f82f31";
+      sha512 = "660a1f30c682ae84aa75d7519e76cb9e2c30978a5195a9e194f734c7b37ed2b12fb216a50c44c0278aa11c51e426b7b85a81363d263dc49a41dd7935db4bc49a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-GB/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-GB/firefox-58.0b1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "48d4fb95963853cee8398c168f51da141ed7e5d18c224d15c35f184669997248078756e6da0f619ed287df034c7d9836f75188c5c8ad17b4af9d1dc022336eff";
+      sha512 = "3e52290ebcc54803162781fb2b87389819537b6e1ad671c8bd95185372ea8dbce11a7cd40ab6d71130effba71155c16be729d0cf74bb39e0aca3d1547cd096b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-US/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-US/firefox-58.0b1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "22555ce1e9f574e5e2e9b1164071ebf2362bdba7c182b6989b8da5e7fb736c7c6444faa44d52d91041d1862c2ad8c0881868e63c424b84d88ef39136e087f87e";
+      sha512 = "f1aacb89284c8627c55c186fc50a5fbb2db42577e0c8db86889599332f711f484cbdf3f53c0ecafe4431da35fe51c3a8b7cb831710c19eeb7eab2ad475061684";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/en-ZA/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-ZA/firefox-58.0b1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "2589efe14b8762492d668def0b4149755ec9ace70f581a1fae669249cfdd44d5bfe60a718fbe300bb92a3ba631ec8b0515357587c8d095013916320f8f1a90b6";
+      sha512 = "f4eb9f4dd20a255bc054089a71d9fdea91c184919b8bbf75ced397bac4d4ee1fb5299d60203f59701ccd1673439653338071fa7c90c32ed0b94ad78cb510f3ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/eo/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/eo/firefox-58.0b1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "1a614091e1638edfcce4d755d4529594bbbc8785ad33af360b9003c76dc64dcd227f71a28e4fcc13b5b2a7afd2858bd9ff6287e7b97b48bee5025ef1de400870";
+      sha512 = "b310c3d01ed998222d922deefb641333239c57da410fff273f238c852e75909eaf1ea851afce1a93257527670b0f0d8861d9b47b68cdc80c5ba4c8bf1afe9775";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-AR/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-AR/firefox-58.0b1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "508812c53be4877f130dbcf0aa712c6410774370b54571210f3c52e1d92fa0477d43f2f24aa95198059c318e91ba7a8fcbfe476cad03a8256eb37eb88ca9f460";
+      sha512 = "95ce1ffd9d736b3ee78e22c3c8b6185d55fc3cfa501bef1779f30d345f4af642c92ed5a0248b2acee04136c7ab04bff604f6931d8e19fa86b9a0047c18d41569";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-CL/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-CL/firefox-58.0b1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "bd7c5493a92fb7d6ee5680895ab24bede3f8dbdbe176166599fa918a981d11fbd124f4fab4b2bcd5f88df5c1cdac48c85a2fcde0fb87ea361ca2baed2db9270c";
+      sha512 = "2be8b488b2c633513e9b8832a3be8263769fcd28721bf26085ffd62d855aa22eee94bd32bf57d19a8a226d6a5997c4595e4a1d4ff3df71948e66ef9d778975cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-ES/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-ES/firefox-58.0b1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "cde05cd2e4127258cfa26c76c018f2dcf8214a75a8c4cfac5b4dfabb51ffc43f21828e9a89fcd326cda5cd0c6fbd09649259b81212e13e4d15e32d0c1b87c267";
+      sha512 = "e5b26bb9cb2a428bee971fb09694a47601304ed5bb49945ce83a84eab90d59e4b60358baea20015a54e4dd8dee1beaa9ce06f80faf9e1d6ef3572087eccee172";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/es-MX/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-MX/firefox-58.0b1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "75b8750f830a6353587a9eb555bb2e207b9d7e37894b6b2334be1dd27025d69adefdbd7ae1bff6c7fed823acf2684352e1bfeaae8a5ce5f0721838a82067a6be";
+      sha512 = "2069a6fe973341930bbb482a7983d49576475a6ab858089c64e388812002e698efc7efa328508cb52cb38f013edbe995b5b941779e03f4f44afabe0b013f2209";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/et/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/et/firefox-58.0b1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "f33bc9d8e107eb70ab039257540e9a3f96826e597771ad86ec416773a1755b1e5551f8a14664e8507e29eb08d0e3abc8e1eb9e00c4320ba82b32c9b7eae7a68d";
+      sha512 = "65c02f08263fb91e5eb5f4edc445f1590e96586890200298339496ec93c9b003eff729f96ce2a954b80bd8161e1ab066bce5df1d1ec501292f4080bd3414a9b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/eu/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/eu/firefox-58.0b1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "94c844674a045f2ef4d2dab12b070e49f6a79e4d86856b29965962df420b4dd57db5f21dab66b7a54317dc908c9b29c9bb3ab74a0b4b8eaf806e2fc2bc45a821";
+      sha512 = "b45b71c7ce796bf6a9bdf1e07ed239b33655ef4b79db6d45be4ce5137039b3ee3e10054d90db19b3733b92e9c77e822c5c27b23f1fa5dfc0350129571e56e7c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fa/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fa/firefox-58.0b1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "487d78630469eaa93bfc24b1b3a9d027b57b62c74904d9440e3cb173a86182e17758f98013b3089a173da0f671e2a44f334c61835f1e6f143d3d83704e36f3b8";
+      sha512 = "e64792f27a99925e49b10db7442963d8ac188f3d2d658fbb6a15e2ca462e2c609abd9f265a6577503b3bf62d9e64879c44917f541d84bd389b6f6ff4150cdf1e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ff/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ff/firefox-58.0b1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "b6465926764e311aca0a74f6d6fb19396f0475bba5d2c43dd3af124e7d6dd1b0c018fd541d2c4f5916d8bf03db6a93344b558fcc392adf222893716bef95275d";
+      sha512 = "ecdf7ffe75352bccc1e5a642f48ed82ed7cef703193ccc97163177fc3c7a77b5bcf4bbef452ea1768ca490037ecad5d742800ec45d984e41dfcc30dcbc70b3a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fi/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fi/firefox-58.0b1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "76f0748b9337bbd7232b0d1a056378f4149b1539bec8c43cc99b14d8036c8b737d71467b8d46fe51a4dbe0cc1fe3a061d749fe3937ad5df045da374ee72d4581";
+      sha512 = "063fbd923090c7452620db1a42358687e1d29975cf19049a5867c18eb0265790f4fca2644010196c09b639e63ada98ffb71bbe17191b31a0cc1b4fd468b4838c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fr/firefox-58.0b1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "84ae5e6b2d6a89bfe20646064f97ecab399cc916ba1c9a17a4787c6e01cffe159fcd563a595f0362c20132dd4dcb143334145a05c7cd6e065678b73f6b5c0017";
+      sha512 = "889f628248f6c504198988697f18cd2f99be305090350aa5fb8d5afcdac572c14cb780ba07e9c3f98b6155f29e4d32fb5f140886b0dbcc55d9a71cf31d058fc9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/fy-NL/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fy-NL/firefox-58.0b1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "e1e8a0d6f1e96b7e4f6e8c315b04130c36717f9cf5a47d3fff06dd1b69ab424674161862296b93fa294a980afe75cdf04ec115e06272cb67cfd74809747a2bb8";
+      sha512 = "8749fc2e704a9156bc944f89626e3fdb2ac51d325cc6c3f2c6646c0a60d6029caf5b51ad8cb6a269cbd4b6c0b23b719cfa1f7c4dd1febc3cea2febc6b4964f5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ga-IE/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ga-IE/firefox-58.0b1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "3cfa2704c00b21d15445489735753014a481ad5b8eaef25a2c6ca35122aab9313b5cc9885d685c3ff206ed895e14dfdb7518ae5476e86bb35e6b81f06e54aad6";
+      sha512 = "93628f55f76a44041a49ae2c2564814b277095d33b67fbe4d902234554a30461acd5eaaef74780722287874ac4080b8def72a2fece9ed72f5a9e6d2140cebae3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gd/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gd/firefox-58.0b1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "b7e4e20f35ffe7275f8009194bd8325c3c8f6c02e185e7a337c85d03232909a44f1d4a41b598d466f560339c0e64cc3babeea2ec2efee0ffed015a791fbe265f";
+      sha512 = "af3bdeeb07e2f63628d787f66d0838bc073b927900e6358768a083832a13e0b056ea1821a43623e3c385b6a77d6cef49cdeacf7678be3ba16263ea7c34144d4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gl/firefox-58.0b1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "9759d271de728720319dcd30507525a1693d00e6f443a5921eb221da1f0e2c122fe1da36c881b0e4032cd5ef074438da5933e8c10b42370f114dbe572204589e";
+      sha512 = "37082a0429ea2fa9d8009452fc9940b4d507f64a5285d67f3f9d77ae4846aac4d40b58f4ea5c6b6684c5c59057bff330f7ca21a7ce240b78037ca90589231990";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gn/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gn/firefox-58.0b1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "9d4ee42485ef63e7747538362a4b5baabb4ecfa706b4c8b0c3fd440c48a6d15c4f8a1cf5e2b8ec71672dc529b50c7a6645986a867491e4f14e0cda127db5bc13";
+      sha512 = "b2ec403ccb785f8eda9e1a03d5200c40827f20bf450a334f8ef0ad1a1b4fb38ba63b812405360efe77e0c6705730dc484541065a969e9b51406a47a8a13fa32f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/gu-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gu-IN/firefox-58.0b1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "45c21939311dc0414716ab272fe72c063b8adad201f2dc7893347a66c5e9abe7f1b215a4d75bd3ed3801b823679fb27f5cfb5fb6691785126ae516f237133ac8";
+      sha512 = "2275c8bf1639108c77b304140ce32a69239fbc96a371c1d88464694f989deb9264ab41053c3a2d3e1afd6443ff3f0fb8e58b61d085dd2f6cde346867aa380c08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/he/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/he/firefox-58.0b1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f17386cf6652a794303dfb24dc439031630239a9e7b82afcab0bd49bc3e018c4ee4f499f3c1557c68d38f74c37b8775a49fc72318a08fdfc2ee8f593426540a9";
+      sha512 = "982b15fc9cef3fb813154f90e1ca6d0768237b04ed496d91c141c59e6b59ce0d02623644d12b885339e6677b01556d1724f3010ed06cce89c1d26a3cbaa9863d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hi-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hi-IN/firefox-58.0b1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "c7311b1a5d69439b93fc0865394895e3d1776fd940d21838d4681659dd2aa222cf1aa041821f5f385cdf904de13e8ee16e000a582495f9eac91c0542317eec1a";
+      sha512 = "40e6842ab3a8fd79bf9c06cbb2bf1aed9244e87470a7b39957db7c48f8eab2dcbd988c47b81d362bfdf19e7c9891c1ecbf0183cceaae9761c38583aff32e6706";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hr/firefox-58.0b1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "70eff0fd9ec9c9c70ddc4afd3b95e427a945b35dad26dc29b166d784efacf9960738cbb0c62c700cfdcb48b38824d34ce46eef1ce0f55fdf63932beb1a69b04e";
+      sha512 = "9c798f2d7483a4b122fa579c0b40232a312a5ac7e19db9a940fd58aa7b54a52494822bf545a79a690c181d47dfbaa7e4e7b9c70d68a981e9bb46f3469b356855";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hsb/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hsb/firefox-58.0b1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "973817d6011a72c676b14f9f5b333ae53fd38af8a06c5434eff0debd88f3beea8d209331870620dc3457cf0bb0f24462d2f9fadb302416e0e9ce84928ddc4d23";
+      sha512 = "b00f4b0e377e413c196eadc2eed1c914b496e6b71742c51ef87ec502308fae0fb55c0d69172d47a9ba6271b137b50e1fa365781cef11d0d65ead0089d8c16ef0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hu/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hu/firefox-58.0b1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "836aec8829d07baced10aea1b461a4b503bd3887541c6e030cd802ee1a04d6533f7f899c268077a3f79e8ada8fe2606780c506a24f0388e3292e6935afc04048";
+      sha512 = "806ec30cfbfc22fa206dda8e3cb5b43aeba99866a19e8fdde212b95c852bd2f313f451b93409d153c0dc07ed5e1ac94a18b75f91a4ba9b4787a89b77491a5293";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/hy-AM/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hy-AM/firefox-58.0b1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "9a411df379d0f900fcabe91515409934da6d51092a4a44df7f7e003f1761504b399e353fc93f69022b91d72c44198d35ad9d7e2cf9be30c549503043bcee9b12";
+      sha512 = "9e3a8e46d15d9b71d645d830f10e3ee2089c4dc5083dd2debbd3d9d05ef464b01405f920d9a2787d5155e533ec57c3fe3def34ad88137a4542a2cf5cf8a904fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/id/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/id/firefox-58.0b1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "e91a619f10a6b9948bef49a5c21545f3881430d8f6c7b5f0eae112c9b8716519a88c635c37cd89586d8ff4669e31f4b549b4eed6cebf5a13a48df9ccd37e3988";
+      sha512 = "253958e0e6955a8768c5dc7645f6431135bacdfc9c1552305f7409c8044a3bff529a87bcdb2a0676b0eca3ec90de34fdff41a46a9ea63c5ab038b4119e231b4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/is/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/is/firefox-58.0b1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "aacbee57162998c21c870d541bd453130292211a19aec1d2b3ed0695f143eafff132cd4700f9a381e405e46ee1ec5865017c447771fee7bcd9c0c8586601c1ba";
+      sha512 = "070ba6e602719e79d2a3ecbca1f5c3c412c02cad89c8aba624918179b436606f352c6fc0586597deb2ba7f703623e0484c17a11df78655b4ca0a1a6a826a1b9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/it/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/it/firefox-58.0b1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "4388a33307067545cbc6c292a5aee825a53d7e38aba4847c347aa4ba3f30df2b2ac15430fd4a28a7fb490efc7c6a6d555d58d61fe753e0f8368d80a2a8034f25";
+      sha512 = "9f624b314b29b1ebaa6c92f2b8cf7b4a0b3c38851af4bfb123e140f49435e294a7aa2bf6e449ecb6b315b893d5d55beb487d30814cf6d72c4905eb7df91d0327";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ja/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ja/firefox-58.0b1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f37f851f573e9ae734ad819f5ba22ff97a9081c10f63950ebc52cfd97202b295e035129fb7f4afcccbfface1de188f1ec8dee7bee14bb3f0f779f9cbc00667df";
+      sha512 = "22a95b25a5e66280791fc18bd5050db7726265aa999ad959b07d45c7fa4720f067749a60e33cf8f548b93adbf440e15e47269f98a31d3643d157ed3d3c46b9d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ka/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ka/firefox-58.0b1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "f06b7589ad1e2d96273be1470032d29816295ee48f05f9da685e210e0ecf35187dfde82cd5a6596ee0a0ecc8143c169eb2e7423c4f9026e3b06851b6ced6e3c4";
+      sha512 = "3cec01bb5d98f192426cb39ccab91d823604b7c722831baefd8f1f6deeebcd5068a9ec8ad52cffeb02842ecccad891534598cb6a898adb40c0fda77a038b94b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kab/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kab/firefox-58.0b1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "c4ca6d1a50378309bff211138924f7b3ce22705592186c14d5b17501f2c49f04a29b4edb23746efcbc2947e0de0db88d0349c85e5a3b7e993649eace1975965b";
+      sha512 = "9f43fea99f324955625889082fc8ca119d0aeef63d226532f87121c6659c0c5a9cb54a07faee30f8b1b10ba58ece7ca1419996269f05c705fa36c364c8fb609b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kk/firefox-58.0b1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "78379ec69c88d1ec8c03feae66d4f4ea3b48de0c324084f8f68a331bba16cef5a66f388d5c0fad4cdeb3ec9b1ade21dcd67e4b5fb026319718daaa8a151d1e5a";
+      sha512 = "c3f10ae05036eff27646d613699c4be408891917fc9d523e202f58815d2ce76a976f3660a507e6f5e4db4dfa7172227c6ab874c8586997d530808ff409ef827a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/km/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/km/firefox-58.0b1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "ebcd7d6259f83f7ac9528e1eaabe7f75600ea96c49ab0f55c77688949096d7503973a262761ec0828f233654d0aa2271f338a756335f27b73a6174aee05e6f9b";
+      sha512 = "d25c83ccbbaec8e599c5ccbd5a21926020392bad5349d65e62a12f9ffcf7fe44bd46fb79974bec12fde2a79e43c6089b9906d5b6926cd17daa30ac3dc6e811ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/kn/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kn/firefox-58.0b1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "dc9f84b8d3efb12710c1a245bdf26c54f421fb6b993ed4219f28bbece45c37aa5c118206cc9c4e2e2805a667d90b7993462e57778c0eaf8193c71dd3111285be";
+      sha512 = "d707cabbe662203520681556c9dce1c7dd0f97e002b795214d17e61f8ef6bcbdd7e16b77f2e5bfd1a0fa80cbba9cff49f4d416f1cffe04138460a49dc7baeded";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ko/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ko/firefox-58.0b1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "377b555ea022b2a963fc2fa9bd44002485f575710925aa5d7056b2c343e476f599060e50e708322c535a8dda3cb50255519a833c031e2aecb5d4fb1f1c3ae65b";
+      sha512 = "c6ad38ff830a6a1af80422af252bcf9dcbdef4151deb59e72de10d048649f8e8ec7ff3013b50ee4e3851afdf609a019bb15e4bb92d93a848b8cd2d57a0bf5a3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lij/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lij/firefox-58.0b1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "56985bc727c6c7baafab85cfbc8e3fd83f4770a446aa2e6a894983948af99a36f522898bc35a17c1e91edad7eb3a80eb736a9bc75a0cfbc1cda49f617d649edd";
+      sha512 = "98dea891a50e0176283eb7435aa36e038e2608ed32ac46b587d6212d3484fd42c5f4fa4dae98878fa2b79c69b46f186ce4487234cfe53474db2fce063bbebcc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lt/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lt/firefox-58.0b1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "fb3644bf073c9c418ea3db482780d6a409e7761e31cb82641d6021dc90ae81f3f955cdfc3f773e4293a29dfc43e93db3d0feff8124f1dcee23a80e3006cb48ea";
+      sha512 = "5b0ed58b46552c756b47a83b6334c7a47184172db0babfe9b40e3b296088f8814ccd190854cc24c4e79f512f444ba447321848ed34d105c419ec6b1372d746e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/lv/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lv/firefox-58.0b1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "5a273bc8d85095663c6d66915e31c2cec48274db8445a3127b5fe23e1a6b59e0cf398a0631b23d7e8e29c2bdb40ea4b1f98d2d09c34f1f609e2b35f106263785";
+      sha512 = "34a6f8469d4fd7e4fd2c3c8f8f336be95160a076dd7a88b58d345ad540179d241d4a68b46c122380627b2177509ca04a565a53364a9f2190017e75dc0b26bd1f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mai/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mai/firefox-58.0b1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "13503b7879ae1c10e151ae85ef0f657dca6bced41bdca7b2ddaf3445c56e712c2b5c084f5490d41c5459ec9c5167c62ed517ca9083dd86cb3523d00a84ced8d1";
+      sha512 = "a5bcf34dd945648f6ef88fb96d7b545936aa811f4d1863fb1b381df9e4190e74ee08eb38bab30a46bc5e6449c98a2b3db99d70a62fc46ab85a178bceab7981f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mk/firefox-58.0b1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "8071102677b25f92dddfe1b5ad16aadd9bccf4a794b9df4655f75777d7d55fdb0c1a5e4ab292c222e61302f1cefc15b649ac17fe58680708bea2223e0c5f0a66";
+      sha512 = "974c9f4ef377be4b456dfc74d8510074f8bc0bceeaec90670a806fc583795bc06360b4aa21831fa23aff8ebd8d4b8ae6c9f88126a9374b4bc96577b6cd7a5b2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ml/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ml/firefox-58.0b1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "962cabdb6a3baa3fe6e25885eb27c5f119c37ca27fe75547a704b3409375d7dc61fdc4a1e4e12f0f0e6405f7be08dd628fd53eccf8431645c549bdac6ff6e6cc";
+      sha512 = "a2ee22bc5caba643d7694652c2f6288aa6e709ba816023321997e070bfb84a356c6b5d5b92c4a973554aa44862e673690c388d92ac5699e4aec7290d24054565";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/mr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mr/firefox-58.0b1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "0758144703046081bf3bf600de84c7a71275d73c3b6f9f27e2797937250b8ad288f41081fbf6f0c31e4d0bd61e1a8c449b546839e2a1da0ecda4097e7de6482b";
+      sha512 = "cd828c6366c5450fc3fc5e16268cbccfae4a14bc2cd8041f2965192a9175d642527194564d9891c57bc6f7f8d70ad56338908520ec1c24407f2bfcad1ec1070a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ms/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ms/firefox-58.0b1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "015433073ad4703c7636eed2e41645d1505b9ead82a8ea5c6e1e639e28db87d0f5afb1aab0e7bb852b2c5b5be7182bfa6bf7bf62a2cfd29d4948b1243d29ff2b";
+      sha512 = "21abfe77496cfef3807c962d8f9328511ced673627dd7227c025733d5e229683590b4200e6654f6c20d1ad82657d31ee4dcb64b6d83f797d0c7fa7bc3f5372ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/my/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/my/firefox-58.0b1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "603b30c61668fdcb0ee54e0881fe4bddd6a6787062060d28fb0a5b632e178b8396c868c637bb08e0e1b03e51d53e878407505f484d864175e357c9aac790dd9c";
+      sha512 = "5d4dec8c8107401ba3e09a1137866b8f690093be14991a0890d941bc4530747d3f64d9cd68bc41dab92b95aa566a30ffbb4156e69f920f0aca7d1560dd9c19c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nb-NO/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nb-NO/firefox-58.0b1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "6c761e7827f210386ccbf210246e2a68a200ed98c3c14b18a9a4b9ceb99383cf59ec2873c0c5fd749a8ccb71575691fbfd0ecff62f9a044b3e4d2c272232a15f";
+      sha512 = "10eb68ae015e2a686bea9340f4a26776b388d1a0394ff229a18fc0861a5bea9b3e726f9e3256f99463b2ef56b0035bd17beb8a06b6b3d57b14e22ebd396b135a";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ne-NP/firefox-58.0b1.tar.bz2";
+      locale = "ne-NP";
+      arch = "linux-i686";
+      sha512 = "6eccbc0c1cd1307a3f37893b3e0bdc01d9de889fe5a203c034aee4ed7a615d8d049728e7fef4ee87776d9294223839d6cf15565e2a7ced72bda56faab5970a9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nl/firefox-58.0b1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "2847d4ceb5c572c090eb030a3c5ccc03a2a43f43002f4e308695905f7ed164bef73d1342800b7c0d0932d5b84246d68c8d5ef1b84b09690558d5b2b7453312cb";
+      sha512 = "f1e27b02d460af36dba3fea06c83446a1a12a5994fb3e8ad84dff769fe2307283e7d8eb4dd04211d1bbc12a8b058b4463b012ab01fd8996c12718072ac94311f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/nn-NO/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nn-NO/firefox-58.0b1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "892eca2b59ae33326c1699afc273c0726b4fc26cea9adf7787310833bb50fac07bb2af18fbdf283f29ea1ac737e654a86bd844e97a0df408c7eb77c931ac4d85";
+      sha512 = "d3c6c97576c393f9a32375ddfe2b6f7055fda84e340af9fa2e4405c0d2e76f309da67a4885ffe58439e7394845c78815bc4ff39367626a3092bf96ae1ccdbb3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/or/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/or/firefox-58.0b1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "0c4e996d5d73b1b13ca6fef1ae79a7f4c180cca8c6b5d1666c7172f80767624f5f64f70c2b5597ca22496e161379b37fbfbd20cc94998488eb6ebdbc1c2a9b5b";
+      sha512 = "93c8b41c446b15144615ef7c58ac81f0e63dac3747e874e52a6503a953cacb9220274dcc31268440c95dae8b242416dfeef39b392e262bae5b741a323be5fbcb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pa-IN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pa-IN/firefox-58.0b1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "eb30dba1b3ee43ff2e6e86bb896b36e775ad6a803062aaa5c3ec68e3d579a0ce2ead6527b0dc1a5b4233f3be707c03af03063ef3495019eea04e331df544dae0";
+      sha512 = "b17ac7bc677fa78f45a2855cc12a35c70701e882a6839764a4d05ee3519f68e1347194895475e916d62d2a679c7bc60588253f6f201b41d82b3a7b85a356a6f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pl/firefox-58.0b1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "d951353704501d27d6fb93da04ecdf8d06a2a6664167976fe018f39f82cf70ec7e59554043e7b4fb7a4b423331bac829f07a9f4d05c3dbe7d66eba3db09284a9";
+      sha512 = "8b65402216f991dbc780099859821facbee757993d1b57cb9c4cdef792affdc14c01519dfc47731f195796322e5a4d3ee5db319c8d96b2565ee6fd639b42a026";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pt-BR/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pt-BR/firefox-58.0b1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "5e8cfd1c70bc72c58c7a7a06d30d9bb701c0c574de4bfffbffd96ac6009c712c0f8b14227c77dd109d16587f906b01c94f18c7d55f08a479cacb4bc479859db7";
+      sha512 = "925380239a6575be1e933f645dd26d922ab5368cd10c6822d9b14df8dcb4aed5a59f4c36181d6da79fdd94019800533bff33e6879070815d3ceb089f6ded8249";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/pt-PT/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pt-PT/firefox-58.0b1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "1035994860329ab318146f1faade952abfc48a50c828efdf73b3a103e7ef331acc82aad1a589b591384f33de1e3f0976eb62b61accb2507069e4055fd7bd5441";
+      sha512 = "d87499d577afcf51f2d7dad05a2307567506612adb87eee14412bd996602c6c8eed554beb1450deaf8224192ee82f8aa6dd51066e7ec1f1cd052f2285402a969";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/rm/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/rm/firefox-58.0b1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "3430038ecd626b4056cb95815ca36ab1d9385e4783259cf973dd1ed7fcce12a3c0e1a18555a579d94f1021d1073089c3d9be40ccd003e00057c498e98ce7bcbb";
+      sha512 = "a99a69291f670e09abeb7bc336e089da68209fb6b7dcca3391e1716c1a0a2f679c0b2ac902f3ba7239d248159de0128ea5643b01478b66f92d139d2232cbdc10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ro/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ro/firefox-58.0b1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "488907bf47fdc4a02e2fdcf11c0c4517aacae0421eac41ca75b573c5401ea729e9dbbdce4a176dfca871ab919ca1a07a1db9e61a82f0516902fc80f6a070b9b2";
+      sha512 = "13d6d1421ccc54a249b89f172aafc1a4330df11fe68d8c49b74c8da8c4e34d7372be770e19d70f46ac57b6784a57848ecd006a35c93e50b05f89568365bd74c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ru/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ru/firefox-58.0b1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "4bf91ef098ced14a89efefb99a8162a328c583ad0e2276ff3539b9ace7540bf7fadbf057acd9cf604b3fed0359bc208186cc42d8801304bc9dde85c4a12f38af";
+      sha512 = "2af20c6a0e203fe79c285718bd286a2c8c282e4d1fc669a1586ff3682d704a07e593670c63f94be646e7e3324666ed1de10e445cf05849184ddb295b5bec71b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/si/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/si/firefox-58.0b1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "e214d7fd32c669f0a5367aad50ea9ea9c0f642c4af862251c52f1f1c95cb17a895edaecc2f69b6899ce95cd023480978936007ff26493cba9971624af422a5fc";
+      sha512 = "b403cb79bfa008d094262c22071e4499101f15607ae43985bb1a550aac4cfc5fd361742dbaf3a1f655cd74aab41dfdbcfeebdb1606ce9cca77030cb1dcab83aa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sk/firefox-58.0b1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "17206bb3d59a74ec7acf2ea205e2d02db7257484257c8cf63341b99b7cbf9434968d3c16df7ba96438c44e970e53498883ac2744dfecb7993c21fc34dc4d9f2e";
+      sha512 = "a1a4b65c352ccc73a8d55f38de5aac5288b7f8b406f62d5cc6993f53b0e5a90dd71834a92be5078b0da5a95892070dd1ad51c9458b54f294c791c8307daa1219";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sl/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sl/firefox-58.0b1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "d04a0b97ad4f3385e48e7a248d280ac5c46a1d63261ab2a4b3e6b7769d82c70bf523acbb040bc3d341669f6b51a724970fe8e358ccb3e88c9656182dff0d3317";
+      sha512 = "8b90668816fb2869f81e4c4ed1611817b63e0072fb58a46409337e4069167722aba206976b9550f72307d8366da5c1379de05cc0102ccfd5b1a01d97b1dfd365";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/son/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/son/firefox-58.0b1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "ae95b4d44e9a0287d6696745edd2d9e6b03eeb7bdaf1959334ec4dd28a84154ec075ab25bdd319f92f2173f8d806f95b875d2050ceda125acf8e98e81e6ba47c";
+      sha512 = "3b6792727ccfdae1ac318b93b82997f6aae8754607429c2f15e16c2ed1d8f1d04f6c95bd474abed2604f16969ca580e85945a7d8ced2a694734a236c43c10949";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sq/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sq/firefox-58.0b1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "713dd79c91fc01940c9b102ebbf83d5a9ffb62e77c42d971eeeddc9dcff1b2947268bab5c99285de5826fe3a5ffd55d9ccbd62c809bcbf2a266f019e35451cb3";
+      sha512 = "554397bd32fbfa5475227cbb5d926c03b5359460c02833b917bd4278ac1917e9fc4da8a75c8cba566a573c26e8f8e0f82f41fef9b57e6584e3da327c6a566b5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sr/firefox-58.0b1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "c7ba73cc0df99cb28f5f5bc6a8dd237a3c9d5b67d7c63444ff8b63ed34f0e0e390d233a3f886999d5531ceb9be5b2272b3b282008499c5f09278c9a9043636a3";
+      sha512 = "8e753463023f2428b15b58fe932ce9a33ff1dab4dcbd4321fb5055eba7768260769b1468d515c76590c61e2248d07fcffe2cc0c0d7035260d6b3694b90ce954e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/sv-SE/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sv-SE/firefox-58.0b1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "58663250980e784ed5481a31c09b4ee9002004d4026d6743f89c739beceb9a135c587a61a391dd3cb68d53ac34427d0ff00cfb8b6a235eb29d6da4d026ea3504";
+      sha512 = "a86ddb45f3900e00906a938d35d5a463f12a7008f0c17c4775ac08216fb4207dc366ce4c23eefaaa7157af8a973cf2bc7a80e166f51c7388dc497ce9455c23fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ta/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ta/firefox-58.0b1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "89fc06a036be7359494eb098def2a7118e0e46449ad7545b148a4194fca4ee446aed7172567a7bc746a202e48aa67a5fd18321f93920c761851a103402dbb008";
+      sha512 = "65565bff074e4f5299c6aeafd81f21d8fd265ee060788d0c494371b0c862baa9fabd1a5182d14b49d1f6aa6a9f8c47894163292236421c42fd93b27f0d9da195";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/te/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/te/firefox-58.0b1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "1c74315d96536cb03e842823e70246bf9597489ea0586db6c474a5a905031e034034a62ea549b202dfd5464684a52d3364d1423f34a5e720b6449981fc8bbe53";
+      sha512 = "5b4f7656a5ef4dee75c958da7492d7d52e3636f0ee064e1ba93c7ad0360fb0a66825be76a4d26e316f67fb73616d223fc77ba95eaf4283f679c22da1dee79adb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/th/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/th/firefox-58.0b1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "4f23ed4c12757f6d472c358af4dcf1366992a8c391bbeaf1f86f735ad2fc1638d516b76b22b118179062ba260154048c179b88bc3178488cfa20be4bcadcafc7";
+      sha512 = "cee14df62eb7923ccf2d63953ddc4763ba76443c181cd9e1239db3b489216207b0a367eb9794cf4d52f3b7459df7515348383eb9a035f4252b0310045aa215b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/tr/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/tr/firefox-58.0b1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "3b45d8d29d6f7f8a08e4fac95ee28b12d482fcd2812ba357252d85bc2bf49dbf640190b3174fdc0e63b9b5d95e87ab3086efb1b1fb717323e971080e0bc5b570";
+      sha512 = "e385eaeb6fc0cd0902c3e48bf99fec484880ca4907c8feeabe2c0747e10fbc3d8198d5aee83bd0b21cff2550d144d20d7a9e9e68ef07169825ef8a512cb0af7c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/uk/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/uk/firefox-58.0b1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a17831cff53566f313f691ae35f6b7032cd7c11b5501b4e84b70b64323d0dd9988ff422d8b7bbf67436af8c8ec631f9c68e7338c8c6d3d470094034a5766f3ec";
+      sha512 = "962aef76a18a25890be145184aabe5149a5469d69ac46c8bafe3ea997613b31c214c96d9ddd565d65173fa639fb5f2cbf5de73b9c9b2aa6394fcbc84233fd38d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/ur/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ur/firefox-58.0b1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "e0eeb311d9cb0789cd17979057c1f4baa2065dcfa30f33058b2a866b239bb44690263ac408cdcbff8d4f7fce312bcd51dab60b84479917f2c615689ed0e1714d";
+      sha512 = "68de26543d894104bf4349a6e7e13ae58cfafdb35bd14cb97604410b02196d0cdcc40750a04c64be301fbbcdd2c74e624c47cc2363d96d4e293edbfbe0a1f3e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/uz/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/uz/firefox-58.0b1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "3d6399921209541e003e8fd83e3eebb39d30682090b0f306fbbae6705cacc7fd1db50426f00084bc1c6b239b57da5587479ffda6bf0b848cf4c458f821936a9f";
+      sha512 = "37afeaeced1488f94212ae76b58465c3ecffc5550db240afc9dee2c5dd1277027402f7264d35707bb132f467305b367d982eaefd83cac72e51601c7d65bef0a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/vi/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/vi/firefox-58.0b1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "3a3d751644d605c92f973b680b4a093fdb8c476aa4eb4473e9350a03128668cfd9c96dc5a1f49dda2647342704e02326ecdda5c02e0b4bd80d73d03d4d5642de";
+      sha512 = "1d23a043e6f1ba27f13f89a88061b1f4f81c4ba70abcd6c15f563c76ff7b3bb95e66d968ead3df8bca51540b10042a8ed1f1792a42eb7f1e563eed0e92035f0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/xh/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/xh/firefox-58.0b1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "8aca9406db4ec188f0c123a298f4bc89d8b5adf6a1471202dcac40e2abd7fb16c807458a52c2a5e9e31703a67dc792153d7c745219da9ab2c7144bb3f853a7c1";
+      sha512 = "247dc73aeb071d3f430e5f61447287d641d18951bb0c519a95146746906f4a25595f57a781c2f402ec7da2379d0b4fad657b5b097d00f774584f1d746fa783ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/zh-CN/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/zh-CN/firefox-58.0b1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "ff87569273037e5de47a5c1ff61fc31933f8a4a9147ce8f54b8c9e16413e3546f7ffacf4ef8127363082ae173d4234783e54a7ece55a8afec1a51a57527d4e43";
+      sha512 = "10ad6c7fe8693d502b9d16630962f19f23b0457403430c8d24b34fe32de9b88513f82af3b09dc23bf252c2026efc6f45cad75e7244533aaebd824c7b0ab01926";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b13/linux-i686/zh-TW/firefox-57.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/zh-TW/firefox-58.0b1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "063d9e0f85a04655f41e3e8cf9c875d6ec19d936c9c9aa04eb151dbd3de34493f7bfac557ae5f4f4dcb42037aad787e7e98ee42bf7fdf89c7833a21e5f827404";
+      sha512 = "d69059c966b06a9b2c7bc10ce83d0b927f29b85d6aa2a78e62163f8718bde6478f7ee5f8040a70816a29719ae7336cc6d483b4ceefbb2b8153acd5040e0bedcc";
     }
     ];
 }
-- 
GitLab


From 49e0be1d4dbb005616d025b9105ed7c5031febe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Stylianos=20Ramos?= <andre.stylianos@gmail.com>
Date: Mon, 30 Oct 2017 00:09:00 +0100
Subject: [PATCH 622/877] joker: init at 0.8.6

---
 lib/maintainers.nix                           |  1 +
 .../interpreters/joker/default.nix            | 29 +++++++++++++++++++
 pkgs/development/interpreters/joker/deps.nix  | 11 +++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/interpreters/joker/default.nix
 create mode 100644 pkgs/development/interpreters/joker/deps.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7c3a845c00c..ccdf1e5b7a5 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -44,6 +44,7 @@
   anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
   andir = "Andreas Rammhold <andreas@rammhold.de>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
+  andrestylianos = "Andre S. Ramos <andre.stylianos@gmail.com>";
   andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
   andsild = "Anders Sildnes <andsild@gmail.com>";
   aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
new file mode 100644
index 00000000000..a0302b5530d
--- /dev/null
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "joker-${version}";
+  version = "0.8.6";
+
+  goPackagePath = "github.com/candid82/joker";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "candid82";
+    repo = "joker";
+    sha256 = "0m6xi1jgss6f4maxqpwjyyhyyc71wy5a7jpm908m49xx80mz5ams";
+  };
+
+  preBuild = "go generate ./...";
+
+  dontInstallSrc = true;
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/candid82/joker;
+    description = "A small Clojure interpreter and linter written in Go";
+    license = licenses.epl10;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ andrestylianos ];
+  };
+}
diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix
new file mode 100644
index 00000000000..d5cc0bc44b0
--- /dev/null
+++ b/pkgs/development/interpreters/joker/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "github.com/chzyer/readline";
+    fetch = {
+      type = "git";
+      url = "https://github.com/chzyer/readline";
+      rev = "6a4bc7b4feaeff8feb63f87d5fb2cf3e3610a559";
+      sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 596051f4ea7..ca40870e48c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6451,6 +6451,8 @@ with pkgs;
 
   jmeter = callPackage ../applications/networking/jmeter {};
 
+  joker = callPackage ../development/interpreters/joker {};
+
   davmail = callPackage ../applications/networking/davmail {};
 
   kanif = callPackage ../applications/networking/cluster/kanif { };
-- 
GitLab


From a167ea6875ed48aab6c4e9cfc537a772b7e7484b Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 4 Nov 2017 07:03:06 +0000
Subject: [PATCH 623/877] joker: do not install private generators

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

diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index a0302b5530d..8906c9c5d24 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -17,6 +17,8 @@ buildGoPackage rec {
 
   dontInstallSrc = true;
 
+  excludedPackages = "gen"; # Do not install private generators.
+
   goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 4b5d30df2de8978516ff0cd979b86b33d9853990 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Nov 2017 08:20:37 +0100
Subject: [PATCH 624/877] sbcl: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 85004767e58..3aa3ac6aadb 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0s87ax5hg9hz6b8kc9yrjckgz56s9iv96l2dcq216cbqkykrrm88";
+    sha256 = "1qdaf847g5p2zgq00ax5hdy4r82bl3ss382psd0kkca1h83cdiz8";
   };
 
   patchPhase = ''
-- 
GitLab


From 765091d80b7e11651657d69eec3f3a33568bc05c Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Nov 2017 08:25:03 +0100
Subject: [PATCH 625/877] tmuxp: 1.3.1 -> 1.3.4

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

diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 9faa36c13f0..24486980b4b 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "tmuxp-${version}";
-  version = "1.3.1";
+  version = "1.3.4";
 
   namePrefix = "";
 
   src = fetchurl {
     url = "mirror://pypi/t/tmuxp/${name}.tar.gz";
-    sha256 = "189mxnb2pxj3wjijn56j8y5x1r23fil00fn2q7d6bd13vgr0f85s";
+    sha256 = "149n35rr27n2c6yna1bla20x3w1zz9gxnjj3m3xxdfp4fbsd2y31";
   };
 
   patchPhase = ''
-- 
GitLab


From 16172d4299d2057701305d30d58d81f8c6509d7f Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Nov 2017 08:36:33 +0100
Subject: [PATCH 626/877] fzf: 0.17.1

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index e0367dc915d..830f9cb878b 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.17.0-2";
+  version = "0.17.1";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "0j4m3xf6qxfymfq6y5ml5rgz2rr1glh54k3b5xa9zi4cl5wg43qv";
+    sha256 = "0zxav6kfifppj49kif8917djq1vqjznqzmviqj4iiar8jmyrn2fy";
   };
 
   outputs = [ "bin" "out" "man" ];
-- 
GitLab


From c375ed9b8668b8d0492f6cf6eaa19c3d445b5433 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Nov 2017 09:29:49 +0100
Subject: [PATCH 627/877] rlwrap: 0.42 -> 0.43

---
 pkgs/tools/misc/rlwrap/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix
index 86d81fd2585..bd60e786036 100644
--- a/pkgs/tools/misc/rlwrap/default.nix
+++ b/pkgs/tools/misc/rlwrap/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "rlwrap-0.42";
+  name = "rlwrap-${version}";
+  version = "0.43";
 
   src = fetchurl {
-    url = "http://utopia.knoware.nl/~hlub/uck/rlwrap/${name}.tar.gz";
-    sha256 = "0i3yz303wscrysyzpdq04h4nrl9ajz9dbwi80risdl5rkm3dhw2s";
+    url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf";
   };
 
   buildInputs = [ readline ];
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Readline wrapper for console programs";
-    homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/;
+    homepage = https://github.com/hanslub42/rlwrap;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-- 
GitLab


From 97d251e6acd09090342e1c19abb826b4d4b850c0 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Nov 2017 09:31:18 +0100
Subject: [PATCH 628/877] rofi-pass: 1.5.2 -> 1.5.3

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

diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index 919ad9791a2..61f51973ed3 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "rofi-pass-${version}";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "carnager";
     repo = "rofi-pass";
     rev = version;
-    sha256 = "1sc4b1g2z7402akk96rqbnwjd66n6qn046ihpwxdb03bv2qahiap";
+    sha256 = "1fn1j2rf3abc5qb44zfc8z8ffw6rva4xfp7597hwr1g3szacazpq";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 292f23c4b5d28fb8ea5a06a49d7c7596496d44c7 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Sat, 4 Nov 2017 08:54:28 +0000
Subject: [PATCH 629/877] bcc: fix module installation

BCC_KERNEL_MODULES_DIR should have not been removed
---
 pkgs/os-specific/linux/bcc/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 768c8cedd35..6cf14b66a35 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper cmake flex bison ];
 
+  cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules";
+
   postInstall = ''
     mkdir -p $out/bin $out/share
     rm -r $out/share/bcc/tools/old
-- 
GitLab


From 6ec3bf3a77b8eadaa6011ef5edaa9f67eb0d79e4 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Sat, 4 Nov 2017 08:58:04 +0000
Subject: [PATCH 630/877] bcc: add myself as maintainer

---
 pkgs/os-specific/linux/bcc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 6cf14b66a35..75b7802772d 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     description = "Dynamic Tracing Tools for Linux";
     homepage = https://iovisor.github.io/bcc/;
     license = licenses.asl20;
-    maintainers = with maintainers; [ ragge ];
+    maintainers = with maintainers; [ ragge mic92 ];
   };
 }
-- 
GitLab


From bb87d2c81a6405032d23cc46c4e859d7818b46cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Nov 2017 10:20:39 +0100
Subject: [PATCH 631/877] drbd: fix evaluation after #30872

---
 pkgs/os-specific/linux/drbd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
index 5c0fae7bf4f..971eef6a8b5 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   preConfigure =
     ''
-      export PATH=${systemd.udev.bin}/sbin:$PATH
+      export PATH=${systemd}/sbin:$PATH
       substituteInPlace user/Makefile.in \
         --replace /sbin '$(sbindir)'
       substituteInPlace user/legacy/Makefile.in \
-- 
GitLab


From 5633431c2b48413274d348d1bd3591041442f615 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 4 Nov 2017 10:23:28 +0100
Subject: [PATCH 632/877] statsd: repackage with node2nix

---
 .../node-packages/node-packages-v6.json       |   1 +
 .../node-packages/node-packages-v6.nix        | 222 ++++++++++----
 pkgs/tools/networking/statsd/default.nix      |  13 -
 .../networking/statsd/node-packages.json      |   6 -
 .../tools/networking/statsd/node-packages.nix | 284 ------------------
 pkgs/top-level/all-packages.nix               |   4 +-
 6 files changed, 158 insertions(+), 372 deletions(-)
 delete mode 100644 pkgs/tools/networking/statsd/default.nix
 delete mode 100644 pkgs/tools/networking/statsd/node-packages.json
 delete mode 100644 pkgs/tools/networking/statsd/node-packages.nix

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index c2876f1128c..76ebb7eaa10 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -74,6 +74,7 @@
 , "sloc"
 , "smartdc"
 , "socket.io"
+, "statsd"
 , "stylus"
 , "svgo"
 , "tern"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index a2be42b0802..16d3b6ebc85 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -8621,13 +8621,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.144.0" = {
+    "aws-sdk-2.145.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.144.0";
+      version = "2.145.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.144.0.tgz";
-        sha1 = "14d8179bb44971b08426c63a1cc5f63dc09389e7";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.145.0.tgz";
+        sha1 = "085bb4553231defd93b96b0d95023717c9c3c093";
       };
     };
     "request-2.83.0" = {
@@ -9431,13 +9431,13 @@ let
         sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
       };
     };
-    "log-update-2.2.0" = {
+    "log-update-2.3.0" = {
       name = "log-update";
       packageName = "log-update";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/log-update/-/log-update-2.2.0.tgz";
-        sha1 = "e1b034d4325e3436c9df1aa7fd9c9c243bfb9198";
+        url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz";
+        sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708";
       };
     };
     "prop-types-15.6.0" = {
@@ -20003,24 +20003,6 @@ let
         sha512 = "1qi9fsw42grlhv4aj7v42xikvicr5657809syvp4dca33fjzzr1h7x1q9zwhclpyb879g6bgb2yd4i2iasnpmxn8ng1dcnq85yg001r";
       };
     };
-    "boxen-1.2.1" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz";
-        sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d";
-      };
-    };
-    "chalk-2.1.0" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
-        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
-      };
-    };
     "detect-port-1.2.1" = {
       name = "detect-port";
       packageName = "detect-port";
@@ -20030,22 +20012,13 @@ let
         sha512 = "0r0mpkpa1r78cmagyv47v38fc8ik7pr3zvlnqg57v8nkh4ipd83rla5s1j2c8gymfbwzzlna6pp7h9xw94h93gic3l2z9hzpd68p9fq";
       };
     };
-    "filesize-3.5.10" = {
+    "filesize-3.5.11" = {
       name = "filesize";
       packageName = "filesize";
-      version = "3.5.10";
+      version = "3.5.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/filesize/-/filesize-3.5.10.tgz";
-        sha1 = "fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f";
-      };
-    };
-    "handlebars-4.0.10" = {
-      name = "handlebars";
-      packageName = "handlebars";
-      version = "4.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz";
-        sha1 = "3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f";
+        url = "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz";
+        sha512 = "3bg35im21jf6dhyrcajczdjl3rjm5mphdhansyfbpzm067vv3jp91n43nrzxf8q6nx3b5vkn2my1rskyp4pmg91xzdq01lawyifazk4";
       };
     };
     "micro-9.0.0" = {
@@ -20093,6 +20066,15 @@ let
         sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg";
       };
     };
+    "chalk-2.1.0" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
+        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
+      };
+    };
     "mri-1.1.0" = {
       name = "mri";
       packageName = "mri";
@@ -20687,6 +20669,78 @@ let
         sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd";
       };
     };
+    "generic-pool-2.2.0" = {
+      name = "generic-pool";
+      packageName = "generic-pool";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz";
+        sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e";
+      };
+    };
+    "modern-syslog-1.1.2" = {
+      name = "modern-syslog";
+      packageName = "modern-syslog";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz";
+        sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5";
+      };
+    };
+    "hashring-3.2.0" = {
+      name = "hashring";
+      packageName = "hashring";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz";
+        sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce";
+      };
+    };
+    "winser-0.1.6" = {
+      name = "winser";
+      packageName = "winser";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
+        sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
+      };
+    };
+    "connection-parse-0.0.7" = {
+      name = "connection-parse";
+      packageName = "connection-parse";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
+        sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69";
+      };
+    };
+    "simple-lru-cache-0.0.2" = {
+      name = "simple-lru-cache";
+      packageName = "simple-lru-cache";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
+        sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
+      };
+    };
+    "sequence-2.2.1" = {
+      name = "sequence";
+      packageName = "sequence";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
+        sha1 = "7f5617895d44351c0a047e764467690490a16b03";
+      };
+    };
+    "commander-1.3.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
+        sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
+      };
+    };
     "css-parse-1.7.0" = {
       name = "css-parse";
       packageName = "css-parse";
@@ -20759,13 +20813,13 @@ let
         sha512 = "3a7768nyac729dk372kmbf8f28j0pajy699g45bs8vrlx605wiad3i692a8y58x437bvnfy7015lx08sxhm2vknmsi83a69dwnv2bjw";
       };
     };
-    "csso-3.3.1" = {
+    "csso-3.4.0" = {
       name = "csso";
       packageName = "csso";
-      version = "3.3.1";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-3.3.1.tgz";
-        sha512 = "087ks3lnvyygbxivwf2fnn53a033ncz1ywm3jyarhz2hvsflka09iw611cwc55ix974bflcf0wmg6zvfkhxsjqmqfrz61w5y1yi6c9s";
+        url = "https://registry.npmjs.org/csso/-/csso-3.4.0.tgz";
+        sha1 = "57b27ef553cccbf5aa964c641748641e9af113f3";
       };
     };
     "object.values-1.0.4" = {
@@ -21569,13 +21623,13 @@ let
         sha1 = "b951f4abb6bd617e66f63eb891498e391763e309";
       };
     };
-    "webpack-sources-1.0.1" = {
+    "webpack-sources-1.0.2" = {
       name = "webpack-sources";
       packageName = "webpack-sources";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz";
-        sha512 = "27l6lhqai0bhgk7mbchvf608bgmrgbqmgjd07k1rsg7xh12lnaflr459cy7ay108jr7dk8g5ybx70xi7cbz6lm5c7m022sl5b34r6yk";
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.2.tgz";
+        sha512 = "1mk1l1f1bv2cnxbyr13i5rbiwm9cgv91d28rk3mmy8z2m6f0xksgkjv5k00xcmvkd3sjsbrica8a1xrlzz0crydrfix3sdgq1s1vdb3";
       };
     };
     "es6-map-0.1.5" = {
@@ -25076,7 +25130,7 @@ in
       sources."JSONStream-1.3.1"
       sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.144.0"
+      sources."aws-sdk-2.145.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.83.0"
@@ -25292,7 +25346,7 @@ in
       sources."indent-string-2.1.0"
       sources."lodash.flattendeep-4.4.0"
       sources."lodash.isequal-4.5.0"
-      sources."log-update-2.2.0"
+      sources."log-update-2.3.0"
       sources."prop-types-15.6.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
@@ -25703,7 +25757,7 @@ in
     };
     dependencies = [
       sources."chalk-2.3.0"
-      sources."log-update-2.2.0"
+      sources."log-update-2.3.0"
       sources."meow-3.7.0"
       (sources."ora-1.3.0" // {
         dependencies = [
@@ -31447,23 +31501,27 @@ in
   serve = nodeEnv.buildNodePackage {
     name = "serve";
     packageName = "serve";
-    version = "6.4.0";
+    version = "6.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serve/-/serve-6.4.0.tgz";
-      sha512 = "0kb65fj5n5z4j11c8247zvabb0qp4w5w9ls29bypm11ay9g2a1riv5wl72ya44b4arwxhyawxxijb5r5zjlwfs9zsbklcp6vbc8mphs";
+      url = "https://registry.npmjs.org/serve/-/serve-6.4.1.tgz";
+      sha512 = "385jwid220bqcnr46ck6vz22ic9kxmxghcpy4m15lvzcl7r3g8f6jyigwmjvdfypf8jaiv1shrfwj2fsgq7wsg6mh7q9hc3pkfk99x0";
     };
     dependencies = [
-      sources."args-3.0.7"
+      (sources."args-3.0.7" // {
+        dependencies = [
+          sources."chalk-2.1.0"
+        ];
+      })
       sources."basic-auth-2.0.0"
       sources."bluebird-3.5.1"
-      sources."boxen-1.2.1"
-      sources."chalk-2.1.0"
+      sources."boxen-1.2.2"
+      sources."chalk-2.3.0"
       sources."clipboardy-1.1.4"
       sources."dargs-5.1.0"
       sources."detect-port-1.2.1"
-      sources."filesize-3.5.10"
+      sources."filesize-3.5.11"
       sources."fs-extra-4.0.2"
-      sources."handlebars-4.0.10"
+      sources."handlebars-4.0.11"
       sources."ip-1.1.5"
       sources."micro-9.0.0"
       sources."micro-compress-1.0.0"
@@ -31478,6 +31536,12 @@ in
       sources."mri-1.1.0"
       sources."pkginfo-0.4.1"
       sources."string-similarity-1.2.0"
+      sources."ansi-styles-3.2.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."supports-color-4.5.0"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
       sources."lodash-4.17.4"
       sources."safe-buffer-5.1.1"
       sources."ansi-align-2.0.0"
@@ -31506,12 +31570,6 @@ in
       sources."path-key-2.0.1"
       sources."code-point-at-1.1.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-styles-3.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.5.0"
-      sources."color-convert-1.9.0"
-      sources."color-name-1.1.3"
-      sources."has-flag-2.0.0"
       sources."address-1.0.3"
       sources."debug-2.6.9"
       sources."ms-2.0.0"
@@ -32018,6 +32076,34 @@ in
     };
     production = true;
   };
+  statsd = nodeEnv.buildNodePackage {
+    name = "statsd";
+    packageName = "statsd";
+    version = "0.8.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/statsd/-/statsd-0.8.0.tgz";
+      sha1 = "92041479e174a214df7147f2fab1348af0839052";
+    };
+    dependencies = [
+      sources."generic-pool-2.2.0"
+      sources."modern-syslog-1.1.2"
+      sources."hashring-3.2.0"
+      sources."winser-0.1.6"
+      sources."nan-2.7.0"
+      sources."connection-parse-0.0.7"
+      sources."simple-lru-cache-0.0.2"
+      sources."sequence-2.2.1"
+      sources."commander-1.3.1"
+      sources."keypress-0.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Network daemon for the collection and aggregation of realtime application metrics";
+      homepage = https://github.com/etsy/statsd;
+      license = "MIT";
+    };
+    production = true;
+  };
   stylus = nodeEnv.buildNodePackage {
     name = "stylus";
     packageName = "stylus";
@@ -32072,7 +32158,7 @@ in
       sources."css-select-1.3.0-rc0"
       sources."css-select-base-adapter-0.1.0"
       sources."css-tree-1.0.0-alpha25"
-      sources."csso-3.3.1"
+      sources."csso-3.4.0"
       sources."js-yaml-3.10.0"
       sources."object.values-1.0.4"
       sources."sax-1.2.4"
@@ -32887,7 +32973,11 @@ in
         ];
       })
       sources."watchpack-1.4.0"
-      sources."webpack-sources-1.0.1"
+      (sources."webpack-sources-1.0.2" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
       sources."yargs-8.0.2"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
diff --git a/pkgs/tools/networking/statsd/default.nix b/pkgs/tools/networking/statsd/default.nix
deleted file mode 100644
index 6f909a915ae..00000000000
--- a/pkgs/tools/networking/statsd/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ recurseIntoAttrs, callPackage, nodejs
-}:
-
-let
-  self = recurseIntoAttrs (
-    callPackage ../../../top-level/node-packages.nix {
-      inherit nodejs self;
-      generated = callPackage ./node-packages.nix { inherit self; };
-      overrides = {
-        "statsd" = { passthru.nodePackages = self; };
-      };
-    });
-in self.statsd
diff --git a/pkgs/tools/networking/statsd/node-packages.json b/pkgs/tools/networking/statsd/node-packages.json
deleted file mode 100644
index f75224e79f9..00000000000
--- a/pkgs/tools/networking/statsd/node-packages.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  "statsd"
-, "statsd-librato-backend"
-, "stackdriver-statsd-backend"
-, "statsd-influxdb-backend"
-]
diff --git a/pkgs/tools/networking/statsd/node-packages.nix b/pkgs/tools/networking/statsd/node-packages.nix
deleted file mode 100644
index fd196c249ae..00000000000
--- a/pkgs/tools/networking/statsd/node-packages.nix
+++ /dev/null
@@ -1,284 +0,0 @@
-{ self, fetchurl, fetchgit ? null, lib }:
-
-{
-  by-spec."commander"."1.3.1" =
-    self.by-version."commander"."1.3.1";
-  by-version."commander"."1.3.1" = self.buildNodePackage {
-    name = "commander-1.3.1";
-    version = "1.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
-      name = "commander-1.3.1.tgz";
-      sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
-    };
-    deps = {
-      "keypress-0.1.0" = self.by-version."keypress"."0.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."connection-parse"."0.0.x" =
-    self.by-version."connection-parse"."0.0.7";
-  by-version."connection-parse"."0.0.7" = self.buildNodePackage {
-    name = "connection-parse-0.0.7";
-    version = "0.0.7";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
-      name = "connection-parse-0.0.7.tgz";
-      sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."generic-pool"."2.2.0" =
-    self.by-version."generic-pool"."2.2.0";
-  by-version."generic-pool"."2.2.0" = self.buildNodePackage {
-    name = "generic-pool-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz";
-      name = "generic-pool-2.2.0.tgz";
-      sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."hashring"."3.2.0" =
-    self.by-version."hashring"."3.2.0";
-  by-version."hashring"."3.2.0" = self.buildNodePackage {
-    name = "hashring-3.2.0";
-    version = "3.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz";
-      name = "hashring-3.2.0.tgz";
-      sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce";
-    };
-    deps = {
-      "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7";
-      "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."keypress"."0.1.x" =
-    self.by-version."keypress"."0.1.0";
-  by-version."keypress"."0.1.0" = self.buildNodePackage {
-    name = "keypress-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
-      name = "keypress-0.1.0.tgz";
-      sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."modern-syslog"."1.1.2" =
-    self.by-version."modern-syslog"."1.1.2";
-  by-version."modern-syslog"."1.1.2" = self.buildNodePackage {
-    name = "modern-syslog-1.1.2";
-    version = "1.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz";
-      name = "modern-syslog-1.1.2.tgz";
-      sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5";
-    };
-    deps = {
-      "nan-2.4.0" = self.by-version."nan"."2.4.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ "!win32" ];
-    cpu = [ ];
-  };
-  by-spec."nan"."^2.0.5" =
-    self.by-version."nan"."2.4.0";
-  by-version."nan"."2.4.0" = self.buildNodePackage {
-    name = "nan-2.4.0";
-    version = "2.4.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz";
-      name = "nan-2.4.0.tgz";
-      sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sequence"."2.2.1" =
-    self.by-version."sequence"."2.2.1";
-  by-version."sequence"."2.2.1" = self.buildNodePackage {
-    name = "sequence-2.2.1";
-    version = "2.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
-      name = "sequence-2.2.1.tgz";
-      sha1 = "7f5617895d44351c0a047e764467690490a16b03";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."simple-lru-cache"."0.0.x" =
-    self.by-version."simple-lru-cache"."0.0.2";
-  by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage {
-    name = "simple-lru-cache-0.0.2";
-    version = "0.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
-      name = "simple-lru-cache-0.0.2.tgz";
-      sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."stackdriver-statsd-backend"."*" =
-    self.by-version."stackdriver-statsd-backend"."0.2.3";
-  by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage {
-    name = "stackdriver-statsd-backend-0.2.3";
-    version = "0.2.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
-      name = "stackdriver-statsd-backend-0.2.3.tgz";
-      sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3";
-  by-spec."statsd"."*" =
-    self.by-version."statsd"."0.8.0";
-  by-version."statsd"."0.8.0" = self.buildNodePackage {
-    name = "statsd-0.8.0";
-    version = "0.8.0";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/statsd/-/statsd-0.8.0.tgz";
-      name = "statsd-0.8.0.tgz";
-      sha1 = "92041479e174a214df7147f2fab1348af0839052";
-    };
-    deps = {
-      "generic-pool-2.2.0" = self.by-version."generic-pool"."2.2.0";
-    };
-    optionalDependencies = {
-      "modern-syslog-1.1.2" = self.by-version."modern-syslog"."1.1.2";
-      "hashring-3.2.0" = self.by-version."hashring"."3.2.0";
-      "winser-0.1.6" = self.by-version."winser"."0.1.6";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "statsd" = self.by-version."statsd"."0.8.0";
-  by-spec."statsd-influxdb-backend"."*" =
-    self.by-version."statsd-influxdb-backend"."0.6.0";
-  by-version."statsd-influxdb-backend"."0.6.0" = self.buildNodePackage {
-    name = "statsd-influxdb-backend-0.6.0";
-    version = "0.6.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz";
-      name = "statsd-influxdb-backend-0.6.0.tgz";
-      sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.6.0";
-  by-spec."statsd-librato-backend"."*" =
-    self.by-version."statsd-librato-backend"."0.1.7";
-  by-version."statsd-librato-backend"."0.1.7" = self.buildNodePackage {
-    name = "statsd-librato-backend-0.1.7";
-    version = "0.1.7";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz";
-      name = "statsd-librato-backend-0.1.7.tgz";
-      sha1 = "270dc406481c0e6a6f4e72957681a73015f478f6";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.7";
-  by-spec."winser"."=0.1.6" =
-    self.by-version."winser"."0.1.6";
-  by-version."winser"."0.1.6" = self.buildNodePackage {
-    name = "winser-0.1.6";
-    version = "0.1.6";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
-      name = "winser-0.1.6.tgz";
-      sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
-    };
-    deps = {
-      "sequence-2.2.1" = self.by-version."sequence"."2.2.1";
-      "commander-1.3.1" = self.by-version."commander"."1.3.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0999802514c..fe9566dadf0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16510,9 +16510,7 @@ with pkgs;
 
   stella = callPackage ../misc/emulators/stella { };
 
-  statsd = callPackage ../tools/networking/statsd {
-    nodejs = nodejs-4_x;
-  };
+  statsd = nodePackages.statsd;
 
   linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
 
-- 
GitLab


From 6269306a8dfa0744ddc4609946a8105b996cd23a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Wed, 25 Oct 2017 10:56:51 +0200
Subject: [PATCH 633/877] pythonPackages.tensorflow: add flags for efficent
 math on CPU

---
 pkgs/development/python-modules/tensorflow/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index a0a2f3a24af..2ce419fa7fb 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -7,6 +7,9 @@
 , cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null
 # Default from ./configure script
 , cudaCapabilities ? [ "3.5" "5.2" ]
+, sse42Support ? false
+, avx2Support ? false
+, fmaSupport ? false
 }:
 
 assert cudaSupport -> cudatoolkit != null
@@ -77,6 +80,9 @@ let
     hardeningDisable = [ "all" ];
 
     bazelFlags = [ "--config=opt" ]
+                 ++ lib.optional sse42Support "--copt=-msse4.2"
+                 ++ lib.optional avx2Support "--copt=-mavx2"
+                 ++ lib.optional fmaSupport "--copt=-mfma"
                  ++ lib.optional cudaSupport "--config=cuda";
 
     bazelTarget = "//tensorflow/tools/pip_package:build_pip_package";
-- 
GitLab


From ba885e1d7decd14dd70c1602a208eda4d2b352cb Mon Sep 17 00:00:00 2001
From: gjeusel <jeusel.guillaume@gmail.com>
Date: Sat, 4 Nov 2017 11:48:38 +0100
Subject: [PATCH 634/877] tortoisehg: 4.1.1 -> 4.3.1

Signed-off-by: gjeusel <jeusel.guillaume@gmail.com>
---
 pkgs/applications/version-management/tortoisehg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 1a0c506a19d..6466e5ab0ae 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
     name = "tortoisehg-${version}";
-    version = "4.1.1";
+    version = "4.3.1";
 
     src = fetchurl {
       url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
-      sha256 = "14fy5p5hx4iij5kyma9679nrprd9lsjr6j047bfyfrwa3l4knj2g";
+      sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n";
     };
 
     pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
-- 
GitLab


From 86bc99cc8a1a15ebb776e3cd9361e8ec2a53f9c2 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 4 Nov 2017 01:00:28 +0100
Subject: [PATCH 635/877] tor-browser-bundle-bin: 7.0.8 -> 7.0.9

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 4464d490bc8..4af725d3c95 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.0.8";
+  version = "7.0.9";
 
   lang = "en-US";
 
@@ -108,7 +108,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0bi4l4ma40ifsajvjpwv6ixphijqvb7yrci2jcyykh3j41ndfjf2";
+      sha256 = "0ykbpp0qr3glygmnnc6ac41kkvrxn52472z6kbpf7i6qzvk4ba0d";
     };
 
     "i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "182q1gb8jnk92wxr7m977yxcksa8d3zg90qbsja1raym2vhqaf73";
+      sha256 = "02alpzmvm3ldlp51sqppz41d12lx93n5qj6i3gqz6din96swm7j8";
     };
   };
 in
-- 
GitLab


From 42b70ae5edccac2c6ca2afb205ace21790850919 Mon Sep 17 00:00:00 2001
From: Maciej Kazulak <kazulakm@gmail.com>
Date: Fri, 3 Nov 2017 15:15:01 +0100
Subject: [PATCH 636/877] nixpkgs manual: add rstudio shell.nix example

Provide an example of a self-contained shell.nix for rstudio with
additional packages.
---
 pkgs/development/r-modules/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md
index 477059cbb2c..c8f02bd1478 100644
--- a/pkgs/development/r-modules/README.md
+++ b/pkgs/development/r-modules/README.md
@@ -79,6 +79,23 @@ environment, see `rstudioWrapper`, which functions similarly to
 Then like above, `nix-env -f "<nixpkgs>" -iA rstudioEnv` will install
 this into your user profile.
 
+Alternatively, you can create a self-contained `shell.nix` without the need to
+modify any configuration files:
+
+```nix
+{ pkgs ? import <nixpkgs> {}
+}:
+
+pkgs.rstudioWrapper.override {
+  packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ];
+}
+
+```
+
+Executing `nix-shell` will then drop you into an environment equivalent to the
+one above. If you need additional packages just add them to the list and
+re-enter the shell.
+
 ## Updating the package set
 
 ```bash
-- 
GitLab


From eafd703a63a598a33028aca6f1349544dfd09b65 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Nov 2017 12:45:51 +0100
Subject: [PATCH 637/877] lispPackages.clwrapper: make sure to patch shebangs
 in the scripts before using them

---
 pkgs/development/lisp-modules/clwrapper/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 2088439c61d..fb4a090c702 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
     substituteAll ${./common-lisp.sh} "$out"/bin/common-lisp.sh
     substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh"
     substituteAll "${./cl-wrapper.sh}" "$out/bin/cl-wrapper.sh"
+    patchShebangs "$out/bin"
     chmod a+x "$out"/bin/*
 
     substituteAll "${./setup-hook.sh}" "setup-hook-parsed"
-- 
GitLab


From 632a1807db13f0176f1374788cd15070eebed8e5 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 4 Nov 2017 12:57:58 +0100
Subject: [PATCH 638/877] hyp: move expression out python-packages.nix

---
 pkgs/servers/http/hyp/default.nix  | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 19 -------------------
 3 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/servers/http/hyp/default.nix

diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix
new file mode 100644
index 00000000000..3a1eb50f05b
--- /dev/null
+++ b/pkgs/servers/http/hyp/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+  name = "hyp-server-${version}";
+  version = "1.2.0";
+
+  src = fetchurl {
+    url    = "mirror://pypi/h/hyp-server/${name}.tar.gz";
+    sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Hyperminimal https server";
+    homepage    = https://github.com/rnhmjoj/hyp;
+    license     = with licenses; [gpl3Plus mit];
+    maintainers = with maintainers; [ rnhmjoj ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b64dd498b6d..93c1245eb11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11489,6 +11489,8 @@ with pkgs;
 
   exhibitor = callPackage ../servers/exhibitor { };
 
+  hyp = callPackage ../servers/http/hyp/default.nix { };
+
   prosody = callPackage ../servers/xmpp/prosody {
     lua5 = lua5_1;
     inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf670a40c6c..300dcd1e9d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7726,25 +7726,6 @@ in {
 
   subliminal = callPackage ../development/python-modules/subliminal {};
 
-  hyp = buildPythonPackage rec {
-    name = "hyp-server-${version}";
-    version = "1.2.0";
-    disabled = !isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/hyp-server/${name}.tar.gz";
-      sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15";
-    };
-
-    meta = {
-      description = "Hyperminimal https server";
-      homepage = https://github.com/rnhmjoj/hyp;
-      license = with licenses; [gpl3Plus mit];
-      maintainers = with maintainers; [ rnhmjoj ];
-      platforms = platforms.unix;
-    };
-  };
-
   hyperlink = callPackage ../development/python-modules/hyperlink {};
 
   zope_copy = buildPythonPackage rec {
-- 
GitLab


From 5fe398fdc9324f94c298b82441ac5a3486b4fdea Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sat, 4 Nov 2017 11:41:54 +0100
Subject: [PATCH 639/877] fdm: 1.8 -> 1.9.0.20170124

sf.net repo does not exist anymore
---
 pkgs/tools/networking/fdm/default.nix | 64 +++++++++++----------------
 1 file changed, 25 insertions(+), 39 deletions(-)

diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix
index 0061620b58d..3984922abe2 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/pkgs/tools/networking/fdm/default.nix
@@ -1,45 +1,31 @@
-{ stdenv, fetchurl
-  , openssl, tdb, zlib, flex, bison
-  }:
-let 
-  buildInputs = [ openssl tdb zlib flex bison ];
-  sourceInfo = rec {
-    baseName="fdm";
-    version = "1.8";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz";
-    sha256 = "0hi39f31ipv8f9wxb41pajvl61w6vaapl39wq8v1kl9c7q6h0k2g";
-  };
+{ stdenv, fetchFromGitHub, autoreconfHook, openssl, tdb, zlib, flex, bison }:
+
+let
+
+  baseName = "fdm";
+  version = "1.9.0.20170124";
+
 in
-stdenv.mkDerivation {
-  src = fetchurl {
-    inherit (sourceInfo) url sha256;
+
+stdenv.mkDerivation rec {
+  name = "${baseName}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "nicm";
+    repo = baseName;
+    rev = "cae4ea37b6b296d1b2e48f62934ea3a7f6085e33";
+    sha256 = "048191wdv1yprwinipmx2152gvd2iq1ssv7xfb1bzh6zirh1ya3n";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  preBuild = ''
-    export makeFlags="$makeFlags PREFIX=$out"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Dbool=int"
-
-    sed -i */Makefile -i Makefile -e 's@ -g bin @ @'
-    sed -i */Makefile -i Makefile -e 's@ -o root @ @'
-    sed -i GNUmakefile -e 's@ -g $(BIN_OWNER) @ @'
-    sed -i GNUmakefile -e 's@ -o $(BIN_GROUP) @ @'
-    sed -i */Makefile -i Makefile -i GNUmakefile -e 's@-I-@@g'
-  '';
-      
-  meta = {
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ openssl tdb zlib flex bison ];
+
+
+  meta = with stdenv.lib; {
     description = "Mail fetching and delivery tool - should do the job of getmail and procmail";
-    maintainers = with stdenv.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with stdenv.lib.platforms;
-      linux;
-    homepage = http://fdm.sourceforge.net/;
-    inherit (sourceInfo) version;
-    updateWalker = true;
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; linux;
+    homepage = https://github.com/nicm/fdm;
+    downloadPage = https://github.com/nicm/fdm/releases;
   };
 }
-- 
GitLab


From adf5aea0b61d8eb1c73a68b7dc67f3ff2e1242f8 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sat, 4 Nov 2017 12:45:59 +0000
Subject: [PATCH 640/877] tcpflow: fix build

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

diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix
index 52727f1c49e..1df0f2c37fc 100644
--- a/pkgs/tools/networking/tcpflow/default.nix
+++ b/pkgs/tools/networking/tcpflow/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl zlib libpcap boost automake autoconf ] ++ lib.optional useCairo cairo;
 
   postUnpack = ''
-    pushd tcpflow-*-src/src
+    pushd "$sourceRoot/src"
     cp -rv ${be13_api}/* be13_api/
     cp -rv ${dfxml}/* dfxml/
     cp -rv ${httpparser}/* http-parser/
-- 
GitLab


From 0936dd0d5784e30b40f94001bdcd1a327bcd4506 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sat, 4 Nov 2017 13:56:32 +0000
Subject: [PATCH 641/877] textadept: fix build

---
 pkgs/applications/editors/textadept/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index db74a58da43..4f1a29278be 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -32,7 +32,7 @@ let
       build_dir=$PWD
       cd $TMPDIR
 
-      local_path=$(basename ${store_path} .zip | sed -e 's/^[a-z0-9]*-//')
+      local_path=$(basename ${url} .zip)
 
       cp -r ${store_path} $local_path
       chmod u+rwX -R $local_path
-- 
GitLab


From 9e59605bab906f7d65c416e3e4646ba99cc553d8 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sat, 4 Nov 2017 14:18:47 +0000
Subject: [PATCH 642/877] openrct2: fix build

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

diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index a54d3a45ae8..6881767cbb9 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -24,8 +24,7 @@ in
 stdenv.mkDerivation rec {
   inherit name;
 
-  srcs = [ openrct2-src title-sequences-src ];
-  sourceRoot = ".";
+  src = openrct2-src;
 
   buildInputs = [
     SDL2
@@ -46,11 +45,7 @@ stdenv.mkDerivation rec {
   ];
 
   postUnpack = ''
-    cp -r ${openrct2-src}/* ${sourceRoot}
-    cp -r ${title-sequences-src} ${sourceRoot}/title
-
-    # creating temporary files in fixCmakeFiles fails otherwise
-    chmod -R u+w ${sourceRoot}
+    cp -r ${title-sequences-src} $sourceRoot/title
   '';
 
   cmakeFlags = [
-- 
GitLab


From 84ad480e0c2b7d65b66cb9551f8985f159d3fe38 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Nov 2017 08:02:45 +0100
Subject: [PATCH 643/877] tilix: 1.6.4 -> 1.7.1

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

diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 2128c260b80..c7ee4fb1c4c 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "tilix-${version}";
-  version = "1.6.4";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "gnunn1";
     repo = "tilix";
     rev = "${version}";
-    sha256 = "1vqi68jlbbaky1569kd4lr6p02zsiv7v2rfb8j1pzwj7gydblaac";
+    sha256 = "0x0bnb26hjvxmvvd7c9k8fw97gcm3z5ssr6r8x90xbyyw6h58hhh";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 93c54acf97077567e8d6135a36f191e872b26692 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 17 Oct 2017 19:58:22 +0200
Subject: [PATCH 644/877] services.xserver: assert that either desktop- or
 window manager is not "none"

resolves #11064
---
 nixos/doc/manual/release-notes/rl-1803.xml           |  8 ++++++++
 .../services/x11/desktop-managers/default.nix        |  4 ++--
 nixos/modules/services/x11/xserver.nix               | 12 ++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index 17b385242f6..fe776c3df22 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -90,6 +90,14 @@ following incompatible changes:</para>
       That means that old configuration is not overwritten by default when update to the znc options are made.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The option <option>services.xserver.desktopManager.default</option> is now <literal>none</literal> by default.
+      An assertion failure is thrown if WM's and DM's default are <literal>none</literal>.
+      To explicitly run a plain X session without and DM or WM, the newly introduced option <option>services.xserver.plainX</option>
+      must be set to true.
+    </para>
+  </listitem>
 </itemizedlist>
 
 </section>
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 13f339e3fbf..b393167ae2c 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -87,8 +87,8 @@ in
 
       default = mkOption {
         type = types.str;
-        default = "";
-        example = "none";
+        default = "none";
+        example = "plasma5";
         description = "Default desktop manager loaded if none have been chosen.";
         apply = defaultDM:
           if defaultDM == "" && cfg.session.list != [] then
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index d4fe475690c..58dc75bcb4e 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -161,6 +161,15 @@ in
         '';
       };
 
+      plainX = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether the X11 session can be plain (without DM/WM) and
+          the Xsession script will be used as fallback or not.
+        '';
+      };
+
       autorun = mkOption {
         type = types.bool;
         default = true;
@@ -552,6 +561,9 @@ in
                 + "${toString (length primaryHeads)} heads set to primary: "
                 + concatMapStringsSep ", " (x: x.output) primaryHeads;
       })
+      { assertion = cfg.desktopManager.default == "none" && cfg.windowManager.default == "none" -> cfg.plainX;
+        message = "Either the desktop manager or the window manager shouldn't be `none`! To explicitly allow this, you can also set `services.xserver.plainX` to `true`.";
+      }
     ];
 
     environment.etc =
-- 
GitLab


From 97594ffd869e134bb1be4ed552ee39edfa184b75 Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Sun, 5 Nov 2017 01:24:20 +1100
Subject: [PATCH 645/877] synergy: track upstream repository name change.

---
 pkgs/applications/misc/synergy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 3ecc772feaa..ee3cb9cd8ed 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "symless";
-    repo = "synergy";
+    repo = "synergy-core";
     rev = "v${version}-stable";
     sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3";
   };
-- 
GitLab


From 303ad53e7ef15784224d9f21efa32188868902d3 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Nov 2017 15:36:17 +0100
Subject: [PATCH 646/877] jruby: 9.1.12.0 -> 9.1.13.0

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

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 0ea1bf19231..ff192c07286 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
 jruby = stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
-  version = "9.1.12.0";
+  version = "9.1.13.0";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha256 = "15x5w4awy8h6xfkbj0p4xnb68xzfrss1rf2prk0kzk5kyjakrcnx";
+    sha256 = "021rmm5c18js569i4z6vj1bb193j4nska43jfiqz5hisc936c5cx";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 9720703d2424485a7bad4c282d33916ef815c548 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Nov 2017 12:05:42 +0100
Subject: [PATCH 647/877] mawk: 1.3.4-20161120 -> 1.3.4-20171017

---
 pkgs/tools/text/mawk/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix
index 8840130dde5..a8657c3ea2f 100644
--- a/pkgs/tools/text/mawk/default.nix
+++ b/pkgs/tools/text/mawk/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mawk-1.3.4-20161120";
+  name = "mawk-1.3.4-20171017";
 
   src = fetchurl {
-    url = "ftp://invisible-island.net/mawk/${name}.tgz";
-    sha256 = "07hc33g2ip7463dravsiz0zwfc8vy4y4jxqvp7rz3hb896xw27in";
+    urls = [
+      "https://invisible-mirror.net/archives/mawk/${name}.tgz"
+      "ftp://invisible-island.net/mawk/${name}.tgz"
+    ];
+    sha256 = "0nwyxhipn4jx7j695lih1xggxm6cp4fjk4wbgihd33ni3rfi25yv";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 4e892b9c03ea69eee38cdd40126194ea92cc00be Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sat, 4 Nov 2017 15:26:22 +0100
Subject: [PATCH 648/877] nixpkgs manual : clearer meta.platforms description

Refer to doubles.nix for a list of common platforms types used in packages
---
 doc/meta.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/doc/meta.xml b/doc/meta.xml
index b1ffd0502b2..0f9dccfb91b 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -200,11 +200,9 @@ meta-attributes</title>
 meta.platforms = stdenv.lib.platforms.linux;
 </programlisting>
 
-    Attribute Set <varname>stdenv.lib.platforms</varname> in
-    <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/platforms.nix">
-    <filename>nixpkgs/lib/platforms.nix</filename></link> defines various common
-    lists of platforms types.
-    </para></listitem>
+    Attribute Set <varname>stdenv.lib.platforms</varname> defines
+    <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix">
+    various common lists</link> of platforms types.</para></listitem>
   </varlistentry>
 
   <varlistentry>
-- 
GitLab


From 25f080ca4af5b5bff1640cdd11202a3ae31b086c Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 24 Oct 2017 17:53:30 +0200
Subject: [PATCH 649/877] gawk: 4.1.4 -> 4.2.0

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

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 415a2ade28d..65d0a1e4c00 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -19,11 +19,11 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  name = "gawk-4.1.4";
+  name = "gawk-4.2.0";
 
   src = fetchurl {
     url = "mirror://gnu/gawk/${name}.tar.xz";
-    sha256 = "0rn2mmjxm767zliqzd67j7h2ncjn4j0321c60y9fy3grs3i89qak";
+    sha256 = "1wm9lqj77y7xz07zi0n187aqm8zavzxzpm1j53ahxz81q0qwvwyl";
   };
 
   # When we do build separate interactive version, it makes sense to always include man.
-- 
GitLab


From 7325ad9ab735424257b05a81e0c8197e4651e68f Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Wed, 1 Nov 2017 01:09:39 +0100
Subject: [PATCH 650/877] graphite: override django and django_tagging

instead of depending on specific versions in the django_tagging_0_4_3
and graphite_web derivations.

This should fix: https://github.com/NixOS/nixpkgs/pull/30277#discussion_r145393088

This was joint work of @basvandijk and @layus at NixCon 2017.
---
 .../modules/services/monitoring/graphite.nix  | 22 +++++++++++++------
 pkgs/top-level/python-packages.nix            | 15 +++++++++----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 645dfeab019..4b1ad34b3a4 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -467,7 +467,15 @@ in {
       ];
     })
 
-    (mkIf cfg.web.enable {
+    (mkIf cfg.web.enable (let
+      python27' = pkgs.python27.override {
+        packageOverrides = self: super: {
+          django = self.django_1_8;
+          django_tagging = self.django_tagging_0_4_3;
+        };
+      };
+      pythonPackages = python27'.pkgs;
+    in {
       systemd.services.graphiteWeb = {
         description = "Graphite Web Interface";
         wantedBy = [ "multi-user.target" ];
@@ -477,8 +485,8 @@ in {
           PYTHONPATH = let
               penv = pkgs.python.buildEnv.override {
                 extraLibs = [
-                  pkgs.python27Packages.graphite_web
-                  pkgs.python27Packages.pysqlite
+                  pythonPackages.graphite_web
+                  pythonPackages.pysqlite
                 ];
               };
               penvPack = "${penv}/${pkgs.python.sitePackages}";
@@ -516,17 +524,17 @@ in {
           fi
 
           # Only collect static files when graphite_web changes.
-          if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python27Packages.graphite_web}" ]; then
+          if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite_web}" ]; then
             mkdir -p ${staticDir}
             ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic  --noinput --clear
             chown -R graphite:graphite ${staticDir}
-            ln -sfT "${pkgs.python27Packages.graphite_web}" "${dataDir}/current_graphite_web"
+            ln -sfT "${pythonPackages.graphite_web}" "${dataDir}/current_graphite_web"
           fi
         '';
       };
 
-      environment.systemPackages = [ pkgs.python27Packages.graphite_web ];
-    })
+      environment.systemPackages = [ pythonPackages.graphite_web ];
+    }))
 
     (mkIf cfg.api.enable {
       systemd.services.graphiteApi = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0be1ff17ee0..7013b980865 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8093,14 +8093,17 @@ in {
 
   django_tagging = callPackage ../development/python-modules/django_tagging { };
 
-  django_tagging_0_4_3 = self.django_tagging.overrideAttrs (attrs: rec {
+  django_tagging_0_4_3 = if
+       self.django != self.django_1_8
+  then throw "django_tagging_0_4_3 should be build with django_1_8"
+  else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec {
     name = "django-tagging-0.4.3";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/django-tagging/${name}.tar.gz";
       sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs";
     };
-    propagatedBuildInputs = with self; [ django_1_8 ];
+    propagatedBuildInputs = with self; [ django ];
   });
 
   django_classytags = buildPythonPackage rec {
@@ -22835,7 +22838,11 @@ EOF
     };
   };
 
-  graphite_web = buildPythonPackage rec {
+  graphite_web = if
+          self.django != self.django_1_8
+       || self.django_tagging != self.django_tagging_0_4_3
+  then throw "graphite_web should be build with django_1_8 and django_tagging_0_4_3"
+  else buildPythonPackage rec {
     name = "graphite-web-${version}";
     disabled = isPy3k;
     version = graphiteVersion;
@@ -22846,7 +22853,7 @@ EOF
     };
 
     propagatedBuildInputs = with self; [
-      django_1_8 django_tagging_0_4_3 whisper pycairo cairocffi
+      django django_tagging whisper pycairo cairocffi
       ldap memcached pytz urllib3 scandir
     ];
 
-- 
GitLab


From 8923737cd5d386c3eafdf8f84fa1aad1a77a4368 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 3 Nov 2017 23:53:25 +0000
Subject: [PATCH 651/877] ocamlPackages.sexplib: 0.9.2 -> 0.9.3

---
 .../ocaml-modules/janestreet/default.nix        | 17 ++++++++++++-----
 pkgs/top-level/ocaml-packages.nix               |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index 4aabb976ee1..7cddf0507df 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -1,17 +1,24 @@
 { stdenv, lib, janePackage, ocaml, ocamlbuild, cryptokit, ctypes, magic-mime,
-  ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith,
+  ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num,
   openssl }:
 
 rec {
 
   # Jane Street packages, up to ppx_core
 
-  sexplib = janePackage {
+  sexplib = janePackage ({
     name = "sexplib";
-    version = "0.9.2";
-    hash = "0szj7gi5ksy7kif5g71rkr6xhxc41xl8hq6s5zz610cjyngzyzjl";
     meta.description = "Automated S-expression conversion";
-  };
+  } // (if lib.versionAtLeast ocaml.version "4.05"
+    then {
+      version = "0.9.3";
+      hash = "0a2sqh235ja3qwy7b2k3qym2616dz7369a195qwi6ljy3cnh7s53";
+      buildInputs = [ num ];
+    } else {
+      version = "0.9.2";
+      hash = "0szj7gi5ksy7kif5g71rkr6xhxc41xl8hq6s5zz610cjyngzyzjl";
+    }
+  ));
 
   base = janePackage {
     name = "base";
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a56343713fe..5e95f2ce7fd 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -682,7 +682,7 @@ let
     janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
 
     janeStreet = import ../development/ocaml-modules/janestreet {
-      inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime;
+      inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime num;
       inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith;
       inherit (pkgs) stdenv openssl;
     };
-- 
GitLab


From 8ea1b79003ddf21a0a7d8da4812aeba9d7f99e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Nov 2017 18:27:32 +0100
Subject: [PATCH 652/877] wxGTK-{2.9,3.0}: apply an upstream patch

Close #30909.
---
 pkgs/development/libraries/wxwidgets/2.9/default.nix |  8 ++++++++
 pkgs/development/libraries/wxwidgets/3.0/default.nix | 12 +++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index 56080841ca3..6230536b33a 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -20,6 +20,14 @@ stdenv.mkDerivation {
     sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc";
   };
 
+  patches = [
+    (fetchurl { # https://trac.wxwidgets.org/ticket/17942
+      url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/"
+          + "fix_assertion_using_hide_in_destroy.diff";
+      sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy";
+    })
+  ];
+
   buildInputs =
     [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst-plugins-base GConf ]
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 2375de4b1bf..951f27f7d54 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, gtk3, libXinerama, libSM, libXxf86vm
+{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig
+, gtk2, gtk3, libXinerama, libSM, libXxf86vm
 , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile
 , withMesa ? true, mesa_glu ? null, mesa_noglu ? null
 , compat24 ? false, compat26 ? true, unicode ? true
@@ -37,9 +38,14 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = optional stdenv.isDarwin AGL;
 
-  patches =
+  patches = [
+    (fetchurl { # https://trac.wxwidgets.org/ticket/17942
+      url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/"
+          + "fix_assertion_using_hide_in_destroy.diff";
+      sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy";
+    })
     # "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4
-    optional (!withGtk2) (fetchpatch {
+  ] ++ optional (!withGtk2) (fetchpatch {
       url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch";
       sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q";
     });
-- 
GitLab


From a8c4829f7c3cf2b88b7469d979ec8a6a610df32b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 4 Nov 2017 17:12:57 +0000
Subject: [PATCH 653/877] ocamlPackages.base: 0.9.3 -> 0.9.4

---
 pkgs/development/ocaml-modules/janestreet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index 7cddf0507df..580ebdc0490 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -22,8 +22,8 @@ rec {
 
   base = janePackage {
     name = "base";
-    version = "0.9.3";
-    hash = "14v3zsr7za9h1gkxdmkk1yagnrfjk3y9snraywv9hsqbhv39ajvv";
+    version = "0.9.4";
+    hash = "0x85xi66b4zwlbdwmyc99zcmawgpp75gxqbl55rr67awavw162rw";
     propagatedBuildInputs = [ sexplib ];
     meta.description = "Full standard library replacement for OCaml";
   };
-- 
GitLab


From 9e0159c04cd38d07fb8c976d868fa0b8efb8ab59 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 4 Nov 2017 17:50:58 +0000
Subject: [PATCH 654/877] ocamlPackages.stdio: 0.9.0 -> 0.9.1

---
 pkgs/development/ocaml-modules/janestreet/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index 580ebdc0490..938a84454be 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -56,7 +56,8 @@ rec {
 
   stdio = janePackage {
     name = "stdio";
-    hash = "1c08jg930j7yxn0sjvlm3fs2fvwaf15sn9513yf1rb7y1lxrgwc4";
+    version = "0.9.1";
+    hash = "13rj3ii0rvmklfim9ild0ib44ssdadig7a9ccjbz22m0pw84a1sx";
     propagatedBuildInputs = [ base ];
     meta.description = "Standard IO library for OCaml";
   };
-- 
GitLab


From 27114d45ae3e68483aab8652f32ec02aa75799cd Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sat, 4 Nov 2017 19:56:04 +0100
Subject: [PATCH 655/877] stdenv.lib.maintainers: add c0bw3b

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e6dd349676f..451cb4867a5 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -94,6 +94,7 @@
   bramd = "Bram Duvigneau <bram@bramd.nl>";
   bstrik = "Berno Strik <dutchman55@gmx.com>";
   bzizou = "Bruno Bzeznik <Bruno@bzizou.net>";
+  c0bw3b = "Renaud <c0bw3b@gmail.com>";
   c0dehero = "CodeHero <codehero@nerdpol.ch>";
   calbrecht = "Christian Albrecht <christian.albrecht@mayflower.de>";
   calrama = "Moritz Maxeiner <moritz@ucworks.org>";
-- 
GitLab


From 9754503c6be6bcaa489658b73dbc4cbad99404d6 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sat, 4 Nov 2017 20:02:23 +0100
Subject: [PATCH 656/877] nsjail: 2.1 -> 2.2

plus fixed meta.license which should be Apache License 2.0
---
 pkgs/tools/security/nsjail/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
index a9763b07b71..8f087ef3d93 100644
--- a/pkgs/tools/security/nsjail/default.nix
+++ b/pkgs/tools/security/nsjail/default.nix
@@ -3,29 +3,31 @@
 
 stdenv.mkDerivation rec {
   name = "nsjail-${version}";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner           = "google";
     repo            = "nsjail";
     rev             = version;
     fetchSubmodules = true;
-    sha256          = "1wkhy86d0vgzngdvv593yhcghjh63chb8s67v891zll6bwgwg5h2";
+    sha256          = "11323j5wd02nm8ibvzbzq7dla70bmcldc71lv5bpk4x7h64ai14v";
   };
 
   nativeBuildInputs = [ autoconf libtool pkgconfig ];
   buildInputs = [ bison flex libnl protobuf protobufc ];
+  enableParallelBuilding = true;
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp nsjail $out/bin
+    mkdir -p $out/bin $out/share/man/man1
+    install nsjail $out/bin/
+    install nsjail.1 $out/share/man/man1/
   '';
 
   meta = with stdenv.lib; {
     description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters";
     homepage    = http://nsjail.com/;
-    license     = licenses.apsl20;
-    maintainers = [ maintainers.bosu ];
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ bosu c0bw3b ];
     platforms   = platforms.linux;
   };
 }
-- 
GitLab


From a09460b82765e22fcb5c2583084d9bd53a945f0e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 31 Oct 2017 19:56:28 +0100
Subject: [PATCH 657/877] ghc: add 8.2.2-rc2

---
 pkgs/development/compilers/ghc/8.2.2.nix | 119 +++++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix      |  11 +++
 2 files changed, 130 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/8.2.2.nix

diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
new file mode 100644
index 00000000000..f76958227d6
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -0,0 +1,119 @@
+{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
+, autoconf, automake, happy, alex, python3, sphinx, hscolour
+, buildPlatform, targetPlatform , selfPkgs, cross ? null
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
+}:
+
+let
+  inherit (bootPkgs) ghc;
+  version = "8.2.1.20171030";
+
+  commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ];
+  commonPreConfigure =  ''
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString enableIntegerSimple ''
+    echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk
+  '';
+in stdenv.mkDerivation (rec {
+  inherit version;
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/~ghc/8.2.2-rc2/${name}-src.tar.xz";
+    sha256 = "0m2lx13yscgxmb18nrzhgg5h4kwzcnxdw7rjcqwx4dcwl1k0a724";
+  };
+
+  postPatch = "patchShebangs .";
+
+  patches = [ ./ghc-gold-linker.patch ];
+
+  preConfigure = commonPreConfigure;
+
+  buildInputs = commonBuildInputs;
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "CC=${stdenv.cc}/bin/cc"
+    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+    "--datadir=$doc/share/doc/ghc"
+  ] ++ stdenv.lib.optional (! enableIntegerSimple) [
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+  ] ++ stdenv.lib.optional stdenv.isDarwin [
+    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
+
+  checkTarget = "test";
+
+  postInstall = ''
+    paxmark m $out/lib/${name}/bin/{ghc,haddock}
+
+    # Install the bash completion file.
+    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc
+
+    # Patch scripts to include "readelf" and "cat" in $PATH.
+    for i in "$out/bin/"*; do
+      test ! -h $i || continue
+      egrep --quiet '^#!' <(head -n 1 $i) || continue
+      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
+    done
+  '';
+
+  outputs = [ "out" "doc" ];
+
+  passthru = {
+    inherit bootPkgs;
+  } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) {
+    crossCompiler = selfPkgs.ghc.override {
+      cross = targetPlatform;
+      bootPkgs = selfPkgs;
+    };
+  };
+
+  meta = {
+    homepage = http://haskell.org/ghc;
+    description = "The Glasgow Haskell Compiler";
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    inherit (ghc.meta) license platforms;
+  };
+
+} // stdenv.lib.optionalAttrs (cross != null) {
+  name = "${cross.config}-ghc-${version}";
+
+  preConfigure = commonPreConfigure + ''
+    sed 's|#BuildFlavour  = quick-cross|BuildFlavour  = perf-cross|' mk/build.mk.sample > mk/build.mk
+  '';
+
+  configureFlags = [
+    "CC=${stdenv.ccCross}/bin/${cross.config}-cc"
+    "LD=${stdenv.binutils}/bin/${cross.config}-ld"
+    "AR=${stdenv.binutils}/bin/${cross.config}-ar"
+    "NM=${stdenv.binutils}/bin/${cross.config}-nm"
+    "RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib"
+    "--target=${cross.config}"
+    "--enable-bootstrap-with-devel-snapshot"
+  ] ++
+    # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+    lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space";
+
+  buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ];
+
+  dontSetConfigureCross = true;
+
+  passthru = {
+    inherit bootPkgs cross;
+    cc = "${stdenv.ccCross}/bin/${cross.config}-cc";
+    ld = "${stdenv.binutils}/bin/${cross.config}-ld";
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b3bbb0d5b64..111893f93b7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -78,6 +78,13 @@ in rec {
       sphinx = pkgs.python3Packages.sphinx;
       selfPkgs = packages.ghc821;
     };
+    ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix rec {
+      bootPkgs = packages.ghc802;
+      inherit (bootPkgs) hscolour alex happy;
+      inherit buildPlatform targetPlatform;
+      sphinx = pkgs.python3Packages.sphinx;
+      selfPkgs = packages.ghc822;
+    };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
       bootPkgs = packages.ghc802;
       inherit (bootPkgs) alex happy;
@@ -166,6 +173,10 @@ in rec {
       ghc = compiler.ghc821;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
     };
+    ghc822 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc822;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
+    };
     ghcHEAD = callPackage ../development/haskell-modules {
       ghc = compiler.ghcHEAD;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
-- 
GitLab


From d594ca69fdbb9aaa96fcbebe6f817a0e86f165f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 1 Nov 2017 03:01:12 +0100
Subject: [PATCH 658/877] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.6-15-g404d240 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/be48096efe0680f3983647271087603c66c6647f.
---
 .../haskell-modules/hackage-packages.nix      | 1141 +++++++++++++----
 1 file changed, 887 insertions(+), 254 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index cc0d8deb1f5..4a393718257 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -8749,6 +8749,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HUnit-approx_1_1_1_1" = callPackage
+    ({ mkDerivation, base, call-stack, HUnit }:
+     mkDerivation {
+       pname = "HUnit-approx";
+       version = "1.1.1.1";
+       sha256 = "1brblqpz002jzql9wgzxk5zlfglmkv91s8gcfd6992xv539jfhsa";
+       libraryHaskellDepends = [ base call-stack HUnit ];
+       testHaskellDepends = [ base call-stack HUnit ];
+       homepage = "https://github.com/goldfirere/HUnit-approx";
+       description = "Approximate equality for floating point numbers with HUnit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HXMPP" = callPackage
     ({ mkDerivation, base, base64-string, binary, bytestring
      , crypto-api, enumerator, HLogger, network, pureMD5, random
@@ -10697,6 +10711,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels-extra_0_2_2" = callPackage
+    ({ mkDerivation, base, criterion, hspec, JuicyPixels }:
+     mkDerivation {
+       pname = "JuicyPixels-extra";
+       version = "0.2.2";
+       sha256 = "1f0ysxwd73s04mrqzqj9rfp6dd5441ckc96x2a4zkc1hixgkfzld";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base JuicyPixels ];
+       testHaskellDepends = [ base hspec JuicyPixels ];
+       benchmarkHaskellDepends = [ base criterion JuicyPixels ];
+       homepage = "https://github.com/mrkkrp/JuicyPixels-extra";
+       description = "Efficiently scale, crop, flip images with JuicyPixels";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-repa" = callPackage
     ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }:
      mkDerivation {
@@ -15848,8 +15878,8 @@ self: {
      }:
      mkDerivation {
        pname = "STLinkUSB";
-       version = "0.1.0";
-       sha256 = "17rqwr9f0g9p4i7qw4gih1g7wj2y7d7bdma55warp82v0v996ypr";
+       version = "0.1.1";
+       sha256 = "1b0cxrjbldsdh948fa3d5qr0lmjl2g5qkh7ii4smkmsakzk9jx0s";
        libraryHaskellDepends = [
          base binary bytestring transformers usb vector
        ];
@@ -15858,6 +15888,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "STM32-Zombie" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, STLinkUSB
+     , STM32F103xx-SVD, transformers
+     }:
+     mkDerivation {
+       pname = "STM32-Zombie";
+       version = "0.2.0";
+       sha256 = "10vknxgihz3cgyzi1rmyh30zqyg0q7ll653ljndjj8lh3hnghajx";
+       libraryHaskellDepends = [
+         base binary bytestring containers STLinkUSB STM32F103xx-SVD
+         transformers
+       ];
+       description = "control a STM32F103 microcontroller";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "STM32F103xx-SVD" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "STM32F103xx-SVD";
+       version = "0.1";
+       sha256 = "0m6vvj4mfmmn1r21aglwdb6801bwr0ks60vbwz7y1cb97vsdad9v";
+       libraryHaskellDepends = [ base ];
+       description = "Definition for Peripherals,Registers and Fields from STM32F103xx.svd";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "STMonadTrans" = callPackage
     ({ mkDerivation, array, base, Cabal, mtl }:
      mkDerivation {
@@ -15872,6 +15929,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "SVD2HS" = callPackage
+    ({ mkDerivation, base, containers, pretty, text, xml-conduit
+     , xml-lens
+     }:
+     mkDerivation {
+       pname = "SVD2HS";
+       version = "0.1";
+       sha256 = "16crp18wyp7gb99x0vmjcqdwvsvns2kppaic3aspnidlc14hwg35";
+       libraryHaskellDepends = [
+         base containers pretty text xml-conduit xml-lens
+       ];
+       description = "translate a SVD of a Microcontroller to Haskell tables";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "SVG2Q" = callPackage
     ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb
      , xml
@@ -17464,8 +17536,8 @@ self: {
      }:
      mkDerivation {
        pname = "TeX-my-math";
-       version = "0.201.1.0";
-       sha256 = "13rf0q74kk8lmgwfxicgf2d83b1jnvyq623pykm5z4g3cnap4nn4";
+       version = "0.201.1.1";
+       sha256 = "064ram3i1a59ypd8i3wnp7x9vbkc8zawby52676y4pfkqvddnhnm";
        libraryHaskellDepends = [
          base decimal-literals dumb-cas hashable haskell-src-meta HaTeX
          template-haskell text unordered-containers vector-space void
@@ -22435,8 +22507,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika";
-       version = "5.3.1";
-       sha256 = "1qgccxz77fa3j6vakg14z81wqw3259zrgg3xvfmrizshxnp1vh54";
+       version = "5.4";
+       sha256 = "1ymzhbmff1wnpksnad0dc47xa0iha5pf6w3ng6gykni2wx8smsgv";
        libraryHaskellDepends = [
          array base binary containers deepseq mtl mwc-random random vector
        ];
@@ -22572,8 +22644,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-lattice";
-       version = "0.4";
-       sha256 = "0fczcyg9bmijjwzh4x2kgs5q0x5swz17b51cv298ka4cmbqbhmgv";
+       version = "0.5";
+       sha256 = "05s7mv2k8211qmrqh8m1xfzpnm7g6x0b9asqlizgqrxq0n5vdyhj";
        libraryHaskellDepends = [
          aivika aivika-transformers array base containers mtl mwc-random
          random
@@ -22606,8 +22678,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "5.3";
-       sha256 = "08c8hkc1sbq08dsj25sb6ik9nq0insv0k8j42klbpgzmmc4pjvxd";
+       version = "5.4";
+       sha256 = "0if4i3jsc0bf8l0grdrijyzs5h5c85nq328gkwpmzpmawzssbqr5";
        libraryHaskellDepends = [
          aivika array base containers mtl mwc-random random vector
        ];
@@ -22798,6 +22870,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alg" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "alg";
+       version = "0.2.0.0";
+       sha256 = "1lh5pz3zmzyq9dkgzabgi8xhlssxccxw24ng97lynmsvc7jjras8";
+       libraryHaskellDepends = [ base ];
+       description = "Algebraic structures";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "alga" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default, exceptions
      , file-embed, filepath, formatting, haskeline, hspec, hxt
@@ -26262,15 +26345,15 @@ self: {
 
   "apiary-http-client" = callPackage
     ({ mkDerivation, apiary, base, bytestring, bytestring-builder
-     , http-client, http-types, text, transformers, types-compat, wai
+     , http-client, http-types, text, transformers, wai
      }:
      mkDerivation {
        pname = "apiary-http-client";
-       version = "0.1.3.0";
-       sha256 = "1p1scvv9m93g11xy7fix10nyw1ps4261v9h98k77z2hmhcvwnrpd";
+       version = "0.1.4.0";
+       sha256 = "0y5sl8xy2ginmb97495xb3dzzczjvrznfrdklvrbsrll9a4b5iia";
        libraryHaskellDepends = [
          apiary base bytestring bytestring-builder http-client http-types
-         text transformers types-compat wai
+         text transformers wai
        ];
        homepage = "https://github.com/winterland1989/apiary-http-client";
        description = "A http client for Apiary";
@@ -36306,6 +36389,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "boop" = callPackage
+    ({ mkDerivation, base, mtl, text }:
+     mkDerivation {
+       pname = "boop";
+       version = "0.1.0.0";
+       sha256 = "1gn4b8y6dlhhf1vi92km32lyryl25xvbc8akbq1xxgn16iq49y8c";
+       libraryHaskellDepends = [ base mtl text ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/tdammers/boop";
+       description = "OOP primitives for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bootstrap-types" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -37141,8 +37237,8 @@ self: {
      }:
      mkDerivation {
        pname = "buffer";
-       version = "0.5.0.1";
-       sha256 = "09dwscqkdppmiprz8k0rfxkwf7qd8b6md8iviqmxw3wamm9qx7dl";
+       version = "0.5.3";
+       sha256 = "0bf9y6rb3q26rk6qd7a2mjlb1gd1gp2k080ywhp5g48l474h6p26";
        libraryHaskellDepends = [ base base-prelude bug bytestring ];
        testHaskellDepends = [
          bug quickcheck-instances rerebase tasty tasty-hunit
@@ -38576,6 +38672,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-doctest_1_0_3" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "cabal-doctest";
+       version = "1.0.3";
+       sha256 = "1qyqxmw5z1418jda3q5j04pknqirfrfrqigibbxi4n31ajwlfisc";
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       homepage = "https://github.com/phadej/cabal-doctest";
+       description = "A Setup.hs helper for doctests running";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-file-th" = callPackage
     ({ mkDerivation, base, Cabal, directory, pretty, template-haskell
      }:
@@ -42409,15 +42518,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "checkers_0_4_9" = callPackage
+  "checkers_0_4_9_5" = callPackage
     ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
      mkDerivation {
        pname = "checkers";
-       version = "0.4.9";
-       sha256 = "1vpyyhvq1xkq8pxz2xpmw14yldn8ks95zaijpqxdzsmq4v3sy83a";
+       version = "0.4.9.5";
+       sha256 = "1xaffx0vmq4swciyq3qzjfklfj19nnhd5yama9di5sas4f8v517i";
        libraryHaskellDepends = [
          array base QuickCheck random semigroupoids
        ];
+       homepage = "https://github.com/conal/checkers";
        description = "Check properties on standard classes and data structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42432,8 +42542,8 @@ self: {
      }:
      mkDerivation {
        pname = "checkmate";
-       version = "0.3.0";
-       sha256 = "0yqinjpc65flh50kb2jax10lrmcbp8lcy36ivrya180wdfvlcm0n";
+       version = "0.3.2";
+       sha256 = "1s79cpi5hzfb59705i6gdvicczvddsbikcwwqx22v3yfyakbbxww";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42451,7 +42561,7 @@ self: {
        ];
        homepage = "https://github.com/spoqa/checkmate#readme";
        description = "Generate checklists relevant to a given patch";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -46104,8 +46214,8 @@ self: {
      }:
      mkDerivation {
        pname = "columbia";
-       version = "0.1.1";
-       sha256 = "10yd0rp9zzdsx2hcb7gn0yxz8b9zj0pfy4g8d09qgs3c8lg8fdan";
+       version = "0.1.2";
+       sha256 = "1mayj9bzjrf37chd37mnwr6xbc126n4cbsdjzb2fy87q3vy4g7bh";
        libraryHaskellDepends = [
          array base bytestring containers contravariant data-endian
          directory filelock invariant mmap mmorph monad-loops mtl parallel
@@ -47865,24 +47975,24 @@ self: {
   "conduit-algorithms" = callPackage
     ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
      , conduit-combinators, conduit-extra, containers, deepseq
-     , directory, filepath, HUnit, mtl, resourcet, stm, stm-chans
-     , stm-conduit, test-framework, test-framework-hunit
-     , test-framework-th, transformers, unix
+     , directory, HUnit, mtl, resourcet, stm, stm-conduit
+     , test-framework, test-framework-hunit, test-framework-th
+     , transformers
      }:
      mkDerivation {
        pname = "conduit-algorithms";
-       version = "0.0.6.0";
-       sha256 = "0b3wpmx35bl85mzy9v0hiz48flzv2vjdimkgdv58si24l3drg6g6";
+       version = "0.0.6.1";
+       sha256 = "0zs7klxlkirch0j7gasxqalfw9nc4pfslgrg93jwn5vhpxdxhgwk";
        libraryHaskellDepends = [
          async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra containers deepseq directory filepath mtl resourcet
-         stm stm-chans stm-conduit transformers unix
+         conduit-extra containers deepseq mtl resourcet stm stm-conduit
+         transformers
        ];
        testHaskellDepends = [
          async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra containers deepseq directory filepath HUnit mtl
-         resourcet stm stm-chans stm-conduit test-framework
-         test-framework-hunit test-framework-th transformers unix
+         conduit-extra containers deepseq directory HUnit mtl resourcet stm
+         stm-conduit test-framework test-framework-hunit test-framework-th
+         transformers
        ];
        description = "Conduit-based algorithms";
        license = stdenv.lib.licenses.mit;
@@ -48174,16 +48284,16 @@ self: {
      }) {};
 
   "conduit-resumablesink" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, hspec, transformers
-     , void
+    ({ mkDerivation, base, bytestring, conduit, hspec, resourcet
+     , transformers, void
      }:
      mkDerivation {
        pname = "conduit-resumablesink";
-       version = "0.1.1";
-       sha256 = "1bqdpnhqjh4dhvppsa8nlgja0jpdw48kxywz2999sp5hi53qxdfg";
+       version = "0.2";
+       sha256 = "0pk4qvsxmmvrx9kfypbsjiq6kgcma73w97873rk3nrc9vdcm888v";
        libraryHaskellDepends = [ base conduit void ];
        testHaskellDepends = [
-         base bytestring conduit hspec transformers void
+         base bytestring conduit hspec resourcet transformers void
        ];
        homepage = "http://github.com/A1kmm/conduit-resumablesink";
        description = "Allows conduit to resume sinks to feed multiple sources into it";
@@ -48193,21 +48303,21 @@ self: {
 
   "conduit-throttle" = callPackage
     ({ mkDerivation, async, base, conduit, conduit-combinators
-     , conduit-extra, HUnit, resourcet, stm, stm-chans, stm-conduit
-     , test-framework, test-framework-hunit, throttle-io-stream
-     , unliftio, unliftio-core
+     , conduit-extra, HUnit, monad-control, resourcet, stm, stm-chans
+     , stm-conduit, test-framework, test-framework-hunit
+     , throttle-io-stream, unliftio, unliftio-core
      }:
      mkDerivation {
        pname = "conduit-throttle";
-       version = "0.2.0.1";
-       sha256 = "0402bnj5z4m2lqgagbw8rc7c8vmm3sldp1vcrywd5zvcp5031xsa";
+       version = "0.3.0.0";
+       sha256 = "1kwrryplhck8q6hn6lx6j741d9hllzf84ykmqwiq0h34fjdd0a4r";
        libraryHaskellDepends = [
-         async base conduit conduit-combinators conduit-extra resourcet stm
-         stm-chans throttle-io-stream unliftio unliftio-core
+         async base conduit conduit-combinators conduit-extra monad-control
+         resourcet stm stm-chans throttle-io-stream unliftio unliftio-core
        ];
        testHaskellDepends = [
          async base conduit conduit-combinators conduit-extra HUnit
-         resourcet stm stm-chans stm-conduit test-framework
+         monad-control resourcet stm stm-chans stm-conduit test-framework
          test-framework-hunit throttle-io-stream unliftio unliftio-core
        ];
        homepage = "https://github.com/mtesseract/conduit-throttle#readme";
@@ -49078,6 +49188,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "content-store" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cond, conduit
+     , conduit-combinators, conduit-extra, cryptonite, directory
+     , filepath, hspec, htoml, memory, monad-control, mtl, resourcet
+     , temporary, text, transformers, transformers-base, unix
+     }:
+     mkDerivation {
+       pname = "content-store";
+       version = "0.1.0";
+       sha256 = "1qimbnqfvnl7zhcpklnzp2n7s7swq5knif6li29fyvfb6ls1471c";
+       libraryHaskellDepends = [
+         aeson base bytestring cond conduit conduit-combinators
+         conduit-extra cryptonite directory filepath htoml memory
+         monad-control mtl resourcet temporary text transformers
+         transformers-base unix
+       ];
+       testHaskellDepends = [ base bytestring hspec memory ];
+       homepage = "https://github.com/weldr/content-store";
+       description = "Store and retrieve data from an on-disk store";
+       license = "LGPL";
+     }) {};
+
   "context-free-grammar" = callPackage
     ({ mkDerivation, array, base, containers, control-monad-omega
      , dlist, HUnit, mtl, pretty, QuickCheck, quickcheck-properties
@@ -57030,14 +57162,14 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
-  "dejafu_0_9_0_1" = callPackage
+  "dejafu_0_9_0_2" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
      , leancheck, random, ref-fd, transformers, transformers-base
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.9.0.1";
-       sha256 = "18i21basz8d50axa1ccgz9djghd95iazv4k7x499fff1nak39147";
+       version = "0.9.0.2";
+       sha256 = "1mxg88jlr6qga82s37xs9mwq2y26vgfkd9dg9j9mxwdzw39581gr";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions leancheck random
          ref-fd transformers transformers-base
@@ -57833,23 +57965,25 @@ self: {
      }) {};
 
   "dhall" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, case-insensitive
-     , charset, containers, contravariant, exceptions, http-client
-     , http-client-tls, lens, optparse-generic, parsers, prettyprinter
-     , system-fileio, system-filepath, tasty, tasty-hunit, text
-     , text-format, transformers, trifecta, unordered-containers, vector
+    ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring
+     , bytestring, case-insensitive, charset, containers, contravariant
+     , cryptohash, exceptions, http-client, http-client-tls, lens
+     , optparse-generic, parsers, prettyprinter, system-fileio
+     , system-filepath, tasty, tasty-hunit, text, text-format
+     , transformers, trifecta, unordered-containers, vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.7.0";
-       sha256 = "1177px9xlvby3wbhwgrvx23wxgmcqhl3qllbry6k42rbgf7rw900";
+       version = "1.8.0";
+       sha256 = "0bfnylfjqp8065i2akz5b8p55c45396hi8h6lx0jkl1i597567c4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring case-insensitive charset containers
-         contravariant exceptions http-client http-client-tls lens parsers
-         prettyprinter system-fileio system-filepath text text-format
-         transformers trifecta unordered-containers vector
+         ansi-wl-pprint base base16-bytestring bytestring case-insensitive
+         charset containers contravariant cryptohash exceptions http-client
+         http-client-tls lens parsers prettyprinter system-fileio
+         system-filepath text text-format transformers trifecta
+         unordered-containers vector
        ];
        executableHaskellDepends = [
          base optparse-generic prettyprinter system-filepath text trifecta
@@ -57868,8 +58002,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.5";
-       sha256 = "1cicl18sz969ws64jybxsibcbk1686mfia9avw8asy1fmr2w6ryv";
+       version = "1.0.6";
+       sha256 = "1wjwjpprvd90dpmxij5zj1gr5x41bvzmr4qwyfhxd2am6bzg5n5d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -57910,8 +58044,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.0.7";
-       sha256 = "1wgzj9gfvxs2yvh0hnncfck2qbf4fhqpnibl6n10d0hllmvdbq1b";
+       version = "1.0.8";
+       sha256 = "0icwbsx7a6m62klyghllvwj474f2kxghh40d7f5v01l135qrg8a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -57928,16 +58062,18 @@ self: {
 
   "dhall-nix" = callPackage
     ({ mkDerivation, base, containers, data-fix, dhall, hnix
-     , neat-interpolation, optparse-generic, text, trifecta, vector
+     , neat-interpolation, optparse-generic, text, text-format, trifecta
+     , vector
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.0.8";
-       sha256 = "1z6jgcfk1zi0alhpp6ycskb6yd40j2l7bl9bxfkb79443383r2mm";
+       version = "1.0.9";
+       sha256 = "06njwk2mmn8virrzd7q1bw91rwagcczkjn21kjhbajn6gzl77dry";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers data-fix dhall hnix neat-interpolation text vector
+         base containers data-fix dhall hnix neat-interpolation text
+         text-format vector
        ];
        executableHaskellDepends = [
          base dhall hnix optparse-generic text trifecta
@@ -57951,8 +58087,8 @@ self: {
     ({ mkDerivation, base, dhall, optparse-generic, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.3";
-       sha256 = "1kic5mwndqmxqrg9f2a7panawns5j43pik42hl2dds5fvj3cmvr9";
+       version = "1.0.4";
+       sha256 = "1ba2sljiq016jhgx7ifh5vjrwxd1czv2gm56h2pig3p0x45ds2wm";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base dhall optparse-generic text ];
@@ -59181,8 +59317,8 @@ self: {
     ({ mkDerivation, base, Cabal, ghc-prim, QuickCheck }:
      mkDerivation {
        pname = "dimensions";
-       version = "0.3.1.0";
-       sha256 = "1img3byk6jyfjqn1diss2067k88ii6hg5g92yaghkizh1d2vmyi0";
+       version = "0.3.2.0";
+       sha256 = "1ps9yy363xfpvq6dl5mjp02h0cj1vdib2vggvsykvgqwwrnra83p";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/achirkin/easytensor#readme";
@@ -59699,6 +59835,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "disjoint-containers" = callPackage
+    ({ mkDerivation, base, containers, doctest, QuickCheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "disjoint-containers";
+       version = "0.2.1";
+       sha256 = "1082mx4af7h70hvnj0fxgimhnqbgn3ywkh53lm1hyhcfalnmyrs7";
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [ base containers doctest QuickCheck ];
+       homepage = "https://github.com/andrewthad/disjoint-containers#readme";
+       description = "Disjoint containers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "disjoint-set" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, QuickCheck
      , transformers
@@ -62424,8 +62575,8 @@ self: {
      }:
      mkDerivation {
        pname = "dumb-cas";
-       version = "0.1.1.0";
-       sha256 = "1crzw0axgamjhxrm2ggdqw45jw80avp227bwc1v0c7lmb4cmkr3p";
+       version = "0.1.1.1";
+       sha256 = "0pimlspgrfv04hwz91krbcq0g01fhrp9vgi2sj1kc7wz9hcd1pva";
        libraryHaskellDepends = [
          base containers decimal-literals hashable template-haskell
          unordered-containers
@@ -62479,9 +62630,10 @@ self: {
     ({ mkDerivation, base, transformers, transformers-base }:
      mkDerivation {
        pname = "dunai";
-       version = "0.2.0.0";
-       sha256 = "1h6rw4h300hbmv05immhzxzf5yb9kc5zsykifdysi40l4fbx7rkc";
+       version = "0.3.0.0";
+       sha256 = "0ncznc3khbanqsq4ab0n246sx30slq13awclafln5bjxvi1cx3yl";
        libraryHaskellDepends = [ base transformers transformers-base ];
+       homepage = "https://github.com/ivanperez-keera/dunai";
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -62835,8 +62987,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamic-plot";
-       version = "0.2.2.0";
-       sha256 = "1w4w58x75x04i4mgfwb2znprrbf8vbml691niymlx1vlzlcsf13z";
+       version = "0.3.0.0";
+       sha256 = "0a674aqs9jnkga3a9sp24qyr3fssbizh4p1zwfvzwafnjrbmrc5c";
        libraryHaskellDepends = [
          base colour colour-space constrained-categories containers
          data-default deepseq diagrams-cairo diagrams-core diagrams-gtk
@@ -63187,8 +63339,8 @@ self: {
      }:
      mkDerivation {
        pname = "easytensor";
-       version = "0.3.1.0";
-       sha256 = "07shnpbnh3qq28yhcrhwhhb8m8b9x5ad36cj5f5hxqghfhih7k6b";
+       version = "0.4.0.0";
+       sha256 = "13wgg67gjg07r1n91kqikbhz8nnzfbgmi0v8a1596a6z7al4kvpr";
        libraryHaskellDepends = [ base dimensions ghc-prim ];
        testHaskellDepends = [ base Cabal dimensions QuickCheck ];
        benchmarkHaskellDepends = [ base dimensions time ];
@@ -64697,6 +64849,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "elm-websocket" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, concurrent-extra
+     , containers, directory, formatting, hspec, http-types, lens, mtl
+     , network, scotty, stm, text, time, wai, wai-middleware-static
+     , wai-websockets, warp, websockets, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "elm-websocket";
+       version = "1.0";
+       sha256 = "10v97m93dl34apvv3jn26jfcb7f206q3bqvwqk220j83s8kas07a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring concurrent-extra containers directory
+         formatting lens mtl stm text time wai wai-websockets websockets
+         wl-pprint-text
+       ];
+       executableHaskellDepends = [
+         aeson base concurrent-extra http-types scotty text wai
+         wai-middleware-static warp
+       ];
+       testHaskellDepends = [
+         aeson base concurrent-extra hspec http-types mtl network text wai
+         warp websockets
+       ];
+       homepage = "http://github.com/rhyskeepence/elm-websocket";
+       description = "Generate ELM code from a Wai websocket application";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "elm-yesod" = callPackage
     ({ mkDerivation, base, blaze-markup, Elm, shakespeare-js, text
      , yesod-core
@@ -64927,8 +65109,8 @@ self: {
      }:
      mkDerivation {
        pname = "emailparse";
-       version = "0.2.0.6";
-       sha256 = "0n02h7d3n4xaivwpqiki2p0qca44y1md5zxp77l74ld7lf7y7rm9";
+       version = "0.2.0.8";
+       sha256 = "1x6hzmmsmdyqbcsx3sfgzi59y21ps7knz5hdinsyg1s30i22zgkz";
        libraryHaskellDepends = [
          attoparsec base bytestring either either-unwrap mime MissingH
          strptime text text-icu time word8
@@ -71042,6 +71224,8 @@ self: {
        pname = "fixed-vector-binary";
        version = "0.6.0.0";
        sha256 = "1yjyw9wc92laiwd9w8ng3456azicvf9a9wqk2v6liiksj3flw7hy";
+       revision = "1";
+       editedCabalFile = "04xrlp3r2798jpjw9v0zfjda79j19xz81szwp8jp5g71r5y16pvj";
        libraryHaskellDepends = [ base binary fixed-vector ];
        testHaskellDepends = [
          base binary fixed-vector tasty tasty-quickcheck
@@ -71058,6 +71242,8 @@ self: {
        pname = "fixed-vector-cereal";
        version = "0.6.0.0";
        sha256 = "1kf3d0pfaif5fish1vc5z7d5ym23bwl80l8bg4bgpdw75cg2dnn6";
+       revision = "1";
+       editedCabalFile = "1xhryv8d2znbfi99grg8dsn2lpya0wd8ff4pv6piyb01c13fl3xh";
        libraryHaskellDepends = [ base cereal fixed-vector ];
        testHaskellDepends = [
          base cereal fixed-vector tasty tasty-quickcheck
@@ -71074,6 +71260,8 @@ self: {
        pname = "fixed-vector-hetero";
        version = "0.3.1.2";
        sha256 = "0l8vphi8ijyzyk372r9i7imq8r6ki1w774gid69c8d2a2b63gvdd";
+       revision = "1";
+       editedCabalFile = "05scgl0r3g9nnb0pfg39cinylm11wdyqr8f51k69wj5y79fzf5yz";
        libraryHaskellDepends = [
          base deepseq fixed-vector ghc-prim primitive transformers
        ];
@@ -71982,8 +72170,8 @@ self: {
      }:
      mkDerivation {
        pname = "fluid-idl";
-       version = "0.0.1";
-       sha256 = "1mqswhsvyycxa7c7c92jag6rsp0dbkdm8bwjv6pcr92w293ycrv2";
+       version = "0.0.2";
+       sha256 = "1qcsdnjwz0gcn8z6ss27f3a687fi47cmm95a9rfag42gvvlwyr9z";
        libraryHaskellDepends = [
          aeson base bytestring containers errors exceptions lifted-async
          monad-control monad-logger mtl random safe-exceptions scientific
@@ -75590,8 +75778,8 @@ self: {
      }:
      mkDerivation {
        pname = "gelatin";
-       version = "0.1.0.0";
-       sha256 = "08y9wsym19rgwr6k44n8pxffwi1fna3nmg4bq5cc7in5zj1ihfbv";
+       version = "0.1.0.1";
+       sha256 = "151sf11a9sfwi6wg26l7lyphklv3lgy51djfqx3qszykhzccgv7b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -76897,8 +77085,8 @@ self: {
      }:
      mkDerivation {
        pname = "geoip2";
-       version = "0.3.0.0";
-       sha256 = "1yazd4wgf4ivk2x3apymddcww24z7a4b0jxzph7l8273wd8dy8zg";
+       version = "0.3.1.0";
+       sha256 = "1w9iqfkyi0ij33kng4adczi6m8chyhsadc2af5ryp8xzl7w64l8m";
        libraryHaskellDepends = [
          base bytestring cereal containers iproute mmap reinterpret-cast
          text
@@ -79263,7 +79451,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "ginger_0_7_2_0" = callPackage
+  "ginger_0_7_3_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , data-default, filepath, http-types, mtl, parsec, safe, scientific
      , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
@@ -79271,8 +79459,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.7.2.0";
-       sha256 = "1xgczxqqd4ml8ifcyr45nrgbqn5a40nrbkvzbn4r4djpivnsrk0k";
+       version = "0.7.3.0";
+       sha256 = "1c4k0ixpkdb711arxcn028z27y78ssr6j5n7dfs9cajf93x727gs";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -90586,8 +90774,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskanoid";
-       version = "0.1.5.2";
-       sha256 = "1hw4ylwwsmp59ifw8s4w1394gv7p2xc6nvqajfmil0p8r8s6r1pf";
+       version = "0.1.5.4";
+       sha256 = "01cwjvs1sj66w9siqfq3vzrw5607bh2pxr6zzx64jhqhcr3yv73d";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -93789,7 +93977,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hasql_1" = callPackage
+  "hasql_1_1" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
      , bytestring-strict-builder, contravariant, contravariant-extras
      , criterion, data-default-class, dlist, either, hashable
@@ -93800,8 +93988,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "1";
-       sha256 = "0zhk9vwlmjc1cwbqx1l9nns155a5f2zbb8k1240wqcylignfqi2b";
+       version = "1.1";
+       sha256 = "1c2gfdgxki17ng6b5qr3pvmra7v7x3hf9vh75hq4n6jr8rp03iki";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring bytestring-strict-builder
          contravariant contravariant-extras data-default-class dlist either
@@ -93870,8 +94058,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-cursor-query";
-       version = "0.4.3.1";
-       sha256 = "0m9lr2n5ac0n9gslj2v24jmm68b1aq29zb9ca5wszfs16x6v92ci";
+       version = "0.4.4";
+       sha256 = "0xbnhgix1g4sf2cpimz77ljiwm79l4lnx1ys7q31rak1fyw7fgs0";
        libraryHaskellDepends = [
          base base-prelude bytestring contravariant foldl hasql
          hasql-cursor-transaction hasql-transaction profunctors
@@ -93893,8 +94081,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-cursor-transaction";
-       version = "0.6.2.1";
-       sha256 = "113fkkkdh2ar431b9l3jbqabymmas2r0fwc7icfys3ayh8r50fg7";
+       version = "0.6.3";
+       sha256 = "12vzkay4r0pzz41p4n60zd077yigr3373i5nr8cpf8z39msj8vaj";
        libraryHaskellDepends = [
          base base-prelude bytestring bytestring-tree-builder contravariant
          contravariant-extras hasql hasql-transaction transformers
@@ -93953,8 +94141,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-optparse-applicative";
-       version = "0.2.3";
-       sha256 = "0ph2dzfl12bcdcd4xqw5kg1sdyd36ajz3n3ha27rnvv0l8slld6i";
+       version = "0.2.4";
+       sha256 = "0gdbwhzcfjriq2yah5kfn9r1anc77f1iyay86zsdgq4z8qi6asvr";
        libraryHaskellDepends = [
          base-prelude hasql hasql-pool optparse-applicative
        ];
@@ -93975,6 +94163,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql-pool_0_4_3" = callPackage
+    ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
+     mkDerivation {
+       pname = "hasql-pool";
+       version = "0.4.3";
+       sha256 = "08fzh0y1cxaslp8ia26p9jhs3dckjfdvmiqw1lasdabb7ij82i0j";
+       libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
+       homepage = "https://github.com/nikita-volkov/hasql-pool";
+       description = "A pool of connections for Hasql";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-postgres" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , criterion-plus, deepseq, directory, doctest, either, filepath
@@ -94079,6 +94280,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql-transaction_0_5_2" = callPackage
+    ({ mkDerivation, async, base, base-prelude, bytestring
+     , bytestring-tree-builder, contravariant, contravariant-extras
+     , hasql, mtl, rebase, transformers
+     }:
+     mkDerivation {
+       pname = "hasql-transaction";
+       version = "0.5.2";
+       sha256 = "0w4y65vqgc4pk66xpip9jzzbas6cpnss4gx1w91rg7j48491cmym";
+       libraryHaskellDepends = [
+         base base-prelude bytestring bytestring-tree-builder contravariant
+         contravariant-extras hasql mtl transformers
+       ];
+       testHaskellDepends = [ async hasql rebase ];
+       homepage = "https://github.com/nikita-volkov/hasql-transaction";
+       description = "A composable abstraction over the retryable transactions for Hasql";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hastache" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
      , directory, filepath, HUnit, ieee754, mtl, process, syb, text
@@ -94318,10 +94539,8 @@ self: {
      }:
      mkDerivation {
        pname = "hat";
-       version = "2.9.0.0";
-       sha256 = "05sbgq1mliahdn4qj7flgw7klrm67r2mz7gxs03i6lx6mi3phm9f";
-       revision = "1";
-       editedCabalFile = "1wspd2shxpp3x4p4ghgf82vqchlkxk6qhvsgn07ypzm2kfz3a9dh";
+       version = "2.9.4";
+       sha256 = "13ldpj92qzp243zwnx0q044isdq2nmbh93wardqzr37jybs7m4xs";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -99130,7 +99349,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hjsonschema_1_7_0" = callPackage
+  "hjsonschema_1_7_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
      , http-client, http-types, pcre-heavy, profunctors, protolude
@@ -99139,8 +99358,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "1.7.0";
-       sha256 = "01k29v8xqw3d8vy3qdf6ppgjmly7ppbg19yjrsiv10szishwigg2";
+       version = "1.7.1";
+       sha256 = "0x9w33scdnbfdmadxpx2c4fgkmpvny9ipsl2y7fq56zr6fa0ybfz";
        libraryHaskellDepends = [
          aeson base bytestring containers file-embed filepath hashable
          hjsonpointer http-client http-types pcre-heavy profunctors
@@ -99693,6 +99912,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hlint_2_0_10" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
+     , containers, cpphs, data-default, directory, extra, filepath
+     , haskell-src-exts, haskell-src-exts-util, hscolour, process
+     , refact, text, transformers, uniplate, unordered-containers
+     , vector, yaml
+     }:
+     mkDerivation {
+       pname = "hlint";
+       version = "2.0.10";
+       sha256 = "1kmjgdj652lx269sppa35wga8a2376nzjd548nnc6h52kdpgix30";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring cmdargs containers cpphs
+         data-default directory extra filepath haskell-src-exts
+         haskell-src-exts-util hscolour process refact text transformers
+         uniplate unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/ndmitchell/hlint#readme";
+       description = "Source code suggestions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hlogger" = callPackage
     ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
@@ -100530,15 +100776,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hoauth2_1_4_0" = callPackage
+  "hoauth2_1_5_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, exceptions
      , http-conduit, http-types, microlens, text, unordered-containers
      , uri-bytestring, uri-bytestring-aeson, wai, warp
      }:
      mkDerivation {
        pname = "hoauth2";
-       version = "1.4.0";
-       sha256 = "0wksa14mj7pyd6mjv81m1djqs8s79sri8a1by14l626pgai7p3h0";
+       version = "1.5.0";
+       sha256 = "0dfrqdjrvc94f94xl8vqggdvzbkiwj3xfkmwilkskvnfg1s1hg8q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101466,8 +101712,8 @@ self: {
        pname = "hopenpgp-tools";
        version = "0.19.5";
        sha256 = "1yb6slxphz7lghclv1cjs2kwig1ll1dxzcaf4js26nanq280lqz0";
-       revision = "1";
-       editedCabalFile = "0lid8ck44b5ybb8wq81bh8wianr4r4rigqzq49cfr1g4kxmhqcq8";
+       revision = "2";
+       editedCabalFile = "1w9ban4w6zm7cknfnlzhgx649xg2j0vsrhqdlnd5g8qzcbbhh0si";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103688,6 +103934,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hsass_0_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, filepath
+     , hlibsass, hspec, hspec-discover, monad-loops, temporary
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hsass";
+       version = "0.5.0";
+       sha256 = "07jhny061fnxqiijr2rqac85qzlxz24w8dms5pn844as8nkwdi4d";
+       libraryHaskellDepends = [
+         base bytestring data-default-class filepath hlibsass monad-loops
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring data-default-class hspec hspec-discover temporary
+       ];
+       homepage = "https://github.com/jakubfijalkowski/hsass";
+       description = "Integrating Sass into Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsay" = callPackage
     ({ mkDerivation, base, Hclip, HTTP, process, unix }:
      mkDerivation {
@@ -109398,8 +109666,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "2.0.4";
-       sha256 = "0mqrxczjr822hccmrdsmy98mw10jdmiiq94vdibkqrh618hs4fd5";
+       version = "2.1.0";
+       sha256 = "1kl9pkcpsciwxya92kr75nd0n2xb4qrhs5fs75ifkgzicjipxd5v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109816,8 +110084,8 @@ self: {
      }:
      mkDerivation {
        pname = "hwsl2";
-       version = "0.4.0.0";
-       sha256 = "0f081h2w2his8fgis6prj6z5bywh4csjqgwn5mc4wdy5s1zi6010";
+       version = "0.4.0.1";
+       sha256 = "07kg0m75fi9m236lnisrjdyx7y53hl6pm4v5l9cxvghfankfbgk0";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring quickcheck-properties tasty tasty-quickcheck
@@ -111377,7 +111645,7 @@ self: {
        pname = "idris";
        version = "1.0";
        sha256 = "1srbz0cyvd0k1yqgbrwnfj94yg5y3z533q1kzac96z1h7v454s5h";
-       configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
+       configureFlags = [ "-fcurses" "-f-execonly" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -111421,7 +111689,7 @@ self: {
        pname = "idris";
        version = "1.1.1";
        sha256 = "0rq43i3mf7b4yiwzrzzpyh3ldka3j514ms9cf31vsfpy0jn3bvkp";
-       configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
+       configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -112662,6 +112930,27 @@ self: {
        license = "GPL";
      }) {};
 
+  "incremental-parser_0_2_5_2" = callPackage
+    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "incremental-parser";
+       version = "0.2.5.2";
+       sha256 = "0qlawnlghp8cz96sc6kjzhp0dlinmnyh38gjcp6i1wfn2qy8qy7d";
+       libraryHaskellDepends = [ base monoid-subclasses ];
+       testHaskellDepends = [
+         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq monoid-subclasses text
+       ];
+       homepage = "https://github.com/blamario/incremental-parser";
+       description = "Generic parser library capable of providing partial results from partial input";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "incremental-sat-solver" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -120244,6 +120533,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lackey_0_4_5" = callPackage
+    ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec
+     , text
+     }:
+     mkDerivation {
+       pname = "lackey";
+       version = "0.4.5";
+       sha256 = "0xczvbfvgcifb6mzyicihgz6vcn7bx2d3w9r8ih9mdclbfhc32l6";
+       libraryHaskellDepends = [ base servant servant-foreign text ];
+       testHaskellDepends = [ base servant tasty tasty-hspec text ];
+       homepage = "https://github.com/tfausak/lackey#readme";
+       description = "Generate Ruby clients from Servant APIs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lagrangian" = callPackage
     ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -123109,8 +123414,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.16.2.0";
-       sha256 = "0wfikbv98p29rv2cl1wwnac82g5vj1w70hy4m40vxgag3qpnr6iw";
+       version = "0.16.3.0";
+       sha256 = "0cjg4r6yjwfzr2xn90gvrw2x93mlpz6z2i1i4djbnilknl9s53vp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -123568,8 +123873,8 @@ self: {
     ({ mkDerivation, base, base-unicode-symbols, transformers }:
      mkDerivation {
        pname = "lenz";
-       version = "0.1.2.1";
-       sha256 = "058j5gkcz0dcwscnssjzxhkgkq5zxffbsj12dwbgiiyd57fwfv88";
+       version = "0.1.2.2";
+       sha256 = "1hzvw76fgaf5d5l1dca9662c0pplgv0h53dwfr42cwg0hxj6c876";
        libraryHaskellDepends = [ base base-unicode-symbols transformers ];
        description = "Van Laarhoven lenses";
        license = "unknown";
@@ -123581,8 +123886,8 @@ self: {
      }:
      mkDerivation {
        pname = "lenz-template";
-       version = "0.1";
-       sha256 = "1cbpb0m31kf7x9li0yf0c2gblz0nbyhl3k7pj70k97y1d4ns0g7h";
+       version = "0.1.0.1";
+       sha256 = "1j11cg76w9kyc1nn395qhzj9cp64ff0jq8y0h5x9lcn2r18zihhi";
        libraryHaskellDepends = [
          base base-unicode-symbols containers lenz template-haskell
        ];
@@ -128400,8 +128705,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltk";
-       version = "0.16.1.0";
-       sha256 = "00vxsp5w38wv12wl09z6wa72kpczd6k5g9m02clshaq3ai6cyg1a";
+       version = "0.16.2.0";
+       sha256 = "1x8abgss6j46wp0cz7vfr704j38f00pcgkhyxn8ismqf3k7sdzxc";
        libraryHaskellDepends = [
          base base-compat Cabal containers filepath ghc gi-cairo gi-gdk
          gi-glib gi-gobject gi-gtk gi-gtk-hs haskell-gi-base
@@ -129351,21 +129656,22 @@ self: {
      , containers, criterion, directory, file-embed, hspec
      , hspec-megaparsec, http-client, http-client-tls, megaparsec
      , MonadRandom, mtl, optparse-applicative, process, random-shuffle
-     , recursion-schemes, tar, template-haskell, text, th-lift-instances
-     , titlecase, zip-archive, zlib
+     , recursion-schemes, recursion-schemes-ext, tar, template-haskell
+     , text, th-lift-instances, titlecase, zip-archive, zlib
      }:
      mkDerivation {
        pname = "madlang";
-       version = "3.1.1.13";
-       sha256 = "0qmgd368brmmibqlimv254i20ayxw96ipnwcfid4q3pdml9javn4";
+       version = "3.1.1.18";
+       sha256 = "00np5hkbab7hi46056hp6maa7fc63vbx227pj0y3d5q502hgf3jj";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory process ];
        libraryHaskellDepends = [
          ansi-wl-pprint base composition-prelude containers directory
          file-embed http-client http-client-tls megaparsec MonadRandom mtl
-         optparse-applicative random-shuffle recursion-schemes tar
-         template-haskell text th-lift-instances titlecase zip-archive zlib
+         optparse-applicative random-shuffle recursion-schemes
+         recursion-schemes-ext tar template-haskell text th-lift-instances
+         titlecase zip-archive zlib
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec hspec-megaparsec text ];
@@ -129437,6 +129743,37 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "magicbane_0_1_2" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude
+     , conduit, conduit-combinators, data-default, data-has, either
+     , ekg-core, ekg-wai, envy, errors, fast-logger, http-api-data
+     , http-client, http-client-tls, http-conduit, http-date
+     , http-link-header, http-media, http-types, lifted-async
+     , mime-types, monad-control, monad-logger, monad-metrics, mtl
+     , network, network-uri, raw-strings-qq, refined, servant
+     , servant-server, split, string-conversions, text, transformers
+     , unordered-containers, wai, wai-cli, wai-middleware-metrics
+     }:
+     mkDerivation {
+       pname = "magicbane";
+       version = "0.1.2";
+       sha256 = "19k31vy2ldf9a3jvmlys16n6w31a8h7b1iyp6m35f4n16ndjvwa1";
+       libraryHaskellDepends = [
+         aeson aeson-qq attoparsec base classy-prelude conduit
+         conduit-combinators data-default data-has either ekg-core ekg-wai
+         envy errors fast-logger http-api-data http-client http-client-tls
+         http-conduit http-date http-link-header http-media http-types
+         lifted-async mime-types monad-control monad-logger monad-metrics
+         mtl network network-uri raw-strings-qq refined servant
+         servant-server split string-conversions text transformers
+         unordered-containers wai wai-cli wai-middleware-metrics
+       ];
+       homepage = "https://github.com/myfreeweb/magicbane#readme";
+       description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "magico" = callPackage
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
      mkDerivation {
@@ -134343,6 +134680,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "model_0_4_1" = callPackage
+    ({ mkDerivation, base, containers, convertible, deepseq, doctest
+     , filemanip, ghc-prim, pretty, tasty, tasty-hunit, tasty-quickcheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "model";
+       version = "0.4.1";
+       sha256 = "115apma3mbvpskd5kbgccs4g4d1n9g5lj62bd9appd0d0i8rskf8";
+       libraryHaskellDepends = [
+         base containers convertible deepseq pretty transformers
+       ];
+       testHaskellDepends = [
+         base containers doctest filemanip ghc-prim pretty tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "http://github.com/tittoassini/model";
+       description = "Derive a model of a data type using Generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "modelicaparser" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, filepath, parsec
      , QuickCheck
@@ -136199,6 +136558,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mono-traversable_1_0_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, foldl
+     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
+     , text, transformers, unordered-containers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "1.0.4.0";
+       sha256 = "0qwmzjf25gradzajr4f9zw3a48m4hw26qvqnb134daqkyxpkzf13";
+       libraryHaskellDepends = [
+         base bytestring containers hashable split text transformers
+         unordered-containers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mono-traversable-instances" = callPackage
     ({ mkDerivation, base, comonad, containers, dlist, dlist-instances
      , mono-traversable, semigroupoids, semigroups, transformers
@@ -136628,6 +137012,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "morte_1_6_11" = callPackage
+    ({ mkDerivation, alex, array, base, binary, code-page, containers
+     , criterion, deepseq, Earley, http-client, http-client-tls
+     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
+     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
+     , tasty-quickcheck, text, text-format, transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.11";
+       sha256 = "10zwdf82hxjgxh7zs7wlnvyzjpaqalwj7rlg454jjlml59ifzvmw";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text text-format transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         base code-page optparse-applicative text text-format
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       benchmarkHaskellDepends = [ base criterion system-filepath text ];
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mosaico-lib" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo
      , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels
@@ -139592,8 +140009,8 @@ self: {
        pname = "natural-transformation";
        version = "0.4";
        sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
-       revision = "1";
-       editedCabalFile = "1scwm1gs07znkj4ahfyxpwrksj4rdl1pa81xflcqhkqfgcndvgl3";
+       revision = "2";
+       editedCabalFile = "1j90pd1zznr18966axskad5w0kx4dvqg62r65rmw1ihqwxm1ndix";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -144528,6 +144945,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye-trans_0_3_7" = callPackage
+    ({ mkDerivation, base, mtl, opaleye, postgresql-simple
+     , product-profunctors, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "opaleye-trans";
+       version = "0.3.7";
+       sha256 = "17yfa0kgd3v8dlz77nlgplyi23f622f46z9q2xyswnrrf5w2c4z0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base mtl opaleye postgresql-simple product-profunctors transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [
+         base opaleye postgresql-simple product-profunctors
+       ];
+       homepage = "https://github.com/WraithM/opaleye-trans";
+       description = "A monad transformer for Opaleye";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "open-browser" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
@@ -145713,6 +146153,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optparse-simple_0_0_4" = callPackage
+    ({ mkDerivation, base, bytestring, directory, either, gitrev
+     , optparse-applicative, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "optparse-simple";
+       version = "0.0.4";
+       sha256 = "1md24dlz6949rqv6y2x9d5r07lrqw42c21kdy09nk5y8r3mq43x0";
+       libraryHaskellDepends = [
+         base either gitrev optparse-applicative template-haskell
+         transformers
+       ];
+       testHaskellDepends = [ base bytestring directory ];
+       description = "Simple interface to optparse-applicative";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "optparse-text" = callPackage
     ({ mkDerivation, base, hspec, optparse-applicative, text }:
      mkDerivation {
@@ -146004,7 +146462,7 @@ self: {
      }) {};
 
   "orgstat" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, colour
+    ({ mkDerivation, aeson, attoparsec, base, boxes, bytestring, colour
      , containers, data-default, diagrams-lib, diagrams-svg, directory
      , exceptions, filepath, formatting, hashable, hspec, HUnit, lens
      , linear, log-warper, mtl, optparse-simple, orgmode-parse
@@ -146013,15 +146471,15 @@ self: {
      }:
      mkDerivation {
        pname = "orgstat";
-       version = "0.1.1";
-       sha256 = "0241f7d996akmqi1id6dqwki5yql7mgw331msxvza616s3gcyd36";
+       version = "0.1.2";
+       sha256 = "11q8n9sy841klms368bs0wl14wg0q5dq5gfcipzm25pw6jswfgyy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring colour containers data-default
-         diagrams-lib diagrams-svg directory exceptions filepath formatting
-         hashable lens linear log-warper mtl optparse-simple orgmode-parse
-         text time turtle universum yaml
+         aeson attoparsec base boxes bytestring colour containers
+         data-default diagrams-lib diagrams-svg directory exceptions
+         filepath formatting hashable lens linear log-warper mtl
+         optparse-simple orgmode-parse text time turtle universum yaml
        ];
        executableHaskellDepends = [
          base bytestring directory exceptions filepath formatting log-warper
@@ -146843,7 +147301,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_0_0_1" = callPackage
+  "pandoc_2_0_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -146857,8 +147315,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.0.0.1";
-       sha256 = "1wq21vsg9afv8lxk6rmmmb57437q7gv1qs4ymbzd1mvxkvzx0hwh";
+       version = "2.0.1";
+       sha256 = "00c7iv2s70dijyd651sflncmba9dfbflrrzii1hn0m5als75jgmb";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -146929,7 +147387,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-citeproc_0_11_1_2" = callPackage
+  "pandoc-citeproc_0_11_1_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
      , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
@@ -146938,8 +147396,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.11.1.2";
-       sha256 = "0lv1j035f5c0dd0n772ivav6kwzfxvnk6zcxmmhmkc3s9r9716sd";
+       version = "0.11.1.3";
+       sha256 = "00c9r8v7rc8ff8gw41470c3marhp0vqrdywmj91565k4ri7wfnwp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -147076,8 +147534,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-include-code";
-       version = "1.1.0.0";
-       sha256 = "1ygdmnmr4lw7f83xhqaa7m074ii6wbrsx148i9qx3inz5z2rm9b5";
+       version = "1.1.1.0";
+       sha256 = "016c6xf9avh4ydhd0vb5l044d4zlxgrpvp40v15889plrkbvxnbb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -147184,17 +147642,17 @@ self: {
      }) {};
 
   "pandoc-stylefrommeta" = callPackage
-    ({ mkDerivation, base, containers, HaTeX, MissingH, pandoc
-     , pandoc-types
+    ({ mkDerivation, base, bytestring, containers, MissingH, pandoc
+     , pandoc-types, text
      }:
      mkDerivation {
        pname = "pandoc-stylefrommeta";
-       version = "0.1.1.0";
-       sha256 = "0blgccnzyignq14y94cnascjxlk6088wwpxifwm45rnn0hs786vf";
+       version = "0.2.0.2";
+       sha256 = "12yvbh8cx5r6llx0gnz70n1b3zwm3zc8bdciq3cxyfivci5iks2r";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base containers HaTeX MissingH pandoc pandoc-types
+         base bytestring containers MissingH pandoc pandoc-types text
        ];
        homepage = "http://github.com/lyokha/styleFromMeta";
        description = "Pandoc filter to customize links, images and paragraphs";
@@ -147967,8 +148425,8 @@ self: {
     ({ mkDerivation, base, data-diverse, hspec, transformers }:
      mkDerivation {
        pname = "parameterized";
-       version = "0.2.0.0";
-       sha256 = "0z40b6cja2c4y177w6iwg8dijlpk5zwrf5yfwppc5y6n57g260z7";
+       version = "0.3.0.0";
+       sha256 = "148i3s6j38qvncbkk2hz86lbzprr5h7l7gpjqf0zb0ay0i9idczs";
        libraryHaskellDepends = [ base data-diverse transformers ];
        testHaskellDepends = [ base data-diverse hspec transformers ];
        homepage = "https://github.com/louispan/parameterized#readme";
@@ -155362,6 +155820,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-typed_0_5_2" = callPackage
+    ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
+     , containers, convertible, cryptonite, haskell-src-meta, HDBC
+     , HUnit, memory, network, old-locale, postgresql-binary, QuickCheck
+     , scientific, template-haskell, text, time, utf8-string, uuid
+     }:
+     mkDerivation {
+       pname = "postgresql-typed";
+       version = "0.5.2";
+       sha256 = "0ws9xmh199jsvdmxjxkhm59j05ljfsrf16xchkbxqd8p1pg8786c";
+       libraryHaskellDepends = [
+         aeson array attoparsec base binary bytestring containers cryptonite
+         haskell-src-meta HDBC memory network old-locale postgresql-binary
+         scientific template-haskell text time utf8-string uuid
+       ];
+       testHaskellDepends = [
+         base bytestring containers convertible HDBC HUnit network
+         QuickCheck time
+       ];
+       homepage = "https://github.com/dylex/postgresql-typed";
+       description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-typed-lifted" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, bytestring, exceptions
      , lens, monad-control, postgresql-typed, transformers-base
@@ -155837,8 +156320,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.49";
-       sha256 = "1xk8l4lbicl1k6xr14x80dlc5g55dj59xgzgx01b61d0k595mmj1";
+       version = "0.0.50";
+       sha256 = "09gsl99ikglf1cyzmy53xcn2lb549z6gi5930ldz03nd50lg0fdg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158715,8 +159198,8 @@ self: {
      }:
      mkDerivation {
        pname = "ptr";
-       version = "0.15.3";
-       sha256 = "1h66bk595nv0jmcxdzfzvpr7ymfm6hl3n4bnglwlwkp2y1ymm3i3";
+       version = "0.15.4";
+       sha256 = "0hmj6411wqsa9wgh2i3aksbkx07yaz88lp9h6lj9r8qfyv9yls5l";
        libraryHaskellDepends = [
          base base-prelude bug bytestring contravariant mtl profunctors
          semigroups text transformers
@@ -162440,6 +162923,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_0_3_7" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, filepath, http-client, http-client-tls, http-types
+     , tasty, tasty-hspec, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.3.7";
+       sha256 = "0jwmlnxnaaldi1gr988gdy82y3ylvmi9ylnrsas8rg6pwyj76v9c";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [ base filepath tasty tasty-hspec ];
+       homepage = "https://github.com/tfausak/ratel#readme";
+       description = "Notify Honeybadger about exceptions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ratel-wai" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
@@ -163251,8 +163754,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-midyim";
-       version = "0.4";
-       sha256 = "0aq3iaq3l4wcdixa09q9na2n4l92nkzikjbma3mxl4d6gklhcvhy";
+       version = "0.4.0.1";
+       sha256 = "1ck2f8nhlhcw9vyh42svp94xrnd4jcvic2kzxikw50vjcd4w6rrf";
        libraryHaskellDepends = [
          base containers data-accessor data-accessor-transformers event-list
          midi non-negative random reactive-banana-bunch transformers
@@ -167176,6 +167679,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rest-snap_0_3_0_0" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, case-insensitive
+     , rest-core, safe, snap-core, unordered-containers, uri-encode
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "rest-snap";
+       version = "0.3.0.0";
+       sha256 = "1s38xrmg90y80rxmz1kf5wfxq7dgf63xysicg0jfawwl3sy88iff";
+       libraryHaskellDepends = [
+         base base-compat bytestring case-insensitive rest-core safe
+         snap-core unordered-containers uri-encode utf8-string
+       ];
+       description = "Rest driver for Snap";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rest-stringmap" = callPackage
     ({ mkDerivation, aeson, base, containers, hashable, hxt
      , json-schema, tostring, unordered-containers
@@ -170690,8 +171211,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.3";
-       sha256 = "01vcil4zij8ap1bnkmmi8439mmnsbw3qc1gw994wdnar082wzh66";
+       version = "7.4";
+       sha256 = "0yylg2zdrcqzckhmlz9d5chac1jawbnrdp7fn49ia1nsl0i3jggc";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -171093,7 +171614,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "schematic_0_4_0_0" = callPackage
+  "schematic_0_4_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema
      , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens
      , mtl, profunctors, regex-tdfa, regex-tdfa-text, scientific
@@ -171102,8 +171623,8 @@ self: {
      }:
      mkDerivation {
        pname = "schematic";
-       version = "0.4.0.0";
-       sha256 = "1n0i7irbf4flnhybhvl5kqkcyz673nyv7bl8z14yxi152a7kjkqi";
+       version = "0.4.2.0";
+       sha256 = "0k63pnv8mip8kn623s5n7w24bd4spjmi1a9h280nf7wd1q8z72n4";
        libraryHaskellDepends = [
          aeson base bytestring containers hjsonschema mtl profunctors
          regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged
@@ -171306,6 +171827,8 @@ self: {
        pname = "scientific";
        version = "0.3.5.2";
        sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w";
+       revision = "1";
+       editedCabalFile = "1gnz52yrd9bnq4qvd4v9kd00clx0sfbh64phafdq5g2hbk9yrg0v";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq hashable integer-gmp
          integer-logarithms primitive text
@@ -173526,8 +174049,8 @@ self: {
        pname = "servant";
        version = "0.11";
        sha256 = "00vbhijdxb00n8ha068zdwvqlfqv1iradkkdchzzvnhg2jpzgcy5";
-       revision = "1";
-       editedCabalFile = "1az9id2dl7psc8lknf7y9cvzkivcjzw7g27yyp40flb6bfvmaqp3";
+       revision = "2";
+       editedCabalFile = "1b5zxz1cqf0n2y1jfvb1rsza95hdyhn9fc6fl73bxr5m9apv511z";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring case-insensitive
@@ -176283,8 +176806,8 @@ self: {
      }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.33";
-       sha256 = "1wn0bk867nbzcg6c6a8q5sa4ma60r3zc46ykpdla34k61nq5g3qy";
+       version = "0.0.35";
+       sha256 = "14hkdkhpg5gs1mhd96ldy7xb35rqrr0cqnnaw3hmv2cyk6np7fnz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177176,8 +177699,8 @@ self: {
     ({ mkDerivation, base, bytestring, hsI2C, time, transformers }:
      mkDerivation {
        pname = "si-clock";
-       version = "0.1.3";
-       sha256 = "0s2d1liaknk5qhh41pi3508m3dz9k0ljl5fc2v1vs6ckv4sd9fjr";
+       version = "0.1.3.1";
+       sha256 = "15fk63nynpk5wz9ikij18g5vnrslsrv97fn649dkssmsdwifjfj5";
        libraryHaskellDepends = [
          base bytestring hsI2C time transformers
        ];
@@ -178390,8 +178913,8 @@ self: {
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "singleton-nats";
-       version = "0.4.0.2";
-       sha256 = "1nrjdy7rkjla2cgyb2j50p7qi30divl6aa75m3yvf2whb38wgisw";
+       version = "0.4.0.3";
+       sha256 = "150pfyfgyvksx600c9c7pyw154dvjgfiykas3wxfzkm3l9mhg32v";
        libraryHaskellDepends = [ base singletons ];
        homepage = "https://github.com/AndrasKovacs/singleton-nats";
        description = "Unary natural numbers relying on the singletons infrastructure";
@@ -178546,8 +179069,8 @@ self: {
      }:
      mkDerivation {
        pname = "sitepipe";
-       version = "0.1.1";
-       sha256 = "1kymvi3pf67chjsvqxv29i4fbac2yyrjx5llc2r7qjfw3hblf5sj";
+       version = "0.2.0.0";
+       sha256 = "15cynic59qkfgb8d3ca6hr3dag0cs48af266xaiblpvim39rk1fb";
        libraryHaskellDepends = [
          aeson base bytestring containers directory exceptions filepath Glob
          lens lens-aeson megaparsec MissingH mtl mustache
@@ -178873,7 +179396,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "skylighting_0_4_2" = callPackage
+  "skylighting_0_4_3_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
      , blaze-html, bytestring, case-insensitive, containers, criterion
      , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random
@@ -178882,8 +179405,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.4.2";
-       sha256 = "0szhhmjz14wq1ica3gl6nj5fh85fwh55xyywlq8q3dq8isl1hcz3";
+       version = "0.4.3.1";
+       sha256 = "087f41qx28609i9ryc5njvjyyw1n3ypym63vmw2q4bhlr5lxkf30";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182370,8 +182893,8 @@ self: {
     ({ mkDerivation, base, cmdargs, containers, leancheck }:
      mkDerivation {
        pname = "speculate";
-       version = "0.2.9";
-       sha256 = "0xk8i5hskr59vrf8vkvwsvp4n048fd66k959q7nl0i5z3k0lx2m2";
+       version = "0.2.10";
+       sha256 = "1c2fpswmlrza9al6i94rjnd1k14g5f48g4zrqgyxrgl4sqkhbbs9";
        libraryHaskellDepends = [ base cmdargs containers leancheck ];
        testHaskellDepends = [ base leancheck ];
        benchmarkHaskellDepends = [ base leancheck ];
@@ -185895,15 +186418,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_10_0" = callPackage
+  "stratosphere_0_11_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable
      , hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.10.0";
-       sha256 = "195rr247bzrnnvjv7i13z88xbpajxk34n94ywqvfyf3457466iqh";
+       version = "0.11.0";
+       sha256 = "1l9wyyw8zvmb7z0qvs5qk0mxbjnlm1405sxiz7wzff6ibxvk9kn5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -189423,8 +189946,8 @@ self: {
     ({ mkDerivation, base, process, regex, regex-with-pcre }:
      mkDerivation {
        pname = "system-info";
-       version = "0.1.0.8";
-       sha256 = "0pv4f5yrzybm2r1zi02ranq1ag1akkpzzc8w3qjpwliv2ahy4516";
+       version = "0.1.0.9";
+       sha256 = "0f27y3bdqlyvbxdchsn7mz2rhsvk4bxqy0xldy6l30vsv2q9gdx4";
        libraryHaskellDepends = [ base process regex regex-with-pcre ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/ChaosGroup/system-info";
@@ -190844,6 +191367,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_0_12" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers
+     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
+     , unbounded-delays, unix
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "0.12";
+       sha256 = "0840ziawhj0lrzn927nx9lww6wxc5krvf0c3xygl577vvxh4adg1";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers deepseq mtl
+         optparse-applicative regex-tdfa stm tagged unbounded-delays unix
+       ];
+       homepage = "https://github.com/feuerbach/tasty";
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-ant-xml" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -190897,12 +191439,12 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
-  "tasty-dejafu_0_7_0_2" = callPackage
+  "tasty-dejafu_0_7_0_3" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "0.7.0.2";
-       sha256 = "1yj4sdprlz79sk14q5b8089sw1bn0z4nqpbdb2sr90smlxa57zpa";
+       version = "0.7.0.3";
+       sha256 = "0xvqlw5w5rwz1xxi277r9w7iad7prds5i1rrmy8wz3x3vh9kbnmm";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
@@ -191057,6 +191599,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.3.2";
        sha256 = "0n4pn89jz9i8d7mxsdp6ynwkg5gjyaipdy261parx64m3nxi4vcv";
+       revision = "1";
+       editedCabalFile = "05fl6jirj479lax2wqg6h5m82mkc475lhas7wmpx91kv1kfklx54";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck random tagged tasty
          tasty-quickcheck tasty-smallcheck
@@ -191321,6 +191865,8 @@ self: {
        pname = "tasty-stats";
        version = "0.2.0.3";
        sha256 = "1jyywffrs270rvf8k9zc82b7fqqv6x1czk6qlbi6sq9z1wgs5w1b";
+       revision = "1";
+       editedCabalFile = "1kvvz549gs7vm9w6gypr8pa1klsab335rzmdq7v638rvijgqfbn8";
        libraryHaskellDepends = [
          base containers directory process stm tagged tasty time
        ];
@@ -191363,6 +191909,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-travis" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "tasty-travis";
+       version = "0.1.2";
+       sha256 = "0ypk596sjlh6s2gyy1bgx414jhhfhaaqqqdl9647mjsd49a83g2s";
+       libraryHaskellDepends = [ base tasty ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "https://github.com/merijn/tasty-travis";
+       description = "Fancy Travis CI output for tasty tests";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tateti-tateti" = callPackage
     ({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }:
      mkDerivation {
@@ -193292,8 +193851,8 @@ self: {
      }:
      mkDerivation {
        pname = "texbuilder";
-       version = "0.1.1.1";
-       sha256 = "14fg4hxyfvv54n85495dbk6avccms92kw5jzgycylnk8aiw2nxa4";
+       version = "0.1.1.2";
+       sha256 = "069y2d2k87sfx4mkmd8219iiyh9s6x79kigxbdi9swfa4k9xa1gm";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -193331,6 +193890,31 @@ self: {
        license = "GPL";
      }) {};
 
+  "texmath_0_10" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, network-uri, pandoc-types, parsec, process, split, syb
+     , temporary, text, utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.10";
+       sha256 = "0i9haxii7kklz6qrfidb54iv5cl73p201zy24mwkf4bf56lff1pa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -195149,16 +195733,16 @@ self: {
 
   "thread-hierarchy" = callPackage
     ({ mkDerivation, base, containers, hspec, lifted-base
-     , monad-control, transformers-base
+     , monad-control, stm, transformers-base
      }:
      mkDerivation {
        pname = "thread-hierarchy";
-       version = "0.1.0.3";
-       sha256 = "1j5caivjcvrmfqgl13lhlx9dq81kka64w96ykb0bfb089kwi0j9f";
+       version = "0.2.0.0";
+       sha256 = "1y11q5ijb9hqvxgcf5jig6d24895nrrg06ig8sy7fk1s32rr0bqm";
        libraryHaskellDepends = [
-         base containers lifted-base monad-control transformers-base
+         base containers lifted-base monad-control stm transformers-base
        ];
-       testHaskellDepends = [ base containers hspec ];
+       testHaskellDepends = [ base containers hspec stm ];
        homepage = "https://github.com/nshimaza/thread-hierarchy#readme";
        description = "Simple Haskel thread management in hierarchical manner";
        license = stdenv.lib.licenses.mit;
@@ -202558,6 +203142,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "units-parser_0_1_1" = callPackage
+    ({ mkDerivation, base, containers, mtl, multimap, parsec, syb
+     , tasty, tasty-hunit, template-haskell
+     }:
+     mkDerivation {
+       pname = "units-parser";
+       version = "0.1.1";
+       sha256 = "0d39r1vcwqs61529gjz3329a41fp4pwx0x4j4kw4xl2lza3wr164";
+       libraryHaskellDepends = [ base containers mtl multimap parsec ];
+       testHaskellDepends = [
+         base containers mtl multimap parsec syb tasty tasty-hunit
+         template-haskell
+       ];
+       description = "A parser for units of measure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unittyped" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -202749,8 +203351,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.7.1";
-       sha256 = "1q7q1ynfm4m1zz2inyvvj7868p3yxjl7w512j5xiz4mzx3llb292";
+       version = "0.7.1.1";
+       sha256 = "08q3ldx0saahlxh2zkwmsq71lkwrvfrs19nzbgwwdvd31y4r0iq6";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions ghc-prim hashable
          microlens microlens-mtl mtl safe safe-exceptions stm text
@@ -210977,8 +211579,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.29";
-       sha256 = "147s2xg9y77gw81gnqgijnfzfx728ddv018n7zs2sl231asjqy3i";
+       version = "0.3.31";
+       sha256 = "1f5b4j788yr2m7f9if2fj41j236h5zjszzldcna0v6f93za7kzy2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -214493,6 +215095,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_24" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
+     , bytestring, conduit, containers, directory, filepath, hspec
+     , HUnit, libyaml, mockery, resourcet, scientific, semigroups
+     , template-haskell, temporary, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.24";
+       sha256 = "08cawq5q2bm23fi48m56x1h6qdf52wn9i9y770v6q2810wj2f7n1";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libyaml;};
+
   "yaml-combinators" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
      , scientific, tasty, tasty-hunit, text, transformers
@@ -217002,8 +217636,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.15.0";
-       sha256 = "1mkdpc4fg7qx8mslcmjwnws24hr5p7289v026qf0m6ivc4dkbkbi";
+       version = "0.17.1";
+       sha256 = "18937w0w1hk7ngyrl1p5gy4djgz8py9kcsndas82w82wwh36jnqg";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = false;
        isExecutable = true;
@@ -217081,23 +217715,23 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-core_0_17_0" = callPackage
+  "yi-core_0_17_1" = callPackage
     ({ mkDerivation, array, attoparsec, base, binary, bytestring
      , containers, criterion, data-default, deepseq, directory, dlist
-     , dynamic-state, filepath, hashable, ListLike, microlens-platform
-     , mtl, old-locale, oo-prototypes, parsec, pointedlist, process
-     , process-extras, quickcheck-text, split, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers-base, unix
-     , unix-compat, unordered-containers, xdg-basedir, yi-language
-     , yi-rope
+     , dynamic-state, exceptions, filepath, hashable, ListLike
+     , microlens-platform, mtl, old-locale, oo-prototypes, parsec
+     , pointedlist, process, process-extras, quickcheck-text, split
+     , tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers-base, unix, unix-compat, unordered-containers
+     , xdg-basedir, yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi-core";
-       version = "0.17.0";
-       sha256 = "018fcmviyy0xrzrvmcrdl4r4mk69ig7jgck5zgq58y0h7m4wxkmg";
+       version = "0.17.1";
+       sha256 = "1qv86znr7kjwnxv771xx1j7z63fqbnfasn2ndkbj5ldk3m5bil0p";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-default
-         directory dlist dynamic-state filepath hashable ListLike
+         directory dlist dynamic-state exceptions filepath hashable ListLike
          microlens-platform mtl old-locale oo-prototypes parsec pointedlist
          process process-extras split text time transformers-base unix
          unix-compat unordered-containers xdg-basedir yi-language yi-rope
@@ -217119,8 +217753,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-dynamic-configuration";
-       version = "0.17.0";
-       sha256 = "1slf3qrq61b171sg6izw212qajvmjwv786gndhql8r9kyi7na9ys";
+       version = "0.17.1";
+       sha256 = "1cnafzrgi7js9zayq223752v7jvl9rp526s7bd1nwwyjwl59y0h8";
        libraryHaskellDepends = [
          base data-default dyre microlens-platform mtl text
          transformers-base yi-core yi-rope
@@ -217150,8 +217784,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-pango";
-       version = "0.17.0";
-       sha256 = "141kp6f6f0xrql8jmghqj1h5vrbim28z7p1a9psa40xry1hhlhr7";
+       version = "0.17.1";
+       sha256 = "0jh9bmxhjr1wpilmghanihq6iwn4xn34ihqlfc2c080wm5s8kw4w";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath glib gtk microlens-platform mtl
@@ -217182,15 +217816,15 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-frontend-vty_0_17_0" = callPackage
+  "yi-frontend-vty_0_17_1" = callPackage
     ({ mkDerivation, base, containers, data-default, dlist
      , microlens-platform, pointedlist, stm, text, vty, yi-core
      , yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi-frontend-vty";
-       version = "0.17.0";
-       sha256 = "12yl4d3dkjkbz8n184lcs8z08mj8yc1ybaj52z7j58nialvq4ibh";
+       version = "0.17.1";
+       sha256 = "0i00m3z7zj6xqgh78wfrw2zqwcffsb31i2549m0b5g9qsicfp9h6";
        libraryHaskellDepends = [
          base containers data-default dlist microlens-platform pointedlist
          stm text vty yi-core yi-language yi-rope
@@ -217219,15 +217853,15 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-fuzzy-open_0_17_0" = callPackage
+  "yi-fuzzy-open_0_17_1" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, pointedlist, text, transformers-base, vector
      , yi-core, yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi-fuzzy-open";
-       version = "0.17.0";
-       sha256 = "1447w8gqwjnala08sysvy1bxhdna1hydh0bnjx2awz7hns5040ap";
+       version = "0.17.1";
+       sha256 = "1wd1w1d67hkp5rk3130cnmffgh40qb1vp9pnz6f36n0c8b2jqvjh";
        libraryHaskellDepends = [
          base binary containers data-default directory filepath mtl
          pointedlist text transformers-base vector yi-core yi-language
@@ -217268,14 +217902,14 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-ireader_0_17_0" = callPackage
+  "yi-ireader_0_17_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, data-default
      , microlens-platform, text, yi-core, yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi-ireader";
-       version = "0.17.0";
-       sha256 = "0cwfjajs25lbxhzn8zbpjavy1yjym3k4iliqal9iq3i51k9inacc";
+       version = "0.17.1";
+       sha256 = "12babkhlqr7w3mb7z8w8ccwrvmkz8583yi0p9s50rqkn778cij7y";
        libraryHaskellDepends = [
          base binary bytestring containers data-default microlens-platform
          text yi-core yi-language yi-rope
@@ -217302,14 +217936,14 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-keymap-cua_0_17_0" = callPackage
+  "yi-keymap-cua_0_17_1" = callPackage
     ({ mkDerivation, base, microlens-platform, text, yi-core
      , yi-keymap-emacs, yi-rope
      }:
      mkDerivation {
        pname = "yi-keymap-cua";
-       version = "0.17.0";
-       sha256 = "0v7gcd5arq33r2cf55ig307cfvapz3r1h9cz3ssvkw0fjzr1p1a3";
+       version = "0.17.1";
+       sha256 = "053w4b1p482wma64888vb3ikh7x0f58bl43vy7xs1lazlz22iwaj";
        libraryHaskellDepends = [
          base microlens-platform text yi-core yi-keymap-emacs yi-rope
        ];
@@ -217338,15 +217972,15 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-keymap-emacs_0_17_0" = callPackage
+  "yi-keymap-emacs_0_17_1" = callPackage
     ({ mkDerivation, base, containers, filepath, Hclip
      , microlens-platform, mtl, oo-prototypes, text, transformers-base
      , yi-core, yi-language, yi-misc-modes, yi-rope
      }:
      mkDerivation {
        pname = "yi-keymap-emacs";
-       version = "0.17.0";
-       sha256 = "1d90884kjpq13d7nrxjla9kx6gr09xh8lwzbpnf69jg6iiavjlfg";
+       version = "0.17.1";
+       sha256 = "1jx7vhp7v098p3rrs21b43fwcbra6fmg4clamgqbbvbqgiy4bsrw";
        libraryHaskellDepends = [
          base containers filepath Hclip microlens-platform mtl oo-prototypes
          text transformers-base yi-core yi-language yi-misc-modes yi-rope
@@ -217386,7 +218020,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-keymap-vim_0_16_0" = callPackage
+  "yi-keymap-vim_0_17_1" = callPackage
     ({ mkDerivation, attoparsec, base, binary, containers, data-default
      , directory, filepath, Hclip, microlens-platform, mtl
      , oo-prototypes, pointedlist, QuickCheck, safe, tasty, tasty-hunit
@@ -217395,9 +218029,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-vim";
-       version = "0.16.0";
-       sha256 = "1fvl4frjikkdp561zai6z35r8r7f4fq2izlcxl1k1rvsvxz3cbi2";
-       enableSeparateDataOutput = true;
+       version = "0.17.1";
+       sha256 = "1zvd0y6ak56cqxa60x4kgil2lp5lbidnkmp6kh7dq3i71n0nv48w";
        libraryHaskellDepends = [
          attoparsec base binary containers data-default directory filepath
          Hclip microlens-platform mtl oo-prototypes pointedlist safe text
@@ -217443,7 +218076,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-language_0_17_0" = callPackage
+  "yi-language_0_17_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
      , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
@@ -217452,8 +218085,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-language";
-       version = "0.17.0";
-       sha256 = "046aavm0pf5s8bx6z0v8fvbizzr3s9s8kq79sj3gvis26im9kzpy";
+       version = "0.17.1";
+       sha256 = "17mnjfhxr6vhpfx7l4zg606f2vffjr39ga4j5qmnp7cf4y5n5vja";
        libraryHaskellDepends = [
          array base binary containers data-default hashable
          microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
@@ -217491,14 +218124,14 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-misc-modes_0_17_0" = callPackage
+  "yi-misc-modes_0_17_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, text, yi-core, yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi-misc-modes";
-       version = "0.17.0";
-       sha256 = "0ki6dc1frzhgn7dfbsrpbf75a5i32iz9a8cvy1c33xmdh9s8k4fw";
+       version = "0.17.1";
+       sha256 = "0yyv8p65vhpcjj97pzax0b8bbqhh3lzy3by4rzf0f11p862wzag0";
        libraryHaskellDepends = [
          array base binary data-default filepath microlens-platform text
          yi-core yi-language yi-rope
@@ -217528,14 +218161,14 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-mode-haskell_0_17_0" = callPackage
+  "yi-mode-haskell_0_17_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, text, yi-core, yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi-mode-haskell";
-       version = "0.17.0";
-       sha256 = "17cfbww6lpg29dz51pbzlsx95azhxlgv0lqcpxpxk82w9s4c2dji";
+       version = "0.17.1";
+       sha256 = "1fl9kmv264c0cmpn6c77ylyngyjh9ilcvpcrsn7j75g2xacgdpyx";
        libraryHaskellDepends = [
          array base binary data-default filepath microlens-platform text
          yi-core yi-language yi-rope
@@ -217566,15 +218199,15 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-mode-javascript_0_17_0" = callPackage
+  "yi-mode-javascript_0_17_1" = callPackage
     ({ 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.17.0";
-       sha256 = "040mc9mfm46alfl21p6p4a8n9p8hr12ywn6sfgq32zrhpa1zn9yb";
+       version = "0.17.1";
+       sha256 = "073yywxsf3j4vcc9rg0hw7jm6gmwvc7krvm0g9q9pv2y49n5aj14";
        libraryHaskellDepends = [
          array base binary data-default dlist filepath microlens-platform
          mtl text yi-core yi-language yi-rope
@@ -217661,15 +218294,15 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-snippet_0_17_0" = callPackage
+  "yi-snippet_0_17_1" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, free
      , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector
      , yi-core, yi-rope
      }:
      mkDerivation {
        pname = "yi-snippet";
-       version = "0.17.0";
-       sha256 = "10680a4zc5r9mnvhajgfrvzxpf8naclx4sygvbi69c5aann4q4a1";
+       version = "0.17.1";
+       sha256 = "1prczicjzmqnpkq6sda878f056g4ld1g6wmfpqzly2qa5rs4zg6b";
        libraryHaskellDepends = [
          base binary containers data-default free microlens-platform mtl
          text vector yi-core yi-rope
-- 
GitLab


From a6e12e5cf53d4d2a2d1e37a27954c9f472762ad0 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Nov 2017 20:30:27 +0100
Subject: [PATCH 659/877] elixir: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
index e85d2500223..469502a3f85 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.5.1";
-  sha256 = "0q0zr3v9cyb7p9aab8v038hnjm84nf9b60kikffp6w9rfqqqf767";
+  version = "1.5.2";
+  sha256 = "0ng7z2gz1c8lkn07fric18b3awcw886s9xb864kmnn2iah5gc65j";
   minimumOTPVersion = "18";
 }
-- 
GitLab


From af3a11b8f60644730368f432a279226a39d947e4 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 4 Nov 2017 21:21:28 +0100
Subject: [PATCH 660/877] pgpdump: Add support for compressed data packets

This will add support for compressed data packets (Tag 8) [0] and enable
it by default.

[0]: https://tools.ietf.org/html/rfc4880#section-5.6
---
 pkgs/tools/security/pgpdump/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix
index 93b53c3ad4a..09b5b5f58ca 100644
--- a/pkgs/tools/security/pgpdump/default.nix
+++ b/pkgs/tools/security/pgpdump/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub
+, supportCompressedPackets ? true, zlib, bzip2
+}:
 
 stdenv.mkDerivation rec {
   name = "pgpdump-${version}";
@@ -11,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "1ip7q5sgh3nwdqbrzpp6sllkls5kma98kns53yspw1830xi1n8xc";
   };
 
+  buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ];
+
   meta = with stdenv.lib; {
     description = "A PGP packet visualizer";
     longDescription = ''
-- 
GitLab


From 0094ca20cc224085d9479c614bfed52172c93b4b Mon Sep 17 00:00:00 2001
From: Keshav Kini <keshav.kini@gmail.com>
Date: Sat, 4 Nov 2017 10:45:34 -0700
Subject: [PATCH 661/877] acl2: 6.5 -> 7.4, refactor

The `make regression` line was failing because the expression was
downloading a core-system-only, no-libraries source tarball.  I
switched to using fetchFromGitHub, which downloads the full source
code -- the core system as well as the "community books",
i.e. libraries -- but the libraries unfortunately do not build yet
because they have more dependencies than the core system, and they
also run into some impurity problems during the build process.

This commit changes the ACL2 package so that at least the user will
obtain the latest version of the core system, even though they won't
get the community books.  In a later commit I hope to fix this; it
will require either changes to ACL2 itself, or a patch to be applied
to ACL2 in nixpkgs.

ACL2 7.4 has no trouble building on the current version of SBCL in
nixpkgs, so I let it do so instead of using the ancient SBCL version
1.2.0 from 2014.

I also added myself as a maintainer to this package, since I'm an
active contributor to the ACL2 project and am interested in seeing it
working on Nix.
---
 lib/maintainers.nix                           |  1 +
 .../development/interpreters/acl2/default.nix | 63 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 451cb4867a5..e2d3c73301b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -328,6 +328,7 @@
   KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>";
   kierdavis = "Kier Davis <kierdavis@gmail.com>";
   kiloreux = "Kiloreux Emperex <kiloreux@gmail.com>";
+  kini = "Keshav Kini <keshav.kini@gmail.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   knedlsepp = "Josef Kemetmüller <josef.kemetmueller@gmail.com>";
   konimex = "Muhammad Herdiansyah <herdiansyah@netc.eu>";
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index f1e2315d794..16734c184eb 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -1,16 +1,26 @@
-{ stdenv, fetchurl, sbcl }:
+{ stdenv, fetchFromGitHub,
+  # perl, which, nettools,
+  sbcl }:
 
-stdenv.mkDerivation rec {
+let hashes = {
+  "7.4" = "04jb789nks9llwysxz1zw9pq1dh0j39b5fcmivcc4bq9v9cga2l1";
+};
+in stdenv.mkDerivation rec {
   name = "acl2-${version}";
-  version = "v6-5";
+  version = "7.4";
 
-  src = fetchurl {
-    url = "http://www.cs.utexas.edu/users/moore/acl2/${version}/distrib/acl2.tar.gz";
-    sha256 = "19kfclgpdyms016s06pjf3icj3mx9jlcj8vfgpbx2ac4ls0ir36g";
-    name = "acl2-${version}.tar.gz";
+  src = fetchFromGitHub {
+    owner = "acl2-devel";
+    repo = "acl2-devel";
+    rev = "${version}";
+    sha256 = hashes."${version}";
   };
 
-  buildInputs = [ sbcl ];
+  buildInputs = [ sbcl
+    # which perl nettools
+  ];
+
+  enableParallelBuilding = true;
 
   phases = "unpackPhase installPhase";
 
@@ -18,18 +28,45 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share/${installSuffix}
+    mkdir -p $out/bin
     cp -R . $out/share/${installSuffix}
     cd $out/share/${installSuffix}
-    make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000'
-    make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000' regression
-    make LISP=${sbcl}/bin/sbcl TAGS
-    mkdir -p $out/bin
+
+    # make ACL2 image
+    make LISP=${sbcl}/bin/sbcl
+
+    # The community books don't build properly under Nix yet.
+    rm -rf books
+    #make ACL2=$out/share/saved_acl2 USE_QUICKLISP=1 regression-everything
+
     cp saved_acl2 $out/bin/acl2
   '';
 
   meta = {
     description = "An interpreter and a prover for a Lisp dialect";
-    maintainers = with stdenv.lib.maintainers; [ raskin ];
+    longDescription = ''
+      ACL2 is a logic and programming language in which you can model
+      computer systems, together with a tool to help you prove
+      properties of those models. "ACL2" denotes "A Computational
+      Logic for Applicative Common Lisp".
+
+      ACL2 is part of the Boyer-Moore family of provers, for which its
+      authors have received the 2005 ACM Software System Award.
+
+      NOTE: In nixpkgs, the community books that usually ship with
+      ACL2 have been removed because it is not currently possible to
+      build them with Nix.
+    '';
+    homepage = http://www.cs.utexas.edu/users/moore/acl2/;
+    downloadPage = https://github.com/acl2-devel/acl2-devel/releases;
+    # There are a bunch of licenses in the community books, but since
+    # they currently get deleted during the build, we don't mention
+    # their licenses here.  ACL2 proper is released under a BSD
+    # 3-clause license.
+    #license = with stdenv.lib.licenses;
+    #[ free bsd3 mit gpl2 llgpl21 cc0 publicDomain ];
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ kini raskin ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92974dd3d5d..bb573341d73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6362,9 +6362,7 @@ with pkgs;
 
   ### DEVELOPMENT / INTERPRETERS
 
-  acl2 = callPackage ../development/interpreters/acl2 {
-    sbcl = sbcl_1_2_0;
-  };
+  acl2 = callPackage ../development/interpreters/acl2 { };
 
   angelscript = callPackage ../development/interpreters/angelscript {};
 
-- 
GitLab


From 21db63d66956aef37f372809877f17c747df66ca Mon Sep 17 00:00:00 2001
From: Keshav Kini <keshav.kini@gmail.com>
Date: Sat, 4 Nov 2017 10:45:51 -0700
Subject: [PATCH 662/877] sbcl: remove old versions 1.2.0, 1.3.12

SBCL 1.2.0 was being retained for the acl2 package, which no longer
needs it.  SBCL 1.3.12 was being retained for the maxima package,
which appears to no longer need it.
---
 pkgs/development/compilers/sbcl/1.2.0.nix  |  84 -----------------
 pkgs/development/compilers/sbcl/1.3.12.nix | 104 ---------------------
 pkgs/top-level/all-packages.nix            |   6 --
 3 files changed, 194 deletions(-)
 delete mode 100644 pkgs/development/compilers/sbcl/1.2.0.nix
 delete mode 100644 pkgs/development/compilers/sbcl/1.3.12.nix

diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix
deleted file mode 100644
index 975cb7db1bb..00000000000
--- a/pkgs/development/compilers/sbcl/1.2.0.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{ stdenv, fetchurl, sbclBootstrap, clisp}:
-
-stdenv.mkDerivation rec {
-  name    = "sbcl-${version}";
-  version = "1.2.0";
-
-  src = fetchurl {
-    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
-  };
-
-  buildInputs = [ ]
-    ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap)
-    ++ (stdenv.lib.optional stdenv.isLinux clisp)
-    ;
-
-  patchPhase = ''
-    echo '"${version}.nixos"' > version.lisp-expr
-    echo "
-    (lambda (features)
-      (flet ((enable (x)
-               (pushnew x features))
-             (disable (x)
-               (setf features (remove x features))))
-        (enable :sb-thread))) " > customize-target-features.lisp
-
-    pwd
-
-    # SBCL checks whether files are up-to-date in many places..
-    # Unfortunately, same timestamp is not good enough
-    sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
-    sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
-    sed -i src/cold/slam.lisp -e \
-      '/file-write-date input/a)'
-    sed -i src/cold/slam.lisp -e \
-      '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
-    sed -i src/code/target-load.lisp -e \
-      '/date defaulted-fasl/a)'
-    sed -i src/code/target-load.lisp -e \
-      '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
-
-    # Fix the tests
-    sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp
-
-    sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
-    sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
-
-    # Use whatever `cc` the stdenv provides
-    substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
-
-    substituteInPlace src/runtime/Config.x86-64-darwin \
-      --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5
-  '';
-
-  preBuild = ''
-    export INSTALL_ROOT=$out
-    mkdir -p test-home
-    export HOME=$PWD/test-home
-  '';
-
-  buildPhase = if stdenv.isLinux
-    then ''
-      sh make.sh clisp --prefix=$out
-    ''
-    else ''
-      sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit'
-    '';
-
-  installPhase = ''
-    INSTALL_ROOT=$out sh install.sh
-  '';
-
-  meta = {
-    description = "Lisp compiler";
-    homepage = http://www.sbcl.org;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.all;
-    inherit version;
-  };
-}
diff --git a/pkgs/development/compilers/sbcl/1.3.12.nix b/pkgs/development/compilers/sbcl/1.3.12.nix
deleted file mode 100644
index 8fa4741a4a1..00000000000
--- a/pkgs/development/compilers/sbcl/1.3.12.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{ stdenv, fetchurl, writeText, sbclBootstrap
-, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
-, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
-  # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
-  # Note that the created binaries still need `patchelf --set-interpreter ...`
-  # to get rid of ${glibc} dependency.
-, purgeNixReferences ? false
-}:
-
-stdenv.mkDerivation rec {
-  name    = "sbcl-${version}";
-  version = "1.3.12";
-
-  src = fetchurl {
-    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "1hjr2xqazy4j0m58y4na6fz8ii3xflqairxy7vpd7ajbs00yqfc0";
-  };
-
-  patchPhase = ''
-    echo '"${version}.nixos"' > version.lisp-expr
-    echo "
-    (lambda (features)
-      (flet ((enable (x)
-               (pushnew x features))
-             (disable (x)
-               (setf features (remove x features))))
-    ''
-    + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)")
-    + stdenv.lib.optionalString stdenv.isArm "(enable :arm)"
-    + ''
-      )) " > customize-target-features.lisp
-
-    pwd
-
-    # SBCL checks whether files are up-to-date in many places..
-    # Unfortunately, same timestamp is not good enough
-    sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
-    sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
-    sed -i src/cold/slam.lisp -e \
-      '/file-write-date input/a)'
-    sed -i src/cold/slam.lisp -e \
-      '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
-    sed -i src/code/target-load.lisp -e \
-      '/date defaulted-fasl/a)'
-    sed -i src/code/target-load.lisp -e \
-      '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
-
-    # Fix the tests
-    sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp
-
-    sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
-    sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
-
-    # Use whatever `cc` the stdenv provides
-    substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
-
-    substituteInPlace src/runtime/Config.x86-64-darwin \
-      --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5
-  ''
-  + (if purgeNixReferences
-    then
-      # This is the default location to look for the core; by default in $out/lib/sbcl
-      ''
-        sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \
-          -i src/runtime/runtime.c
-      ''
-    else
-      # Fix software version retrieval
-      ''
-        sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp
-      ''
-    );
-
-
-  preBuild = ''
-    export INSTALL_ROOT=$out
-    mkdir -p test-home
-    export HOME=$PWD/test-home
-  '';
-
-  buildPhase = ''
-    sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}"
-  '';
-
-  installPhase = ''
-    INSTALL_ROOT=$out sh install.sh
-  '';
-
-  # Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`.
-  setupHook = writeText "setupHook.sh" ''
-    envHooks+=(_setSbclHome)
-    _setSbclHome() {
-      export SBCL_HOME='@out@/lib/sbcl/'
-    }
-  '';
-
-  meta = sbclBootstrap.meta // {
-    inherit version;
-    updateWalker = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb573341d73..b47d817d372 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6234,12 +6234,6 @@ with pkgs;
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
   sbcl = callPackage ../development/compilers/sbcl {};
-  # For Maxima
-  sbcl_1_3_12 = callPackage ../development/compilers/sbcl/1.3.12.nix { };
-  # For ACL2
-  sbcl_1_2_0 = callPackage ../development/compilers/sbcl/1.2.0.nix {
-    clisp = clisp;
-  };
 
   scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { };
   scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
-- 
GitLab


From d71833ee36c707717821b7f833587817168b4684 Mon Sep 17 00:00:00 2001
From: knupfer <fknupfer@gmail.com>
Date: Sat, 4 Nov 2017 23:01:20 +0100
Subject: [PATCH 663/877] fetchipfs: init

Fixes #18296
---
 pkgs/applications/misc/hello/default.nix |  9 +--
 pkgs/build-support/fetchipfs/builder.sh  | 87 ++++++++++++++++++++++++
 pkgs/build-support/fetchipfs/default.nix | 52 ++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 ++
 4 files changed, 148 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/build-support/fetchipfs/builder.sh
 create mode 100644 pkgs/build-support/fetchipfs/default.nix

diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index 8a31c591b29..6b090e84c3f 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchipfs }:
 
 stdenv.mkDerivation rec {
   name = "hello-2.10";
 
-  src = fetchurl {
-    url = "mirror://gnu/hello/${name}.tar.gz";
-    sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
+  src = fetchipfs {
+    url    = "https://ftp.gnu.org/gnu/hello/hello-2.10.tar.gz";
+    ipfs   = "QmWyj65ak3wd8kG2EvPCXKd6Tij15m4SwJz6g2yG2rQ7w8";
+    sha256 = "1im1gglfm4k10bh4mdaqzmx3lm3kivnsmxrvl6vyvmfqqzljq75l";
   };
 
   doCheck = true;
diff --git a/pkgs/build-support/fetchipfs/builder.sh b/pkgs/build-support/fetchipfs/builder.sh
new file mode 100644
index 00000000000..7a6a517566f
--- /dev/null
+++ b/pkgs/build-support/fetchipfs/builder.sh
@@ -0,0 +1,87 @@
+source $stdenv/setup
+
+# Curl flags to handle redirects, not use EPSV, handle cookies for
+# servers to need them during redirects, and work on SSL without a
+# certificate (this isn't a security problem because we check the
+# cryptographic hash of the output anyway).
+
+set -o noglob
+
+curl="curl            \
+ --location           \
+ --max-redirs 20      \
+ --retry 2            \
+ --disable-epsv       \
+ --cookie-jar cookies \
+ --insecure           \
+ --speed-time 5       \
+ -#                   \
+ --fail               \
+ $curlOpts            \
+ $NIX_CURL_FLAGS"
+
+finish() {
+    runHook postFetch
+    set +o noglob
+    exit 0
+}
+
+ipfs_add() {
+    if curl --retry 0 --head --silent "localhost:5001" > /dev/null; then
+        echo "=IPFS= add $ipfs"
+        tar --owner=root --group=root -cWf "source.tar" $(echo *)
+        res=$(curl -# -F "file=@source.tar" "localhost:5001/api/v0/tar/add" | sed 's/.*"Hash":"\(.*\)".*/\1/')
+        if [ $ipfs != $res ]; then
+            echo "\`ipfs tar add' results in $res when $ipfs is expected"
+            exit 1
+        fi
+        rm "source.tar"
+    fi
+}
+
+echo
+
+mkdir download
+cd download
+
+if curl --retry 0 --head --silent "localhost:5001" > /dev/null; then
+    curlexit=18;
+    echo "=IPFS= get $ipfs"
+    # if we get error code 18, resume partial download
+    while [ $curlexit -eq 18 ]; do
+        # keep this inside an if statement, since on failure it doesn't abort the script
+        if $curl -C - "http://localhost:5001/api/v0/tar/cat?arg=$ipfs" --output "$ipfs.tar"; then
+            unpackFile "$ipfs.tar"
+            rm "$ipfs.tar"
+            set +o noglob
+            mv $(echo *) "$out"
+            finish
+        else
+            curlexit=$?;
+        fi
+    done
+fi
+
+if test -n "$url"; then
+    curlexit=18;
+    echo "Downloading $url"
+    while [ $curlexit -eq 18 ]; do
+        # keep this inside an if statement, since on failure it doesn't abort the script
+        if $curl "$url" -O; then
+            set +o noglob
+            tmpfile=$(echo *)
+            unpackFile $tmpfile
+            rm $tmpfile
+            ipfs_add
+            mv $(echo *) "$out"
+            finish
+        else
+            curlexit=$?;
+        fi
+    done
+fi
+
+echo "error: cannot download $ipfs from ipfs or the given url"
+echo
+set +o noglob
+exit 1
diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix
new file mode 100644
index 00000000000..196b3bebc91
--- /dev/null
+++ b/pkgs/build-support/fetchipfs/default.nix
@@ -0,0 +1,52 @@
+{ stdenv
+, curl
+}:
+
+{ ipfs
+, url            ? ""
+, curlOpts       ? ""
+, outputHash     ? ""
+, outputHashAlgo ? ""
+, md5            ? ""
+, sha1           ? ""
+, sha256         ? ""
+, sha512         ? ""
+, meta           ? {}
+, port           ? "8080"
+, postFetch      ? ""
+}:
+
+assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0;
+
+let
+
+  hasHash = (outputHash != "" && outputHashAlgo != "")
+    || md5 != "" || sha1 != "" || sha256 != "" || sha512 != "";
+
+in
+
+if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation {
+  name = ipfs;
+  builder = ./builder.sh;
+  buildInputs = [ curl ];
+
+  # New-style output content requirements.
+  outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
+      if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
+  outputHash = if outputHash != "" then outputHash else
+      if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
+
+  outputHashMode = "recursive";
+
+  inherit curlOpts
+          postFetch
+          ipfs
+          url
+          port;
+
+  # Doing the download on a remote machine just duplicates network
+  # traffic, so don't do that.
+  preferLocalBuild = true;
+
+  inherit meta;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92974dd3d5d..bfc54b5fa52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -177,6 +177,10 @@ with pkgs;
 
   fetchRepoProject = callPackage ../build-support/fetchrepoproject { };
 
+  fetchipfs = import ../build-support/fetchipfs {
+    inherit curl stdenv;
+  };
+
   # fetchurlBoot is used for curl and its dependencies in order to
   # prevent a cyclic dependency (curl depends on curl.tar.bz2,
   # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl).  It
-- 
GitLab


From bfe218e3cb3a66d25a95e37711e1e7419670cf23 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sat, 4 Nov 2017 18:03:04 -0400
Subject: [PATCH 664/877] adapta-gtk-theme: 3.91.2.147 -> 3.92.1.72

---
 pkgs/misc/themes/adapta/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index bfbae3396c8..9a4ec9f49f6 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.91.2.147";
+  version = "3.92.1.72";
 
   src = fetchFromGitHub {
-    owner = "tista500";
-    repo = "Adapta";
+    owner = "adapta-project";
+    repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "1sv4s8rcc40v4lanapdqanlqf1l60rbc5wd7h73l5cigbqxxgda9";
+    sha256 = "19kav8m6aj4h7qg0z92k09lppzdgy6h9lxxv3qqqrl3hmg7bn0sx";
   };
 
   preferLocalBuild = true;
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An adaptive Gtk+ theme based on Material Design";
-    homepage = https://github.com/tista500/Adapta;
+    homepage = https://github.com/adapta-project/adapta-gtk-theme;
     license = with licenses; [ gpl2 cc-by-sa-30 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];
-- 
GitLab


From 0cabd5fa6782aa26167ce334a9b02338f8a7665f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 4 Nov 2017 19:13:51 +0000
Subject: [PATCH 665/877] ocamlPackages.ocaml-migrate-parsetree: 1.0.5 -> 1.0.7

---
 .../ocaml-modules/ocaml-migrate-parsetree/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index 108a2c30f2d..b88000eeb32 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
@@ -6,13 +6,13 @@ else
 
 stdenv.mkDerivation rec {
    name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}";
-   version = "1.0.5";
+   version = "1.0.7";
 
    src = fetchFromGitHub {
      owner = "let-def";
      repo = "ocaml-migrate-parsetree";
      rev = "v${version}";
-     sha256 = "1wj66nb16zijacpfrcm7yi0hlg315v71nxri3ia7r0sa3mlzxl34";
+     sha256 = "0v1h943xv5bd8qy5mr8pvyjbgamhs59nkgr94j3vznabrcfqzkh7";
    };
 
    buildInputs = [ ocaml findlib ocamlbuild jbuilder ];
-- 
GitLab


From e64dc2543458b52abcd913bad87851f5d7db435d Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 4 Nov 2017 19:06:37 +0100
Subject: [PATCH 666/877] Revert "services.xserver: assert that either desktop-
 or window manager is not "none""

This reverts commit 93c54acf97077567e8d6135a36f191e872b26692.
This reopens #30517 @nbp @Ma27

Breaking people's config for this is hardly reasonable as is. If it
absolutely cannot be avoided, at the very least, we need to provide
clear instructions on what people need to upgrade in their config. I
actually had to bisect to the commit, to even find out what property I
should change or define, as the error message was useless. It didn't
even mention a property name.

Discussion on the PR seems to be ongoing, so I'm reverting this, so we
don't break people's systems on unstable.
---
 nixos/doc/manual/release-notes/rl-1803.xml           |  8 --------
 .../services/x11/desktop-managers/default.nix        |  4 ++--
 nixos/modules/services/x11/xserver.nix               | 12 ------------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index fe776c3df22..17b385242f6 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -90,14 +90,6 @@ following incompatible changes:</para>
       That means that old configuration is not overwritten by default when update to the znc options are made.
     </para>
   </listitem>
-  <listitem>
-    <para>
-      The option <option>services.xserver.desktopManager.default</option> is now <literal>none</literal> by default.
-      An assertion failure is thrown if WM's and DM's default are <literal>none</literal>.
-      To explicitly run a plain X session without and DM or WM, the newly introduced option <option>services.xserver.plainX</option>
-      must be set to true.
-    </para>
-  </listitem>
 </itemizedlist>
 
 </section>
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index b393167ae2c..13f339e3fbf 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -87,8 +87,8 @@ in
 
       default = mkOption {
         type = types.str;
-        default = "none";
-        example = "plasma5";
+        default = "";
+        example = "none";
         description = "Default desktop manager loaded if none have been chosen.";
         apply = defaultDM:
           if defaultDM == "" && cfg.session.list != [] then
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 58dc75bcb4e..d4fe475690c 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -161,15 +161,6 @@ in
         '';
       };
 
-      plainX = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether the X11 session can be plain (without DM/WM) and
-          the Xsession script will be used as fallback or not.
-        '';
-      };
-
       autorun = mkOption {
         type = types.bool;
         default = true;
@@ -561,9 +552,6 @@ in
                 + "${toString (length primaryHeads)} heads set to primary: "
                 + concatMapStringsSep ", " (x: x.output) primaryHeads;
       })
-      { assertion = cfg.desktopManager.default == "none" && cfg.windowManager.default == "none" -> cfg.plainX;
-        message = "Either the desktop manager or the window manager shouldn't be `none`! To explicitly allow this, you can also set `services.xserver.plainX` to `true`.";
-      }
     ];
 
     environment.etc =
-- 
GitLab


From 07e2460afd4b2de598cebd4c7466e63e0a28d872 Mon Sep 17 00:00:00 2001
From: Michal Rus <m@michalrus.com>
Date: Fri, 1 Sep 2017 23:25:31 +0200
Subject: [PATCH 667/877] hubstaff: init at 1.2.14

---
 pkgs/applications/misc/hubstaff/default.nix | 64 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/applications/misc/hubstaff/default.nix

diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix
new file mode 100644
index 00000000000..91cf494d257
--- /dev/null
+++ b/pkgs/applications/misc/hubstaff/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE, libXext
+, freetype, libXrender, fontconfig, libXft, libXinerama, libnotify, glib
+, gtk3, libappindicator-gtk3, curl }:
+
+let
+
+  version = "1.2.14-36df5e3";
+
+  rpath = stdenv.lib.makeLibraryPath
+    [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
+      libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3
+      curl ];
+
+in
+
+stdenv.mkDerivation {
+  name = "hubstaff-${version}";
+
+  src = fetchurl {
+    url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh";
+    sha256 = "0yzhxk9zppj94llnf8naa6ca61f7c8jaj6b1m25zffnnz37m1sdb";
+  };
+
+  nativeBuildInputs = [ unzip makeWrapper ];
+
+  unpackCmd = ''
+    # MojoSetups have a ZIP file at the end. ZIP’s magic string is
+    # most often PK\x03\x04. This *should* work for future updates,
+    # but feel free to come up with something more reasonable.
+    dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text $'PK\x03\x04' $curSrc | cut -d: -f1)
+    dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null
+    unzip -q data.zip "data/*"
+    rm data.zip
+  '';
+
+  dontBuild = true;
+
+  installPhase = ''
+    # TODO: handle 32-bit arch?
+    rm -r x86
+
+    opt=$out/opt/hubstaff
+    mkdir -p $out/bin $opt
+    cp -r . $opt/
+
+    prog=$opt/x86_64/HubstaffClient.bin.x86_64
+
+    patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $prog
+    wrapProgram $prog --prefix LD_LIBRARY_PATH : ${rpath}
+
+    ln -s $prog $out/bin/HubstaffClient
+
+    # Why is this needed? SEGV otherwise.
+    ln -s $opt/data/resources $opt/x86_64/resources
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Time tracking software";
+    homepage = https://hubstaff.com/;
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    maintainers = [ maintainers.michalrus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f039113e3bd..6aaba4e165e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14615,6 +14615,8 @@ with pkgs;
 
   ht = callPackage ../applications/editors/ht { };
 
+  hubstaff = callPackage ../applications/misc/hubstaff { };
+
   hue-cli = callPackage ../tools/networking/hue-cli { };
 
   hugin = callPackage ../applications/graphics/hugin { };
-- 
GitLab


From a4085e28b17fcac19c7c44b1b72fd47becc93989 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 1 Nov 2017 12:26:04 +0000
Subject: [PATCH 668/877] subsurface: 4.6.0 -> 4.7.2

---
 pkgs/applications/misc/subsurface/default.nix | 109 +++++++++---------
 1 file changed, 55 insertions(+), 54 deletions(-)

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 950f8da7860..051b67bc972 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -1,71 +1,65 @@
-{
-  stdenv,
-  cmake, doxygen, pkgconfig, autoreconfHook,
-  curl,
-  fetchgit,
-  grantlee,
-  libgit2,
-  libusb,
-  libssh2,
-  libxml2,
-  libxslt,
-  libzip,
-  qtbase, qtconnectivity, qtquickcontrols, qtscript, qtsvg, qttools, qtwebkit,
-  sqlite
+{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake
+, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib
+, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit
 }:
 
 let
-  version = "4.6.0";
+  version = "4.7.2";
 
-  libmarble = stdenv.mkDerivation rec {
-    name = "libmarble-ssrf-${version}";
+  libdc = stdenv.mkDerivation rec {
+    name = "libdivecomputer-ssrf-${version}";
 
-    src = fetchgit {
-      url    = "git://git.subsurface-divelog.org/marble";
-      rev    = "refs/tags/v${version}";
-      sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd";
+    src = fetchurl {
+      url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
+      sha256 = "04wadhhva1bfnwk0kl359kcv0f83mgym2fzs441spw5llcl7k52r";
     };
 
-    buildInputs = [ qtbase qtquickcontrols qtscript qtwebkit ];
-    nativeBuildInputs = [ doxygen pkgconfig cmake ];
+    nativeBuildInputs = [ autoreconfHook ];
+
+    buildInputs = [ zlib ];
 
     enableParallelBuilding = true;
 
-    cmakeFlags = [
-      "-DQTONLY=TRUE"
-      "-DQT5BUILD=ON"
-      "-DBUILD_MARBLE_TESTS=NO"
-      "-DWITH_DESIGNER_PLUGIN=NO"
-      "-DBUILD_MARBLE_APPS=NO"
-    ];
-
     meta = with stdenv.lib; {
-      description = "Qt library for a slippy map with patches from the Subsurface project";
-      homepage = http://subsurface-divelog.org;
-      license = licenses.lgpl21;
+      homepage = http://www.libdivecomputer.org;
+      description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
       maintainers = with maintainers; [ mguentner ];
+      license = licenses.lgpl21;
       platforms = platforms.all;
     };
   };
 
-  libdc = stdenv.mkDerivation rec {
-    name = "libdivecomputer-ssrf-${version}";
+  googlemaps = stdenv.mkDerivation rec {
+    name = "googlemaps-${version}";
+
+    version = "2017-09-17";
 
-    src = fetchgit {
-      url    = "git://subsurface-divelog.org/libdc";
-      rev    = "refs/tags/v${version}";
-      sha256 = "0s82c8bvqph9c9chwzd76iwrw968w7lgjm3pj4hmad1jim67bs6n";
+    src = fetchFromGitHub {
+      owner = "vladest";
+      repo = "googlemaps";
+      rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35";
+      sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84";
     };
 
-    nativeBuildInputs = [ autoreconfHook ];
+    nativeBuildInputs = [ qmake ];
+
+    buildInputs = [ qtbase qtlocation ];
+
+    pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins";
+
+    installPhase = ''
+      mkdir $out $(dirname ${pluginsSubdir})
+      mv plugins ${pluginsSubdir}
+      mv lib $out/
+    '';
 
     enableParallelBuilding = true;
 
     meta = with stdenv.lib; {
-      homepage = http://www.libdivecomputer.org;
-      description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
-      maintainers = with maintainers; [ mguentner ];
-      license = licenses.lgpl21;
+      inherit (src.meta) homepage;
+      description = "QtLocation plugin for Google maps tile API";
+      maintainers = with maintainers; [ orivej ];
+      license = licenses.mit;
       platforms = platforms.all;
     };
   };
@@ -73,28 +67,35 @@ let
 in stdenv.mkDerivation rec {
   name = "subsurface-${version}";
 
-  src = fetchgit {
-    url    = "git://git.subsurface-divelog.org/subsurface";
-    rev    = "refs/tags/v${version}";
-    sha256 = "1rk5n52p6cnyjrgi7ybhmvh7y31zxrjny0mqpnc1wql69f90h94c";
+  src = fetchurl {
+    url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
+    sha256 = "06f215xx1nc2q2qff2ihcl86fkrlnkvacl1swi3fw9iik6nq3bjp";
   };
 
   buildInputs = [
-    libdc libmarble
+    libdc googlemaps
     curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip
     qtbase qtconnectivity qtsvg qttools qtwebkit
   ];
-  nativeBuildInputs = [ cmake pkgconfig ];
 
-  enableParallelBuilding = false; # subsurfacewebservices.h dependency on ui_webservices.h
+  nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
 
   cmakeFlags = [
-    "-DMARBLE_LIBRARIES=${libmarble}/lib/libssrfmarblewidget.so"
+    "-DLIBDC_FROM_PKGCONFIG=ON"
     "-DNO_PRINTING=OFF"
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/subsurface \
+      --prefix QT_PLUGIN_PATH : "${googlemaps}/${googlemaps.pluginsSubdir}"
+  '';
+
+  enableParallelBuilding = true;
+
+  passthru = { inherit version libdc googlemaps; };
+
   meta = with stdenv.lib; {
-    description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux";
+    description = "A divelog program";
     longDescription = ''
       Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix.
       It allows tracking of dive locations including GPS coordinates (which can also
-- 
GitLab


From 7d52814ba56bcb3bf41c3d0a2e6186a1b9930311 Mon Sep 17 00:00:00 2001
From: James Earl Douglas <james@earldouglas.com>
Date: Wed, 18 Oct 2017 19:45:40 -0600
Subject: [PATCH 669/877] dump1090: init at 2014-10-31

---
 pkgs/applications/misc/dump1090/default.nix | 33 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/misc/dump1090/default.nix

diff --git a/pkgs/applications/misc/dump1090/default.nix b/pkgs/applications/misc/dump1090/default.nix
new file mode 100644
index 00000000000..3e9fe133d93
--- /dev/null
+++ b/pkgs/applications/misc/dump1090/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, pkgconfig, libusb, rtl-sdr }:
+
+stdenv.mkDerivation rec {
+  name = "dump1090-${version}";
+  version = "2014-10-31";
+
+  src = fetchFromGitHub {
+    owner = "MalcolmRobb";
+    repo = "dump1090";
+    rev = "bff92c4ad772a0a8d433f788d39dae97e00e4dbe";
+    sha256 = "06aaj9gpz5v4qzvnp8xf18wdfclp0jvn3hflls79ly46gz2dh9hy";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libusb rtl-sdr ];
+
+  makeFlags = [ "PREFIX=$out" ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share
+    cp -v dump1090 $out/bin/dump1090
+    cp -vr public_html $out/share/dump1090
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple Mode S decoder for RTLSDR devices";
+    homepage = https://github.com/MalcolmRobb/dump1090;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ earldouglas ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c6d4ad356e..9db04cee12e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -122,6 +122,8 @@ with pkgs;
 
   dispad = callPackage ../tools/X11/dispad { };
 
+  dump1090 = callPackage ../applications/misc/dump1090 { };
+
   vsenv = callPackage ../build-support/vsenv {
     vs = vs90wrapper;
   };
-- 
GitLab


From 316de025d1cd2d12c0a2a6b8b61b8a70a293fe9b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 5 Nov 2017 06:36:00 +0100
Subject: [PATCH 670/877] python/meliae: Fix version string for download URL

While the version listed on PyPI is "0.4.0.final.0", the actual tarball
however is called just "meliae-0.4.0.tar.gz", which is the same *name*
(but different hash) as the one before the update in
7ce848309e6d64820af1e96045c5386992e90a4a.

Here is the PyPI page for reference:

https://pypi.python.org/pypi/meliae/0.4.0.final.0

After checking the tarballs contents, the version string however *is*
"0.4.0.final.0", so I'm only changing the version in the download URL
rather than in the version attribute.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @FRidh
---
 pkgs/development/python-modules/meliae/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix
index 9fa46ce6863..2a1c4f4341f 100644
--- a/pkgs/development/python-modules/meliae/default.nix
+++ b/pkgs/development/python-modules/meliae/default.nix
@@ -12,7 +12,11 @@ buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchPypi {
-    inherit pname version;
+    inherit pname;
+    # FIXME when updating to the next version: The tarball on pypi is called
+    # "meliae-0.4.0.tar.gz" while the version within that tarball is
+    # "0.4.0.final.0".
+    version = "0.4.0";
     sha256 = "976519ab02aaa6a8fb5f596dc4dd9f64fc9510b00e054979566e51c9be7cec99";
   };
 
-- 
GitLab


From ef21b240c84ae4a1c3dd3c7060006d766c2140bc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 5 Nov 2017 10:12:19 +0100
Subject: [PATCH 671/877] fetchurl: add passthru

so that we could add e.g. the `version` attribute.
---
 pkgs/build-support/fetchurl/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 5811950bf05..8dac273eb1c 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -84,6 +84,9 @@ in
 
 , # Meta information, if any.
   meta ? {}
+
+  # Passthru information, if any.
+, passthru ? {}
 }:
 
 assert builtins.isList urls;
@@ -139,4 +142,5 @@ else stdenv.mkDerivation {
   '';
 
   inherit meta;
+  inherit passthru;
 }
-- 
GitLab


From 07eeeb36008b63c8edfc75fce79beb028cd5c1e4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 5 Nov 2017 10:45:54 +0100
Subject: [PATCH 672/877] Python: move expressions in python-modules to their
 own folders

---
 .../{bcrypt.nix => bcrypt/default.nix}        |  0
 .../default.nix}                              |  0
 .../default.nix}                              |  0
 .../{docker.nix => docker/default.nix}        |  0
 .../default.nix}                              |  0
 .../{ds4drv.nix => ds4drv/default.nix}        |  0
 .../{dulwich.nix => dulwich/default.nix}      |  0
 .../default.nix}                              |  0
 .../default.nix}                              |  0
 .../default.nix}                              |  0
 .../default.nix}                              |  0
 .../default.nix}                              |  0
 .../{flask-wtf.nix => flask-wtf/default.nix}  |  0
 .../{ghdiff.nix => ghdiff/default.nix}        |  0
 .../{gunicorn.nix => gunicorn/default.nix}    |  0
 .../{htmlmin.nix => htmlmin/default.nix}      |  0
 .../default.nix}                              |  0
 .../{jabberbot.nix => jabberbot/default.nix}  |  0
 .../{ldap.nix => ldap/default.nix}            |  0
 .../{markdown2.nix => markdown2/default.nix}  |  0
 .../{nltk.nix => nltk/default.nix}            |  0
 .../{pep257.nix => pep257/default.nix}        |  0
 .../{protobuf.nix => protobuf/default.nix}    |  0
 .../{pyaes.nix => pyaes/default.nix}          |  0
 .../{pyrax.nix => pyrax/default.nix}          |  0
 .../default.nix}                              |  0
 .../{pyudev.nix => pyudev/default.nix}        |  0
 .../default.nix}                              |  0
 .../default.nix}                              |  0
 pkgs/top-level/python-packages.nix            | 60 +++++++++----------
 30 files changed, 30 insertions(+), 30 deletions(-)
 rename pkgs/development/python-modules/{bcrypt.nix => bcrypt/default.nix} (100%)
 rename pkgs/development/python-modules/{csscompressor.nix => csscompressor/default.nix} (100%)
 rename pkgs/development/python-modules/{django_guardian.nix => django_guardian/default.nix} (100%)
 rename pkgs/development/python-modules/{docker.nix => docker/default.nix} (100%)
 rename pkgs/development/python-modules/{docker_compose.nix => docker_compose/default.nix} (100%)
 rename pkgs/development/python-modules/{ds4drv.nix => ds4drv/default.nix} (100%)
 rename pkgs/development/python-modules/{dulwich.nix => dulwich/default.nix} (100%)
 rename pkgs/development/python-modules/{flask-elastic.nix => flask-elastic/default.nix} (100%)
 rename pkgs/development/python-modules/{flask-ldap-login.nix => flask-ldap-login/default.nix} (100%)
 rename pkgs/development/python-modules/{flask-login.nix => flask-login/default.nix} (100%)
 rename pkgs/development/python-modules/{flask-oauthlib.nix => flask-oauthlib/default.nix} (100%)
 rename pkgs/development/python-modules/{flask-testing.nix => flask-testing/default.nix} (100%)
 rename pkgs/development/python-modules/{flask-wtf.nix => flask-wtf/default.nix} (100%)
 rename pkgs/development/python-modules/{ghdiff.nix => ghdiff/default.nix} (100%)
 rename pkgs/development/python-modules/{gunicorn.nix => gunicorn/default.nix} (100%)
 rename pkgs/development/python-modules/{htmlmin.nix => htmlmin/default.nix} (100%)
 rename pkgs/development/python-modules/{hypothesis.nix => hypothesis/default.nix} (100%)
 rename pkgs/development/python-modules/{jabberbot.nix => jabberbot/default.nix} (100%)
 rename pkgs/development/python-modules/{ldap.nix => ldap/default.nix} (100%)
 rename pkgs/development/python-modules/{markdown2.nix => markdown2/default.nix} (100%)
 rename pkgs/development/python-modules/{nltk.nix => nltk/default.nix} (100%)
 rename pkgs/development/python-modules/{pep257.nix => pep257/default.nix} (100%)
 rename pkgs/development/python-modules/{protobuf.nix => protobuf/default.nix} (100%)
 rename pkgs/development/python-modules/{pyaes.nix => pyaes/default.nix} (100%)
 rename pkgs/development/python-modules/{pyrax.nix => pyrax/default.nix} (100%)
 rename pkgs/development/python-modules/{pytest-pep257.nix => pytest-pep257/default.nix} (100%)
 rename pkgs/development/python-modules/{pyudev.nix => pyudev/default.nix} (100%)
 rename pkgs/development/python-modules/{rackspace-novaclient.nix => rackspace-novaclient/default.nix} (100%)
 rename pkgs/development/python-modules/{requests-oauthlib.nix => requests-oauthlib/default.nix} (100%)

diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt/default.nix
similarity index 100%
rename from pkgs/development/python-modules/bcrypt.nix
rename to pkgs/development/python-modules/bcrypt/default.nix
diff --git a/pkgs/development/python-modules/csscompressor.nix b/pkgs/development/python-modules/csscompressor/default.nix
similarity index 100%
rename from pkgs/development/python-modules/csscompressor.nix
rename to pkgs/development/python-modules/csscompressor/default.nix
diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian/default.nix
similarity index 100%
rename from pkgs/development/python-modules/django_guardian.nix
rename to pkgs/development/python-modules/django_guardian/default.nix
diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker/default.nix
similarity index 100%
rename from pkgs/development/python-modules/docker.nix
rename to pkgs/development/python-modules/docker/default.nix
diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose/default.nix
similarity index 100%
rename from pkgs/development/python-modules/docker_compose.nix
rename to pkgs/development/python-modules/docker_compose/default.nix
diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv/default.nix
similarity index 100%
rename from pkgs/development/python-modules/ds4drv.nix
rename to pkgs/development/python-modules/ds4drv/default.nix
diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich/default.nix
similarity index 100%
rename from pkgs/development/python-modules/dulwich.nix
rename to pkgs/development/python-modules/dulwich/default.nix
diff --git a/pkgs/development/python-modules/flask-elastic.nix b/pkgs/development/python-modules/flask-elastic/default.nix
similarity index 100%
rename from pkgs/development/python-modules/flask-elastic.nix
rename to pkgs/development/python-modules/flask-elastic/default.nix
diff --git a/pkgs/development/python-modules/flask-ldap-login.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix
similarity index 100%
rename from pkgs/development/python-modules/flask-ldap-login.nix
rename to pkgs/development/python-modules/flask-ldap-login/default.nix
diff --git a/pkgs/development/python-modules/flask-login.nix b/pkgs/development/python-modules/flask-login/default.nix
similarity index 100%
rename from pkgs/development/python-modules/flask-login.nix
rename to pkgs/development/python-modules/flask-login/default.nix
diff --git a/pkgs/development/python-modules/flask-oauthlib.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix
similarity index 100%
rename from pkgs/development/python-modules/flask-oauthlib.nix
rename to pkgs/development/python-modules/flask-oauthlib/default.nix
diff --git a/pkgs/development/python-modules/flask-testing.nix b/pkgs/development/python-modules/flask-testing/default.nix
similarity index 100%
rename from pkgs/development/python-modules/flask-testing.nix
rename to pkgs/development/python-modules/flask-testing/default.nix
diff --git a/pkgs/development/python-modules/flask-wtf.nix b/pkgs/development/python-modules/flask-wtf/default.nix
similarity index 100%
rename from pkgs/development/python-modules/flask-wtf.nix
rename to pkgs/development/python-modules/flask-wtf/default.nix
diff --git a/pkgs/development/python-modules/ghdiff.nix b/pkgs/development/python-modules/ghdiff/default.nix
similarity index 100%
rename from pkgs/development/python-modules/ghdiff.nix
rename to pkgs/development/python-modules/ghdiff/default.nix
diff --git a/pkgs/development/python-modules/gunicorn.nix b/pkgs/development/python-modules/gunicorn/default.nix
similarity index 100%
rename from pkgs/development/python-modules/gunicorn.nix
rename to pkgs/development/python-modules/gunicorn/default.nix
diff --git a/pkgs/development/python-modules/htmlmin.nix b/pkgs/development/python-modules/htmlmin/default.nix
similarity index 100%
rename from pkgs/development/python-modules/htmlmin.nix
rename to pkgs/development/python-modules/htmlmin/default.nix
diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis/default.nix
similarity index 100%
rename from pkgs/development/python-modules/hypothesis.nix
rename to pkgs/development/python-modules/hypothesis/default.nix
diff --git a/pkgs/development/python-modules/jabberbot.nix b/pkgs/development/python-modules/jabberbot/default.nix
similarity index 100%
rename from pkgs/development/python-modules/jabberbot.nix
rename to pkgs/development/python-modules/jabberbot/default.nix
diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap/default.nix
similarity index 100%
rename from pkgs/development/python-modules/ldap.nix
rename to pkgs/development/python-modules/ldap/default.nix
diff --git a/pkgs/development/python-modules/markdown2.nix b/pkgs/development/python-modules/markdown2/default.nix
similarity index 100%
rename from pkgs/development/python-modules/markdown2.nix
rename to pkgs/development/python-modules/markdown2/default.nix
diff --git a/pkgs/development/python-modules/nltk.nix b/pkgs/development/python-modules/nltk/default.nix
similarity index 100%
rename from pkgs/development/python-modules/nltk.nix
rename to pkgs/development/python-modules/nltk/default.nix
diff --git a/pkgs/development/python-modules/pep257.nix b/pkgs/development/python-modules/pep257/default.nix
similarity index 100%
rename from pkgs/development/python-modules/pep257.nix
rename to pkgs/development/python-modules/pep257/default.nix
diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf/default.nix
similarity index 100%
rename from pkgs/development/python-modules/protobuf.nix
rename to pkgs/development/python-modules/protobuf/default.nix
diff --git a/pkgs/development/python-modules/pyaes.nix b/pkgs/development/python-modules/pyaes/default.nix
similarity index 100%
rename from pkgs/development/python-modules/pyaes.nix
rename to pkgs/development/python-modules/pyaes/default.nix
diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax/default.nix
similarity index 100%
rename from pkgs/development/python-modules/pyrax.nix
rename to pkgs/development/python-modules/pyrax/default.nix
diff --git a/pkgs/development/python-modules/pytest-pep257.nix b/pkgs/development/python-modules/pytest-pep257/default.nix
similarity index 100%
rename from pkgs/development/python-modules/pytest-pep257.nix
rename to pkgs/development/python-modules/pytest-pep257/default.nix
diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev/default.nix
similarity index 100%
rename from pkgs/development/python-modules/pyudev.nix
rename to pkgs/development/python-modules/pyudev/default.nix
diff --git a/pkgs/development/python-modules/rackspace-novaclient.nix b/pkgs/development/python-modules/rackspace-novaclient/default.nix
similarity index 100%
rename from pkgs/development/python-modules/rackspace-novaclient.nix
rename to pkgs/development/python-modules/rackspace-novaclient/default.nix
diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix
similarity index 100%
rename from pkgs/development/python-modules/requests-oauthlib.nix
rename to pkgs/development/python-modules/requests-oauthlib/default.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 70202d2d4a8..d33b7fd6dd5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -208,7 +208,7 @@ in {
   # version of nixpart.
   nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { };
 
-  nltk = callPackage ../development/python-modules/nltk.nix { };
+  nltk = callPackage ../development/python-modules/nltk { };
 
   ntlm-auth = callPackage ../development/python-modules/ntlm-auth { };
 
@@ -216,7 +216,7 @@ in {
 
   Pmw = callPackage ../development/python-modules/Pmw { };
 
-  pyaes = callPackage ../development/python-modules/pyaes.nix { };
+  pyaes = callPackage ../development/python-modules/pyaes { };
 
   pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}";
 
@@ -1659,7 +1659,7 @@ in {
 
   cram = callPackage ../development/python-modules/cram { };
 
-  csscompressor = callPackage ../development/python-modules/csscompressor.nix {};
+  csscompressor = callPackage ../development/python-modules/csscompressor {};
 
   csvkit =  callPackage ../development/python-modules/csvkit { };
 
@@ -3641,7 +3641,7 @@ in {
     };
   };
 
-  bcrypt = callPackage ../development/python-modules/bcrypt.nix { };
+  bcrypt = callPackage ../development/python-modules/bcrypt { };
 
   cffi = callPackage ../development/python-modules/cffi { };
 
@@ -3960,7 +3960,7 @@ in {
     };
   };
 
-  pytest-pep257 = callPackage ../development/python-modules/pytest-pep257.nix { };
+  pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { };
 
   pytest-raisesregexp = buildPythonPackage rec {
     name = "pytest-raisesregexp-${version}";
@@ -4737,7 +4737,7 @@ in {
 
   dns = callPackage ../development/python-modules/dns { };
 
-  docker = callPackage ../development/python-modules/docker.nix {};
+  docker = callPackage ../development/python-modules/docker {};
 
   dockerpty = buildPythonPackage rec {
     name = "dockerpty-0.4.1";
@@ -4932,7 +4932,7 @@ in {
     };
   };
 
-  ds4drv = callPackage ../development/python-modules/ds4drv.nix {
+  ds4drv = callPackage ../development/python-modules/ds4drv {
     inherit (pkgs) fetchFromGitHub bluez;
   };
 
@@ -5940,7 +5940,7 @@ in {
   });
 
 
-  htmlmin = callPackage ../development/python-modules/htmlmin.nix {};
+  htmlmin = callPackage ../development/python-modules/htmlmin {};
 
   httpauth = buildPythonPackage rec {
     version = "0.3";
@@ -8051,7 +8051,7 @@ in {
 
   django_extensions = callPackage ../development/python-modules/django-extensions { };
 
-  django_guardian = callPackage ../development/python-modules/django_guardian.nix { };
+  django_guardian = callPackage ../development/python-modules/django_guardian { };
 
   django-ipware = callPackage ../development/python-modules/django-ipware { };
 
@@ -8383,7 +8383,7 @@ in {
     };
   };
 
-  dulwich = callPackage ../development/python-modules/dulwich.nix {
+  dulwich = callPackage ../development/python-modules/dulwich {
     inherit (pkgs) git glibcLocales;
   };
 
@@ -8716,7 +8716,7 @@ in {
     };
   };
 
-  docker_compose = callPackage ../development/python-modules/docker_compose.nix {};
+  docker_compose = callPackage ../development/python-modules/docker_compose {};
 
   fdroidserver = buildPythonPackage rec {
     version = "2016-05-31";
@@ -8865,11 +8865,11 @@ in {
 
   flask-cors = callPackage ../development/python-modules/flask-cors { };
 
-  flask_elastic = callPackage ../development/python-modules/flask-elastic.nix { };
+  flask_elastic = callPackage ../development/python-modules/flask-elastic { };
 
-  flask_login = callPackage ../development/python-modules/flask-login.nix { };
+  flask_login = callPackage ../development/python-modules/flask-login { };
 
-  flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login.nix { };
+  flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { };
 
   flask_mail = callPackage ../development/python-modules/flask-mail { };
 
@@ -8877,7 +8877,7 @@ in {
 
   flask_migrate = callPackage ../development/python-modules/flask-migrate { };
 
-  flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { };
+  flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { };
 
   flask_principal = buildPythonPackage rec {
     name = "Flask-Principal-${version}";
@@ -8944,9 +8944,9 @@ in {
     };
   };
 
-  flask_testing = callPackage ../development/python-modules/flask-testing.nix { };
+  flask_testing = callPackage ../development/python-modules/flask-testing { };
 
-  flask_wtf = callPackage ../development/python-modules/flask-wtf.nix { };
+  flask_wtf = callPackage ../development/python-modules/flask-wtf { };
 
   wtforms = buildPythonPackage rec {
     version = "2.1";
@@ -9486,7 +9486,7 @@ in {
 
   gflags = callPackage ../development/python-modules/gflags { };
 
-  ghdiff = callPackage ../development/python-modules/ghdiff.nix { };
+  ghdiff = callPackage ../development/python-modules/ghdiff { };
 
   gipc = buildPythonPackage rec {
     name = "gipc-0.5.0";
@@ -9802,7 +9802,7 @@ in {
 
   rebulk = callPackage ../development/python-modules/rebulk { };
 
-  gunicorn = callPackage ../development/python-modules/gunicorn.nix { };
+  gunicorn = callPackage ../development/python-modules/gunicorn { };
 
   hawkauthlib = buildPythonPackage rec {
     name = "hawkauthlib-${version}";
@@ -9945,7 +9945,7 @@ in {
     propagatedBuildInputs = with self; [ requests ];
   };
 
-  hypothesis = callPackage ../development/python-modules/hypothesis.nix { };
+  hypothesis = callPackage ../development/python-modules/hypothesis { };
 
   colored = buildPythonPackage rec {
     name = "colored-${version}";
@@ -10391,7 +10391,7 @@ in {
     };
   };
 
-  jabberbot = callPackage ../development/python-modules/jabberbot.nix {};
+  jabberbot = callPackage ../development/python-modules/jabberbot {};
 
   jedi = callPackage ../development/python-modules/jedi { };
 
@@ -14886,7 +14886,7 @@ in {
     };
   };
 
-  pep257 = callPackage ../development/python-modules/pep257.nix { };
+  pep257 = callPackage ../development/python-modules/pep257 { };
 
   percol = buildPythonPackage rec {
     name = "percol-${version}";
@@ -15415,13 +15415,13 @@ in {
 
   });
 
-  protobuf = callPackage ../development/python-modules/protobuf.nix {
+  protobuf = callPackage ../development/python-modules/protobuf {
     disabled = isPyPy;
     doCheck = !isPy3k;
     protobuf = pkgs.protobuf;
   };
 
-  protobuf3_1 = callPackage ../development/python-modules/protobuf.nix {
+  protobuf3_1 = callPackage ../development/python-modules/protobuf {
     disabled = isPyPy;
     doCheck = !isPy3k;
     protobuf = pkgs.protobuf3_1;
@@ -16843,7 +16843,7 @@ in {
     buildInputs = with self; [ pyasn1 pycrypto ];
   };
 
-  pyudev = callPackage ../development/python-modules/pyudev.nix {
+  pyudev = callPackage ../development/python-modules/pyudev {
     inherit (pkgs) fetchurl systemd;
   };
 
@@ -16908,7 +16908,7 @@ in {
     };
   });
 
-  ldap = callPackage ../development/python-modules/ldap.nix {
+  ldap = callPackage ../development/python-modules/ldap {
     inherit (pkgs) openldap cyrus_sasl openssl;
   };
 
@@ -17230,9 +17230,9 @@ in {
     doCheck = false;
   };
 
-  rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient.nix { };
+  rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient { };
 
-  pyrax = callPackage ../development/python-modules/pyrax.nix {
+  pyrax = callPackage ../development/python-modules/pyrax {
     glibcLocales = pkgs.glibcLocales;
   };
 
@@ -17750,7 +17750,7 @@ in {
 
   requests_ntlm = callPackage ../development/python-modules/requests_ntlm { };
 
-  requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { };
+  requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { };
 
   requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { };
   requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26
@@ -23883,7 +23883,7 @@ EOF
     };
   };
 
-  markdown2 = callPackage ../development/python-modules/markdown2.nix { };
+  markdown2 = callPackage ../development/python-modules/markdown2 { };
 
   evernote = buildPythonPackage rec {
     name = "evernote-${version}";
-- 
GitLab


From 6254141c927842bdf95dca39613b9baa21f32f76 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 5 Nov 2017 10:56:38 +0100
Subject: [PATCH 673/877] Python pkgs: remove old/unused patches

---
 .../pelican-fix-tests-with-pygments-2.1.patch | 318 ------------------
 .../sqlalchemy-0.7.10-test-failures.patch     |  49 ---
 2 files changed, 367 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch
 delete mode 100644 pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch

diff --git a/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch b/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch
deleted file mode 100644
index 4568b8b9448..00000000000
--- a/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
-index 3ce41d7..3cf97a8 100644
---- a/pelican/tests/output/basic/feeds/all-en.atom.xml
-+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
-@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-@@ -58,4 +58,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
--</summary></entry></feed>
-+</summary></entry></feed>
-\ No newline at end of file
-diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
-index 3a9478a..24d31a9 100644
---- a/pelican/tests/output/basic/feeds/all.atom.xml
-+++ b/pelican/tests/output/basic/feeds/all.atom.xml
-@@ -43,7 +43,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-@@ -59,4 +59,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
--</summary></entry></feed>
-+</summary></entry></feed>
-\ No newline at end of file
-diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
-index a9b5977..4ad7008 100644
---- a/pelican/tests/output/basic/feeds/misc.atom.xml
-+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
-@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
--</summary></entry></feed>
-+</summary></entry></feed>
-\ No newline at end of file
-diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
-index dfb0c54..b7f8a7e 100644
---- a/pelican/tests/output/basic/unbelievable.html
-+++ b/pelican/tests/output/basic/unbelievable.html
-@@ -38,7 +38,7 @@
-                 Published: Fri 15 October 2010
-         </abbr>
- 
--<p>In <a href="/category/misc.html">misc</a>. </p>
-+<p>In <a href="/category/misc.html">misc</a>.</p>
- 
- </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
- <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-@@ -58,7 +58,7 @@ pelican.conf, it will have nothing in default.</p>
- </div>
- <div class="section" id="testing-more-sourcecode-directives">
- <h2>Testing more sourcecode directives</h2>
--<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
-+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
- <p>Lovely.</p>
- </div>
- <div class="section" id="testing-even-more-sourcecode-directives">
-@@ -97,4 +97,4 @@ pelican.conf, it will have nothing in default.</p>
-         </footer><!-- /#contentinfo -->
- 
- </body>
--</html>
-+</html>
-\ No newline at end of file
-diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
-index cb74637..987f987 100644
---- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
-+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
-@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
-index 2c4b116..89082ee 100644
---- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
-+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
-@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
-index 3574ab4..75b6333 100644
---- a/pelican/tests/output/custom/feeds/all-en.atom.xml
-+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
-@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
-index 391ab85..efb43cd 100644
---- a/pelican/tests/output/custom/feeds/all.atom.xml
-+++ b/pelican/tests/output/custom/feeds/all.atom.xml
-@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
-index a78d2de..548b16c 100644
---- a/pelican/tests/output/custom/feeds/all.rss.xml
-+++ b/pelican/tests/output/custom/feeds/all.rss.xml
-@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
-index 91d6b28..dbab63c 100644
---- a/pelican/tests/output/custom/feeds/misc.atom.xml
-+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
-@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
-index 3493d2a..2d13bda 100644
---- a/pelican/tests/output/custom/feeds/misc.rss.xml
-+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
-@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
-index 2e51cf0..b6d2136 100644
---- a/pelican/tests/output/custom/unbelievable.html
-+++ b/pelican/tests/output/custom/unbelievable.html
-@@ -43,9 +43,9 @@
-         </abbr>
- 
-         <address class="vcard author">
--                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-         </address>
--<p>In <a href="./category/misc.html">misc</a>. </p>
-+<p>In <a href="./category/misc.html">misc</a>.</p>
- 
- </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
- <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.</p>
- </div>
- <div class="section" id="testing-more-sourcecode-directives">
- <h2>Testing more sourcecode directives</h2>
--<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
-+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
- <p>Lovely.</p>
- </div>
- <div class="section" id="testing-even-more-sourcecode-directives">
-diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
-index 8fb3ef6..2090087 100644
---- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
-+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
-@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
-index 99255ee..00944ce 100644
---- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
-+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
-@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
-index 6b2f09b..297558d 100644
---- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
-+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
-@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
-index 5ef59e0..78da527 100644
---- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
-+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
-@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
-index 071e2f1..84fd5df 100644
---- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
-+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
-@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
-index c91d4d7..fde02e6 100644
---- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
-+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
-@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
-index 82b5898..bd727bb 100644
---- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
-+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
-@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
- &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
--&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
- &lt;p&gt;Lovely.&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
-index a6ea869..1e2d78f 100644
---- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
-+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
-@@ -45,7 +45,7 @@
-         <address class="vcard author">
-                 By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
-         </address>
--<p>In <a href="../../../../../category/misc.html">misc</a>. </p>
-+<p>In <a href="../../../../../category/misc.html">misc</a>.</p>
- 
- </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
- <p><a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
-@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.</p>
- </div>
- <div class="section" id="testing-more-sourcecode-directives">
- <h2>Testing more sourcecode directives</h2>
--<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
-+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
- <p>Lovely.</p>
- </div>
- <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch b/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch
deleted file mode 100644
index 5880af40d14..00000000000
--- a/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From abd9f52ade78c737571be69f21dba384be3edf4e Mon Sep 17 00:00:00 2001
-From: Mike Bayer <mike_mp@zzzcomputing.com>
-Date: Sat, 2 Mar 2013 16:24:50 -0500
-Subject: [PATCH] - Fixed an import of "logging" in test_execute which was not
- working on some linux platforms. [ticket:2669]
-
----
- doc/build/changelog/changelog_07.rst | 10 ++++++++++
- lib/sqlalchemy/__init__.py           |  2 +-
- test/engine/test_execute.py          |  2 +-
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst
-index 416df5a..f07c9ec 100644
---- a/doc/build/changelog/changelog_07.rst
-+++ b/doc/build/changelog/changelog_07.rst
-@@ -3,6 +3,16 @@
- 0.7 Changelog
- ==============
- 
-+.. changelog::
-+    :version: 0.7.11
-+
-+    .. change::
-+        :tags: bug, tests
-+        :tickets: 2669
-+        :pullreq: 41
-+
-+      Fixed an import of "logging" in test_execute which was not
-+      working on some linux platforms.
- 
- .. changelog::
-     :version: 0.7.10
-diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
-index 69b94f1..a37f684 100644
---- a/test/engine/test_execute.py
-+++ b/test/engine/test_execute.py
-@@ -9,7 +9,7 @@
- import sqlalchemy as tsa
- from test.lib import testing, engines
- from test.lib.engines import testing_engine
--import logging
-+import logging.handlers
- from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
- from sqlalchemy.engine import base, default
- from sqlalchemy.engine.base import Connection, Engine
--- 
-1.8.1.6
-
-- 
GitLab


From 14da187ad60b46a0e657933fd55d99cbb00e1c5c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 5 Nov 2017 11:08:38 +0100
Subject: [PATCH 674/877] Python update-python-libraries: fetch and update
 asynchronously

---
 maintainers/scripts/update-python-libraries | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index 7c73510c353..3ddc8c23a79 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -18,6 +18,7 @@ import os
 import re
 import requests
 import toolz
+from concurrent.futures import ThreadPoolExecutor as pool
 
 INDEX = "https://pypi.io/pypi"
 """url of PyPI"""
@@ -235,7 +236,8 @@ def main():
 
     packages = map(os.path.abspath, args.package)
 
-    count = list(map(_update, packages))
+    with pool() as p:
+        count = list(p.map(_update, packages))
 
     logging.info("{} package(s) updated".format(sum(count)))
 
-- 
GitLab


From 5f3b84e979a85765fd2f05b302d75b24b285f930 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 17 Oct 2017 00:31:44 +0300
Subject: [PATCH 675/877] cc-wrapper: disable POSIX compatibility

---
 pkgs/build-support/cc-wrapper/cc-wrapper.sh       | 2 +-
 pkgs/build-support/cc-wrapper/gnat-wrapper.sh     | 2 +-
 pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh | 2 +-
 pkgs/build-support/cc-wrapper/ld-wrapper.sh       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index f1f56cf5cec..d2cdbf6ce0c 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -1,5 +1,5 @@
 #! @shell@
-set -eu -o pipefail
+set -eu -o pipefail +o posix
 shopt -s nullglob
 
 if (( "${NIX_DEBUG:-0}" >= 7 )); then
diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
index b15f1e461e5..7a0eb28be63 100644
--- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
@@ -1,5 +1,5 @@
 #! @shell@
-set -eu -o pipefail
+set -eu -o pipefail +o posix
 shopt -s nullglob
 
 if (( "${NIX_DEBUG:-0}" >= 7 )); then
diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
index 88e644dc54d..0944d74e431 100644
--- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
@@ -1,5 +1,5 @@
 #! @shell@
-set -eu -o pipefail
+set -eu -o pipefail +o posix
 shopt -s nullglob
 
 if (( "${NIX_DEBUG:-0}" >= 7 )); then
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 232e1245af0..ef618f9a86d 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -1,5 +1,5 @@
 #! @shell@
-set -eu -o pipefail
+set -eu -o pipefail +o posix
 shopt -s nullglob
 
 if (( "${NIX_DEBUG:-0}" >= 7 )); then
-- 
GitLab


From 5fde24c20bf212e3faa80802e2831c19a62abdbc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 5 Nov 2017 13:44:16 +0100
Subject: [PATCH 676/877] python.pkgs.urwid: fix build

---
 pkgs/development/python-modules/urwid/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index 129f4821e87..000cf5ea5ef 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchurl }:
 
 buildPythonPackage (rec {
   pname = "urwid";
@@ -10,6 +10,13 @@ buildPythonPackage (rec {
     sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng";
   };
 
+  patches = [
+    (fetchurl {
+      url = https://github.com/urwid/urwid/commit/4b0ed8b6030450e6d99909a7c683e9642e546387.patch;
+      sha256 = "0ygghd6wzjqij5szg61l1dsk8b0yv8bwyj3bgxxj1lj4m17zsy5q";
+    })
+  ];
+
   meta = with stdenv.lib; {
     description = "A full-featured console (xterm et al.) user interface library";
     homepage = http://excess.org/urwid;
-- 
GitLab


From 20bb7d5373ee7816dae8b24786deb2279830c29d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 5 Nov 2017 11:35:14 +0100
Subject: [PATCH 677/877] krita: 3.2.1 -> 3.3.2

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

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 98f92413a76..a9c238ead3c 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -9,11 +9,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "3.2.1";
+  version = "3.3.2";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "0fafy5ggplgq2rz85sqa42vmkzs2r9dq47qfrbnn2n6pfzkcw1pg";
+    url = https://download.kde.org/stable/krita/3.3.2/krita-3.3.2.1.tar.xz;
+    sha256 = "0i3l27cfi1h486m74xf4ynk0pwx32xaqraa91a0g1bpj1jxf2mg5";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
-- 
GitLab


From cf610f8a48dd10be105881393fae5857c8cbfd71 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sun, 5 Nov 2017 14:00:27 +0100
Subject: [PATCH 678/877] fast-cli: pinpoint to a 1.x version, since 2.x
 requires nodejs 8 or greater

---
 pkgs/development/node-packages/default-v6.nix |   2 +-
 .../node-packages/node-packages-v6.json       |   2 +-
 .../node-packages/node-packages-v6.nix        | 409 ++++++++++--------
 3 files changed, 220 insertions(+), 193 deletions(-)

diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
index 6cf74cdc4e7..179629ddfa6 100644
--- a/pkgs/development/node-packages/default-v6.nix
+++ b/pkgs/development/node-packages/default-v6.nix
@@ -61,7 +61,7 @@ nodePackages // {
     '';
   });
 
-  fast-cli = nodePackages.fast-cli.override (oldAttrs: {
+  fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: {
     preRebuild = ''
       # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
       sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 76ebb7eaa10..51b08fb8f6e 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -16,7 +16,7 @@
 , "eslint"
 , "eslint_d"
 , "emojione"
-, "fast-cli"
+, { "fast-cli": "1.x" }
 , "fetch-bower"
 , "forever"
 , "git-run"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 16d3b6ebc85..99f2b08897f 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -10196,6 +10196,15 @@ let
         sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa";
       };
     };
+    "log-update-1.0.2" = {
+      name = "log-update";
+      packageName = "log-update";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz";
+        sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
+      };
+    };
     "ora-1.3.0" = {
       name = "ora";
       packageName = "ora";
@@ -10205,22 +10214,31 @@ let
         sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a";
       };
     };
-    "puppeteer-0.12.0" = {
-      name = "puppeteer";
-      packageName = "puppeteer";
-      version = "0.12.0";
+    "phantomjs-prebuilt-2.1.16" = {
+      name = "phantomjs-prebuilt";
+      packageName = "phantomjs-prebuilt";
+      version = "2.1.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-0.12.0.tgz";
-        sha512 = "0lz3hi4l5ajb19cspw7s46bnygfb5njss0jb7nb21p32qjpad8lmnyavipfya9fp2wdq3240b3366n5zqis2ndj6wdwqwf5vsag5xhz";
+        url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz";
+        sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef";
       };
     };
-    "zen-observable-0.6.0" = {
+    "promise-phantom-3.1.6" = {
+      name = "promise-phantom";
+      packageName = "promise-phantom";
+      version = "3.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz";
+        sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931";
+      };
+    };
+    "zen-observable-0.5.2" = {
       name = "zen-observable";
       packageName = "zen-observable";
-      version = "0.6.0";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.6.0.tgz";
-        sha512 = "0i23iwlb1ycrijxi8b09v6fx1nms22g2aj52kmbgqr7n5fxafmjmbbfkiv57c7wzvzayzy5hyqqpcvkbibwmqjdym1a5ykmarwgi6qv";
+        url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz";
+        sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf";
       };
     };
     "cli-spinners-1.1.0" = {
@@ -10241,6 +10259,15 @@ let
         sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
       };
     };
+    "es6-promise-4.1.1" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
+        sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r";
+      };
+    };
     "extract-zip-1.6.6" = {
       name = "extract-zip";
       packageName = "extract-zip";
@@ -10250,31 +10277,40 @@ let
         sha1 = "1290ede8d20d0872b429fd3f351ca128ec5ef85c";
       };
     };
-    "https-proxy-agent-2.1.0" = {
-      name = "https-proxy-agent";
-      packageName = "https-proxy-agent";
-      version = "2.1.0";
+    "fs-extra-1.0.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
-        sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
       };
     };
-    "proxy-from-env-1.0.0" = {
-      name = "proxy-from-env";
-      packageName = "proxy-from-env";
-      version = "1.0.0";
+    "hasha-2.2.0" = {
+      name = "hasha";
+      packageName = "hasha";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz";
-        sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee";
+        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
+        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
       };
     };
-    "ws-3.2.0" = {
-      name = "ws";
-      packageName = "ws";
-      version = "3.2.0";
+    "kew-0.7.0" = {
+      name = "kew";
+      packageName = "kew";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-3.2.0.tgz";
-        sha512 = "1bj83dg7c5sca2v9cpzz4m83y9mm8icldvpk2c9sq3216cr6cn7qvfwhw9hq881nq7pii3xxbg8lz6g2p6223ililwkzzp68ndbfd45";
+        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
+        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
+      };
+    };
+    "request-progress-2.0.1" = {
+      name = "request-progress";
+      packageName = "request-progress";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
+        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
       };
     };
     "mkdirp-0.5.0" = {
@@ -10313,40 +10349,40 @@ let
         sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
       };
     };
-    "agent-base-4.1.1" = {
-      name = "agent-base";
-      packageName = "agent-base";
-      version = "4.1.1";
+    "throttleit-1.0.0" = {
+      name = "throttleit";
+      packageName = "throttleit";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
-        sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9";
+        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
+        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
       };
     };
-    "es6-promisify-5.0.0" = {
-      name = "es6-promisify";
-      packageName = "es6-promisify";
-      version = "5.0.0";
+    "mkpath-1.0.0" = {
+      name = "mkpath";
+      packageName = "mkpath";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
-        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
+        url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz";
+        sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d";
       };
     };
-    "es6-promise-4.1.1" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "4.1.1";
+    "node-phantom-simple-2.2.4" = {
+      name = "node-phantom-simple";
+      packageName = "node-phantom-simple";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
-        sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r";
+        url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz";
+        sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d";
       };
     };
-    "async-limiter-1.0.0" = {
-      name = "async-limiter";
-      packageName = "async-limiter";
-      version = "1.0.0";
+    "tmp-0.0.31" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
-        sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf";
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
+        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
       };
     };
     "glob-3.2.11" = {
@@ -12537,6 +12573,15 @@ let
         sha512 = "2b8y1xdv7szw0hvad64rghp2zdahs6qhx0k79c0s9xa0a35zbcrb9b9gywixhcxqi1c9ab7ah8ibra22k8baakh7rvmhf904d559g32";
       };
     };
+    "ws-3.3.0" = {
+      name = "ws";
+      packageName = "ws";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-3.3.0.tgz";
+        sha512 = "04dfjwby2clbbb8pijv63a46hi2s4vl03p1l6yg533ra5hz5x6205z8bgdwkm5y2xw1j067msjbl08x7175lqhsh2rqw91cirzhdz2w";
+      };
+    };
     "netmask-1.0.6" = {
       name = "netmask";
       packageName = "netmask";
@@ -12753,6 +12798,15 @@ let
         sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
       };
     };
+    "async-limiter-1.0.0" = {
+      name = "async-limiter";
+      packageName = "async-limiter";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
+        sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf";
+      };
+    };
     "is-wsl-1.1.0" = {
       name = "is-wsl";
       packageName = "is-wsl";
@@ -13779,15 +13833,6 @@ let
         sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b";
       };
     };
-    "tmp-0.0.31" = {
-      name = "tmp";
-      packageName = "tmp";
-      version = "0.0.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
-        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
-      };
-    };
     "useragent-2.2.1" = {
       name = "useragent";
       packageName = "useragent";
@@ -16542,15 +16587,6 @@ let
         sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a";
       };
     };
-    "fs-extra-1.0.0" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
-        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
-      };
-    };
     "fs.notify-0.0.4" = {
       name = "fs.notify";
       packageName = "fs.notify";
@@ -18765,13 +18801,13 @@ let
         sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
       };
     };
-    "lokijs-1.5.0" = {
+    "lokijs-1.5.1" = {
       name = "lokijs";
       packageName = "lokijs";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.0.tgz";
-        sha1 = "99e403d6a89e47e11ed0c5d499fb55a0603d5efc";
+        url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.1.tgz";
+        sha512 = "1pi08ry0a4zvg7mqj14gl0vacka95k77bbvljmcf25whxxbkh2rprsxpd8pv6frqh4ix6vslk44silx83sk65xhaw7ia2zssf0vngiy";
       };
     };
     "vscode-languageclient-3.4.5" = {
@@ -19444,24 +19480,6 @@ let
         sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4";
       };
     };
-    "hasha-2.2.0" = {
-      name = "hasha";
-      packageName = "hasha";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
-        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
-      };
-    };
-    "kew-0.7.0" = {
-      name = "kew";
-      packageName = "kew";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
-        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
-      };
-    };
     "request-2.67.0" = {
       name = "request";
       packageName = "request";
@@ -19471,15 +19489,6 @@ let
         sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
       };
     };
-    "request-progress-2.0.1" = {
-      name = "request-progress";
-      packageName = "request-progress";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
-        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
-      };
-    };
     "which-1.2.14" = {
       name = "which";
       packageName = "which";
@@ -19525,15 +19534,6 @@ let
         sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7";
       };
     };
-    "throttleit-1.0.0" = {
-      name = "throttleit";
-      packageName = "throttleit";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
-        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
-      };
-    };
     "browserify-13.3.0" = {
       name = "browserify";
       packageName = "browserify";
@@ -20984,15 +20984,6 @@ let
         sha1 = "03ca7ba2d150d4267773f74e57558d1053d2bee3";
       };
     };
-    "log-update-1.0.2" = {
-      name = "log-update";
-      packageName = "log-update";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz";
-        sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
-      };
-    };
     "promise-finally-3.0.0" = {
       name = "promise-finally";
       packageName = "promise-finally";
@@ -21803,6 +21794,15 @@ let
         sha1 = "eec5c726eacef51b7f6b73c20db6e1b13b069c98";
       };
     };
+    "es6-promisify-5.0.0" = {
+      name = "es6-promisify";
+      packageName = "es6-promisify";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
+        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
+      };
+    };
     "event-to-promise-0.8.0" = {
       name = "event-to-promise";
       packageName = "event-to-promise";
@@ -22091,22 +22091,13 @@ let
         sha1 = "79450aff22b2a9c5a41ef54e02db907ccfbf9ee2";
       };
     };
-    "parse5-3.0.2" = {
+    "parse5-3.0.3" = {
       name = "parse5";
       packageName = "parse5";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz";
-        sha1 = "05eff57f0ef4577fb144a79f8b9a967a6cc44510";
-      };
-    };
-    "@types/node-6.0.90" = {
-      name = "_at_types_slash_node";
-      packageName = "@types/node";
-      version = "6.0.90";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz";
-        sha512 = "2q3rymdpikk7mc1rlmv8r1n0rlw856xmw64dx65mi90khgn1plppcsal3jvcbbhc527f06fh2wk9yargn2mlmgxxibhdvv2ax2hcymm";
+        url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz";
+        sha512 = "005xscj5zlz7pkxa5ngys7i7pdb2f4pirj1zw7hr1145zhxxgg04nhykjh1csy2ncr5lyjw8phq8m2ylqhfhi2z4hgvjb2b1rkbs0xf";
       };
     };
     "anchor-markdown-header-0.5.7" = {
@@ -25747,42 +25738,33 @@ in
     };
     production = true;
   };
-  fast-cli = nodeEnv.buildNodePackage {
+  "fast-cli-1.x" = nodeEnv.buildNodePackage {
     name = "fast-cli";
     packageName = "fast-cli";
-    version = "2.1.0";
+    version = "1.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/fast-cli/-/fast-cli-2.1.0.tgz";
-      sha512 = "10v8s8wk027pmsk69zgmnhhmbjiq33sz8fv92g30m488hm62j9kzpsqjrxvr28zm6s2abszgsflp5m62rjwxi9kjy89r867728fbkb6";
+      url = "https://registry.npmjs.org/fast-cli/-/fast-cli-1.0.0.tgz";
+      sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010";
     };
     dependencies = [
-      sources."chalk-2.3.0"
-      sources."log-update-2.3.0"
+      sources."chalk-1.1.3"
+      sources."log-update-1.0.2"
       sources."meow-3.7.0"
-      (sources."ora-1.3.0" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-        ];
-      })
-      sources."puppeteer-0.12.0"
-      sources."zen-observable-0.6.0"
+      sources."ora-1.3.0"
+      sources."phantomjs-prebuilt-2.1.16"
+      sources."promise-phantom-3.1.6"
+      sources."zen-observable-0.5.2"
       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."color-convert-1.9.0"
-      sources."color-name-1.1.3"
-      sources."has-flag-2.0.0"
-      sources."ansi-escapes-3.0.0"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-escapes-1.4.0"
       sources."cli-cursor-2.1.0"
-      sources."wrap-ansi-3.0.1"
       sources."restore-cursor-2.0.0"
+      sources."exit-hook-1.1.1"
       sources."onetime-2.0.1"
-      sources."signal-exit-3.0.2"
-      sources."mimic-fn-1.1.0"
-      sources."string-width-2.1.1"
-      sources."strip-ansi-3.0.1"
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."ansi-regex-2.1.1"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -25795,6 +25777,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
+      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
@@ -25826,17 +25809,18 @@ in
       sources."get-stdin-4.0.1"
       sources."cli-spinners-1.1.0"
       sources."log-symbols-1.0.2"
-      sources."has-ansi-2.0.0"
-      sources."debug-2.6.9"
+      sources."mimic-fn-1.1.0"
+      sources."es6-promise-4.1.1"
       sources."extract-zip-1.6.6"
-      sources."https-proxy-agent-2.1.0"
-      sources."mime-1.4.1"
-      sources."progress-2.0.0"
-      sources."proxy-from-env-1.0.0"
-      sources."rimraf-2.6.2"
-      sources."ws-3.2.0"
-      sources."ms-2.0.0"
+      sources."fs-extra-1.0.0"
+      sources."hasha-2.2.0"
+      sources."kew-0.7.0"
+      sources."progress-1.1.8"
+      sources."request-2.83.0"
+      sources."request-progress-2.0.1"
+      sources."which-1.3.0"
       sources."concat-stream-1.6.0"
+      sources."debug-2.6.9"
       sources."mkdirp-0.5.0"
       sources."yauzl-2.4.1"
       sources."inherits-2.0.3"
@@ -25848,23 +25832,66 @@ in
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
+      sources."ms-2.0.0"
       sources."fd-slicer-1.0.1"
       sources."pend-1.2.0"
-      sources."agent-base-4.1.1"
-      sources."es6-promisify-5.0.0"
-      sources."es6-promise-4.1.1"
-      sources."glob-7.1.2"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."minimatch-3.0.4"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
-      sources."async-limiter-1.0.0"
-      sources."ultron-1.1.0"
+      sources."jsonfile-2.4.0"
+      sources."klaw-1.3.1"
+      sources."is-stream-1.1.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.6.0"
+      sources."caseless-0.12.0"
+      sources."combined-stream-1.0.5"
+      sources."extend-3.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.1"
+      sources."har-validator-5.0.3"
+      sources."hawk-6.0.2"
+      sources."http-signature-1.2.0"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."json-stringify-safe-5.0.1"
+      sources."mime-types-2.1.17"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-2.1.0"
+      sources."qs-6.5.1"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.3"
+      sources."tunnel-agent-0.6.0"
+      sources."uuid-3.1.0"
+      sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."ajv-5.3.0"
+      sources."har-schema-2.0.0"
+      sources."co-4.6.0"
+      sources."fast-deep-equal-1.0.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."json-schema-traverse-0.3.1"
+      sources."hoek-4.2.0"
+      sources."boom-5.2.0"
+      sources."cryptiles-3.1.2"
+      sources."sntp-2.1.0"
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
+      sources."extsprintf-1.3.0"
+      sources."json-schema-0.2.3"
+      sources."verror-1.10.0"
+      sources."asn1-0.2.3"
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
+      sources."jsbn-0.1.1"
+      sources."tweetnacl-0.14.5"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."mime-db-1.30.0"
+      sources."punycode-1.4.1"
+      sources."throttleit-1.0.0"
+      sources."isexe-2.0.0"
+      sources."mkpath-1.0.0"
+      sources."node-phantom-simple-2.2.4"
+      sources."tmp-0.0.31"
+      sources."os-tmpdir-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -26526,7 +26553,7 @@ in
       sources."tiny-lr-1.0.5"
       sources."uuid-3.1.0"
       sources."wrap-ansi-3.0.1"
-      sources."ws-3.2.0"
+      sources."ws-3.3.0"
       sources."netmask-1.0.6"
       sources."archiver-utils-1.3.0"
       sources."async-2.5.0"
@@ -29361,7 +29388,7 @@ in
       sources."media-typer-0.3.0"
       (sources."mqtt-2.9.0" // {
         dependencies = [
-          sources."ws-3.2.0"
+          sources."ws-3.3.0"
         ];
       })
       sources."multer-1.3.0"
@@ -30221,16 +30248,16 @@ in
   ocaml-language-server = nodeEnv.buildNodePackage {
     name = "ocaml-language-server";
     packageName = "ocaml-language-server";
-    version = "1.0.1";
+    version = "1.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.1.tgz";
-      sha512 = "05wpkgddw5r99fm8082l7sm48yd4xi2892w95fbsqhvy81xas0v2z8k9c7s09m7bvw3hn8rhl7c7cdwf4xafzphwax8zx5w22prpp15";
+      url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.4.tgz";
+      sha512 = "1ppin5vfrqf2x1d1mmw98r4j9iblgv7lhhmfbvmzqp97ynkksyzajx5ssm1l8drn79k8l1iqqx1y4ldpq83hnvlfv3h8zh053iv8p04";
     };
     dependencies = [
       sources."async-2.5.0"
       sources."glob-7.1.2"
       sources."lodash-4.17.4"
-      sources."lokijs-1.5.0"
+      sources."lokijs-1.5.1"
       sources."pegjs-0.10.0"
       sources."vscode-jsonrpc-3.4.1"
       sources."vscode-languageclient-3.4.5"
@@ -32460,10 +32487,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.1.6";
+    version = "3.1.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.6.tgz";
-      sha512 = "1hffvxym85dy9nzmjriwyazvy7k6x3iwp0j0dway300hawcdbmfirbglvshxjflzci25z725zl07650m5dgdfydlc0m648a275ixfzy";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.7.tgz";
+      sha512 = "2797l10f7jfyy5pljy05q04aa7000bzdyj6c57b91fvhvdnh1g4gk71ghn6399qgpja92k5s6fjsw9dnvyiwxr3xnfbd169l81ky6v5";
     };
     dependencies = [
       sources."commander-2.11.0"
@@ -33338,7 +33365,7 @@ in
       sources."dom-serializer-0.1.0"
       sources."entities-1.1.1"
       sources."htmlparser2-3.9.2"
-      sources."parse5-3.0.2"
+      sources."parse5-3.0.3"
       sources."css-what-2.1.0"
       sources."domutils-1.5.1"
       sources."boolbase-1.0.0"
@@ -33353,7 +33380,7 @@ in
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      sources."@types/node-6.0.90"
+      sources."@types/node-8.0.47"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
-- 
GitLab


From b50693d16ca394690bfec52ddd9eaf43d346ca8b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 3 Nov 2017 15:55:09 +0200
Subject: [PATCH 679/877] kernel, initrd: Remove legacy ubootChooser

---
 pkgs/build-support/kernel/make-initrd.nix       | 4 ++--
 pkgs/os-specific/linux/kernel/manual-config.nix | 6 +++---
 pkgs/top-level/all-packages.nix                 | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 70727f9b49d..6fcdc93b104 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -12,13 +12,13 @@
 # `contents = {object = ...; symlink = /init;}' is a typical
 # argument.
 
-{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend
+{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools
 , hostPlatform
 }:
 
 let
   inputsFun = ubootName : [ perl cpio ]
-    ++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ];
+    ++ stdenv.lib.optional (ubootName != null) ubootTools;
   makeUInitrdFun = ubootName : (ubootName != null);
 in
 stdenv.mkDerivation {
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 8227475f1b1..61349175c78 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,5 +1,5 @@
 { runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
-, writeTextFile, ubootChooser
+, writeTextFile, ubootTools
 , hostPlatform
 }:
 
@@ -225,7 +225,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null)
-    (ubootChooser stdenv.platform.uboot);
+    ubootTools;
 
   hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];
 
@@ -248,6 +248,6 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
       # crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot
       # can just go into buildInputs (but not nativeBuildInputs since cp.uboot
       # may be different from stdenv.platform.uboot)
-      buildInputs = optional (cp.uboot != null) (ubootChooser cp.uboot).crossDrv;
+      buildInputs = optional (cp.uboot != null) ubootTools.crossDrv;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fef39389c8..eee20ec8f08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13002,9 +13002,6 @@ with pkgs;
 
   tunctl = callPackage ../os-specific/linux/tunctl { };
 
-  # TODO(dezgeg): either refactor & use ubootTools directly, or remove completely
-  ubootChooser = name: ubootTools;
-
   # Upstream U-Boots:
   inherit (callPackage ../misc/uboot {})
     buildUBoot
-- 
GitLab


From 91de9958c0223a57f6703b6e93484c4ce578dfb6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 5 Nov 2017 14:38:03 +0100
Subject: [PATCH 680/877] browserpass: 1.0.6 -> 2.0.7

---
 pkgs/tools/security/browserpass/default.nix |  6 +++--
 pkgs/tools/security/browserpass/deps.nix    | 30 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/security/browserpass/deps.nix

diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
index c078c3a21c5..7230d30c795 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/pkgs/tools/security/browserpass/default.nix
@@ -3,15 +3,17 @@
 
 buildGoPackage rec {
   name = "browserpass-${version}";
-  version = "1.0.6";
+  version = "2.0.7";
 
   goPackagePath = "github.com/dannyvankooten/browserpass";
 
+  goDeps = ./deps.nix;
+
   src = fetchFromGitHub {
     repo = "browserpass";
     owner = "dannyvankooten";
     rev = version;
-    sha256 = "07wkvwb9klzxnlrm9a07kxzj3skpy0lymc9ijr8ykfbz6l0bpbqy";
+    sha256 = "1dbp5za5qh6xmgh3w2cx5fbw13mh1szgj2y7ilmq0jh2ik09fbnd";
   };
 
   postInstall = ''
diff --git a/pkgs/tools/security/browserpass/deps.nix b/pkgs/tools/security/browserpass/deps.nix
new file mode 100644
index 00000000000..4a86966a9fc
--- /dev/null
+++ b/pkgs/tools/security/browserpass/deps.nix
@@ -0,0 +1,30 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/gokyle/twofactor";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gokyle/twofactor";
+      rev = "eaad1884d40f9cabff98a57a524c17afd00c9fe7";
+      sha256 = "07kvga6f2b56kpy52a3xk16garvlqz950s350dax97x7cayba95g";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-zglob";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-zglob";
+      rev = "4b74c24375b3b1ee226867156e01996f4e19a8d6";
+      sha256 = "1qc502an4q3wgvrd9zw6zprgm28d90d2f98bdamdf4js03jj22xn";
+    };
+  }
+  {
+    goPackagePath = "rsc.io/qr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rsc/qr";
+      rev = "48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5";
+      sha256 = "1npxy32glnkvsp0871972jzjzgkwaqmbv6jsj9wgqsa1s2jr004p";
+    };
+  }
+]
-- 
GitLab


From b032b3544fe583d467ca11b7e605eae7e2f95346 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 5 Nov 2017 14:56:06 +0100
Subject: [PATCH 681/877] linux_mptcp: 0.92.1 -> 0.93

---
 pkgs/os-specific/linux/kernel/linux-mptcp.nix | 14 ++++++++------
 pkgs/top-level/all-packages.nix               |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index 4c237cb24b4..c7e9859ded7 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -1,8 +1,8 @@
-{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  mptcpVersion = "0.92.1";
-  modDirVersion = "4.4.83";
+  mptcpVersion = "0.93";
+  modDirVersion = "4.9.60";
   version = "${modDirVersion}-mptcp_v${mptcpVersion}";
 
   extraMeta = {
@@ -10,9 +10,11 @@ import ./generic.nix (args // rec {
     maintainers = with stdenv.lib.maintainers; [ teto layus ];
   };
 
-  src = fetchurl {
-    url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz";
-    sha256 = "1afjqmxq9p5gyr6r607bx3mqpnx451kfpwlffzxwgdwnf93alngz";
+  src = fetchFromGitHub {
+    owner = "multipath-tcp";
+    repo = "mptcp";
+    rev = "v${mptcpVersion}";
+    sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys";
   };
 
   extraConfig = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eee20ec8f08..1817ed69c31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12410,7 +12410,8 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.p9_fixes
-        kernelPatches.cpu-cgroup-v2."4.4"
+        kernelPatches.cpu-cgroup-v2."4.9"
+        kernelPatches.modinst_arg_list_too_long
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
-- 
GitLab


From cdbe4671bef1c0ba6345c51270472998bd44e266 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Nov 2017 15:25:54 +0100
Subject: [PATCH 682/877] SBCL: bump to unstable to include upstream fixes for
 bugs breaking iolib

---
 pkgs/development/compilers/sbcl/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 3aa3ac6aadb..9b7ce4120c4 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, sbclBootstrap
+{ stdenv, fetchurl, fetchgit, writeText, sbclBootstrap
 , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
 , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.system)
   # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
@@ -9,11 +9,16 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.4.1";
+  version = "1.4.1.0.20171104";
 
-  src = fetchurl {
-    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "1qdaf847g5p2zgq00ax5hdy4r82bl3ss382psd0kkca1h83cdiz8";
+  #src = fetchurl {
+  #  url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
+  #  sha256 = "1qdaf847g5p2zgq00ax5hdy4r82bl3ss382psd0kkca1h83cdiz8";
+  #};
+  src = fetchgit {
+    url    = "https://git.code.sf.net/p/sbcl/sbcl";
+    sha256 = "1fq34h8h8pax5q17w84kwv5amiaag3ikkq3cdmb31r64736mxi6r";
+    rev    = "11aa57d23bc464d6a6867a80e946907404ceadd1";
   };
 
   patchPhase = ''
@@ -35,7 +40,7 @@ stdenv.mkDerivation rec {
     # SBCL checks whether files are up-to-date in many places..
     # Unfortunately, same timestamp is not good enough
     sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
-    sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
+    #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
     sed -i src/cold/slam.lisp -e \
       '/file-write-date input/a)'
     sed -i src/cold/slam.lisp -e \
-- 
GitLab


From 8877ba4c0f7c1be2c4d7d83de748d7c8a70b9beb Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 5 Nov 2017 15:41:13 +0100
Subject: [PATCH 683/877] bdf2psf 1.158 -> 1.170

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

diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index bf1377419a5..b8b01a7c0fc 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bdf2psf-${version}";
-  version = "1.158";
+  version = "1.170";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "12zaj7hi5gzdh9r7rcyqnkwik1ljw1qzj6j7rw80bgw6fn611rs9";
+    sha256 = "0xh743cr21qk8cmc6ijp59d61dqra4ggdlgbin9v991xqa0mqdxb";
   };
 
   buildInputs = [ dpkg ];
-- 
GitLab


From 896ec47a39e49c7f9b499e540fef6e39fba2fae0 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 5 Nov 2017 15:52:37 +0100
Subject: [PATCH 684/877] rewritefs: 2016-07-27 -> 2017-08-14

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

diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix
index 3801036f9e5..5b16799a89c 100644
--- a/pkgs/os-specific/linux/rewritefs/default.nix
+++ b/pkgs/os-specific/linux/rewritefs/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "rewritefs-${version}";
-  version = "2016-07-27";
+  version = "2017-08-14";
 
   src = fetchFromGitHub {
-    owner = "sloonz";
-    repo = "rewritefs";
-    rev = "fe19d389746bdffcc1cc7b3e3156dbacd04b4e9b";
+    owner  = "sloonz";
+    repo   = "rewritefs";
+    rev    = "33fb844d8e8ff441a3fc80d2715e8c64f8563d81";
     sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla";
   };
  
-- 
GitLab


From c53d874277c0eaf88ec71bab9658425535a2252a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 8 Jul 2017 14:10:22 +0200
Subject: [PATCH 685/877] lib/types: add intBetween

An int type that checks the value range.
---
 lib/types.nix                                 |  6 ++++++
 nixos/doc/manual/development/option-types.xml | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/lib/types.nix b/lib/types.nix
index db3bd381523..e921f7f6d9f 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -114,6 +114,12 @@ rec {
       merge = mergeOneOption;
     };
 
+    intBetween = min: max:
+      addCheck types.int (x: x >= min && x <= max) // {
+        name = "intBetween";
+        description = "integer between ${toString min} and ${toString max} (both inclusively)";
+      };
+
     str = mkOptionType {
       name = "str";
       description = "string";
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 7b86e518aaf..dedfc286ca3 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -26,6 +26,17 @@
     <term><varname>types.int</varname></term>
     <listitem><para>An integer.</para></listitem>
   </varlistentry>
+  <varlistentry>
+    <term>
+      <varname>types.intBetween</varname>
+      <replaceable>min</replaceable>
+      <replaceable>max</replaceable>
+    </term>
+    <listitem><para>An integer between <replaceable>min</replaceable>
+        and <replaceable>max</replaceable> (both inclusive).
+        Useful for e.g. port ranges.
+    </para></listitem>
+  </varlistentry>
   <varlistentry>
     <term><varname>types.path</varname></term>
     <listitem><para>A filesystem path, defined as anything that when coerced to 
-- 
GitLab


From af424a607cf6888c7e7e2cf718516d0786a2e3d2 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 8 Jul 2017 14:17:11 +0200
Subject: [PATCH 686/877] lib/modules: Change type error to be gramatically
 nicer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before:
  <x> is not a integer between 0 and 100 (inclusively).
(notice that “a” is wrong, it should be “an”)
Now:
  <x> is not of type `integer between 0 and 100 (inclusively)'.

This sounds a bit more formal, but circumvents the grammatical problems.
Multi-word type descriptions are also easier to see.
---
 lib/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index eb2f89684f3..8c3584bbbf4 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -338,7 +338,7 @@ rec {
     # Type-check the remaining definitions, and merge them.
     mergedValue = foldl' (res: def:
       if type.check def.value then res
-      else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.description}.")
+      else throw "The option value `${showOption loc}' in `${def.file}' is not of type `${type.description}'.")
       (type.merge loc defsFinal) defsFinal;
 
     isDefined = defsFinal != [];
-- 
GitLab


From 281d071b6a5380a811c5b2f7493bbcf75461c7ff Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 5 Aug 2017 15:06:48 +0200
Subject: [PATCH 687/877] lib/types: add various signed/unsigned int types

It is sometimes necessary to restrict the domain of integers for configurations,
as well as restricting them to unsigned/positive values.
---
 lib/types.nix | 67 +++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 57 insertions(+), 10 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index e921f7f6d9f..3dc99cd36f2 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -107,17 +107,64 @@ rec {
       merge = mergeEqualOption;
     };
 
-    int = mkOptionType rec {
-      name = "int";
-      description = "integer";
-      check = isInt;
-      merge = mergeOneOption;
-    };
+    int = ints.signed;
+
+    # specialized subdomains of int
+    ints =
+      let
+        int = mkOptionType rec {
+          name = "int";
+          description = "signed integer";
+          check = isInt;
+          merge = mergeOneOption;
+        };
+
+        betweenDesc = lowest: highest:
+          "${toString lowest} and ${toString highest} (both inclusive).";
+        between = lowest: highest: assert lowest <= highest;
+          addCheck int (x: x >= lowest && x <= highest) // {
+            name = "intBetween";
+            description = "Integer between ${betweenDesc lowest highest}";
+          };
+        ign = lowest: highest: name: docStart:
+          between lowest highest // {
+            inherit name;
+            description = docStart + " Between ${betweenDesc lowest highest}";
+          };
+        unsign = bit: range: ign 0 (range - 1)
+          "unsignedInt${toString bit}" "${toString bit} bit unsigned integer.";
+        sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1)
+          "signedInt${toString bit}" "${toString bit} bit signed integer.";
+
+      in rec {
+        /* an int with a fixed range
+        *
+        * Example:
+        *   (ints.between 0 100).check (-1)
+        *   => false
+        *   (ints.between 0 100).check (101)
+        *   => false
+        *   (ints.between 0 0).check 0
+        *   => true
+        */
+        inherit between;
+
+        unsigned = addCheck types.int (x: x >= 0) // {
+          name = "unsignedInt";
+          description = "unsigned integer, meaning >=0";
+        };
+        unsigned8 = unsign 8 256;
+        unsigned16 = unsign 16 65536;
+        unsigned32 = unsign 32 4294967296;
+        # the biggest int the nix lexer accepts is 9223372036854775808
+        # the smallest int the nix lexer accepts is -9223372036854775807
+        # unsigned64 = unsign 64 18446744073709551616;
+
+        signed = int;
+        signed8 = sign 8 256;
+        signed16 = sign 16 65536;
+        signed32 = sign 32 4294967296;
 
-    intBetween = min: max:
-      addCheck types.int (x: x >= min && x <= max) // {
-        name = "intBetween";
-        description = "integer between ${toString min} and ${toString max} (both inclusively)";
       };
 
     str = mkOptionType {
-- 
GitLab


From c776489cacb32d2cbfe0ba2622b2b6e4d27bae7d Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 5 Aug 2017 15:13:55 +0200
Subject: [PATCH 688/877] lib/types: add port type

---
 lib/types.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 3dc99cd36f2..cd59a00cfd8 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -120,16 +120,16 @@ rec {
         };
 
         betweenDesc = lowest: highest:
-          "${toString lowest} and ${toString highest} (both inclusive).";
+          "${toString lowest} and ${toString highest} (both inclusive)";
         between = lowest: highest: assert lowest <= highest;
           addCheck int (x: x >= lowest && x <= highest) // {
             name = "intBetween";
-            description = "Integer between ${betweenDesc lowest highest}";
+            description = "Integer between ${betweenDesc lowest highest}.";
           };
         ign = lowest: highest: name: docStart:
           between lowest highest // {
             inherit name;
-            description = docStart + " Between ${betweenDesc lowest highest}";
+            description = docStart + " Between ${betweenDesc lowest highest}.";
           };
         unsign = bit: range: ign 0 (range - 1)
           "unsignedInt${toString bit}" "${toString bit} bit unsigned integer.";
@@ -137,7 +137,7 @@ rec {
           "signedInt${toString bit}" "${toString bit} bit signed integer.";
 
       in rec {
-        /* an int with a fixed range
+        /* An int with a fixed range.
         *
         * Example:
         *   (ints.between 0 100).check (-1)
@@ -167,6 +167,9 @@ rec {
 
       };
 
+    /* A network port number */
+    port = ints.unsigned16;
+
     str = mkOptionType {
       name = "str";
       description = "string";
-- 
GitLab


From 3e3bfc66f7b98d7b57f67ba201dd446be9512078 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 5 Aug 2017 16:44:12 +0200
Subject: [PATCH 689/877] lib/types: nixos manual documentation for
 signed/unsinged int

Synchronize the manual for the new types.
---
 nixos/doc/manual/development/option-types.xml | 83 +++++++++++++++----
 1 file changed, 69 insertions(+), 14 deletions(-)

diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index dedfc286ca3..ccdbc0900be 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -22,31 +22,75 @@
     <listitem><para>A boolean, its values can be <literal>true</literal> or 
         <literal>false</literal>.</para></listitem>
   </varlistentry>
+  <varlistentry>
+    <term><varname>types.path</varname></term>
+    <listitem><para>A filesystem path, defined as anything that when coerced to 
+        a string starts with a slash. Even if derivations can be considered as 
+        path, the more specific <literal>types.package</literal> should be 
+        preferred.</para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><varname>types.package</varname></term>
+    <listitem><para>A derivation or a store path.</para></listitem>
+  </varlistentry>
+</variablelist>
+
+<para>Integer related types:</para>
+
+<variablelist>
+  <varlistentry>
+    <term>
+      <varname>types.ints.signed</varname>
+    </term>
+    <listitem><para>A signed integer.
+    </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>
+      <varname>types.ints{signed8, signed16, signed32}</varname>
+    </term>
+    <listitem>
+      <para>Signed integers with a fixed length (8, 16 or 32 bits).
+        They go from
+        <inlineequation><mathphrase>−2<superscript>n</superscript>/2</mathphrase>
+        </inlineequation> to <inlineequation>
+        <mathphrase>2<superscript>n</superscript>/2−1</mathphrase>
+        </inlineequation>
+        respectively (e.g. <literal>−128</literal> to <literal>127</literal>
+        for 8 bits).
+    </para></listitem>
+  </varlistentry>
   <varlistentry>
     <term><varname>types.int</varname></term>
-    <listitem><para>An integer.</para></listitem>
+    <listitem><para>A convenience alias for <literal>ints.signed</literal>.
+    </para></listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <varname>types.intBetween</varname>
-      <replaceable>min</replaceable>
-      <replaceable>max</replaceable>
+      <varname>types.ints.unsigned</varname>
     </term>
-    <listitem><para>An integer between <replaceable>min</replaceable>
-        and <replaceable>max</replaceable> (both inclusive).
-        Useful for e.g. port ranges.
+    <listitem><para>An unsigned integer (that is ≥ 0).
     </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term><varname>types.path</varname></term>
-    <listitem><para>A filesystem path, defined as anything that when coerced to 
-        a string starts with a slash. Even if derivations can be considered as 
-        path, the more specific <literal>types.package</literal> should be 
-        preferred.</para></listitem>
+    <term>
+      <varname>types.ints{unsigned8, unsigned16, unsigned32}</varname>
+    </term>
+    <listitem>
+      <para>Unsigned integers with a fixed length (8, 16 or 32 bits).
+        They go from
+        <inlineequation><mathphrase>0</mathphrase></inlineequation> to <inlineequation>
+        <mathphrase>2<superscript>n</superscript>−1</mathphrase>
+        </inlineequation>
+        respectively (e.g. <literal>0</literal> to <literal>255</literal>
+        for 8 bits).
+    </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term><varname>types.package</varname></term>
-    <listitem><para>A derivation or a store path.</para></listitem>
+    <term>
+      <varname>types.port</varname>
+    </term>
+    <listitem><para>A network port number (0–65635).</para></listitem>
   </varlistentry>
 </variablelist>
 
@@ -95,6 +139,17 @@
         <replaceable>sep</replaceable>, e.g. <literal>types.separatedString
           "|"</literal>.</para></listitem>
   </varlistentry>
+  <varlistentry>
+    <term>
+      <varname>types.ints.between</varname>
+      <replaceable>lowest</replaceable>
+      <replaceable>highest</replaceable>
+    </term>
+    <listitem><para>An integer between <replaceable>lowest</replaceable>
+        and <replaceable>highest</replaceable> (both inclusive).
+        Useful for e.g. creating types like <literal>types.port</literal>.
+    </para></listitem>
+  </varlistentry>
   <varlistentry>
     <term><varname>types.submodule</varname> <replaceable>o</replaceable></term>
     <listitem><para>A set of sub options <replaceable>o</replaceable>.
-- 
GitLab


From 7fcd3892a93912cd444832f6289307aedc3abcbd Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 31 Oct 2017 12:47:49 +0100
Subject: [PATCH 690/877] lib/types: remove port type again

Will be introduced as a taggedUnion, once that type is in nixpkgs.
---
 lib/types.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index cd59a00cfd8..df141885f95 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -167,9 +167,6 @@ rec {
 
       };
 
-    /* A network port number */
-    port = ints.unsigned16;
-
     str = mkOptionType {
       name = "str";
       description = "string";
-- 
GitLab


From 77648da2336b4a85bbbf33866402a775e3cbdae8 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 31 Oct 2017 12:48:37 +0100
Subject: [PATCH 691/877] lib/types: signed -> s, unsigned -> u, remove signed
 alias
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mirrors the way it’s done in modern low-level languages like Rust (by input of
@nbp).
Removes the signed alias for int.
---
 lib/types.nix | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index df141885f95..01d82d31c83 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -107,18 +107,16 @@ rec {
       merge = mergeEqualOption;
     };
 
-    int = ints.signed;
+    int = mkOptionType rec {
+        name = "int";
+        description = "signed integer";
+        check = isInt;
+        merge = mergeOneOption;
+      };
 
     # specialized subdomains of int
     ints =
       let
-        int = mkOptionType rec {
-          name = "int";
-          description = "signed integer";
-          check = isInt;
-          merge = mergeOneOption;
-        };
-
         betweenDesc = lowest: highest:
           "${toString lowest} and ${toString highest} (both inclusive)";
         between = lowest: highest: assert lowest <= highest;
@@ -153,18 +151,16 @@ rec {
           name = "unsignedInt";
           description = "unsigned integer, meaning >=0";
         };
-        unsigned8 = unsign 8 256;
-        unsigned16 = unsign 16 65536;
-        unsigned32 = unsign 32 4294967296;
+        u8 = unsign 8 256;
+        u16 = unsign 16 65536;
+        u32 = unsign 32 4294967296;
         # the biggest int the nix lexer accepts is 9223372036854775808
         # the smallest int the nix lexer accepts is -9223372036854775807
         # unsigned64 = unsign 64 18446744073709551616;
 
-        signed = int;
-        signed8 = sign 8 256;
-        signed16 = sign 16 65536;
-        signed32 = sign 32 4294967296;
-
+        s8 = sign 8 256;
+        s16 = sign 16 65536;
+        s32 = sign 32 4294967296;
       };
 
     str = mkOptionType {
-- 
GitLab


From f8e6cd3465c6efdfd3b9db510c6365c31740644c Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 31 Oct 2017 14:23:05 +0100
Subject: [PATCH 692/877] lib/types: add tests for `ints.between` and
 `ints.unsigned`

The int types are trivial invocations of `ints.between`, so they are not tested
explicitely.
---
 lib/tests/modules.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index ba0c67fb7d4..ac0372e66f8 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -61,6 +61,14 @@ checkConfigError() {
 checkConfigOutput "false" config.enable ./declare-enable.nix
 checkConfigError 'The option .* defined in .* does not exist.' config.enable ./define-enable.nix
 
+# Check integer types.
+# unsigned
+checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix
+checkConfigError 'The option value .* in .* is not of type.*unsigned integer.*' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix
+# between
+checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix
+checkConfigError 'The option value .* in .* is not of type.*between.*-21 and 43.*inclusive.*' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix
+
 # Check mkForce without submodules.
 set -- config.enable ./declare-enable.nix ./define-enable.nix
 checkConfigOutput "true" "$@"
@@ -126,7 +134,7 @@ checkConfigOutput "true" "$@" ./define-module-check.nix
 # Check coerced value.
 checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
 checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
-checkConfigError 'The option value .* in .* is not a string or integer.' config.value ./declare-coerced-value.nix ./define-value-list.nix
+checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix
 
 cat <<EOF
 ====== module tests ======
-- 
GitLab


From c85f085062a09369a471eec438f86f1e1d2a721e Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 31 Oct 2017 14:55:51 +0100
Subject: [PATCH 693/877] lib/types: update docs to match the new type names

---
 .../modules/declare-int-between-value.nix     |  9 ++++++
 .../modules/declare-int-unsigned-value.nix    |  9 ++++++
 .../modules/define-value-int-negative.nix     |  3 ++
 .../modules/define-value-int-positive.nix     |  3 ++
 nixos/doc/manual/development/option-types.xml | 32 ++++++-------------
 5 files changed, 33 insertions(+), 23 deletions(-)
 create mode 100644 lib/tests/modules/declare-int-between-value.nix
 create mode 100644 lib/tests/modules/declare-int-unsigned-value.nix
 create mode 100644 lib/tests/modules/define-value-int-negative.nix
 create mode 100644 lib/tests/modules/define-value-int-positive.nix

diff --git a/lib/tests/modules/declare-int-between-value.nix b/lib/tests/modules/declare-int-between-value.nix
new file mode 100644
index 00000000000..8b2624cc5d6
--- /dev/null
+++ b/lib/tests/modules/declare-int-between-value.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+
+{
+  options = {
+    value = lib.mkOption {
+      type = lib.types.ints.between (-21) 43;
+    };
+  };
+}
diff --git a/lib/tests/modules/declare-int-unsigned-value.nix b/lib/tests/modules/declare-int-unsigned-value.nix
new file mode 100644
index 00000000000..05d0eff01c9
--- /dev/null
+++ b/lib/tests/modules/declare-int-unsigned-value.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+
+{
+  options = {
+    value = lib.mkOption {
+      type = lib.types.ints.unsigned;
+    };
+  };
+}
diff --git a/lib/tests/modules/define-value-int-negative.nix b/lib/tests/modules/define-value-int-negative.nix
new file mode 100644
index 00000000000..a041222987a
--- /dev/null
+++ b/lib/tests/modules/define-value-int-negative.nix
@@ -0,0 +1,3 @@
+{
+  value = -23;
+}
diff --git a/lib/tests/modules/define-value-int-positive.nix b/lib/tests/modules/define-value-int-positive.nix
new file mode 100644
index 00000000000..5803de17263
--- /dev/null
+++ b/lib/tests/modules/define-value-int-positive.nix
@@ -0,0 +1,3 @@
+{
+  value = 42;
+}
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index ccdbc0900be..0b00f7077c2 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -35,19 +35,16 @@
   </varlistentry>
 </variablelist>
 
-<para>Integer related types:</para>
+<para>Integer-related types:</para>
 
 <variablelist>
   <varlistentry>
-    <term>
-      <varname>types.ints.signed</varname>
-    </term>
-    <listitem><para>A signed integer.
-    </para></listitem>
+    <term><varname>types.int</varname></term>
+    <listitem><para>A signed integer.</para></listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <varname>types.ints{signed8, signed16, signed32}</varname>
+      <varname>types.ints.{s8, s16, s32}</varname>
     </term>
     <listitem>
       <para>Signed integers with a fixed length (8, 16 or 32 bits).
@@ -60,21 +57,16 @@
         for 8 bits).
     </para></listitem>
   </varlistentry>
-  <varlistentry>
-    <term><varname>types.int</varname></term>
-    <listitem><para>A convenience alias for <literal>ints.signed</literal>.
-    </para></listitem>
-  </varlistentry>
   <varlistentry>
     <term>
       <varname>types.ints.unsigned</varname>
     </term>
-    <listitem><para>An unsigned integer (that is ≥ 0).
+    <listitem><para>An unsigned integer (that is >= 0).
     </para></listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <varname>types.ints{unsigned8, unsigned16, unsigned32}</varname>
+      <varname>types.ints.{u8, u16, u32}</varname>
     </term>
     <listitem>
       <para>Unsigned integers with a fixed length (8, 16 or 32 bits).
@@ -86,15 +78,9 @@
         for 8 bits).
     </para></listitem>
   </varlistentry>
-  <varlistentry>
-    <term>
-      <varname>types.port</varname>
-    </term>
-    <listitem><para>A network port number (0–65635).</para></listitem>
-  </varlistentry>
 </variablelist>
 
-<para>String related types:</para>
+<para>String-related types:</para>
 
 <variablelist>
   <varlistentry>
@@ -123,7 +109,7 @@
 
  <section><title>Value Types</title>
 
-   <para>Value types are type that take a value parameter.</para>
+   <para>Value types are types that take a value parameter.</para>
 
 <variablelist>
   <varlistentry>
@@ -147,7 +133,7 @@
     </term>
     <listitem><para>An integer between <replaceable>lowest</replaceable>
         and <replaceable>highest</replaceable> (both inclusive).
-        Useful for e.g. creating types like <literal>types.port</literal>.
+        Useful for creating types like <literal>types.port</literal>.
     </para></listitem>
   </varlistentry>
   <varlistentry>
-- 
GitLab


From 1158910676323b57ba0248a71ad0a0d8e57a960b Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 31 Oct 2017 17:08:32 +0100
Subject: [PATCH 694/877] lib/types: match lowercase descriptions of other
 types

---
 lib/types.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 01d82d31c83..021641fdc22 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -122,17 +122,17 @@ rec {
         between = lowest: highest: assert lowest <= highest;
           addCheck int (x: x >= lowest && x <= highest) // {
             name = "intBetween";
-            description = "Integer between ${betweenDesc lowest highest}.";
+            description = "integer between ${betweenDesc lowest highest}";
           };
         ign = lowest: highest: name: docStart:
           between lowest highest // {
             inherit name;
-            description = docStart + " Between ${betweenDesc lowest highest}.";
+            description = docStart + "; between ${betweenDesc lowest highest}";
           };
         unsign = bit: range: ign 0 (range - 1)
-          "unsignedInt${toString bit}" "${toString bit} bit unsigned integer.";
+          "unsignedInt${toString bit}" "${toString bit} bit unsigned integer";
         sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1)
-          "signedInt${toString bit}" "${toString bit} bit signed integer.";
+          "signedInt${toString bit}" "${toString bit} bit signed integer";
 
       in rec {
         /* An int with a fixed range.
-- 
GitLab


From 462c048c77fa0aa0cb4c47d7812a57f094587f68 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 31 Oct 2017 17:30:15 +0100
Subject: [PATCH 695/877] lib/types: add `ints.positive`.

For values that are positive, but cannot be 0.
---
 lib/tests/modules.sh                             | 2 ++
 lib/tests/modules/declare-int-positive-value.nix | 9 +++++++++
 lib/tests/modules/define-value-int-zero.nix      | 3 +++
 lib/types.nix                                    | 4 ++++
 nixos/doc/manual/development/option-types.xml    | 7 +++++++
 5 files changed, 25 insertions(+)
 create mode 100644 lib/tests/modules/declare-int-positive-value.nix
 create mode 100644 lib/tests/modules/define-value-int-zero.nix

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index ac0372e66f8..96a91c0fffb 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -65,6 +65,8 @@ checkConfigError 'The option .* defined in .* does not exist.' config.enable ./d
 # unsigned
 checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix
 checkConfigError 'The option value .* in .* is not of type.*unsigned integer.*' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix
+# positive
+checkConfigError 'The option value .* in .* is not of type.*positive integer.*' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix
 # between
 checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix
 checkConfigError 'The option value .* in .* is not of type.*between.*-21 and 43.*inclusive.*' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix
diff --git a/lib/tests/modules/declare-int-positive-value.nix b/lib/tests/modules/declare-int-positive-value.nix
new file mode 100644
index 00000000000..6e48c6ac8fe
--- /dev/null
+++ b/lib/tests/modules/declare-int-positive-value.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+
+{
+  options = {
+    value = lib.mkOption {
+      type = lib.types.ints.positive;
+    };
+  };
+}
diff --git a/lib/tests/modules/define-value-int-zero.nix b/lib/tests/modules/define-value-int-zero.nix
new file mode 100644
index 00000000000..68bb9f415c3
--- /dev/null
+++ b/lib/tests/modules/define-value-int-zero.nix
@@ -0,0 +1,3 @@
+{
+  value = 0;
+}
diff --git a/lib/types.nix b/lib/types.nix
index 021641fdc22..1675a54156d 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -151,6 +151,10 @@ rec {
           name = "unsignedInt";
           description = "unsigned integer, meaning >=0";
         };
+        positive = addCheck types.int (x: x > 0) // {
+          name = "positiveInt";
+          description = "positive integer, meaning >0";
+        };
         u8 = unsign 8 256;
         u16 = unsign 16 65536;
         u32 = unsign 32 4294967296;
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 0b00f7077c2..83dcf0232d9 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -78,6 +78,13 @@
         for 8 bits).
     </para></listitem>
   </varlistentry>
+  <varlistentry>
+    <term>
+      <varname>types.ints.positive</varname>
+    </term>
+    <listitem><para>A positive integer (that is > 0).
+    </para></listitem>
+  </varlistentry>
 </variablelist>
 
 <para>String-related types:</para>
-- 
GitLab


From 213bd2847bb6590126591435766793df0410b4d1 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 3 Nov 2017 12:20:35 +0100
Subject: [PATCH 696/877] lib/types: fix up documentation formatting a bit

---
 lib/types.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 1675a54156d..adbae8f08a5 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -114,7 +114,7 @@ rec {
         merge = mergeOneOption;
       };
 
-    # specialized subdomains of int
+    # Specialized subdomains of int
     ints =
       let
         betweenDesc = lowest: highest:
@@ -225,7 +225,7 @@ rec {
     };
 
     # drop this in the future:
-    list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf;
+    list = builtins.trace "`types.list` is deprecated; use `types.listOf` instead" types.listOf;
 
     listOf = elemType: mkOptionType rec {
       name = "listOf";
@@ -242,7 +242,7 @@ rec {
               ).optionalValue
             ) def.value
           else
-            throw "The option value `${showOption loc}' in `${def.file}' is not a list.") defs)));
+            throw "The option value `${showOption loc}` in `${def.file}` is not a list.") defs)));
       getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: listOf (elemType.substSubModules m);
@@ -313,7 +313,7 @@ rec {
         let nrNulls = count (def: def.value == null) defs; in
         if nrNulls == length defs then null
         else if nrNulls != 0 then
-          throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}."
+          throw "The option `${showOption loc}` is defined both null and not null, in ${showFiles (getFiles defs)}."
         else elemType.merge loc defs;
       getSubOptions = elemType.getSubOptions;
       getSubModules = elemType.getSubModules;
-- 
GitLab


From 14f232d812e94a9de4fdb5693c362b8660d2c272 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sat, 4 Nov 2017 15:17:12 +0000
Subject: [PATCH 697/877] ultrastardx: fix build

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1817ed69c31..b5a795913e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18098,7 +18098,9 @@ with pkgs;
 
   ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
 
-  ultrastardx = callPackage ../games/ultrastardx/default.nix { };
+  ultrastardx = callPackage ../games/ultrastardx/default.nix {
+    ffmpeg = ffmpeg_2;
+  };
 
   unnethack = callPackage ../games/unnethack { };
 
-- 
GitLab


From 0d9f2f0bb497020af31c93706cdf970a3db4bdfc Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 5 Nov 2017 16:58:14 +0200
Subject: [PATCH 698/877] platforms.nix: Clean up more 'uboot' legacy

For a while now, the only thing the 'uboot' attribute does is to tell
whether to add ubootTools to kernel/initrd builds. That can be
determined with platform.kernelTarget == "uImage" just as well.
---
 lib/systems/platforms.nix                       | 14 --------------
 pkgs/build-support/kernel/make-initrd.nix       | 13 +++++--------
 pkgs/os-specific/linux/kernel/generic.nix       |  1 -
 pkgs/os-specific/linux/kernel/manual-config.nix | 10 +++-------
 4 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 9ce697a1f7a..9dcd59066d0 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -2,7 +2,6 @@
 rec {
   pcBase = {
     name = "pc";
-    uboot = null;
     kernelHeadersBaseConfig = "defconfig";
     kernelBaseConfig = "defconfig";
     # Build whatever possible as a module, if not stated in the extra config.
@@ -50,9 +49,6 @@ rec {
     kernelTarget = "uImage";
     # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working
     #kernelDTB = true;
-
-    # XXX can be anything non-null, pkgs actually only cares if it is set or not
-    uboot = "pogoplug4";
   };
 
   sheevaplug = {
@@ -162,9 +158,6 @@ rec {
     '';
     kernelMakeFlags = [ "LOADADDR=0x0200000" ];
     kernelTarget = "uImage";
-    uboot = "sheevaplug";
-    # Only for uboot = uboot :
-    ubootConfig = "sheevaplug_config";
     kernelDTB = true; # Beyond 3.10
     gcc = {
       arch = "armv5te";
@@ -251,7 +244,6 @@ rec {
       LATENCYTOP y
     '';
     kernelTarget = "zImage";
-    uboot = null;
     gcc = {
       arch = "armv6";
       fpu = "vfp";
@@ -342,7 +334,6 @@ rec {
       XEN? n
     '';
     kernelTarget = "zImage";
-    uboot = null;
   };
 
   scaleway-c1 = armv7l-hf-multiplatform // {
@@ -374,7 +365,6 @@ rec {
     kernelMakeFlags = [ "LOADADDR=0x10800000" ];
     kernelTarget = "uImage";
     kernelDTB = true;
-    uboot = true; #XXX: any non-null value here is needed so that mkimage is present to build kernelTarget uImage
     gcc = {
       cpu = "cortex-a9";
       fpu = "neon";
@@ -464,7 +454,6 @@ rec {
       FTRACE n
     '';
     kernelTarget = "vmlinux";
-    uboot = null;
     gcc = {
       arch = "loongson2f";
       abi = "n32";
@@ -477,7 +466,6 @@ rec {
     kernelAutoModules = false;
     kernelExtraConfig = ""; # TBD kernel config
     kernelTarget = "zImage";
-    uboot = null;
   };
 
   armv7l-hf-multiplatform = {
@@ -489,7 +477,6 @@ rec {
     kernelDTB = true;
     kernelAutoModules = true;
     kernelPreferBuiltin = true;
-    uboot = null;
     kernelTarget = "zImage";
     kernelExtraConfig = ''
       # Fix broken sunxi-sid nvmem driver.
@@ -552,7 +539,6 @@ rec {
       # which our initrd builder can't currently do easily.
       USB_XHCI_TEGRA m
     '';
-    uboot = null;
     kernelTarget = "Image";
     gcc = {
       arch = "armv8-a";
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 6fcdc93b104..5353ae82841 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -16,17 +16,14 @@
 , hostPlatform
 }:
 
-let
-  inputsFun = ubootName : [ perl cpio ]
-    ++ stdenv.lib.optional (ubootName != null) ubootTools;
-  makeUInitrdFun = ubootName : (ubootName != null);
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "initrd";
   builder = ./make-initrd.sh;
-  nativeBuildInputs = inputsFun hostPlatform.platform.uboot;
 
-  makeUInitrd = makeUInitrdFun hostPlatform.platform.uboot;
+  makeUInitrd = hostPlatform.platform.kernelTarget == "uImage";
+
+  nativeBuildInputs = [ perl cpio ]
+    ++ stdenv.lib.optional makeUInitrd ubootTools;
 
   # !!! should use XML.
   objects = map (x: x.object) contents;
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 3912d9d10f5..c2f4e6843f5 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -29,7 +29,6 @@
 , ...
 }:
 
-assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null;
 assert stdenv.isLinux;
 
 let
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 61349175c78..28ad5aeca35 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -224,8 +224,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null)
-    ubootTools;
+  nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ]
+    ++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools;
 
   hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];
 
@@ -244,10 +244,6 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
 
       karch = cp.kernelArch;
 
-      # !!! uboot has messed up cross-compiling, nativeDrv builds arm tools on x86,
-      # crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot
-      # can just go into buildInputs (but not nativeBuildInputs since cp.uboot
-      # may be different from stdenv.platform.uboot)
-      buildInputs = optional (cp.uboot != null) ubootTools.crossDrv;
+      nativeBuildInputs = optional (cp.kernelTarget == "uImage") ubootTools;
   };
 })
-- 
GitLab


From 611829ba42f833c4627063c2510c4209486db074 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 5 Nov 2017 15:15:41 +0100
Subject: [PATCH 699/877] imagemagick: 6.9.9-20 -> 6.9.9-21

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 35e4fb989b3..507912ee43e 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "6.9.9-20";
-    sha256 = "1pz8clmhnq26vdsp1j21czq3nfbvrmfdz30k7na7w4vh7wqxsrx1";
+    version = "6.9.9-21";
+    sha256 = "0241g3c207rawn61bz8rc5gz55k5mi2b0n3zlwa0jv9xczlkd6a9";
     patches = [];
   }
     # Freeze version on mingw so we don't need to port the patch too often.
-- 
GitLab


From 4f8c5331c85b578c38076b7c6b92b70f7d659bc0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 5 Nov 2017 15:16:00 +0100
Subject: [PATCH 700/877] imagemagick7: 7.0.7-8 -> 7.0.7-9

---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index f2046f0d912..973e7f88e80 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.7-8";
-    sha256 = "0h2jbaxrxrmdcr5crf1d93sc60v4zfqrrl3w79md6h11wf57ksbp";
+    version = "7.0.7-9";
+    sha256 = "0p0879chcfrghcamwgxxcmaaj04xv0z91ris7hxi37qdw8c7836w";
     patches = [];
   };
 in
-- 
GitLab


From 711303952e7333f8667958610e3248c2a4c6b1c6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 23 Aug 2017 23:02:47 +0200
Subject: [PATCH 701/877] wireguard module: add device name environment var

This makes the interface name available as an environment variable for
the pre/post hooks.
---
 nixos/modules/services/networking/wireguard.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index eb08e7f90c0..24accd41511 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -195,6 +195,7 @@ let
         description = "WireGuard Tunnel - ${name}";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
+        environment.DEVICE = name;
 
         serviceConfig = {
           Type = "oneshot";
-- 
GitLab


From f4914d4eb4e966d7dbb66f903de391fc921b5349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Sun, 22 Oct 2017 19:49:16 +0200
Subject: [PATCH 702/877] bignums: init at various versions

Bignums used to be part of the standard library of Coq.
We provide a version for Coq 8.6, and one for Coq 8.7.
---
 .../coq-modules/bignums/default.nix           | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/coq-modules/bignums/default.nix

diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
new file mode 100644
index 00000000000..5762da66fed
--- /dev/null
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, coq }:
+
+let rev_and_sha = {
+  "8.6" = {
+    rev = "v8.6.0";
+    sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj";
+  };
+  "8.7" = {
+    rev = "V8.7.0";
+    sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
+  };
+};
+in
+
+if ! (rev_and_sha ? "${coq.coq-version}") then
+  throw "bignums is not available for Coq ${coq.coq-version}"
+else with rev_and_sha."${coq.coq-version}";
+
+stdenv.mkDerivation rec {
+
+  name = "coq${coq.coq-version}-bignums";
+
+  src = fetchFromGitHub {
+    owner = "coq";
+    repo = "bignums";
+    inherit rev sha256;
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ];
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    license = licenses.lgpl2;
+    platforms = coq.meta.platforms;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9226e15d63c..3eb87bd64f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18630,6 +18630,7 @@ with pkgs;
     coqPackages = self;
 
     autosubst = callPackage ../development/coq-modules/autosubst {};
+    bignums = callPackage ../development/coq-modules/bignums {};
     coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
     coquelicot = callPackage ../development/coq-modules/coquelicot {};
     dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
-- 
GitLab


From 1ddadc6b1c43b46bfff3e85ab543bcf8e742ccfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Sun, 29 Oct 2017 18:56:03 +0100
Subject: [PATCH 703/877] coqPackages.math-classes: 1.0.6 -> 1.0.7

This version introduces compatibility with Coq 8.7.
---
 .../coq-modules/math-classes/default.nix      | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix
index 0e7549623e7..d045ec4223b 100644
--- a/pkgs/development/coq-modules/math-classes/default.nix
+++ b/pkgs/development/coq-modules/math-classes/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, coq }:
+{ stdenv, fetchFromGitHub, coq, coqPackages }:
 
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-math-classes-1.0.6";
+if ! stdenv.lib.versionAtLeast coq.coq-version "8.6" then
+  throw "Math-Classes requires Coq 8.6 or later."
+else
 
-  src = fetchurl {
-    url = https://github.com/math-classes/math-classes/archive/1.0.6.tar.gz;
-    sha256 = "071hgjk4bz2ybci7dp2mw7xqmxmm2zph7kj28xcdg28iy796lf02";
-  };
+stdenv.mkDerivation rec {
+
+  name = "coq${coq.coq-version}-math-classes-${version}";
+  version = "1.0.7";
 
-  # src = fetchFromGitHub {
-  #   owner  = "math-classes";
-  #   repo   = "math-classes";
-  #   rev    = "1d426a08c2fbfd68bd1b3622fe8f31dd03712e6c";
-  #   sha256 = "3kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr";
-  # };
+  src = fetchFromGitHub {
+    owner = "math-classes";
+    repo = "math-classes";
+    rev = version;
+    sha256 = "0wgnczacvkb2pc3vjbni9bwjijfyd5jcdnyyjg8185hkf9zzabgi";
+  };
 
-  buildInputs = [ coq ];
+  buildInputs = [ coq coqPackages.bignums ];
   enableParallelBuilding = true;
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
-- 
GitLab


From 9ee18a51c609f33777597651283af42403e3d20b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:01:31 +0200
Subject: [PATCH 704/877] =?UTF-8?q?gnome3.folks:=200.11.3=20=E2=86=92=200.?=
 =?UTF-8?q?11.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/folks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
index 171ad077450..6fcaa67b771 100644
--- a/pkgs/desktops/gnome-3/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/core/folks/default.nix
@@ -8,11 +8,11 @@ let
   majorVersion = "0.11";
 in
 stdenv.mkDerivation rec {
-  name = "folks-${majorVersion}.3";
+  name = "folks-${majorVersion}.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz";
-    sha256 = "2a2828a7c87fd39e5786f8f2cf0ebe47576a74974f1355c478a6dc747d7bcb64";
+    sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57";
   };
 
   propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
-- 
GitLab


From 1e8e2a4f0d86c4adab90ef422ef886fd42d817d5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 5 Oct 2017 00:41:27 +0200
Subject: [PATCH 705/877] gnome3.totem-pl-parser: move src to a separate file

---
 pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix |  7 +------
 pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix     | 10 ++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix

diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
index 794f3801333..370fdee5381 100644
--- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
@@ -1,12 +1,7 @@
 { stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "totem-pl-parser-3.10.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
-    sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
-  };
+  inherit (import ./src.nix fetchurl) name src;
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ file intltool gmime libxml2 libsoup ];
diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix
new file mode 100644
index 00000000000..8e352ccfb4c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "totem-pl-parser-3.10.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz;
+    sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
+  };
+}
-- 
GitLab


From 573c039f9be29da3c7673afdceb14fc756e431bb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:10:29 +0200
Subject: [PATCH 706/877] =?UTF-8?q?gnome3.grilo:=200.3.3=20=E2=86=92=200.3?=
 =?UTF-8?q?.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/grilo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
index 18a4da4efe2..ffa489927e2 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   major = "0.3"; # if you change this, also change ./setup-hook.sh
-  minor = "3";
+  minor = "4";
   name = "grilo-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";
-    sha256 = "1qx072m0gl6m3d5g5cbbf13p4h217icmlxjnrn829x5xqwi451sw";
+    sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw";
   };
 
   setupHook = ./setup-hook.sh;
-- 
GitLab


From e03c009a5e7ebab3c710b48ed3c0c8af48b63224 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:10:50 +0200
Subject: [PATCH 707/877] =?UTF-8?q?gnome3.grilo=5Fplugins:=200.3.3=20?=
 =?UTF-8?q?=E2=86=92=200.3.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/grilo-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
index b6d9ccef666..b8911dd5c1f 100644
--- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   major = "0.3";
-  minor = "3";
+  minor = "5";
   name = "grilo-plugins-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz";
-    sha256 = "fe66e887847fef9c361bcb7226047c43b2bc22b172aaf22afd5534947cc85b9c";
+    sha256 = "1yv8a0mfd5qmdbdrnd0is5c51s1mvibhw61na99iagnbirxq4xr9";
   };
 
   installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ];
-- 
GitLab


From b5c634966141cc95f16a4f55c01e1339daa2b19c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:11:19 +0200
Subject: [PATCH 708/877] =?UTF-8?q?gnome3.libgdata:=200.17.6=20=E2=86=92?=
 =?UTF-8?q?=200.17.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/libgdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix
index 08f05bcaedc..ddf245f49e0 100644
--- a/pkgs/desktops/gnome-3/core/libgdata/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix
@@ -5,11 +5,11 @@ let
   majorVersion = "0.17";
 in
 stdenv.mkDerivation rec {
-  name = "libgdata-${majorVersion}.6";
+  name = "libgdata-${majorVersion}.9";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz";
-    sha256 = "8b6a3ff1db23bd9e5ebbcc958b29b769a898f892eed4798222d562ba69df30b0";
+    sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45";
   };
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
-- 
GitLab


From f53657d68b2c6b30287ff7ebd2e4d14e640e8efd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:12:51 +0200
Subject: [PATCH 709/877] =?UTF-8?q?clutter=5Fgtk:=201.8.2=20=E2=86=92=201.?=
 =?UTF-8?q?8.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 39296f86d8e..bada2c2c709 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   major = "1.8";
-  minor = "2";
+  minor = "4";
   name = "clutter-gtk-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz";
-    sha256 = "da27d486325490ad3f65d2abf9413aeb8b4a8f7b559e4b2f73567a5344a26b94";
+    sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j";
   };
 
   propagatedBuildInputs = [ clutter gtk3 ];
-- 
GitLab


From 7d0357449ff2b1ecdd1147fdc13688e0f181a937 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:13:19 +0200
Subject: [PATCH 710/877] =?UTF-8?q?gnome3.libpeas:=201.18.0=20=E2=86=92=20?=
 =?UTF-8?q?1.22.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/libpeas/src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libpeas/src.nix b/pkgs/desktops/gnome-3/core/libpeas/src.nix
index cd440858946..6f2cd82fb21 100644
--- a/pkgs/desktops/gnome-3/core/libpeas/src.nix
+++ b/pkgs/desktops/gnome-3/core/libpeas/src.nix
@@ -1,13 +1,13 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: rec {
-  major = "1.18";
+  major = "1.22";
   minor = "0";
   version = "${major}.${minor}";
   name = "libpeas-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz";
-    sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz";
+    sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv";
   };
 }
-- 
GitLab


From 1ac2dec0f628cdb3056503b5bb918523c0a60117 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:14:47 +0200
Subject: [PATCH 711/877] =?UTF-8?q?glibmm:=202.50.0=20=E2=86=92=202.54.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 5c318c9b46a..a3af96d51ed 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }:
 
 let
-  ver_maj = "2.50";
-  ver_min = "0";
+  ver_maj = "2.54";
+  ver_min = "1";
 in
 stdenv.mkDerivation rec {
   name = "glibmm-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz";
-    sha256 = "df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94";
+    sha256 = "0jkapw18icz59cmlmsl00nwwz0wh291kb4hc9z9hxmq45drqrhkw";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 578beeb52547205de597495731dc0194e647cc2f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:15:55 +0200
Subject: [PATCH 712/877] =?UTF-8?q?gusb:=200.2.9=20=E2=86=92=200.2.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/gusb/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 93f24b0f722..4da9db3ef04 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -1,24 +1,22 @@
 {stdenv, fetchurl
 , automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt
-, glib, systemd, libusb1, vala_0_23
+, glib, systemd, libusb1, vala_0_38
 }:
 stdenv.mkDerivation rec {
   name = "gusb-${version}";
-  version = "0.2.9";
+  version = "0.2.11";
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "http://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
-    sha256 = "056yxlppgycsfw1l8c9j6givk1n15jylhvx89wqhsxdi1b6vs83k";
+    url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
+    sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw";
   };
 
   preConfigure = "./autogen.sh";
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt
-    systemd vala_0_23 glib
-  ];
+  nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext
+                        gobjectIntrospection libxslt vala_0_38 ];
+  buildInputs = [ systemd  glib ];
 
   propagatedBuildInputs = [ libusb1 ];
 
-- 
GitLab


From 00269f660c4da075bd931555845161cafc5d6758 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:16:25 +0200
Subject: [PATCH 713/877] =?UTF-8?q?gvfs:=201.30.1=20=E2=86=92=201.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bash completions were removed upstream because gvfs is deprecated
in favour of glib’s gio .

https://bugzilla.gnome.org/show_bug.cgi?id=769378
---
 pkgs/development/libraries/gvfs/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 6eb341d66bc..78f507ca146 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, libtool
 , glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit
-, libgphoto2, avahi, libarchive, fuse, libcdio
+, libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma
 , libxml2, libxslt, docbook_xsl, samba, libmtp
 , gnomeSupport ? false, gnome, makeWrapper }:
 
 let
-  ver_maj = "1.30";
+  ver_maj = "1.34";
   version = "${ver_maj}.1";
 in
 stdenv.mkDerivation rec {
@@ -13,21 +13,21 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz";
-    sha256 = "e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b";
+    sha256 = "1d3j6f252mk316hrspwy63inrhxk6l78l4bmlmql401lqapb5yby";
   };
 
   nativeBuildInputs = [
-    pkgconfig intltool libtool
+    pkgconfig intltool libtool file makeWrapper
     libxml2 libxslt docbook_xsl
   ];
 
   buildInputs =
-    [ makeWrapper glib dbus udev libgudev udisks2 libgcrypt
-      libgphoto2 avahi libarchive fuse libcdio
+    [ glib dbus udev libgudev udisks2 libgcrypt
+      libgphoto2 avahi libarchive fuse libcdio lzma bzip2
       samba libmtp libcap polkit
       # ToDo: a ligther version of libsoup to have FTP/HTTP support?
     ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
-      gtk libsoup libgnome_keyring gconf gcr
+      libsoup libgnome_keyring gconf gcr
       # ToDo: not working and probably useless until gnome3 from x-updates
     ]);
 
-- 
GitLab


From 804af47f8af761f2be6251253878576a4542d37c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:16:54 +0200
Subject: [PATCH 714/877] =?UTF-8?q?libchamplain:=200.12.14=20=E2=86=92=200?=
 =?UTF-8?q?.12.16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index f6d6c5b803e..514a1fa8534 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   major = "0.12";
-  version = "${major}.14";
+  version = "${major}.16";
   name = "libchamplain-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libchamplain/${major}/${name}.tar.xz";
-    sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi";
+    sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 14e518d0207dff28689807c5688c521144ef613f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:17:22 +0200
Subject: [PATCH 715/877] =?UTF-8?q?librsvg:=202.40.17=20=E2=86=92=202.40.1?=
 =?UTF-8?q?9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 7845f28adc9..09a0f4444b5 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -6,11 +6,11 @@
 # no introspection by default, it's too big
 
 stdenv.mkDerivation rec {
-  name = "librsvg-2.40.17";
+  name = "librsvg-2.40.19";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz";
-    sha256 = "1k39gyf7f5m9x0jvpcxvfcqswdb04xhm1lbwbjabn1f4xk5wbxp6";
+    url    = "mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.tar.xz";
+    sha256 = "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z";
   };
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
-- 
GitLab


From d3027030ceacaf670e58935630f2f5d5a83cd1fa Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:17:45 +0200
Subject: [PATCH 716/877] =?UTF-8?q?libgtop:=202.34.1=20=E2=86=92=202.38.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index de72072e48b..49cd1d163a6 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection, libintlOrEmpty }:
 stdenv.mkDerivation rec {
   name = "libgtop-${version}";
-  major = "2.34";
-  version = "${major}.1";
+  major = "2.38";
+  version = "${major}.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libgtop/${major}/${name}.tar.xz";
-    sha256 = "c89978a76662b18d392edbe0d1b794f5a9a399a5ccf22a02d5b9e28b5ed609e2";
+    sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g";
   };
 
   propagatedBuildInputs = [ glib ];
-- 
GitLab


From 464a113201f805012f37880bf66af109a55e569e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:19:36 +0200
Subject: [PATCH 717/877] =?UTF-8?q?spice=5Fprotocol:=200.12.12=20=E2=86=92?=
 =?UTF-8?q?=200.12.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index bd56d880f94..56adea9ca82 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "spice-protocol-0.12.12";
+  name = "spice-protocol-0.12.13";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "00wx81f2ml62g3maw63jq9w217zym921rdi38h7lpm5m8ckxraqp";
+    sha256 = "0cwrgkp558mblcf4vrhacb3iizz12khsrrl82w38w9nj0ar13vl9";
   };
 
   postInstall = ''
-- 
GitLab


From 846608238df2f9551efcb1d772f29de0c3991a1b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:20:03 +0200
Subject: [PATCH 718/877] =?UTF-8?q?spice=5Fgtk:=200.33=20=E2=86=92=200.34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 240de378afc..080dbc4510d 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, spice_protocol, intltool, celt_0_5_1
+{ stdenv, fetchurl, pkgconfig, spice_protocol, gettext, celt_0_5_1
 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
 , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup
 , gtk3, epoxy }:
@@ -8,11 +8,11 @@ with stdenv.lib;
 let
   inherit (python2Packages) python pygtk;
 in stdenv.mkDerivation rec {
-  name = "spice-gtk-0.33";
+  name = "spice-gtk-0.34";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
-    sha256 = "0fdgx9k4vgmasp8i2n0swrkapq8f212igcg7wsgvr3mbhsvk7bvx";
+    sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9";
   };
 
   buildInputs = [
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy
   ];
 
-  nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ];
+  nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook ];
 
   NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
@@ -29,10 +29,6 @@ in stdenv.mkDerivation rec {
           --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'
   '';
 
-  preConfigure = ''
-    intltoolize -f
-  '';
-
   configureFlags = [
     "--disable-maintainer-mode"
     "--with-gtk3"
-- 
GitLab


From a443311dfc91d07347ef3d15323554300214e7d8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:20:23 +0200
Subject: [PATCH 719/877] =?UTF-8?q?libxkbcommon:=200.7.1=20=E2=86=92=200.7?=
 =?UTF-8?q?.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index fd61ae84028..e730cc6eaab 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "libxkbcommon-0.7.1";
+  name = "libxkbcommon-0.7.2";
 
   src = fetchurl {
     url = "http://xkbcommon.org/download/${name}.tar.xz";
-    sha256 = "ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b";
+    sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 1d55dd3d138e15f3529732b9c14ed981ab2b67b5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:22:39 +0200
Subject: [PATCH 720/877] =?UTF-8?q?fwup:=200.14.3=20=E2=86=92=200.16.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index 8937de88c38..82b3a1d963d 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "fwup-${version}";
-  version = "0.14.3";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "15sjpxw1llpipshriivpha6470lkvhcgs5wh5mlaabjbvrgxygqh";
+    sha256 = "1hphgpwxzdbfswzxbx0jm7lma1xkkwxvm8ll3jp2ljmimqzzb7jf";
   };
 
   doCheck = true;
-- 
GitLab


From 4d5a009b117c0a912055a193bcbff0b86d05eb23 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:25:14 +0200
Subject: [PATCH 721/877] spidermonkey_52: init at 52.2.1gnome1

---
 .../interpreters/spidermonkey/52.nix          | 62 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/interpreters/spidermonkey/52.nix

diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
new file mode 100644
index 00000000000..75c7c64e324
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
+
+stdenv.mkDerivation rec {
+  version = "52.2.1gnome1";
+  name = "spidermonkey-${version}";
+
+  # the release notes point to some guys home directory, see
+  # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
+  # probably it would be more ideal to pull a particular tag/revision
+  # from the mercurial repo
+  src = fetchurl {
+    url = "mirror://gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${version}.tar.gz";
+    sha256 = "1bxhz724s1ch1c0kdlzlg9ylhg1mk8kbhdgfkax53fyvn51pjs9i";
+  };
+
+  buildInputs = [ readline icu zlib nspr ];
+  nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/js/src";
+
+  preConfigure = ''
+    export CXXFLAGS="-fpermissive"
+    export LIBXUL_DIST=$out
+    export PYTHON="${python2.interpreter}"
+  '';
+
+  configureFlags = [
+    "--enable-threadsafe"
+    "--with-system-nspr"
+    "--with-system-zlib"
+    "--with-system-icu"
+    "--with-intl-api"
+    "--enable-readline"
+
+    # enabling these because they're wanted by 0ad. They may or may
+    # not be good defaults for other uses.
+    "--enable-gcgenerational"
+    "--enable-shared-js"
+  ];
+
+  # This addresses some build system bug. It's quite likely to be safe
+  # to re-enable parallel builds if the source revision changes.
+  enableParallelBuilding = true;
+
+  postFixup = ''
+    # The headers are symlinks to a directory that doesn't get put
+    # into $out, so they end up broken. Fix that by just resolving the
+    # symlinks.
+    for i in $(find $out -type l); do
+      cp --remove-destination "$(readlink "$i")" "$i";
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Mozilla's JavaScript engine written in C/C++";
+    homepage = https://developer.mozilla.org/en/SpiderMonkey;
+    # TODO: MPL/GPL/LGPL tri-license.
+
+    maintainers = [ maintainers.abbradar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3eb87bd64f1..47c3f1c4c1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6731,6 +6731,7 @@ with pkgs;
   spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };
   spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
   spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { };
+  spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };
   spidermonkey = spidermonkey_31;
 
   ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
-- 
GitLab


From faac8b301c9ba0db32f12c895e3b143deaccc938 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:26:42 +0200
Subject: [PATCH 722/877] libzapojit: add meta.description

---
 pkgs/desktops/gnome-3/core/libzapojit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
index c5c75c166f7..dab1a0fea8a 100644
--- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
 
   meta = with stdenv.lib; {
+    description = "GObject wrapper for the SkyDrive and Hotmail REST APIs";
     platforms = platforms.linux;
   };
 }
-- 
GitLab


From 716af52fe12a666f66b48f9b537162325dddb83d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 16 Sep 2017 21:28:31 +0200
Subject: [PATCH 723/877] =?UTF-8?q?gstreamer:=201.10.4=20=E2=86=92=201.12.?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/orc/default.nix                 | 6 +++---
 pkgs/development/libraries/gstreamer/bad/default.nix       | 6 +++---
 pkgs/development/libraries/gstreamer/base/default.nix      | 6 +++---
 pkgs/development/libraries/gstreamer/core/default.nix      | 6 +++---
 pkgs/development/libraries/gstreamer/ges/default.nix       | 6 +++---
 pkgs/development/libraries/gstreamer/gnonlin/default.nix   | 2 +-
 pkgs/development/libraries/gstreamer/good/default.nix      | 6 +++---
 .../libraries/gstreamer/gstreamermm/default.nix            | 7 +++++++
 .../libraries/gstreamer/legacy/gst-ffmpeg/default.nix      | 2 +-
 .../libraries/gstreamer/legacy/gst-plugins-bad/default.nix | 2 +-
 .../gstreamer/legacy/gst-plugins-base/default.nix          | 2 +-
 .../gstreamer/legacy/gst-plugins-good/default.nix          | 2 +-
 .../gstreamer/legacy/gst-plugins-ugly/default.nix          | 2 +-
 .../libraries/gstreamer/legacy/gst-python/default.nix      | 2 +-
 .../libraries/gstreamer/legacy/qt-gstreamer/default.nix    | 2 +-
 pkgs/development/libraries/gstreamer/libav/default.nix     | 6 +++---
 .../libraries/gstreamer/qt-gstreamer/default.nix           | 2 +-
 pkgs/development/libraries/gstreamer/ugly/default.nix      | 6 +++---
 pkgs/development/libraries/gstreamer/vaapi/default.nix     | 6 +++---
 pkgs/development/libraries/gstreamer/validate/default.nix  | 6 +++---
 pkgs/development/python-modules/gst-python/default.nix     | 6 +++---
 21 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 5e0cbb9d395..543fc6dfa48 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "orc-0.4.26";
+  name = "orc-0.4.27";
 
   src = fetchurl {
-    url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
-    sha256 = "0jd69ynvr3k70mlxxgbsk047l1rd63m1wkj3qdcq7644xy0gllkx";
+    url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
+    sha256 = "14vbwdydwarcvswzf744jdjb3ibhv6k4j6hzdacfan41zic3xrai";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 69378d95a30..2e0e711ce71 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -17,11 +17,11 @@ let
   inherit (stdenv.lib) optional optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-1.10.4";
+  name = "gst-plugins-bad-1.12.2";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Bad Plugins";
-    homepage    = "http://gstreamer.freedesktop.org";
+    homepage    = "https://gstreamer.freedesktop.org";
     longDescription = ''
       a set of plug-ins that aren't up to par compared to the
       rest.  They might be close to being good quality, but they're missing
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
-    sha256 = "0rk9rlzf2b0hjw5hwbadz53yh4ls7vm3w3cshsa3n8isdd8axp93";
+    sha256 = "0dwyq03g2m0p16dwx8q5qvjn5x9ia72h21sf87mp97gmwkfpwb4w";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 70aa9101ad8..2ff42917964 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -4,18 +4,18 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-1.10.4";
+  name = "gst-plugins-base-1.12.2";
 
   meta = {
     description = "Base plugins and helper libraries";
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
-    sha256 = "1dsyjf6rncsbg4rfj40cvf1wwpjj9h3j3c7bh4zp7jylnfv4blpn";
+    sha256 = "0x86a7aph0y6gyq178plvwvbbyhkfb3hf0gadx9sk5z1mzixqrsh";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 4bd7fb5396a..67521e40daf 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-1.10.4";
+  name = "gstreamer-1.12.2";
 
   meta = {
     description = "Open source multimedia framework";
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
-    sha256 = "062jidnw17hkpva6ddygp80gyasyigfkpm1y7w56rk56a2pzbhjh";
+    sha256 = "1fllz7n58lavyy4nh64xc7izd4ffhl12a2ff0yg4z67al8wkzplz";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index cf69fa943a2..e206f317d4b 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -3,18 +3,18 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-editing-services-1.10.4";
+  name = "gstreamer-editing-services-1.12.2";
 
   meta = with stdenv.lib; {
     description = "Library for creation of audio/video non-linear editors";
-    homepage    = "http://gstreamer.freedesktop.org";
+    homepage    = "https://gstreamer.freedesktop.org";
     license     = licenses.lgpl2Plus;
     platforms   = platforms.unix;
   };
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
-    sha256 = "0i11b1rwkjsy9gxrf9vk9lgg8qm60ggfi5lp0ncyh4lxvh16vbgj";
+    sha256 = "0bi0f487949k9xnl1r6ngysgaibmmswwgdqcrchg0dixnnbm9isr";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
index 90d4ec458a9..c04b64ae3c6 100644
--- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Gstreamer Non-Linear Multimedia Editing Plugins";
-    homepage    = "http://gstreamer.freedesktop.org";
+    homepage    = "https://gstreamer.freedesktop.org";
     longDescription = ''
       Gnonlin is a library built on top of GStreamer which provides 
       support for writing non-linear audio and video editing
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index c18d8332b0c..1c7f7951e91 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -11,11 +11,11 @@ let
   inherit (stdenv.lib) optionals optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-1.10.4";
+  name = "gst-plugins-good-1.12.2";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Good Plugins";
-    homepage    = "http://gstreamer.freedesktop.org";
+    homepage    = "https://gstreamer.freedesktop.org";
     longDescription = ''
       a set of plug-ins that we consider to have good quality code,
       correct functionality, our preferred license (LGPL for the plug-in
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
-    sha256 = "0zjdwxn83sp9wjp9rxjbyk8kf284g9av7l2v6rjldi586hacd1la";
+    sha256 = "15pfw54fsh9s9xwrnbap4z4njwgqdfvq52k562d2hc5b11rfx4am";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index a4169565511..f6138fafaef 100644
--- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
@@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry";
   };
 
+  patches = [
+    (fetchurl {
+      url = https://bug783628.bugzilla-attachments.gnome.org/attachment.cgi?id=354765;
+      sha256 = "082510a934bl05mz4cyakp8mfmd97cdj7vdrbvyqc4g58dcskvz0";
+    })
+  ];
+
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ pkgconfig file ];
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
index 953f8900ade..95b394a6d4b 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
+      "https://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
     sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n";
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
index fecc77b2a54..bdb1b6c7bb7 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
 
     description = "‘Bad’ (potentially low quality) plug-ins for GStreamer";
 
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
index 5b2ba728f3a..2c2e1b0da12 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = with stdenv.lib; {
-    homepage    = http://gstreamer.freedesktop.org;
+    homepage    = https://gstreamer.freedesktop.org;
     description = "Base plug-ins for GStreamer";
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
index 9339de3d9ed..d533f798d99 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
 
     description = "`Good' plug-ins for GStreamer";
 
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
index 9863b3e0128..5c289fb3911 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
 
     description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer";
 
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
index fd01aa5c1dc..c8414a7b681 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gstreamer python ];
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
 
     description = "Python bindings for GStreamer";
 
diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
index 74b1417e069..9797f21c168 100644
--- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   pname = "qt-gstreamer";
 
   src = fetchurl {
-    url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";
+    url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";
     sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index f312a14de24..7c0a05f8202 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,17 +9,17 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-1.10.4";
+  name = "gst-libav-1.12.2";
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
-    sha256 = "12r68ri03mgbbwsxyn6yklgfsq32rwvyq83zw0aq7m73fp5gx83c";
+    sha256 = "1crdahkjm23byg1awcrjkmgfbalfpvvac7h7whm6b2r1pfwkbdsv";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index 72068bb1f7b..a9e7f9fcff3 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   pname = "qt-gstreamer";
 
   src = fetchurl {
-    url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz";
+    url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz";
     sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index bd034ac13a1..610f10075a8 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-1.10.4";
+  name = "gst-plugins-ugly-1.12.2";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Ugly Plugins";
-    homepage    = "http://gstreamer.freedesktop.org";
+    homepage    = "https://gstreamer.freedesktop.org";
     longDescription = ''
       a set of plug-ins that have good quality and correct functionality,
       but distributing them might pose problems.  The license on either
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
-    sha256 = "0ngsiwcsz3jd08id4mc0qiy2q1n7h2kkvdnh3r1vm725m1ycg1k3";
+    sha256 = "0rplyp1qk359c97ig9i2vc1v34g92khd8dslwfipva1ypwmr9hqw";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index caca5440084..becd4cf0d92 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gst-vaapi-${version}";
-  version = "1.10.4";
+  version = "1.12.2";
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
-    sha256 = "0xfyf1mgcxnwf380wxv20hakl2srp34dmiw6bm4zkncl2mi91rh3";
+    sha256 = "0fhncs27hcdcnb9a4prkxlyvr883hnzsx148zzk7lg2b8zh19ir3";
   };
 
   outputs = [ "out" "dev" ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0";
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ tstrobel ];
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index b537ad2897d..9704ca1d743 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -3,18 +3,18 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-validate-1.10.4";
+  name = "gst-validate-1.12.2";
 
   meta = {
     description = "Integration testing infrastructure for the GStreamer framework";
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
-    sha256 = "0g6px08x4kq5xqlbyxvxn6cm9b1s1gfvhkmlrmvw9afccjzh1775";
+    sha256 = "1pgycs35bwmp4aicyxwyzlfy1i5l2rzmh2a8ivhgy21azp8jaykb";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 1333c4b59a4..71d77c283b8 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gst-python";
-  version = "1.10.4";
+  version = "1.12.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
       "${meta.homepage}/src/gst-python/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "04l2hvvz9b0f3nyds1k3yfk5di8a91fpr6maj19c11mwp1s82l2r";
+    sha256 = "0iwy0v2k27wd3957ich6j5f0f04b0wb2mb175ypf2lx68snk5k7l";
   };
 
   patches = [ ./different-path-with-pygobject.patch ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   passthru.pythonPath = [];
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
 
     description = "Python bindings for GStreamer";
 
-- 
GitLab


From f5d5c13ad77ae67d054206c7f7fc59f9f53dfc8b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 03:29:08 +0200
Subject: [PATCH 724/877] =?UTF-8?q?gnome3.libgxps:=200.2.2=20=E2=86=92=200?=
 =?UTF-8?q?.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktops/gnome-3/core/libgxps/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix
index 5c1ffb45039..9e1e4588918 100644
--- a/pkgs/desktops/gnome-3/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
-, openssl, bzip2, acl, attr, libxml2
+{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo
+, libarchive, freetype, libjpeg, libtiff
 }:
 
 stdenv.mkDerivation rec {
-  name = "libgxps-0.2.2";
+  name = "libgxps-0.3.0";
 
   src = fetchurl {
-    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
-    sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
+    url = "mirror://gnome/sources/libgxps/0.3/${name}.tar.xz";
+    sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
+  buildInputs = [ glib cairo freetype libjpeg libtiff ];
   propagatedBuildInputs = [ libarchive ];
 
-  configureFlags = "--without-liblcms2";
+  mesonFlags = [
+    "-Denable-test=false"
+    "-Dwith-liblcms2=false"
+  ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-- 
GitLab


From f9031957eda8d880edf17cc9eb8469e47f382bb0 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 5 Nov 2017 17:32:06 +0100
Subject: [PATCH 725/877] pdns-recursor: 4.0.4 -> 4.0.6

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

diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index 0e8d1e70bc7..664fabbb312 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -11,11 +11,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "pdns-recursor-${version}";
-  version = "4.0.4";
+  version = "4.0.6";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
-    sha256 = "0k8y9zxj2lz4rq782vgzr28yd43q0hwlnvszwq0k9l6c967pff13";
+    sha256 = "03fnjiacvhdlkr3a2206mham0p6p24gkawashs5v12r68k32l67j";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 38dd08bc77fa3b4d31466e80145c1fd62eb6c8fc Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 5 Nov 2017 15:22:24 +0100
Subject: [PATCH 726/877] zimg: 2.4 -> 2.6.1

---
 pkgs/development/libraries/zimg/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index 2c9d27a8b6a..b5bb73e3e33 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,17 +2,16 @@
 
 stdenv.mkDerivation rec{
   name = "zimg-${version}";
-  version = "2.4";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner  = "sekrit-twc";
     repo   = "zimg";
-    rev    = "v${version}";
-    sha256 = "11pk8a5manr751jhy0xrql57jzab57lwqjxbpd8kvm9m8b51icwq";
+    rev    = "release-${version}";
+    sha256 = "08hynzcxz95a4i67k5cn6isafdb6xjgd0x0miyhlnp2xc220zfqj";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ];
 
   meta = with stdenv.lib; {
     description = "Scaling, colorspace conversion and dithering library";
-- 
GitLab


From c47ac4d2ad758b4ee1e47dc6207fbeff579711d4 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 5 Nov 2017 15:04:25 +0100
Subject: [PATCH 727/877] ddcutil: 0.8.2 -> 0.8.4

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

diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index c45c85e4271..53755c8a19d 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "ddcutil-${version}";
-  version = "0.8.2";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner  = "rockowitz";
     repo   = "ddcutil";
     rev    = "v${version}";
-    sha256 = "1hcdg54xyb1pfl03iqll14y9yglwmyvxyvhbql87hd9q0dywah6m";
+    sha256 = "1w9bkrlxlgc58rpf03xfd2qbkj73rlbiqrhy8nhwxqqhsj1kkdb0";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From 9f30edc08530f754a3b16da08b3d7e62e72d4516 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 5 Nov 2017 17:52:09 +0100
Subject: [PATCH 728/877] gnome3.glade: fix compatibility with glib 2.53.4

Closes: #31272
---
 pkgs/desktops/gnome-3/apps/glade/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index da49c36cd06..6064a8c768a 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchurl, python
+{ stdenv, intltool, fetchurl, python, autoreconfHook
 , pkgconfig, gtk3, glib
 , makeWrapper, itstool, libxml2, docbook_xsl
 , gnome3, librsvg, gdk_pixbuf, libxslt }:
@@ -8,13 +8,25 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    pkgconfig
+    # reconfiguration
+    autoreconfHook gnome3.gnome_common gnome3.yelp_tools
+  ];
   buildInputs = [ gtk3 glib intltool itstool libxml2 python
                   gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
                   gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ];
 
   enableParallelBuilding = true;
 
+  patches = [
+    # https://bugzilla.gnome.org/show_bug.cgi?id=782161
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=351054;
+      sha256 = "093wjjj40027pkqqnm14jb2dp2i2m8p1bayqx1lw18pq66c8fahn";
+    })
+  ];
+
   preFixup = ''
     wrapProgram "$out/bin/glade" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-- 
GitLab


From 6ad65e046fa19e8249e2b8e3c598656c949f1e03 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 5 Nov 2017 17:58:30 +0100
Subject: [PATCH 729/877] gnome3.glade: clean up

---
 pkgs/desktops/gnome-3/apps/glade/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index 6064a8c768a..ce29ebf0a7e 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -9,13 +9,13 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkgconfig intltool itstool makeWrapper docbook_xsl libxslt
     # reconfiguration
     autoreconfHook gnome3.gnome_common gnome3.yelp_tools
   ];
-  buildInputs = [ gtk3 glib intltool itstool libxml2 python
-                  gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ];
+  buildInputs = [ gtk3 glib libxml2 python
+                  gnome3.gsettings_desktop_schemas
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   enableParallelBuilding = true;
 
-- 
GitLab


From c1a6665549ba566fe33b433d31fc52686844c7e7 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 5 Nov 2017 17:16:36 +0000
Subject: [PATCH 730/877] pdns-recursor: enable parallel building

---
 pkgs/servers/dns/pdns-recursor/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index 664fabbb312..9b017249c15 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     "--with-systemd"
   ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "A recursive DNS server";
     homepage = http://www.powerdns.com/;
-- 
GitLab


From de1e0ee43f1c4c87a2a3f8f283c7b1b6b51a9484 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 5 Nov 2017 18:15:53 +0100
Subject: [PATCH 731/877] masscan: 2017-02-04 -> 1.0.4

---
 pkgs/tools/security/masscan/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix
index 46c90481628..22a452ccabd 100644
--- a/pkgs/tools/security/masscan/default.nix
+++ b/pkgs/tools/security/masscan/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, libpcap }:
+{ stdenv, fetchFromGitHub, makeWrapper, libpcap }:
 
 stdenv.mkDerivation rec {
   name = "masscan-${version}";
-  version = "2016-11-03";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner  = "robertdavidgraham";
     repo   = "masscan";
-    rev    = "dc88677a11dc3d9a5f6aa55cc1377bc17dba1496";
-    sha256 = "1mdjqkn4gnbwr5nci6i6xn7qzkjgq7dx37fzd6gghv87xgw7cdbg";
+    rev    = "39061a5e9ef158dde1e6618f6fbf379739934a73";
+    sha256 = "0mjvwh4i0ncsa3ywavw2s55v5bfv7pyga028c8m8xfash9764wwf";
   };
 
-  buildInputs = [ libpcap ];
+  buildInputs = [ makeWrapper ];
 
   makeFlags = [ "PREFIX=$(out)" "CC=cc" "-j" ];
 
@@ -24,13 +24,15 @@ stdenv.mkDerivation rec {
     cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.hml
     cp doc/masscan.8 $out/share/man/man8/masscan.8
     cp LICENSE $out/share/licenses/masscan/LICENSE
+
+    wrapProgram $out/bin/masscan --prefix LD_LIBRARY_PATH : "${libpcap}/lib"
   '';
 
   meta = with stdenv.lib; {
     description = "Fast scan of the Internet";
     homepage    = https://github.com/robertdavidgraham/masscan;
     license     = licenses.agpl3;
-    platforms   = with platforms; allBut darwin;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ rnhmjoj ];
   };
 }
-- 
GitLab


From 4f8b98035500c02338488ccd0c7627c17697e8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Nov 2017 18:23:31 +0100
Subject: [PATCH 732/877] torcs: fix libGL when the OS uses non-mesa

Fixes OP of issue #30749.
---
 pkgs/games/torcs/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix
index 1b6ad5b34c3..26f0fe534f3 100644
--- a/pkgs/games/torcs/default.nix
+++ b/pkgs/games/torcs/default.nix
@@ -1,4 +1,4 @@
-{ fetchpatch, fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto,
+{ fetchpatch, fetchurl, stdenv, mesa_glu, freeglut, libX11, plib, openal, freealut, libXrandr, xproto,
 libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis,
 libpng, zlib, bash, makeWrapper }:
 
@@ -29,18 +29,11 @@ stdenv.mkDerivation rec {
     sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in
   '';
 
-  buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto
+  buildInputs = [ mesa_glu freeglut libX11 plib openal freealut libXrandr xproto
     libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ];
 
-  nativeBuildInputs = [ bash ];
-
   installTargets = "install datainstall";
 
-  postInstall = ''
-    wrapProgram $out/bin/torcs \
-      --prefix LD_LIBRARY_PATH : ${mesa}/lib
-  '';
-
   meta = {
     description = "Car racing game";
     homepage = http://torcs.sourceforge.net/;
-- 
GitLab


From 721e07ea99573cb242a0df6c00f260471e12388b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 5 Nov 2017 11:29:50 -0600
Subject: [PATCH 733/877] hplip: 3.17.9 -> 3.17.10

---
 pkgs/misc/drivers/hplip/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index a01fc74ce47..66ed1d44adc 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -11,16 +11,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.17.9";
+  version = "3.17.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0y46jjq8jdfk9m4vjq55h8yggibvqbi9rl08vni7vbhxym1diamj";
+    sha256 = "0v27hg856b5z2rilczcbfgz8ksxn0n810g1glac3mxkj8qbl8wqg";
   };
 
   plugin = fetchurl {
-    url = "http://hplipopensource.com/hplip-web/plugin/${name}-plugin.run";
-    sha256 = "10z8vzwcwmwni7s4j9xp0fa7l4lwrhl4kp450dga3fj0cck1gxwq";
+    url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
+    sha256 = "07am3dnl0ipgfswz5wndprryljh9rqbfhq7mm4d4yyj3bdnnzlig";
   };
 
   hplipState = substituteAll {
-- 
GitLab


From 06105849982e6d9a808bdc0118b3a48440c6e84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Nov 2017 18:42:20 +0100
Subject: [PATCH 734/877] factor-lang: fix libGL when the OS uses non-mesa

I was careful to keep libGLU in LD_LIBRARY_PATH,
in the unlikely case that it's actually used.
Reported in https://github.com/NixOS/nixpkgs/issues/30749#issuecomment-341987725
---
 pkgs/development/compilers/factor-lang/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index 87572661635..ae2d39d604a 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, glib, glibc, git,
   rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
   libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext,
-  mesa, libXmu, libXt, libICE, libSM }:
+  mesa_glu, libXmu, libXt, libICE, libSM }:
 
 stdenv.mkDerivation rec {
   name = "factor-lang-${version}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ git rlwrap curl perl makeWrapper
     libX11 pango cairo gtk2 gdk_pixbuf gtkglext
-    mesa libXmu libXt libICE libSM ];
+    mesa_glu libXmu libXt libICE libSM ];
 
   buildPhase = ''
     make $(bash ./build-support/factor.sh make-target) GIT_LABEL=heads/master-${rev}
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     # to be a generic solution here.
     find $(echo ${stdenv.lib.makeLibraryPath [
         glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext
-        mesa libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
+        mesa_glu libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
 
     (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
     for l in $(<$TMPDIR/so.lst);
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \
       "${stdenv.lib.makeLibraryPath [ glib
         libX11 pango cairo gtk2 gdk_pixbuf gtkglext
-        mesa libXmu libXt libICE libSM ]}"
+        mesa_glu libXmu libXt libICE libSM ]}"
 
     sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor
     mv $out/bin/.factor-wrapped $out/lib/factor/factor
-- 
GitLab


From d6b8f184970406fe540839fe381ea7b165c2dc61 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 4 Nov 2017 00:43:27 +0100
Subject: [PATCH 735/877] ncmpc: remove unneeded rpath wrapping

---
 pkgs/applications/audio/ncmpc/default.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index ef0bb75b2ec..cb0f35ebc15 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -1,11 +1,7 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses
 , mpd_clientlib, gettext }:
 
-let
-  rpath = stdenv.lib.makeLibraryPath [
-    glib ncurses mpd_clientlib
-  ];
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "ncmpc-${version}";
   version = "0.28";
 
@@ -19,12 +15,6 @@ in stdenv.mkDerivation rec {
   buildInputs = [ glib ncurses mpd_clientlib ];
   nativeBuildInputs = [ meson ninja pkgconfig gettext ];
 
-  postFixup = ''
-    for elf in "$out"/bin/*; do
-      patchelf --set-rpath '${rpath}':"$out/lib" "$elf"
-    done
-  '';
-
   meta = with stdenv.lib; {
     description = "Curses-based interface for MPD (music player daemon)";
     homepage    = http://www.musicpd.org/clients/ncmpc/;
-- 
GitLab


From 0979856cdf38538436b81a31e9be362227f13df2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 4 Nov 2017 00:44:36 +0100
Subject: [PATCH 736/877] appstream-glib: remove unneeded rpath wrapping

---
 .../libraries/appstream-glib/default.nix         | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index e07e1fc3908..1c97b879a18 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -3,15 +3,7 @@
 , gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
 , libuuid, json_glib, autoconf-archive, meson, gperf, ninja, gdk_pixbuf
 }:
-let rpath = stdenv.lib.makeLibraryPath
-      [ libuuid.out
-        glib
-        libsoup
-        gdk_pixbuf
-        libarchive.lib
-        gcab
-      ];
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "appstream-glib-0.7.2";
 
   src = fetchFromGitHub {
@@ -28,12 +20,6 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gtk3 ];
   mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ];
 
-  postFixup = ''
-    for elf in "$out"/bin/* "$out"/lib/*.so; do
-      patchelf --set-rpath '${rpath}':"$out/lib" "$elf"
-    done
-  '';
-
   meta = with stdenv.lib; {
     description = "Objects and helper methods to read and write AppStream metadata";
     homepage    = https://github.com/hughsie/appstream-glib;
-- 
GitLab


From 2dfa36233d38097462359ef54d14c36d1ab7dcb1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 4 Nov 2017 00:45:04 +0100
Subject: [PATCH 737/877] sshfs-fuse: remove unneeded rpath wrapping

---
 pkgs/tools/filesystems/sshfs-fuse/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 7d251d2e00d..eebe3076c98 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -4,7 +4,6 @@
 
 let
   inherit (stdenv.lib) optional;
-  rpath = stdenv.lib.makeLibraryPath [ fuse3 glib ];
 in stdenv.mkDerivation rec {
   version = "3.3.1";
   name = "sshfs-fuse-${version}";
@@ -30,10 +29,6 @@ in stdenv.mkDerivation rec {
     ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
   '';
 
-  postFixup = ''
-       patchelf --set-rpath '${rpath}' "$out/bin/sshfs"
-  '';
-
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH";
-- 
GitLab


From 00fe37217e8ec37c6fb3ce821fd9bdb8b98840b9 Mon Sep 17 00:00:00 2001
From: Alex Feldman-Crough <alex@fldcr.com>
Date: Sun, 5 Nov 2017 10:00:17 -0800
Subject: [PATCH 738/877] gitea: 1.2.1 -> 1.2.3

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

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 734b9d3629c..d4afdd7b3cd 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gitea-${version}";
-  version = "1.2.1";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "15zw4b6hnx4hmzn2xlsi4p7jvh6jx4g4smbdidnrzrykzyq4rmpp";
+    sha256 = "0v24q14xzmqgwk10m7rqyn6pahd630v3bnc646ij4w8fbgr8hzja";
   };
 
   patches = [ ./static-root-path.patch ];
-- 
GitLab


From 0c01c58aec109d856aeb09fc3479b4af902174a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 27 Aug 2017 22:06:04 +0200
Subject: [PATCH 739/877] gcc6: fix build with new glibc, by upstream patches

---
 pkgs/development/compilers/gcc/6/default.nix  |   4 +-
 .../compilers/gcc/struct-sigaltstack.patch    |  87 ++++++++
 .../compilers/gcc/struct-ucontext.patch       | 190 ++++++++++++++++++
 3 files changed, 280 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/struct-sigaltstack.patch
 create mode 100644 pkgs/development/compilers/gcc/struct-ucontext.patch

diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 47cb93c1995..7d019c7fe84 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -72,7 +72,9 @@ let version = "6.4.0";
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
       ++ optional langAda ../gnat-cflags.patch
-      ++ optional langFortran ../gfortran-driving.patch;
+      ++ optional langFortran ../gfortran-driving.patch
+      ++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26
+      ;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
diff --git a/pkgs/development/compilers/gcc/struct-sigaltstack.patch b/pkgs/development/compilers/gcc/struct-sigaltstack.patch
new file mode 100644
index 00000000000..6e1ddb252c2
--- /dev/null
+++ b/pkgs/development/compilers/gcc/struct-sigaltstack.patch
@@ -0,0 +1,87 @@
+From 72edc2c02f8b4768ad660f46a1c7e2400c0a8e06 Mon Sep 17 00:00:00 2001
+From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Mon, 17 Jul 2017 19:41:08 +0000
+Subject: [PATCH] 	Backported from mainline 	2017-07-14  Jakub
+ Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/81066
+	* sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969.
+	* sanitizer_common/sanitizer_linux.cc: Likewise.
+	* sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise.
+	* tsan/tsan_platform_linux.cc: Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@250287 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ libsanitizer/ChangeLog  (REMOVED)                             | 11 +++++++++++
+ libsanitizer/sanitizer_common/sanitizer_linux.cc              |  3 +--
+ libsanitizer/sanitizer_common/sanitizer_linux.h               |  4 +---
+ .../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc  |  2 +-
+ libsanitizer/tsan/tsan_platform_linux.cc                      |  2 +-
+ 5 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc
+index 806fcd5..5b6f186 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc
+@@ -605,8 +605,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {
+ }
+ #endif
+ 
+-uptr internal_sigaltstack(const struct sigaltstack *ss,
+-                         struct sigaltstack *oss) {
++uptr internal_sigaltstack(const void *ss, void *oss) {
+   return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);
+ }
+ 
+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h
+index 895bfc1..a42df57 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_linux.h
++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h
+@@ -19,7 +19,6 @@
+ #include "sanitizer_platform_limits_posix.h"
+ 
+ struct link_map;  // Opaque type returned by dlopen().
+-struct sigaltstack;
+ 
+ namespace __sanitizer {
+ // Dirent structure for getdents(). Note that this structure is different from
+@@ -28,8 +27,7 @@ struct linux_dirent;
+ 
+ // Syscall wrappers.
+ uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
+-uptr internal_sigaltstack(const struct sigaltstack* ss,
+-                          struct sigaltstack* oss);
++uptr internal_sigaltstack(const void* ss, void* oss);
+ uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
+     __sanitizer_sigset_t *oldset);
+ 
+diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+index 891386dc..234e8c6 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+@@ -273,7 +273,7 @@ static int TracerThread(void* argument) {
+ 
+   // Alternate stack for signal handling.
+   InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
+-  struct sigaltstack handler_stack;
++  stack_t handler_stack;
+   internal_memset(&handler_stack, 0, sizeof(handler_stack));
+   handler_stack.ss_sp = handler_stack_memory.data();
+   handler_stack.ss_size = kHandlerStackSize;
+diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc
+index 2ed5718..6f972ab 100644
+--- a/libsanitizer/tsan/tsan_platform_linux.cc
++++ b/libsanitizer/tsan/tsan_platform_linux.cc
+@@ -287,7 +287,7 @@ void InitializePlatform() {
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+   int cnt = 0;
+-  __res_state *statp = (__res_state*)state;
++  struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
+       fds[cnt++] = statp->_u._ext.nssocks[i];
+-- 
+2.9.3
+
diff --git a/pkgs/development/compilers/gcc/struct-ucontext.patch b/pkgs/development/compilers/gcc/struct-ucontext.patch
new file mode 100644
index 00000000000..c7fb6d1f71c
--- /dev/null
+++ b/pkgs/development/compilers/gcc/struct-ucontext.patch
@@ -0,0 +1,190 @@
+From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001
+From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 4 Jul 2017 10:23:57 +0000
+Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files.
+
+Current glibc no longer gives the ucontext_t type the tag struct
+ucontext, to conform with POSIX namespace rules.  This requires
+various linux-unwind.h files in libgcc, that were previously using
+struct ucontext, to be fixed to use ucontext_t instead.  This is
+similar to the removal of the struct siginfo tag from siginfo_t some
+years ago.
+
+This patch changes those files to use ucontext_t instead.  As the
+standard name that should be unconditionally safe, so this is not
+restricted to architectures supported by glibc, or conditioned on the
+glibc version.
+
+Tested compilation together with current glibc with glibc's
+build-many-glibcs.py.
+
+	* config/aarch64/linux-unwind.h (aarch64_fallback_frame_state),
+	config/alpha/linux-unwind.h (alpha_fallback_frame_state),
+	config/bfin/linux-unwind.h (bfin_fallback_frame_state),
+	config/i386/linux-unwind.h (x86_64_fallback_frame_state,
+	x86_fallback_frame_state), config/m68k/linux-unwind.h (struct
+	uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext),
+	config/pa/linux-unwind.h (pa32_fallback_frame_state),
+	config/sh/linux-unwind.h (sh_fallback_frame_state),
+	config/tilepro/linux-unwind.h (tile_fallback_frame_state),
+	config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use
+	ucontext_t instead of struct ucontext.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ libgcc/ChangeLog     (REMOVED)       | 14 ++++++++++++++
+ libgcc/config/aarch64/linux-unwind.h |  2 +-
+ libgcc/config/alpha/linux-unwind.h   |  2 +-
+ libgcc/config/bfin/linux-unwind.h    |  2 +-
+ libgcc/config/i386/linux-unwind.h    |  4 ++--
+ libgcc/config/m68k/linux-unwind.h    |  2 +-
+ libgcc/config/nios2/linux-unwind.h   |  2 +-
+ libgcc/config/pa/linux-unwind.h      |  2 +-
+ libgcc/config/sh/linux-unwind.h      |  2 +-
+ libgcc/config/tilepro/linux-unwind.h |  2 +-
+ libgcc/config/xtensa/linux-unwind.h  |  2 +-
+ 11 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
+index 4512efb..06de45a 100644
+--- a/libgcc/config/aarch64/linux-unwind.h
++++ b/libgcc/config/aarch64/linux-unwind.h
+@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
+   struct rt_sigframe
+   {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   };
+ 
+   struct rt_sigframe *rt_;
+diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
+index bdbba4a..e84812e 100644
+--- a/libgcc/config/alpha/linux-unwind.h
++++ b/libgcc/config/alpha/linux-unwind.h
+@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       sc = &rt_->uc.uc_mcontext;
+     }
+diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
+index 77b7c23..8bf5e82 100644
+--- a/libgcc/config/bfin/linux-unwind.h
++++ b/libgcc/config/bfin/linux-unwind.h
+@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+ 	void *puc;
+ 	char retcode[8];
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+ 
+       /* The void * cast is necessary to avoid an aliasing warning.
+diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
+index 540a0a2..29efbe3 100644
+--- a/libgcc/config/i386/linux-unwind.h
++++ b/libgcc/config/i386/linux-unwind.h
+@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+   if (*(unsigned char *)(pc+0) == 0x48
+       && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
+     {
+-      struct ucontext *uc_ = context->cfa;
++      ucontext_t *uc_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+          because it does not alias anything.  */
+@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+ 	siginfo_t *pinfo;
+ 	void *puc;
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
+index 75b7cf7..f964e24 100644
+--- a/libgcc/config/m68k/linux-unwind.h
++++ b/libgcc/config/m68k/linux-unwind.h
+@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ /* <sys/ucontext.h> is unfortunately broken right now.  */
+ struct uw_ucontext {
+ 	unsigned long	  uc_flags;
+-	struct ucontext  *uc_link;
++	ucontext_t	 *uc_link;
+ 	stack_t		  uc_stack;
+ 	mcontext_t	  uc_mcontext;
+ 	unsigned long	  uc_filler[80];
+diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h
+index 2304142..30f25ea 100644
+--- a/libgcc/config/nios2/linux-unwind.h
++++ b/libgcc/config/nios2/linux-unwind.h
+@@ -38,7 +38,7 @@ struct nios2_mcontext {
+ 
+ struct nios2_ucontext {
+   unsigned long uc_flags;
+-  struct ucontext *uc_link;
++  ucontext_t *uc_link;
+   stack_t uc_stack;
+   struct nios2_mcontext uc_mcontext;
+   sigset_t uc_sigmask;	/* mask last for extensibility */
+diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
+index 9a2657f..e47493d 100644
+--- a/libgcc/config/pa/linux-unwind.h
++++ b/libgcc/config/pa/linux-unwind.h
+@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+   struct sigcontext *sc;
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *frame;
+ 
+   /* rt_sigreturn trampoline:
+diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
+index e389cac..0bf43ba 100644
+--- a/libgcc/config/sh/linux-unwind.h
++++ b/libgcc/config/sh/linux-unwind.h
+@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
+index 796e976..75f8890 100644
+--- a/libgcc/config/tilepro/linux-unwind.h
++++ b/libgcc/config/tilepro/linux-unwind.h
+@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
+   struct rt_sigframe {
+     unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *rt_;
+ 
+   /* Return if this is not a signal handler.  */
+diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
+index 9872492..586a9d4 100644
+--- a/libgcc/config/xtensa/linux-unwind.h
++++ b/libgcc/config/xtensa/linux-unwind.h
+@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+ 
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *rt_;
+ 
+   /* movi a2, __NR_rt_sigreturn; syscall */
+-- 
+2.9.3
+
-- 
GitLab


From 9bb67d5c1e546968fa3d195f0bcad82414243566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 26 Aug 2017 11:35:11 +0200
Subject: [PATCH 740/877] glibc: 2.25-49 -> 2.26-75

Security: the NEWS claims a couple more CVEs are fixed than what we
patched, though perhaps nothing critical.

I personally don't find DNS fragmentation attacks that interesting
anymore, as it's just about weaker improvements for cases that choose
not to use DNSSEC.

Largest expected caveat: upstream bumped the minimal supportable kernel
to 3.2.0.  That's the oldest kernel still supported upstream, released
in Jan 2012, but most notably RHEL 6 and derivates still use a heavily
patched 2.6.32 kernel and those systems are still supported and in use
(production support is scheduled to last till the end of 2020!).
---
 .../libraries/glibc/2.25-49.patch.gz           | Bin 89721 -> 0 bytes
 .../libraries/glibc/2.26-75.patch.gz           | Bin 0 -> 289084 bytes
 pkgs/development/libraries/glibc/common.nix    |  17 +++++++----------
 3 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc/2.25-49.patch.gz
 create mode 100644 pkgs/development/libraries/glibc/2.26-75.patch.gz

diff --git a/pkgs/development/libraries/glibc/2.25-49.patch.gz b/pkgs/development/libraries/glibc/2.25-49.patch.gz
deleted file mode 100644
index 6796347e3795f2c45c400cbb3789ff86f36ebf92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 89721
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
z%0D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%0Dj3RLb7q)6v!E#<s
zta9e_TrI-lQYd9Qc|GTHH_5pnHx49W-WC<md$ZaV5c#M2ME0Fd-7?wt9VTme6)qjC
z`flm7@8=R{AC3$5O|=I?gALn62mZV_GGsfV(-t_m2m9lL4%vnX6I2I0(3$@1B1w0w
zf8$CJiK1RFL2#YQFCM3g4a!4R^~}>;QiD~LfH_VvP}rN(%ZtA+u0D;%SX=$r4qgU9
z5_T2`M;I9kMHu@s4B5u^AyL*k*&@M61P}{EP6!8r5XS8Upv~Yi4ujZkcj6B}(T`O~
zp1S?uy?ODokEdIZW1lMOqz;_yx0C2$<3Dgmw1C(tl=MvwZtTPX7ArcicP4NHI<A|M
zC25(n>g@}&!>}tim?mT=TdcB8vq{vQHn#kcUw>HTXB9d#emUfGpt7fN%?mCpWCT2O
zSv@FGxj~R`aH;NvFA(MdTdqVovwlXoiU9p2EOe398PoH)U&@g@7-XF?Z<_U@=%9oB
zJRyTU?y5lW&AD>k+!wRo^aiEqx>^RaFf5@}o81}?9Gcg*!5#(5eUr*wG)HGb=A&eF
ziY(c7h%B+=JA}V@f5?)-zK|vR{UF%f!L9%~?sEec)le5;g$*%(o?xKq^BjZBUS@d7
z<g=u0?ye!G)&I(O30|L#&t9e3o7b<#zyHzMcoSUd+ue8*nfC?_LFkHI*J)Gc%jUjX
zN%<$}GhQzzt7?K8VVdie+GPc9(I4V)cPVRft<(Cqq=ZT`=V+vsHXn!@+zf>69+Xn`
z{z?7^00960w4A|D!Y~xZ&;A!ZZeb&GkQj|Io(vZ+YCMuDBXD3E2O%W>@%DSKuWL&;
zVc>btu4~`d*Y@|7sCGWE)a@=la6u4U9y^W++F|C6ldaB?$d6alp-{-NkS>t)22$j|
ziMp_ukU)A17|r9~Xp6|uzg@1qko;CZcWqFuGdc$DB(r~%eXGi<zzX3VeMx{^MWIAK
zm}!8vn!2MWVU48Lw~+(TfXr}1xc1wt6RHgzOD$wPaL95RTdQKeW^Pd!DtfAm;Lm><
zo+bt@wjc3u2GjW#_5vnkUdgK1P3r}gJ)DGML`;cOz3%{7Z@@d#Z3fPS)ykr`IB}#E
zhqG`BBN23DRnm16vC19wZ8!=8v)Xl9;GJM2kGX@&AP`5;;ye$KZe3kxqw!b^7rCLv
zrz)3TPa;a%YEA<>++&u5e$ca!tWiw7Soa67S}f!JY>vFmJ%hZySXN!=qqlZw`M>(3
zfY%D93Ao7yvQdhA0-QoJ>1dRmU|vf@ti@ywvrj1mX;HH_qum8pwj>AY%`=ZuyEuUH
zRUz>4nsa6`iL?+_1#qv)bmVfQCKrs0A@wuYAjucC%!vbkqKfSlINa$Og)~21Nb~av
zY2IH*^WH+5pG!z{VS>d!w5g795ZM_L3CAkdw;kF@IftF87iHA|dSHtaOVUR;v(#pp
zp4o%9KukH26q1tJ#=ctH`h_w?Q;M32_P9AfQj|bsEEm`=HJN8Ugrdx5<Ort9m`;Op
z%HpMb{{R8~l}XFspYzinJo0pA^JPkKe^yhH=UXaNvK*GfY;TY7?P2mVd3sF$hdN|r
zylcL+ujdZ{Xwl(gpsn`_T#OC?{h)vE6JvCG*E5pVyWf8S00960>|Mc595D<%=P#z0
z(p8p9oKX)*rRs^IJ@i;<i<T4YA{M$rh<<w$JC2=9l8Lvp2#F)hcqZc{_OtWsIW*5S
z>93N$)JXch3~{NMg?#0dCFH+^1B90%E4>kwCZ>n!N-slE`WN&hNEYS~hvsa!8sCjJ
z-udG6%jtp+zs}AjFQsv}sJxy#*60U!5eXe0Mjkj(WK*s{YHiErsm>D!CVzIEk`H!F
zkHA+p(ity*LNB(B@HCVMnTrA|;vMiALWW4)EjGvKdx%7HfSeQ-T@E)ZsG&r#Of;Gc
zIAmJhg*2u2@PV)+&RipR1ppkmG)zCmoHWZ2aBvG1Zx88g_kdp_6^smCA@m@);N(F)
z8woqM%`ptPUM)i>IhGXg<H9{;?W-GzkQ_+TQNJujivGwyErNDk#6nr<%<IE%&i-u2
z_d(r+^2<9Y{DhMCdtU>$+TnSJF=_cqT!JQFf5JcJWtx1S=}-mgZt?oyeC3LaTSh^b
zSp{lGdmnfUIH${Cl1kZ(uP0}pzkNSl1gcEfAz_Pf?JO^bpe%C2yUU&`)Hn*RAjRLz
zwEB+1OPIt?8e>YQ_VAA<q0cJ8hv^a-w`H?i^NPZx#`VerX5d61QuU3{#I}}oEZh&s
zR|Ick%7+@eu$ZqpaKlM*7s$zQ*q)k{`Y1NtYkrA3yy^E>FbotnkclAcuvxPdcAFIR
zd}At^7uDL{U543s8k43nwj&k2Cm~RwcSf|{aP01ecH^uWX4yw6gfVF`N(=I$$a(%H
z8E-OQN{G|+dp|q2JQdGpr{`sM%-otCQ&5YJIdOmF)=JKAkT$36_^4LLzuOg7%H!3w
zcgLeDp@GV{CfqV~&e6MM5YxG18<~-Pt{AS@xM38~x?t=>rE$L?!LAqn)VSS5zQg5O
zTr`Qh9m<HW<#C4zcb9qFexA12vO+{`o&+@#*}6rZ1D!0{j{0oM>h@qeYRD@XcFa^x
zsLBaN98<D56<))rp>5>t5|2af0l%5BVC(8(*xb4)@J*TG<)Vo29#TPZ9r!bvj6WcJ
z5U<hHCj0q4@x^-~A>)-IU}BbuS#Gh9jBMn^DKD10=VfD*5UGzi$XB{pX!ucWHzY57
zKm7h6m+!2aQJRIX5424;;x+s{!z5N4B6J)i)Ttr1A;FiOpbb7fG1c-TP0AC@JDO);
zEgfN{vrRI_!j_E+m8h~kK$>M9TCpujaonu5G0q$!fV8Gb6lGwv7s@0vqCl7dSfX4X
zxFk#&p49;?OL#J2aH`L9aM@oHfZ0=D<k>Zd97S|!+~P-66i6H-a;@2x*22>21mVM5
z&BA}LS?DVq=ucXT+JOENf;Q9lsZrF}9g+EEx?eQrCCic6v((}B$77E&DAPwiwgRuJ
z!4C;^$3Oi@*y>VGwzrDxQ$1QN__oAKD^M{QH3cFLc2k9hZ7EJIBVo8yhl0`es}Qi2
zy>vU#FUSz`wd(w!?JB1Wz_bl|!$n%a`^ea+hD)tBk!VMG#2(U}hj&Lg;+ue@VrU&u
zv~OGyjlzg3NVHOn<f%sb8ZRx_Ow5)JZ<44Ia>gg_gF3A-`y$SWnx3ze3nn3at>>+j
z>kj|`0RR8(UF~z)$Ql1!PydK*I+w8n#*z>S;=9b?gj{F|_F&wM+qv-wN!YrApa`6J
zlHA|keO`9862g!)>2x}m4>4NpKHB$v_IdmL54dve?N_y*%3n!|_VTWJJj=(&{0qO%
zuZq1!c3Fy+x?mZuR^Q2Q=}(5=(zo}#$?R66FZI0Hv)ju2bn-qq-@(g8oh@5@H!5g`
zidaJX?tyY6=Y3E^!1A|$?vCDe--<(iyzKU0SLIb9M7&?qNn{h2B#+>vFhcUF2MNPE
zA!MII9brgd{jXMY{V4LCacj~*NRpE<x<5(eD46IY1<GLkZB;GA-Xi=90Qwt6D7;6o
zBm*6Qqi&z%VsLMZx%lO<;b@lsEug?F$~yM}66IGo+A=^9rX~(~A0l@x#m`Y9cj2kH
zSdV2>GQ@ClnOHz7xD6?*+-=P`RbDQ#4*(fTI5k^YA67CXa*XjOCp)xaDGvZB3Q?^e
z#MED9r628&tl6PDW$xrr!roCU3IsRC0A_L-lIsL){qK6CH<Bq5ox!zu*BK5wgVFUV
za^`RXg0co_0jhWm;Zgi0#2a})mKxZT?(pRsS*CN=>-R?2(2&=?(V%;IDPErsMMqq8
zhNIrgtA1xFF0O_b=a=1DW>_y<LH+P(ufudh2Q0t<j;E>Whif_J>0K7B1U%B>dvq8G
z<W$=^tmY8x0E1U|Qe1K`&o8bevs&x-&M>$P(otCPd*Q@aOlVTMJ16r3Tq!~U7Sa|O
z0DPqcN4~NHM?OP9EtF1Hg+%mo%O}x>xEq<CP(j}zmn83n@BIXY0vHvO`A_-ikf1<r
zC*d0SG7L+erfbPzz}&u_`%~;w!bHKb1@^kcL&9g|AHHmG#8Fv>BIolgXC7JE+Vk?z
z%0muCzCypR)%&@ME-5EEAuO>qw+;j<7cxe%zw?(NtoSOL-=Y*pUcBcD@DZHbq8YUz
znl5yOavx?cGM&Q42)4Uq_rHqd9+>(Ma+~}?O=R{zJWt?e0pj(hoab;2Uj$7T5Y_Gg
zO_!K@SSN5S<O(y4X(Bhkg}(~!*oh1c^_j3}5zP;+=1n=#-`e#YQRE=0T@-Q@t|$n)
zNk~u7TfT6KEa8LVwTFYs`}Z;{T!4@SfFt|hGZ<hrL=bsEgv@b#E8w7%cNt*h<3!J%
zcpOg&x&&&Uh!&E;Z~ZHptxx`WKNGiWIJ}5==Q#&4!KblLg+;iWFL0QCv#lR^g(`4j
zI>0YQ9TzPp{<SxFwabJL@&mMp+{iXuqY$V_zead-nBYGFLy#2%AlGLHmDPkWU7rCM
zp5$LXLKB($E*JFyF)gg)fc2RX<}#4~(WkP+_mn7SOr8T<%a;p4)INf*YXKldz-LM}
zah>mtr_a1aLzMQp&W~mkGS_At{cW(^PYWUQw}ELF^TAh+kLmfd{`PXOZ!2W)ul@G2
z@a@k<%k`auhCnUYxfSZw7lxN25;fFlgR6dDzQP_iCQl4T7UBE`a0(g0nx~Fx25!m!
z;Q9Rv4m-?*<kZZR167AVT#N09?oSnXyV!}`{**x4VKp6<(^WJnPMRjoenKQ0S;;*g
z@JgcWYR}+Y`jup57VFGqm!P-ps&F=lv7iMGa@f0O5MAU}?s3cr!3hE2(yMT8(35St
zAFn3>B@|*HIvA6xxapk_&R(<FSo^Xhxb{RMepGwQsi;&EUa2r7$uBaC?ubDC4|d^1
zb2X_dgy$n+uFgb#gi*g?Yfk0WO)^bW{{e>sf7Mp^ats1o>-p4#k|{OulX*IgA{Zsi
zL5-qu-EuvG8BBhJs!!i3!GpqcU?xEK+#WrmJL1>5-1iTugVZ;&dlW5zP38pV|8cmC
z;T96S(1_RLpy3Bm)0;%?mQ(i{UZd_rmgChY&A<-AN$6Y6hFh<T!#A=*;`oIUW1l!R
zr*Sg#Q;hF0KPgE*+6j|wLhLGl>`QrE{$)KCPFvpKo?Fgyt4?>MW6M<l*)zDX6F&BG
zJ_d~nrWlZra6vvpm~788VX~WzmTgU}Xks;@R?v>>_4>s2eAkU+KC3mhoAtnV+AV<4
zMh-ehA6O_j<@vOrGc*)uf2Z#}XY4AJU!f;H_=%EdvZ|F&l|&u_F}e>*;(BmcXbw}Z
zOvq3$kg~v=fVr84lO&0b35UsH;}Jzzb`&v@DO_M4R6Kza!3OFgl+c5cXmVw@JlQ%`
zrJOtGI09Z~jsYe7l=}i{P2y!rV#Mrb0ezGJAIYpAEFGi!u!D{a;O-G|$9UnsWrSgK
z5L8$AnSRYIEvG-IClluAsv>T-npNT%`Og%bs_Sj*gXClVWpD>C{N?Q4yPNI@Al_&@
zmhbva#~s@fHyqb(E3^aGZMVH~)3qYUcbkoR)c6tr@eDM)R<rA_-I%oH9Q_&q@n#-C
zy#4(E#BnkFvIz-}i|7Uw#i+5(fr1xa9z7RVI7ua$`81UE6vf$5+xCTR#P@&<$BZ5T
zh6BVoj4NWgf+)w25%U@_W~aD#<di~i^5OZ})#a!vUUmDO>zl!4_hnTK&#wlr<T4o?
zA@n%rgENac5ojHW=VzrApk1ecTmCp4J4nK~N($io3t-~K{-Z2*qMvKT^IC1<Sq;yV
zTduta`nikf=k9-se*S+BB2G~0u)@U9Je+3omaN+P&5*{$9}mRew9w9Jd^z-Z1~*=-
zIj+_8yk<)d-`7Bo^8`^d<Z<Y6;E@R>8-6+Z7vW^f3#`AMQi?8u{YYi-r<47xXFuKS
zXCwRB%v15QH?8bv+bHU1zdc{Wikr(nPjL|&HCx1v`A|0>T=St(Bw~Jd5jV{TFZYnk
z*D8`}KZ+!t+lI&6-|-X)gLdG%f$KGEHP?0IG3o_%>k$m`9E}nH@!Wen1KVEJw&gJh
zf8Bf#m%`bQMR4I0Nj#g8n$8H#GRiY`$_7ct2cghS$QxLau{QvqkHC_I(K|uPJ(4@e
zCl29tgRI?6rg6;SGnS&!^3nKH&hv{9P7C%Na!bi<I>65yG)bAi7q-z*=}^cTW#20A
zS&vl`?sgoyBGcMwvw`xen>F7QM$lXRC^EyP()P%_(44L9$moduT9Y>h+g0~J7;WVM
zXiDeFS)U40)t<i_bcZ*udZs-zwS3oVGTEl_jtso6e0Lm;y|EPrwOSaqT0!7OL3`)A
zG6`*6TxKR*VGWm782rT*wk7|z^;P|Sef_?^{;TWD<o8V_uu4;_$hQ4SIQAP+t!A|*
zk<+lFXk4<2a%BsOWt~opOx0-sBU5#4xRi-9m6h03M2UlAQbGgQivmr&59=F=h9+Rv
zh>)|C2`wj*=pJQCs~n4s3?deyLC4p8r(bJ`@8b1`^{}co@;?7SLIwa31OK#S65pbX
zV4ziB1ad%t21|bytq?yK{mW%tRMZ*`IE8h(o$JMK%6bq-mx7PNtX4KdC>e?T;Eulu
z@`x}>gJnEMSP2AFRxxKN3lhjj@sdL@kyBtIM%Ncz`6QGsL_TV@$6K6tuez^0SN)O9
z1kQgG7${Yku7~nj6{my(fy+^+-v|6(CZLOFw@QOVmMCnv7;F}!3ux}EkRZx)4~&ch
z$fL8!rB=}1sBN2+H!vrU|6KA7ok;YKdG2<NK>-RGa##*9js`W=JAYL?#L<+HqIu?~
zGcflBxl+;EcQH@V+!t(SRXj1KSR8QJl2WrfQQ(Wp%T&#iaISnX3v*7}C`v+IocY`^
zv?9X0Dfb9Up%t`Xk;sx(BVy!%L<tPkK!&fptPC}ncy=I^9!xw#Js3D^vBm<7-VafK
zk2gB``c%COk`+c0DoVxi0`*a3(r~LP3?Vp9F7f%aOrXA_sL`jNPbnlUO1YKR4XPx5
z<PHKsH!7t#x)tn_jb_!Zi;Cxv=xU?gnMtcw1lUuKo~ME)nd19ZYRc}lW^a|M7Jzn1
zeEK9fDN$)~0&O8w67ZJvP!ygIXZ)p1U*Lc**GaYuf(R9CQq5fo=Z(2lv7Vd^D$$6N
za~d1fDAOmPgoGhv#4Ju?xkQBhHa<f-Bw9#gv;hSZaWbO~=b1IVf{!kl?D@$EYBf<%
ztMRzCEV!k&+g00vVJl{0NbV1y&$5s5QDI>~a@&kjmGOo6@Tp(r?K2ldRO@vYYdI?q
zpOlpakzo`*$woh`g3>19h7a3echEWOcW*9w2jY=R$>V7?59U*<mfFrQhQ0Hf-r!Al
z*wd91yIBw=@!Mn?)SG>6-CB-g`%OD^+K=116{s8bZl1Ds(;5`gwan1~3k=u5@}OMt
zLdu7t@xbPRIXEA_?ew!OrH7(EIya9!%PeZ1Z2HuxJBA+YiOGaLIrulQzvT)?t_1+v
C_JCdh

diff --git a/pkgs/development/libraries/glibc/2.26-75.patch.gz b/pkgs/development/libraries/glibc/2.26-75.patch.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e2a8867e4fff6396fd1c1a368929c9f0e93e6d1e
GIT binary patch
literal 289084
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%0DI>AW%
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

literal 0
HcmV?d00001

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 5c7bbb32c33..7894d75fbe6 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -19,9 +19,9 @@
 } @ args:
 
 let
-  version = "2.25";
-  patchSuffix = "-49";
-  sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";
+  version = "2.26";
+  patchSuffix = "-75";
+  sha256 = "1ggnj1hzjym7sn93rbwydcqd562q73lsb7g7kd199g6j9j9hlkp5";
   cross = if buildPlatform != hostPlatform then hostPlatform else null;
 in
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation ({
           glibc-2.25-49-gbc5ace67fe
           $ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz
       */
-      ./2.25-49.patch.gz
+      ./2.26-75.patch.gz
 
       /* Have rpcgen(1) look for cpp(1) in $PATH.  */
       ./rpcgen-path.patch
@@ -100,15 +100,12 @@ stdenv.mkDerivation ({
       (if profilingLibraries
        then "--enable-profile"
        else "--disable-profile")
-    ] ++ lib.optionals (cross == null && withLinuxHeaders) [
-      "--enable-kernel=2.6.32"
+    ] ++ lib.optionals withLinuxHeaders [
+      "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
     ] ++ lib.optionals (cross != null) [
       (if cross.withTLS then "--with-tls" else "--without-tls")
       (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
-    ] ++ lib.optionals (cross != null
-          && cross.platform ? kernelMajor
-          && cross.platform.kernelMajor == "2.6") [
-      "--enable-kernel=2.6.0"
+    ] ++ lib.optionals (cross != null) [
       "--with-__thread"
     ] ++ lib.optionals (cross == null && stdenv.isArm) [
       "--host=arm-linux-gnueabi"
-- 
GitLab


From 080092ffa73edebd0e78c3a8130ac1436ef2149a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 5 Nov 2017 18:10:48 +0000
Subject: [PATCH 741/877] nat-traverse: do not wrap with perl path

---
 pkgs/tools/networking/nat-traverse/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix
index 0972e767758..a352596eed0 100644
--- a/pkgs/tools/networking/nat-traverse/default.nix
+++ b/pkgs/tools/networking/nat-traverse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, makeWrapper }:
+{ stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   name = "nat-traverse-${version}";
@@ -9,13 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "0knwnqsjwv7sa5wjb863ghabs7s269a73qwkmxpsbngjw9s0j2ih";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ perl ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1
     cp nat-traverse $out/bin
     gzip -c nat-traverse.1 > $out/share/man/man1/nat-traverse.1.gz
-    wrapProgram $out/bin/nat-traverse --prefix PATH : "${stdenv.lib.makeBinPath [ perl ]}"
   '';
 
   meta = with stdenv.lib; {
@@ -31,8 +30,8 @@ stdenv.mkDerivation rec {
       nat-traverse works out-of-the-box.
     '';
     homepage = https://www.speicherleck.de/iblech/nat-traverse/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
     maintainers = [ maintainers.iblech ];
   };
 }
-- 
GitLab


From 587037c42d3c3cfe7f22f1ea08d7a6b503c5480d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Nov 2017 19:18:34 +0100
Subject: [PATCH 742/877] lilypond: disable parallel building

Example failure: https://hydra.nixos.org/build/63597640
---
 pkgs/misc/lilypond/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 15481d74598..f312cce19d7 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec{
       fontforge help2man groff makeWrapper t1utils
     ];
 
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true; # fatal error: parser.hh: No such file or directory
 
   meta = with stdenv.lib; {
     description = "Music typesetting system";
-- 
GitLab


From 35539c641ec620b527330acc26377dcd4a5a1a91 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 5 Nov 2017 19:28:20 +0100
Subject: [PATCH 743/877] arx-libertatis: 2017-02-26 -> 2017-10-30

---
 pkgs/games/arx-libertatis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index 40b594a1952..e6594adde55 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "arx-libertatis-${version}";
-  version = "2017-02-26";
+  version = "2017-10-30";
 
   src = fetchFromGitHub {
     owner  = "arx";
     repo   = "ArxLibertatis";
-    rev    = "0d2bb46025b2ad0fd5c8bcddd1cc04750282608d";
+    rev    = "e5ea4e8f0f7e86102cfc9113c53daeb0bdee6dd3";
     sha256 = "11z0ndhk802jr3w3z5gfqw064g98v99xin883q1qd36jw96s27p5";
   };
 
-- 
GitLab


From a9b39814dd378f3a721ff20fba0e8f4c790d0486 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 5 Nov 2017 18:33:13 +0000
Subject: [PATCH 744/877] timescaledb: 0.5.0 -> 0.6.0

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

diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix
index fbf0bfa1926..223bd6e470b 100644
--- a/pkgs/servers/sql/postgresql/timescaledb/default.nix
+++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   name = "timescaledb-${version}";
-  version = "0.5.0";
+  version = "0.6.0";
 
   buildInputs = [ postgresql ];
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "timescale";
     repo = "timescaledb";
     rev = version;
-    sha256 = "01swgjw563c42azxsg55ry7cyiipxkcvfrxmw71jil5dxl3s0fkz";
+    sha256 = "061z1ll3x7ca7fj12rl2difkdvmqykksqhpsql552qkkylg7iq4d";
   };
 
   installPhase = ''
-- 
GitLab


From 1aef6f40bbbe3348986058a12898e57afd4c0ba6 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 14 Sep 2017 14:58:37 +0200
Subject: [PATCH 745/877] libgit2: fix hash

... and switch to fetchFromGitHub to avoid future hash changes.
---
 pkgs/development/libraries/git2/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 0d53d00737b..ecc6552d1b4 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,13 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, python
+, zlib, libssh2, openssl, http-parser, curl, libiconv
+}:
 
 stdenv.mkDerivation (rec {
   version = "0.25.1";
   name = "libgit2-${version}";
 
-  src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://github.com/libgit2/libgit2/tarball/v${version}";
-    sha256 = "100bah8picqjzyhpw4wd7z5vyidcb8aggin50bhbpn607h8n8bml";
+  src = fetchFromGitHub {
+    owner = "libgit2";
+    repo = "libgit2";
+    rev = "v${version}";
+    sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj";
   };
 
   # TODO: `cargo` (rust's package manager) surfaced a serious bug in
@@ -23,8 +26,11 @@ stdenv.mkDerivation (rec {
   cmakeFlags = "-DTHREADSAFE=ON";
 
   nativeBuildInputs = [ cmake python pkgconfig ];
+
   buildInputs = [ zlib libssh2 openssl http-parser curl ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "The Git linkable library";
     homepage = https://libgit2.github.com/;
-- 
GitLab


From ce1b0c05a52f70fbf03c277018384c9bac3fdf56 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 5 Nov 2017 05:03:17 +0000
Subject: [PATCH 746/877] libgit2: 0.25.1 -> 0.26.0

---
 pkgs/development/libraries/git2/0.25.nix    | 43 +++++++++++++++++++++
 pkgs/development/libraries/git2/default.nix | 25 ++++--------
 pkgs/top-level/all-packages.nix             | 10 +++--
 3 files changed, 56 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/libraries/git2/0.25.nix

diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.25.nix
new file mode 100644
index 00000000000..ecc6552d1b4
--- /dev/null
+++ b/pkgs/development/libraries/git2/0.25.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, python
+, zlib, libssh2, openssl, http-parser, curl, libiconv
+}:
+
+stdenv.mkDerivation (rec {
+  version = "0.25.1";
+  name = "libgit2-${version}";
+
+  src = fetchFromGitHub {
+    owner = "libgit2";
+    repo = "libgit2";
+    rev = "v${version}";
+    sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj";
+  };
+
+  # TODO: `cargo` (rust's package manager) surfaced a serious bug in
+  # libgit2 when the `Security.framework` transport is used on Darwin.
+  # The upstream issue is tracked at
+  # https://github.com/libgit2/libgit2/issues/3885 - feel free to
+  # remove this patch as soon as it's resolved (i.E. when cargo is
+  # working fine without this patch)
+  patches = stdenv.lib.optionals stdenv.isDarwin [
+    ./disable-security.framework.patch
+  ];
+
+  cmakeFlags = "-DTHREADSAFE=ON";
+
+  nativeBuildInputs = [ cmake python pkgconfig ];
+
+  buildInputs = [ zlib libssh2 openssl http-parser curl ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "The Git linkable library";
+    homepage = https://libgit2.github.com/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = with stdenv.lib.platforms; all;
+  };
+} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
+  NIX_LDFLAGS = "-liconv";
+  propagatedBuildInputs = [ libiconv ];
+})
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index ecc6552d1b4..42cf181f84f 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,28 +1,17 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, python
-, zlib, libssh2, openssl, http-parser, curl, libiconv
-}:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }:
 
 stdenv.mkDerivation (rec {
-  version = "0.25.1";
   name = "libgit2-${version}";
+  version = "0.26.0";
+  # keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib
 
   src = fetchFromGitHub {
     owner = "libgit2";
     repo = "libgit2";
     rev = "v${version}";
-    sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj";
+    sha256 = "0zrrmfkfhd2xb4879z5khjb6xsdklrm01f1lscrs2ks68v25fk78";
   };
 
-  # TODO: `cargo` (rust's package manager) surfaced a serious bug in
-  # libgit2 when the `Security.framework` transport is used on Darwin.
-  # The upstream issue is tracked at
-  # https://github.com/libgit2/libgit2/issues/3885 - feel free to
-  # remove this patch as soon as it's resolved (i.E. when cargo is
-  # working fine without this patch)
-  patches = stdenv.lib.optionals stdenv.isDarwin [
-    ./disable-security.framework.patch
-  ];
-
   cmakeFlags = "-DTHREADSAFE=ON";
 
   nativeBuildInputs = [ cmake python pkgconfig ];
@@ -31,11 +20,11 @@ stdenv.mkDerivation (rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "The Git linkable library";
     homepage = https://libgit2.github.com/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; all;
+    license = licenses.gpl2;
+    platforms = with platforms; all;
   };
 } // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
   NIX_LDFLAGS = "-liconv";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e87a3f73472..b02213de79d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8293,11 +8293,13 @@ with pkgs;
 
   icon-lang = callPackage ../development/interpreters/icon-lang { };
 
-  libgit2 = callPackage ../development/libraries/git2 (
-    stdenv.lib.optionalAttrs stdenv.isDarwin {
+  inherit (rec {
+    arg = stdenv.lib.optionalAttrs stdenv.isDarwin {
       inherit (darwin) libiconv;
-    }
-  );
+    };
+    libgit2 = callPackage ../development/libraries/git2 arg;
+    libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix arg;
+  }) libgit2 libgit2_0_25;
 
   gle = callPackage ../development/libraries/gle { };
 
-- 
GitLab


From 43934459fa82b99abab5565fac537922aecf08ce Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 2 Nov 2017 16:35:40 +0800
Subject: [PATCH 747/877] pythonPackages.pygit2: 0.25.1 -> 0.26.0

---
 .../python-modules/pygit2/default.nix         | 31 ++++++++++++++
 pkgs/top-level/python-packages.nix            | 40 +------------------
 2 files changed, 32 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/development/python-modules/pygit2/default.nix

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
new file mode 100644
index 00000000000..90bfe978391
--- /dev/null
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, libgit2, six, cffi }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pygit2";
+  version = "0.26.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1cbc488ra3kg7r3qky17ms0szi3cda2d96qfkv1l9djsy9hnvw57";
+  };
+
+  preConfigure = lib.optionalString stdenv.isDarwin ''
+    export DYLD_LIBRARY_PATH="${libgit2}/lib"
+  '';
+
+  propagatedBuildInputs = [ libgit2 six ] ++ lib.optional (!isPyPy) cffi;
+
+  preCheck = ''
+    # disable tests that require networking
+    rm test/test_repository.py
+    rm test/test_credentials.py
+    rm test/test_submodule.py
+  '';
+
+  meta = with lib; {
+    description = "A set of Python bindings to the libgit2 shared library";
+    homepage = https://pypi.python.org/pypi/pygit2;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4600cf162a..98470de6b52 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15674,45 +15674,7 @@ in {
     };
   };
 
-  pygit2 = buildPythonPackage rec {
-    name = "pygit2-0.25.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pygit2/${name}.tar.gz";
-      sha256 = "0sja3g9mqwp5bnhdc313b2gc4z3p70nn6zzf2h8j581g0lrn0sg8";
-    };
-
-    # Fixes a bug which can cause test failed when cffi==1.10
-    prePatch = let
-      cffiVersionPatch = pkgs.fetchurl {
-        url = "https://github.com/libgit2/pygit2/commit/b88dc868423af2f760f649960112efd0e37e5335.patch";
-        sha256 = "14cfrz56y2dnwlxrrss9pjhxfnyyg5856gbabzjzyx674k0qcid4";
-      };
-    in ''
-      # we need to delete part of the patch because the missing .travis.yml causes problem
-      sed -e '1,36d' ${cffiVersionPatch} | patch -p1
-    '';
-
-    preConfigure = ( if stdenv.isDarwin then ''
-      export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib"
-    '' else "" );
-
-    propagatedBuildInputs = with self; [ pkgs.libgit2 six ] ++ optionals (!isPyPy) [ cffi ];
-
-    preCheck = ''
-      # disable tests that require networking
-      rm test/test_repository.py
-      rm test/test_credentials.py
-      rm test/test_submodule.py
-    '';
-
-    meta = {
-      homepage = https://pypi.python.org/pypi/pygit2;
-      description = "A set of Python bindings to the libgit2 shared library";
-      license = licenses.gpl2;
-      platforms = platforms.all;
-    };
-  };
+  pygit2 = callPackage ../development/python-modules/pygit2 { };
 
   Babel = buildPythonPackage (rec {
     name = "Babel-2.3.4";
-- 
GitLab


From 711f260f71a4b54f28296fc89a2e0c854b72eff2 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 3 Nov 2017 03:30:31 +0000
Subject: [PATCH 748/877] libgit2-glib: 0.25.0 -> 0.26.0

---
 pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix | 10 ++++++----
 pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix     | 10 ++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
index a71dbf5494d..36feb09d7ee 100644
--- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala_0_32, libssh2
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2
 , gtk_doc, gobjectIntrospection, libgit2, glib }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gnome3.gnome_common libtool vala_0_32 libssh2
-                  gtk_doc gobjectIntrospection libgit2 glib ];
+  nativeBuildInputs = [
+    gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection
+  ];
+
+  buildInputs = [ libssh2 libgit2 glib ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix
index b9abde42cbd..00e747500c6 100644
--- a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix
+++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix
@@ -1,12 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
-fetchurl: rec {
-  major = "0.25";
-  minor = "0";
-  name = "libgit2-glib-${major}.${minor}";
+fetchurl: {
+  name = "libgit2-glib-0.26.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgit2-glib/${major}/${name}.tar.xz";
-    sha256 = "0rf5gcr3khp35wj9ax9cbyq5j3iiwa1l0fi16w6sfgmrryd6n9aa";
+    url = mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.0.tar.xz;
+    sha256 = "06b16cfcc3a53d9804858618d690e5509e9af2e2245b75f0479cadbbe39745c3";
   };
 }
-- 
GitLab


From 2b9975c2440c1f6250a7b41194f8b72c66270458 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 3 Nov 2017 03:51:01 +0000
Subject: [PATCH 749/877] gitg: 3.24.0 -> 3.26.0

---
 pkgs/desktops/gnome-3/misc/gitg/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gitg/src.nix b/pkgs/desktops/gnome-3/misc/gitg/src.nix
index 9c6dd2148cc..c72e2830ad1 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/src.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gitg-3.24.0";
+  name = "gitg-3.26.0";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gitg/3.24/gitg-3.24.0.tar.xz;
-    sha256 = "3e4ec4a8ae83bc7ced8c7610927ade70e37daa5e8beeb4f357a6ea30b4cc951e";
+    url = mirror://gnome/sources/gitg/3.26/gitg-3.26.0.tar.xz;
+    sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5";
   };
 }
-- 
GitLab


From 2fb0edd085ea83a66e88de209806be720fb53244 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 3 Nov 2017 04:49:55 +0000
Subject: [PATCH 750/877] git-series: fix build after "source" name change

---
 pkgs/development/tools/git-series/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix
index 44120ad023a..7d94863ea1c 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/pkgs/development/tools/git-series/default.nix
@@ -17,7 +17,7 @@ buildRustPackage rec {
 
   cargoDepsHook = ''
     (
-      cd ${name}-src
+      cd */
       # see https://github.com/git-series/git-series/pull/56
       patch -p1 < ${fetchpatch {
         url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch";
-- 
GitLab


From 225a05906c3a9b4a9d59d00d10cbf7b86d7fc881 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 3 Nov 2017 17:48:42 +0000
Subject: [PATCH 751/877] julia_05: use libgit2_0_25

It's libgit2 test fails with libgit2 0.26.0.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b02213de79d..8dcc65f175c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6011,6 +6011,7 @@ with pkgs;
 
   julia_05 = callPackage ../development/compilers/julia/0.5.nix {
     gmp = gmp6;
+    libgit2 = libgit2_0_25;
     openblas = openblasCompat;
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
     llvm = llvm_38;
-- 
GitLab


From 62e18a947b88124e2728ec846ff9f90542cc77ed Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 5 Nov 2017 16:38:00 +0000
Subject: [PATCH 752/877] libgit2: delete obsolete patch

---
 pkgs/development/libraries/git2/0.25.nix      | 10 ----
 .../git2/disable-security.framework.patch     | 58 -------------------
 2 files changed, 68 deletions(-)
 delete mode 100644 pkgs/development/libraries/git2/disable-security.framework.patch

diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.25.nix
index ecc6552d1b4..679049a0e13 100644
--- a/pkgs/development/libraries/git2/0.25.nix
+++ b/pkgs/development/libraries/git2/0.25.nix
@@ -13,16 +13,6 @@ stdenv.mkDerivation (rec {
     sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj";
   };
 
-  # TODO: `cargo` (rust's package manager) surfaced a serious bug in
-  # libgit2 when the `Security.framework` transport is used on Darwin.
-  # The upstream issue is tracked at
-  # https://github.com/libgit2/libgit2/issues/3885 - feel free to
-  # remove this patch as soon as it's resolved (i.E. when cargo is
-  # working fine without this patch)
-  patches = stdenv.lib.optionals stdenv.isDarwin [
-    ./disable-security.framework.patch
-  ];
-
   cmakeFlags = "-DTHREADSAFE=ON";
 
   nativeBuildInputs = [ cmake python pkgconfig ];
diff --git a/pkgs/development/libraries/git2/disable-security.framework.patch b/pkgs/development/libraries/git2/disable-security.framework.patch
deleted file mode 100644
index ce6a008b1c4..00000000000
--- a/pkgs/development/libraries/git2/disable-security.framework.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From fbc2ea65406236a740b8734dd41dc5ddbc24f8c9 Mon Sep 17 00:00:00 2001
-From: mulrich <mulrich@entwicklerheld.local>
-Date: Mon, 8 Aug 2016 15:36:07 +0200
-Subject: [PATCH] disable security.framework
-
----
- CMakeLists.txt    | 7 +++----
- src/curl_stream.c | 9 ++++++++-
- 2 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 93a9e47..331e148 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,8 @@ ENDIF()
- 
- IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- 	SET( USE_ICONV ON )
--	FIND_PACKAGE(Security)
-+	# FIND_PACKAGE(Security)
-+  SET(SECURITY_FOUND "NO")
- 	FIND_PACKAGE(CoreFoundation REQUIRED)
- ENDIF()
- 
-@@ -87,9 +88,7 @@ IF(MSVC)
- 	OPTION(MSVC_CRTDBG "Enable CRTDBG memory leak reporting" OFF)
- ENDIF()
- 
--IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--	OPTION( USE_OPENSSL                     "Link with and use openssl library"             ON )
--ENDIF()
-+OPTION( USE_OPENSSL                     "Link with and use openssl library"             ON )
- 
- CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtim "sys/types.h;sys/stat.h"
- 	HAVE_STRUCT_STAT_ST_MTIM LANGUAGE C)
-diff --git a/src/curl_stream.c b/src/curl_stream.c
-index 98de187..a8a9f4c 100644
---- a/src/curl_stream.c
-+++ b/src/curl_stream.c
-@@ -309,7 +309,14 @@ int git_curl_stream_new(git_stream **out, const char *host, const char *port)
- 	curl_easy_setopt(handle, CURLOPT_HTTPPROXYTUNNEL, 1);
- 	curl_easy_setopt(handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
- 
--	/* curl_easy_setopt(handle, CURLOPT_VERBOSE, 1); */
-+  const char* cainfo = getenv("SSL_CERT_FILE");
-+  if(cainfo != NULL) {
-+    curl_easy_setopt(handle, CURLOPT_CAINFO, cainfo);
-+  }
-+
-+  /*
-+	curl_easy_setopt(handle, CURLOPT_VERBOSE, 1);
-+  */
- 
- 	st->parent.version = GIT_STREAM_VERSION;
- 	st->parent.encrypted = 0; /* we don't encrypt ourselves */
--- 
-2.3.8 (Apple Git-58)
-
-- 
GitLab


From 9cb5201d3337dabd27938337fe4f5d5e784818cc Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 5 Nov 2017 11:24:39 -0600
Subject: [PATCH 753/877] yosys/symbiyosys: 2017.10.16 -> 2017.11.05

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/symbiyosys/default.nix |  6 +++---
 pkgs/development/compilers/yosys/default.nix           | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 5da3e7c31b4..53e1a90f5b6 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "symbiyosys-${version}";
-  version = "2017.10.16";
+  version = "2017.11.05";
 
   src = fetchFromGitHub {
     owner  = "cliffordwolf";
     repo   = "symbiyosys";
-    rev    = "f403b99fae053baab651e3ec8345a68cb3ba6a96";
-    sha256 = "0jzzlybxaqmhrasfjv3q3skshalr7lvv4p142qgdqz1ig36znbi8";
+    rev    = "db9c7e97b8f84ef7e9b18ae630009897c7982a08";
+    sha256 = "0pyznkjm0vjmaf6mpwknmh052qrwy2fzi05h80ysx1bxc51ns0m0";
   };
 
   buildInputs = [ python3 yosys ];
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 02f5d3494e6..b1c36f841a4 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -4,21 +4,21 @@
 
 stdenv.mkDerivation rec {
   name = "yosys-${version}";
-  version = "2017.10.16";
+  version = "2017.11.05";
 
   srcs = [
     (fetchFromGitHub {
       owner = "cliffordwolf";
       repo = "yosys";
-      rev = "716dbc92745aa8b41d85a60d50263433d5a79393";
-      sha256 = "0va77my4iddsw6psgjfhfgs0z0z1hpj0l8ipchcl8crpxipxcr77";
+      rev = "4f31cb6daddedcee467d85797d81b79360ce1826";
+      sha256 = "1a5n0g5kpjsy8f99f64w81gkrr450wvffp407r1pddl8pmb0c3r7";
       name = "yosys";
     })
     (fetchFromBitbucket {
       owner = "alanmi";
       repo = "abc";
-      rev = "6283c5d99b06";
-      sha256 = "1mv8r1la4d4r9bk32sl4nq3flyxi8jf2ccaak64j5rz9hirrlpla";
+      rev = "f6838749f234";
+      sha256 = "0n7ywvih958h1c4n7a398a9w3qikhkv885fx5j3y2a0xwqc86m4y";
       name = "yosys-abc";
     })
   ];
-- 
GitLab


From 5ccd5cded42cdfb1aefa53b0cb7ead43ce360bd3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 5 Nov 2017 11:27:24 -0600
Subject: [PATCH 754/877] icestorm: 2017.10.16 -> 2017.11.05

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/icestorm/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index b01127ffa56..b9d72084518 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "icestorm-${version}";
-  version = "2017.10.16";
+  version = "2017.11.05";
 
   src = fetchFromGitHub {
-    owner = "cliffordwolf";
-    repo = "icestorm";
-    rev = "d9d2a3dcaa749014f5b9a539768b8368bb529b28";
-    sha256 = "1a755jnbjq3v7a3l90qjlgihmrpbdfiiabb4g8sw3ay3qmvzwh6b";
+    owner  = "cliffordwolf";
+    repo   = "icestorm";
+    rev    = "3ba18d001754de563ab0baa2a1c8eecbe63ef121";
+    sha256 = "1c7yv91xi4vx0130xn2zq74gfjbf7fhm2q4fma9xgwj5xpdy8rmn";
   };
 
   buildInputs = [ python3 libftdi ];
-- 
GitLab


From c4f784db1d7994957cb87ec3533bc7d5a08f2d24 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 5 Nov 2017 11:28:41 -0600
Subject: [PATCH 755/877] arachne-pnr: 2017.06.29 -> 2017.11.05

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/arachne-pnr/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index 17f068c1c6f..7db75d12978 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "arachne-pnr-${version}";
-  version = "2017.06.29";
+  version = "2017.11.05";
 
   src = fetchFromGitHub {
-    owner = "cseed";
-    repo = "arachne-pnr";
-    rev = "7e135edb31feacde85ec5b7e5c03fc9157080977";
-    sha256 = "1wszcx6hgw4q4r778zswrlwdwvwxq834bkajck8w9yfqwxs9lmq8";
+    owner  = "cseed";
+    repo   = "arachne-pnr";
+    rev    = "1e81432830c75c505c76e419619f605a6c4c7583";
+    sha256 = "0lzblmi1klbsmd32h8nh027npm1z1a199lng13lcrqwr17lhb7my";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From e27e0ebe48d784b9bf304413889593946b4acca8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 5 Nov 2017 11:34:32 -0600
Subject: [PATCH 756/877] cvc4: unstable-2017-05-18 -> 1.5

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/cvc4/default.nix            | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix
index df7eac02513..6b213226635 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cln, gmp, swig, pkgconfig, readline, libantlr3c,
-boost, jdk, autoreconfHook, python2, antlr3_4 }:
+{ stdenv, fetchurl, cln, gmp, swig, pkgconfig
+, readline, libantlr3c, boost, jdk, autoreconfHook
+, python2, antlr3_4
+}:
 
 stdenv.mkDerivation rec {
-  name = "cvc4-unstable-${version}";
-  version = "2017-05-18";
+  name = "cvc4-${version}";
+  version = "1.5";
 
-  src = fetchFromGitHub {
-    owner = "CVC4";
-    repo = "CVC4";
-    rev = "d77107cc56b0a089364c3d1512813701c155ea93";
-    sha256 = "085bjrrm33rl5pwqx13af9sgni9cfbg70wag6lm08jj41ws411xs";
+  src = fetchurl {
+    url = "http://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz";
+    sha256 = "0yxxawgc9vd2cz883swjlm76rbdkj48n7a8dfppsami530y2rvhi";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     "--with-readline"
     "--with-boost=${boost.dev}"
   ];
+
   preConfigure = ''
     patchShebangs ./src/
   '';
-- 
GitLab


From 5fc4f17862883b1f133e69f8e283f96715018c30 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 5 Nov 2017 11:36:21 -0600
Subject: [PATCH 757/877] yices: 2.5.3 -> 2.5.4

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/yices/default.nix           | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index aac72ba24f0..a607f106639 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -2,38 +2,40 @@
 
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
-  version = "2.5.3";
+  version = "2.5.4";
 
   src = fetchurl {
     url = "https://github.com/SRI-CSL/yices2/archive/Yices-${version}.tar.gz";
     name = "${name}-src.tar.gz";
-    sha256 = "0a3zzbvmgyiljzqn6xmc037gismm779p696jywk09j2pqbvp52ac";
+    sha256 = "1k8wmlddi3zv5kgg6xbch3a0s0xqsmsfc7y6z8zrgcyhswl36h7p";
   };
 
-  patchPhase = ''patchShebangs tests/regress/check.sh'';
-
-  configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"
-                     "--with-static-gmp-include-dir=${gmp-static.dev}/include"
-                     "--enable-mcsat"
-                   ];
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ gmp-static gperf libpoly ];
+  buildInputs       = [ gmp-static gperf libpoly ];
+  configureFlags =
+    [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"
+      "--with-static-gmp-include-dir=${gmp-static.dev}/include"
+      "--enable-mcsat"
+    ];
 
   enableParallelBuilding = true;
   doCheck = true;
 
+  # Usual shenanigans
+  patchPhase = ''patchShebangs tests/regress/check.sh'';
+
   # Includes a fix for the embedded soname being libyices.so.2.5, but
-  # only installing the libyices.so.2.5.1 file.
+  # only installing the libyices.so.2.5.x file.
   installPhase = ''
       make install LDCONFIG=true
-      (cd $out/lib && ln -s -f libyices.so.2.5.3 libyices.so.2.5)
+      (cd $out/lib && ln -s -f libyices.so.${version} libyices.so.2.5)
   '';
 
   meta = with stdenv.lib; {
     description = "A high-performance theorem prover and SMT solver";
     homepage    = "http://yices.csl.sri.com";
     license     = licenses.gpl3;
-    platforms   = platforms.linux ++ platforms.darwin;
+    platforms   = with platforms; linux ++ darwin;
     maintainers = [ maintainers.thoughtpolice ];
   };
 }
-- 
GitLab


From 50c236772ba1009e52f5869fd1cf0e5503998d4a Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin@protonmail.com>
Date: Sun, 5 Nov 2017 18:53:40 +0100
Subject: [PATCH 758/877] typora: 0.9.31 -> 0.9.38

---
 pkgs/applications/editors/typora/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 0733bd79665..b20a6e5ec45 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -3,18 +3,18 @@
 
 stdenv.mkDerivation rec {
   name = "typora-${version}";
-  version = "0.9.31";
+  version = "0.9.38";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
-        sha256 = "786b5164d9c63ecc23eb427c5ff393285ce8fd540c5bfdd5c1464655fac87a42";
+        sha256 = "bf6a069c5da4a7dc289bdb3c8d27e7a81daeaee99488d4d3b512c6b673780557";
       }
     else
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_i386.deb";
-        sha256 = "a8fe53f8984d9f8c4e06c14affbb616be58a91cd2b475b9681fb18a6e21930d1";
+        sha256 = "edd092e96ebf69503cf6b39b77a61ec5e3185f8a1447da0bed063fa11861c1b9";
       }
     ;
 
@@ -57,8 +57,10 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out
     dpkg -x $src $out
-    cp -av $out/usr/* $out
+    mv $out/usr/bin $out
+    mv $out/usr/share $out
     rm $out/bin/typora
+    rmdir $out/usr
 
     # Otherwise it looks "suspicious"
     chmod -R g-w $out
@@ -81,9 +83,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A minimal Markdown reading & writing app";
     homepage = https://typora.io;
-    license = licenses.free;
-    maintainers = with stdenv.lib.maintainers; [ jensbin ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ jensbin ];
     platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }
-
-- 
GitLab


From d8249443147ad11a354f433f76ab085450f7bc6e Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 5 Nov 2017 16:09:41 +0000
Subject: [PATCH 759/877] firefox-bin: Fail on unsupported architectures

---
 .../networking/browsers/firefox-bin/default.nix       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 31bc01ea14a..347ceba9ab4 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -54,9 +54,12 @@ let
 
   inherit (generated) version sources;
 
-  arch = if stdenv.system == "i686-linux"
-    then "linux-i686"
-    else "linux-x86_64";
+  mozillaPlatforms = {
+    "i686-linux" = "linux-i686";
+    "x86_64-linux" = "linux-x86_64";
+  };
+
+  arch = mozillaPlatforms.${stdenv.system};
 
   isPrefixOf = prefix: string:
     builtins.substring 0 (builtins.stringLength prefix) string == prefix;
@@ -185,7 +188,7 @@ stdenv.mkDerivation {
       free = false;
       url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
     };
-    platforms = platforms.linux;
+    platforms = builtins.attrNames mozillaPlatforms;
     maintainers = with maintainers; [ garbas ];
   };
 }
-- 
GitLab


From 9c5bf726e5aba99fb786ee7206e1d9481aac97b4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 5 Nov 2017 13:16:18 +0100
Subject: [PATCH 760/877] python.pkgs: maintenance updates

---
 pkgs/development/python-modules/Cython/default.nix       | 4 ++--
 pkgs/development/python-modules/aiohttp/default.nix      | 4 ++--
 pkgs/development/python-modules/asgi_ipc/default.nix     | 4 ++--
 pkgs/development/python-modules/dulwich/default.nix      | 4 ++--
 pkgs/development/python-modules/fiona/default.nix        | 4 ++--
 pkgs/development/python-modules/gflags/default.nix       | 4 ++--
 pkgs/development/python-modules/jug/default.nix          | 4 ++--
 pkgs/development/python-modules/keras/default.nix        | 4 ++--
 pkgs/development/python-modules/multidict/default.nix    | 4 ++--
 pkgs/development/python-modules/netcdf4/default.nix      | 4 ++--
 pkgs/development/python-modules/notebook/default.nix     | 4 ++--
 pkgs/development/python-modules/phonenumbers/default.nix | 4 ++--
 pkgs/development/python-modules/pyodbc/default.nix       | 4 ++--
 pkgs/development/python-modules/pyspread/default.nix     | 4 ++--
 pkgs/development/python-modules/shapely/default.nix      | 4 ++--
 pkgs/development/python-modules/sqlalchemy/default.nix   | 4 ++--
 pkgs/development/python-modules/sqlmap/default.nix       | 4 ++--
 17 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index e507b89bbbb..751e064ad70 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -14,11 +14,11 @@
 buildPythonPackage rec {
   pname = "Cython";
   name = "${pname}-${version}";
-  version = "0.27.2";
+  version = "0.27.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "265dacf64ed8c0819f4be9355c39beaa13dc2ad2f85237a2c4e478f5ce644b48";
+    sha256 = "6a00512de1f2e3ce66ba35c5420babaef1fe2d9c43a8faab4080b0dbcc26bc64";
   };
 
   # With Python 2.x on i686-linux or 32-bit ARM this test fails because the
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 19e94471c86..5f87580643f 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "2.3.1";
+  version = "2.3.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04f58bbcc9ae6f9aec30b9219ae47fa3c31586c77679405720545738ea62236e";
+    sha256 = "42373fbdbe8f09233c17e74f53cee877bc7d5b495b4fc14c32a119255e85e736";
   };
 
   disabled = pythonOlder "3.4";
diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix
index 41de61dbcca..a60109b6e8c 100644
--- a/pkgs/development/python-modules/asgi_ipc/default.nix
+++ b/pkgs/development/python-modules/asgi_ipc/default.nix
@@ -2,13 +2,13 @@
   asgiref, msgpack, posix_ipc
 }:
 buildPythonPackage rec {
-  version = "1.4.1";
+  version = "1.4.2";
   pname = "asgi_ipc";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz";
-    sha256 = "87cc9dda476d28f335261b73f0f3070f28847718de2e64da9a80492638203e43";
+    sha256 = "2403f41184405791b05e7aee570bd6ccd47e2d91845d78fe17adcf58ef48c037";
   };
 
   propagatedBuildInputs = [ asgiref msgpack posix_ipc ];
diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 778c8c984c8..422674152a6 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -3,13 +3,13 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.18.4";
+  version = "0.18.5";
   pname = "dulwich";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/dulwich/${name}.tar.gz";
-    sha256 = "b4baace48dde5e0a76f37b251c246c7e1829bda0617679f00cbade0e70a5ac5b";
+    sha256 = "838bac318fd0ed79e0eedb6cfd53b6424dc618fec6b99dc959881b12da7bd6e0";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index d53a29d182f..5c150844c84 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "Fiona";
-  version = "1.7.9.post1";
+  version = "1.7.10.post1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "68e8a925b23e3987845c11b0fdd6378fdec4316fe8ba767a935151b6ee1fc607";
+    sha256 = "fc4c8996be3131f36c791d66273317d38b72b19dc24c2afc332fd734752eb7a8";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix
index 48fff723056..f73ff2b4686 100644
--- a/pkgs/development/python-modules/gflags/default.nix
+++ b/pkgs/development/python-modules/gflags/default.nix
@@ -1,13 +1,13 @@
 { lib, buildPythonPackage, fetchPypi, six, pytest }:
 
 buildPythonPackage rec {
-  version = "3.1.1";
+  version = "3.1.2";
   name = "gflags-${version}";
 
   src = fetchPypi {
     inherit version;
     pname = "python-gflags";
-    sha256 = "0qvcizlz6r4511kl4jlg6fr34y1ka956dr2jj1q0qcklr94n9zxa";
+    sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix
index ab94d7b40ac..b1053bbdaab 100644
--- a/pkgs/development/python-modules/jug/default.nix
+++ b/pkgs/development/python-modules/jug/default.nix
@@ -6,7 +6,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Jug";
-  version = "1.6.3";
+  version = "1.6.4";
   buildInputs = [ nose numpy ];
   propagatedBuildInputs = [
     bottle
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86";
+    sha256 = "e739b20e7fe53ac50f5954b9e32568bdd92012dd4bd199d13e2a675ccd69d97d";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 877fbe9470d..c2d5362b134 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "Keras";
-  version = "2.0.8";
+  version = "2.0.9";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "899dc6aaed366f20100b9f80cf1093ea5b43eecc74afd1dc63a4e48dfa776ab9";
+    sha256 = "6b8572cf1b4a22fd0120b7c23382ba4fa04a6f0397e02af1249be9a7309d1767";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 8d9340625e1..614157542b1 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -8,13 +8,13 @@
 
 let
   pname = "multidict";
-  version = "3.3.0";
+  version = "3.3.2";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "e76909da2fad6966281d4e0e4ccfd3c3025699ebcc30806afa09fa1384c3532b";
+    sha256 = "f82e61c7408ed0dce1862100db55595481911f159d6ddec0b375d35b6449509b";
   };
 
   buildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 0ef864d33e2..67df4403f98 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -4,13 +4,13 @@
 buildPythonPackage rec {
   pname = "netCDF4";
   name = "${pname}-${version}";
-  version = "1.3.0";
+  version = "1.3.1";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
-    sha256 = "1982372aeacc6b36054d90d8cb54ee9506b66b6f44d5cff10e2ffb162aad5476";
+    sha256 = "570ea59992aa6d98a9b672c71161d11ba5683f787da53446086077470a869957";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index c30e6e5e77d..2a23ff4de78 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -22,12 +22,12 @@
 
 buildPythonPackage rec {
   pname = "notebook";
-  version = "5.2.0";
+  version = "5.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1sh3jkkmjzv17c3r8ii3kfhpxi6dkjk846b2lfy71g9qwqdcvbvz";
+    sha256 = "4ae5b81dd39b37cdd99dcffe83a5182c849947b92d46ac4d2b5093af2bb9f224";
   };
 
   LC_ALL = "en_US.utf8";
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 9fb16bb0302..75a3f51afc6 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.8.4";
+  version = "8.8.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01kim7mwgm97wysclhyxcwvd2a8ifinaidkskglx7b2k0r7ji5sj";
+    sha256 = "adb2dd985f875ac035bbdc6a1cc57e30834e106e2ff7899e09a1690b474c1774";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index c09e15f4bfb..b236715a5d6 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyodbc";
-  version = "4.0.19";
+  version = "4.0.21";
   name = "${pname}-${version}";
   disabled = isPyPy;  # use pypypdbc instead
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg";
+    sha256 = "9655f84ca9e5cb2dfffff705601017420c840d55271ba62dd44f05383eff0329";
   };
 
   buildInputs = [ libiodbc ];
diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix
index 2f275005c19..7fbda048ca3 100644
--- a/pkgs/development/python-modules/pyspread/default.nix
+++ b/pkgs/development/python-modules/pyspread/default.nix
@@ -19,11 +19,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pyspread";
-  version = "1.1";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0m1a4zvzrfrnc42j8mrbm7747w03nzyl9z02wjagccmlhi6nd9hx";
+    sha256 = "b90edb92c7fce3b8332cdddd3dd1c72ba14440ab39a10ca89c9888ad973a8862";
   };
 
   propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ];
diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index 85052a34a56..e8e92818ecf 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Shapely";
-  version = "1.6.1";
+  version = "1.6.2.post1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1iyhrkm6g233gwbd20sf4aq4by0kg52cz1d2k7imnqgzjpmkgqas";
+    sha256 = "07fba518e76b3276558f62a5829bdfa476f790cdef752383ccdc8c66b04b0899";
   };
 
   buildInputs = [ geos glibcLocales cython ];
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index ed1c32df555..9b3a5fa2039 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -11,11 +11,11 @@
 buildPythonPackage rec {
   pname = "SQLAlchemy";
   name = "${pname}-${version}";
-  version = "1.1.14";
+  version = "1.1.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f1191e29e35b6fe1aef7175a09b1707ebb7bd08d0b17cb0feada76c49e5a2d1e";
+    sha256 = "8b79a5ed91cdcb5abe97b0045664c55c140aec09e5dd5c01303e23de5fe7a95a";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index 7156d86bb80..2c85bdbe3d1 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.1.10";
+  version = "1.1.11";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "90db96664955c6a576b495c973bd3976b9d4eaffaea205c0343ac7e8f8147cbe";
+    sha256 = "bb5297df9cd97316b3c7ca64f8e31cae5cc6b94c015afd84c546877f1f77d6e4";
   };
 
   # No tests in archive
-- 
GitLab


From 5d21308f81e8332e8743a2c807b6406d37642da9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 5 Nov 2017 13:37:45 +0100
Subject: [PATCH 761/877] python.pkgs.six: 1.10.0 -> 1.11.0

---
 .../python-modules/six/default.nix            | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-------------
 2 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/six/default.nix

diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix
new file mode 100644
index 00000000000..38117337d06
--- /dev/null
+++ b/pkgs/development/python-modules/six/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "six";
+  version = "1.11.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test test_six.py
+  '';
+
+  meta = {
+    description = "A Python 2 and 3 compatibility library";
+    homepage = http://pypi.python.org/pypi/six/;
+    license = lib.licenses.mit;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 890aae47124..0ae7d8f2bea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19539,25 +19539,7 @@ in {
   };
 
 
-  six = buildPythonPackage rec {
-    name = "six-1.10.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/six/${name}.tar.gz";
-      sha256 = "0snmb8xffb3vsma0z67i0h0w2g2dy0p3gsgh9gi4i0kgc5l8spqh";
-    };
-
-    buildInputs = with self; [ pytest ];
-
-    checkPhase = ''
-      py.test test_six.py
-    '';
-
-    meta = {
-      description = "A Python 2 and 3 compatibility library";
-      homepage = http://pypi.python.org/pypi/six/;
-    };
-  };
+  six = callPackage ../development/python-modules/six { };
 
 
   skype4py = buildPythonPackage (rec {
-- 
GitLab


From a51f6474d2c814f2252a8aa32286736d567c01e0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Sep 2017 03:25:11 +0200
Subject: [PATCH 762/877] =?UTF-8?q?libical:=201.0.1=20=E2=86=92=202.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/libraries/libical/default.nix |  9 ++--
 .../libraries/libical/respect-env-tzdir.patch | 48 ++++++++++---------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index a91205e182c..5ba8bb66784 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -2,18 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "libical-${version}";
-  version = "1.0.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "libical";
     repo = "libical";
     rev = "v${version}";
-    sha256 = "1y6rbw24m133d984pyqzx2bi7f37dsw6f33l6arwn6yd4zlqdib9";
+    sha256 = "0xsvqy1hzmwxn783wrb2k8p751544pzv39v9ynr9pj4yzkwjzsvb";
   };
 
   nativeBuildInputs = [ perl cmake ];
 
-  patches = [ ./respect-env-tzdir.patch ];
+  patches = [
+    # TODO: upstream this patch
+    ./respect-env-tzdir.patch
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/libical/libical;
diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch
index fad78c2fb8a..715ba1fa842 100644
--- a/pkgs/development/libraries/libical/respect-env-tzdir.patch
+++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch
@@ -1,27 +1,29 @@
---- a/src/libical/icaltz-util.c	2015-06-11 15:40:58.843138630 +0200
-+++ b/src/libical/icaltz-util.c	2015-06-11 15:43:12.722046252 +0200
-@@ -107,7 +107,7 @@
- 	char	charcnt[4];			
- } tzinfo; 
- 
--static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"};
-+static char *search_paths [] = {"/etc/zoneinfo","/usr/share/zoneinfo","/usr/lib/zoneinfo","/usr/share/lib/zoneinfo"};
+--- a/src/libical/icaltz-util.c
++++ b/src/libical/icaltz-util.c
+@@ -96,9 +96,9 @@ typedef struct
  static char *zdir = NULL;
  
- #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0]))
-@@ -194,6 +194,15 @@
- 	const char *fname = ZONES_TAB_SYSTEM_FILENAME;
- 	unsigned int i;
+ static char *search_paths[] = {
++    "/etc/zoneinfo",
+     "/usr/share/zoneinfo",
+     "/usr/lib/zoneinfo",
+-    "/etc/zoneinfo",
+     "/usr/share/lib/zoneinfo"
+ };
+ 
+@@ -179,6 +179,15 @@ static void set_zonedir(void)
+     const char *fname = ZONES_TAB_SYSTEM_FILENAME;
+     size_t i, num_search_paths;
  
-+	const char *env_tzdir = getenv ("TZDIR");
-+	if (env_tzdir) {
-+		sprintf (file_path, "%s/%s", env_tzdir, fname);
-+		if (!access (file_path, F_OK|R_OK)) {
-+			zdir = env_tzdir;
-+			return;
-+		}
-+	}
++   const char *env_tzdir = getenv ("TZDIR");
++   if (env_tzdir) {
++       snprintf(file_path, MAXPATHLEN, "%s/%s", env_tzdir, fname);
++       if (!access (file_path, F_OK|R_OK)) {
++           zdir = env_tzdir;
++           return;
++       }
++   }
 +
- 	for (i = 0; i < NUM_SEARCH_PATHS; i++) {
- 		sprintf (file_path, "%s/%s", search_paths [i], fname);
- 		if (!access (file_path, F_OK|R_OK)) {
+     num_search_paths = sizeof(search_paths) / sizeof(search_paths[0]);
+     for (i = 0; i < num_search_paths; i++) {
+         snprintf(file_path, MAXPATHLEN, "%s/%s", search_paths[i], fname);
-- 
GitLab


From 55abc42a1ed79941c779ef7f22021cfea18dc014 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Sep 2017 11:12:30 +0200
Subject: [PATCH 763/877] =?UTF-8?q?glib-networking:=202.50.0=20=E2=86=92?=
 =?UTF-8?q?=202.54.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 422b7f4c58c..fd8055fd0b3 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -2,7 +2,7 @@
 , gsettings_desktop_schemas }:
 
 let
-  ver_maj = "2.50";
+  ver_maj = "2.54";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
-    sha256 = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee";
+    sha256 = "5961b3779080b72314b373ff5d4790eb7e41b75ca91816ad7a81ef32922f7096";
   };
 
   outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
-- 
GitLab


From 05562d92376959bede93a354798c64bde22b47ba Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Sep 2017 11:46:49 +0200
Subject: [PATCH 764/877] networkmanagerapplet: cleanup

---
 .../networking/network-manager-applet/default.nix      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 3220aebdfe4..fc320ba2fb9 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
-, libnotify, libsecret, polkit, isocodes, modemmanager, librsvg
+, libnotify, libsecret, polkit, isocodes, modemmanager
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
-, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk
+, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk
 , withGnome ? false }:
 
 stdenv.mkDerivation rec {
@@ -24,13 +24,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas
-    polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring
-    modemmanager jansson librsvg glib_networking gnome3.dconf
+    polkit isocodes udev libgudev gnome3.libgnome_keyring
+    modemmanager jansson glib_networking
   ] ++ stdenv.lib.optional withGnome webkitgtk;
 
   nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
 
-  propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ];
+  propagatedUserEnvPkgs = [ gnome3.gnome_keyring hicolor_icon_theme ];
 
   makeFlags = [
     ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
-- 
GitLab


From fd115ece2952afaf39505ae8ded6ac4eb1db5196 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Sep 2017 11:49:05 +0200
Subject: [PATCH 765/877] =?UTF-8?q?libgudev:=20231=20=E2=86=92=20232?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index ef2a44bf183..a5f8f5036d0 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libgudev-${version}";
-  version = "231";
+  version = "232";
 
   src = fetchurl {
-    url = "https://download.gnome.org/sources/libgudev/${version}/${name}.tar.xz";
-    sha256 = "15iz0qp57qy5pjrblsn36l0chlncqggqsg8h8i8c71499afzj7iv";
+    url = "mirror://gnome/sources/libgudev/${version}/${name}.tar.xz";
+    sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From c01fd4a3e359ad07e58b29fbbd1067d29842b19e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Sep 2017 12:34:10 +0200
Subject: [PATCH 766/877] =?UTF-8?q?libinput:=201.7.3=20=E2=86=92=201.9.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/libinput/default.nix            | 22 +++++++++----------
 .../libinput/udev-absolute-path.patch         | 21 +++++++++---------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 1cc275b3048..553bb9463ed 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchurl, pkgconfig
+{ stdenv, fetchurl, pkgconfig, meson, ninja
 , libevdev, mtdev, udev, libwacom
 , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
 , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
 , testsSupport ? false, check ? null, valgrind ? null
-, autoconf, automake
 }:
 
 assert documentationSupport -> doxygen != null && graphviz != null;
@@ -11,38 +10,37 @@ assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
 assert testsSupport -> check != null && valgrind != null;
 
 let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+  mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}";
 in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-${version}";
-  version = "1.7.3";
+  version = "1.9.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89";
+    sha256 = "1y3559146zlfizncky1jlly226i66vwikxhpdkw0jg8v47j0sy7h";
   };
 
   outputs = [ "out" "dev" ];
 
-  configureFlags = [
+  mesonFlags = [
     (mkFlag documentationSupport "documentation")
-    (mkFlag eventGUISupport "event-gui")
+    (mkFlag eventGUISupport "debug-gui")
     (mkFlag testsSupport "tests")
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
-
-  buildInputs = [ libevdev mtdev libwacom autoconf automake ]
-    ++ optionals eventGUISupport [ cairo glib gtk3 ]
+  nativeBuildInputs = [ pkgconfig meson ninja ]
     ++ optionals documentationSupport [ doxygen graphviz ]
     ++ optionals testsSupport [ check valgrind ];
 
+  buildInputs = [ libevdev mtdev libwacom ]
+    ++ optionals eventGUISupport [ cairo glib gtk3 ];
+
   propagatedBuildInputs = [ udev ];
 
   patches = [ ./udev-absolute-path.patch ];
-  patchFlags = [ "-p0" ];
 
   meta = {
     description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch
index 2d3fa966b29..fb22fea40e8 100644
--- a/pkgs/development/libraries/libinput/udev-absolute-path.patch
+++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch
@@ -1,12 +1,11 @@
---- configure.ac	2016-05-27 14:00:25.248388226 +0200
-+++ configure.ac	2016-05-27 14:01:28.228943416 +0200
-@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil
- # Used by the udev rules so we can use callouts during testing without
- # installing everything first. Default is the empty string so the installed
- # rule will use udev's default path. Override is in udev/Makefile.am
--AC_SUBST(UDEV_TEST_PATH, "")
-+UDEV_TEST_PATH="${UDEV_DIR}/"
-+AC_SUBST(UDEV_TEST_PATH)
- AC_PATH_PROG(SED, [sed])
+--- a/meson.build
++++ b/meson.build
+@@ -100,7 +100,7 @@
+      args : model_quirks)
  
- AC_CONFIG_FILES([Makefile
+ udev_rules_config = configuration_data()
+-udev_rules_config.set('UDEV_TEST_PATH', '')
++udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/')
+ configure_file(input : 'udev/80-libinput-device-groups.rules.in',
+ 	       output : '80-libinput-device-groups.rules',
+ 	       install : true,
-- 
GitLab


From a5a8bb0a62ead5d1288bc53ecc8a3b9ede3dff55 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Sep 2017 12:34:29 +0200
Subject: [PATCH 767/877] =?UTF-8?q?libwacom:=200.22=20=E2=86=92=200.26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index ad3cbe119c5..1fb0605530d 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libwacom-${version}";
-  version = "0.22";
+  version = "0.26";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2";
-    sha256 = "1h10awwapj5v8nik220ga0raggv3lgaq0kzwlma2qjmzdhhrrhcp";
+    sha256 = "0xpvkjvzaj9blcmw8ha46616bzfivj99kwzvr91clxd6iaf11r63";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 3f12993f3ad6d27a1d87328ad489f21d670b7678 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Sep 2017 12:35:50 +0200
Subject: [PATCH 768/877] =?UTF-8?q?xf86=5Finput=5Fwacom:=200.34=20?=
 =?UTF-8?q?=E2=86=92=200.35?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index e231e3a5989..2ebb2b1890d 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
-  name = "xf86-input-wacom-0.34.0";
+  name = "xf86-input-wacom-0.35.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
-    sha256 = "0idhkigl0pnyp08sqm6bqfb4h20v6rjrb71z1gdv59gk7d7qwpgi";
+    sha256 = "0za44snc0zirq65a4lxsmg7blp1bynj6j835hm459x8yx1qhmxjm";
   };
 
   buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender
-- 
GitLab


From 185484d6ac5133bab3ea86c69dacc47b14ca164f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 19 Sep 2017 03:52:06 +0200
Subject: [PATCH 769/877] =?UTF-8?q?gnome3.vte:=200.48.3=20=E2=86=92=200.50?=
 =?UTF-8?q?.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/vte/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/vte/src.nix b/pkgs/desktops/gnome-3/core/vte/src.nix
index 841798848e6..45029e8bb8d 100644
--- a/pkgs/desktops/gnome-3/core/vte/src.nix
+++ b/pkgs/desktops/gnome-3/core/vte/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "vte-0.48.3";
+  name = "vte-0.50.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/vte/0.48/vte-0.48.3.tar.xz;
-    sha256 = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3";
+    url = mirror://gnome/sources/vte/0.50/vte-0.50.1.tar.xz;
+    sha256 = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2";
   };
 }
-- 
GitLab


From c2bc77220336e717f901b44967148144db78ed09 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 26 Sep 2017 21:19:21 +0200
Subject: [PATCH 770/877] =?UTF-8?q?gobjectIntrospection:=201.52.1=20?=
 =?UTF-8?q?=E2=86=92=201.54.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index b26ae9c9d61..f629b9a8a3c 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -7,7 +7,7 @@
 # In that case its about 6MB which could be separated
 
 let
-  ver_maj = "1.52";
+  ver_maj = "1.54";
   ver_min = "1";
 in
 with stdenv.lib;
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
-    sha256 = "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f";
+    sha256 = "0zl7pfkzkm07733391b4f3cwjbnvb1nwvpmajf5bajh6bxgfv3dq";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From db16b930394ba40ecacba6b3c3b4202b18456ad2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Oct 2017 15:39:35 +0200
Subject: [PATCH 771/877] =?UTF-8?q?ostree:=202017.9=20=E2=86=92=202017.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/misc/ostree/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 82abb5c9bbc..a8332ad494d 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -1,24 +1,24 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection
 , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse
-, libcap, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42
+, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42
 }:
 
 let
   libglnx-src = fetchFromGitHub {
     owner  = "GNOME";
     repo   = "libglnx";
-    rev    = "50a0feaba03ffa5a1980d3a14487276b8f49f8a6";
-    sha256 = "1rn5jdh84y1yfpqmvidx82lkm0jr7scjzdrps57r37ksxvrk3ibs";
+    rev    = "5362f6bc3ff3e30f379e767b203d15c9e56d6f08";
+    sha256 = "1l4vm7bx3cf4q44n3a1i2gszyryqyimcxvx54gna72q7dw130mrr";
   };
 
   bsdiff-src = fetchFromGitHub {
     owner  = "mendsley";
     repo   = "bsdiff";
-    rev    = "7d70d8f4ff48345bc76e314c9d98da91f78873fa";
-    sha256 = "0ai2kykj8i4bqcy3gry36r3n4ax0fldncfhksl5b293nf2fihnws";
+    rev    = "1edf9f656850c0c64dae260960fabd8249ea9c60";
+    sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
   };
 
-  version = "2017.9";
+  version = "2017.12";
 in stdenv.mkDerivation {
   name = "ostree-${version}";
 
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
     rev    = "v${version}";
     owner  = "ostreedev";
     repo   = "ostree";
-    sha256 = "1040xcw8qcs6xq8x4wg47hha3915qzb6lndb38wjyn6wzl1680q3";
+    sha256 = "0gxvpzwz7z4zihz5hkn6ajv7f6gas4zi2pznhi5v6wy7cw06if68";
   };
 
   nativeBuildInputs = [
@@ -34,7 +34,7 @@ in stdenv.mkDerivation {
     libxslt docbook_xsl docbook_xml_dtd_42
   ];
 
-  buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libcap ];
+  buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ];
 
   prePatch = ''
     rmdir libglnx bsdiff
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Git for operating system binaries";
-    homepage    = "http://live.gnome.org/OSTree/";
+    homepage    = https://ostree.readthedocs.io/en/latest/;
     license     = licenses.lgpl2Plus;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ copumpkin ];
-- 
GitLab


From 01d7bb6dc4a70edf8ddc0ec7fd321bcdc47bd117 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 12 Oct 2017 23:30:40 +0200
Subject: [PATCH 772/877] =?UTF-8?q?json=5Fglib:=201.2.0=20=E2=86=92=201.4.?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/json-glib/default.nix           | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 9d434c088ba..2414931e76a 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,24 +1,34 @@
-{ stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus, libintlOrEmpty }:
+{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext, gobjectIntrospection, dbus, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  name = "json-glib-${minVer}.0";
-  minVer = "1.2";
+  name = "json-glib-${minVer}.2";
+  minVer = "1.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz";
-    sha256 = "1lx7p1c7cl21byvfgw92n8dhm09vi6qxrs0zkx9dg3y096zdzmlr";
+    sha256 = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8";
   };
 
-  configureflags= "--with-introspection";
-
-  propagatedBuildInputs = [ glib gobjectIntrospection ];
-  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
   buildInputs = libintlOrEmpty;
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
+  patches = [
+    # https://gitlab.gnome.org/GNOME/json-glib/issues/27
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/json-glib/merge_requests/2.diff";
+      sha256 = "0pf006jxj1ki7a0w4ykxm6b24m0wafrhpdcmixsw9x83m227156c";
+    })
+  ];
+
   outputs = [ "out" "dev" ];
 
+  doCheck = true;
+
+  checkPhase = "meson test";
+
   meta = with stdenv.lib; {
     homepage = http://live.gnome.org/JsonGlib;
     description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format";
-- 
GitLab


From 360f9b7706e0e371da846eba185740926a39bad2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 12 Oct 2017 23:31:36 +0200
Subject: [PATCH 773/877] =?UTF-8?q?zeitgeist:=200.9.15=20=E2=86=92=201.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/zeitgeist/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index e759e65dfc6..ed84dec365e 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23
+{ stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38
 , intltool, libtool, dbus_libs, telepathy_glib
 , gtk3, json_glib, librdf_raptor2, dbus_glib
 , pythonSupport ? true, python2Packages
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.15";
+  version = "1.0";
   name = "zeitgeist-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/seiflotfy/zeitgeist/archive/v${version}.tar.gz";
-    sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0";
+  src = fetchgit {
+    url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist";
+    rev = "v${version}";
+    sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
@@ -19,9 +20,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib sqlite gnome3.gnome_common intltool
-                  libtool dbus_libs telepathy_glib vala_0_23 dbus_glib
+  nativeBuildInputs = [ pkgconfig gnome3.gnome_common intltool libtool vala_0_38 ];
+  buildInputs = [ glib sqlite dbus_libs telepathy_glib dbus_glib
                   gtk3 json_glib librdf_raptor2 python2Packages.rdflib ];
 
   prePatch = "patchShebangs .";
-- 
GitLab


From cdd40ba79e7eca9674bdb23a65223ab10528219c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 12 Oct 2017 23:36:57 +0200
Subject: [PATCH 774/877] =?UTF-8?q?colord:=201.2.12=20=E2=86=92=201.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/misc/colord/default.nix           | 43 +++++++--------
 pkgs/tools/misc/colord/fix-build-paths.patch | 56 ++++++++++++++++++++
 2 files changed, 74 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/tools/misc/colord/fix-build-paths.patch

diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 40ea672296d..020599e17a8 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,51 +1,44 @@
 { stdenv, fetchurl, bash-completion
-, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
-, gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook
+, glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus
+, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38
 , libgudev, sane-backends }:
 
 stdenv.mkDerivation rec {
-  name = "colord-1.2.12";
+  name = "colord-1.4.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
-    sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m";
+    sha256 = "0m854clp8szvq38z16jpazzlqfb3lb3icxcfnsisfrc25748y1ib";
   };
 
   enableParallelBuilding = true;
 
-  # Version mismatch requires intltoolize to overwrite
-  # with newer version.
-  preConfigure = ''
-    intltoolize --force
-  '';
-
-  configureFlags = [
-    "--enable-sane"
-    "--with-udevrulesdir=$(out)/lib/udev/rules.d"
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+  mesonFlags = [
+    "-Denable-sane=true"
+    "-Denable-vala=true"
     "--localstatedir=/var"
-    "--disable-bash-completion"
+    "-Denable-bash-completion=true"
+    # TODO: man page cannot be build with docbook2x
+    "-Denable-man=false"
+    "-Denable-docs=false"
   ];
 
+  patches = [
+    ./fix-build-paths.patch
+  ];
 
-  # don't touch /var at install time, colord creates what it needs at runtime
-  postPatch = ''
-    sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in}
-  '';
-
-  nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
+  nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection ];
 
-  buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
+  buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus
                   bash-completion argyllcms libgudev sane-backends ];
 
   postInstall = ''
-    mkdir -p $out/etc/bash_completion.d
-    cp -v data/colormgr $out/etc/bash_completion.d
+    glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
   meta = {
     description = "System service to manage, install and generate color profiles to accurately color manage input and output devices";
-    homepage = http://www.freedesktop.org/software/colord/intro.html;
+    homepage = https://www.freedesktop.org/software/colord/;
     license = stdenv.lib.licenses.lgpl2Plus;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch
new file mode 100644
index 00000000000..7eb66a0b34b
--- /dev/null
+++ b/pkgs/tools/misc/colord/fix-build-paths.patch
@@ -0,0 +1,56 @@
+--- a/contrib/session-helper/meson.build
++++ b/contrib/session-helper/meson.build
+@@ -21,7 +21,7 @@
+     output : 'colord-session.service',
+     configuration : con2,
+     install: true,
+-    install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'),
++    install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'user'),
+   )
+ endif
+ 
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -8,13 +8,13 @@
+ 
+ if get_option('enable-systemd')
+   install_data('colord.conf',
+-    install_dir: systemd.get_pkgconfig_variable('tmpfilesdir')
++    install_dir: join_paths(get_option('prefix'), 'lib', 'tmpfiles.d')
+   )
+ endif
+ 
+ if get_option('enable-bash-completion')
+   install_data('colormgr',
+-    install_dir: bash_completion.get_pkgconfig_variable('completionsdir')
++    install_dir: join_paths(get_option('prefix'), 'etc', 'bash_completion.d')
+   )
+ endif
+ 
+@@ -31,7 +31,7 @@
+     output : 'colord.service',
+     configuration : con2,
+     install: true,
+-    install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
++    install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'system'),
+   )
+ endif
+ 
+--- a/meson.build
++++ b/meson.build
+@@ -258,6 +258,3 @@
+ subdir('policy')
+ subdir('rules')
+ subdir('src')
+-
+-meson.add_install_script('meson_post_install.sh',
+-                         localstatedir, get_option('with-daemon-user'))
+--- a/rules/meson.build
++++ b/rules/meson.build
+@@ -9,5 +9,5 @@
+     sensor_rules_in,
+     '95-cd-devices.rules',
+   ],
+-  install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
++  install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d')
+ )
-- 
GitLab


From e7795a6dd79c9dc36fb6a5b38995f2614688e53a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 12 Oct 2017 23:37:56 +0200
Subject: [PATCH 775/877] appstream-glib: clean up

---
 .../libraries/appstream-glib/default.nix      | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index e07e1fc3908..d177c3acfa7 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,17 +1,9 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib
-, gtk_doc, autoconf, automake, libtool, libarchive
-, gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
-, libuuid, json_glib, autoconf-archive, meson, gperf, ninja, gdk_pixbuf
+{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, glib
+, gtk_doc, libarchive, gobjectIntrospection
+, sqlite, libsoup, gcab, attr, acl, docbook_xsl
+, libuuid, json_glib, meson, gperf, ninja
 }:
-let rpath = stdenv.lib.makeLibraryPath
-      [ libuuid.out
-        glib
-        libsoup
-        gdk_pixbuf
-        libarchive.lib
-        gcab
-      ];
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "appstream-glib-0.7.2";
 
   src = fetchFromGitHub {
@@ -28,12 +20,6 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gtk3 ];
   mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ];
 
-  postFixup = ''
-    for elf in "$out"/bin/* "$out"/lib/*.so; do
-      patchelf --set-rpath '${rpath}':"$out/lib" "$elf"
-    done
-  '';
-
   meta = with stdenv.lib; {
     description = "Objects and helper methods to read and write AppStream metadata";
     homepage    = https://github.com/hughsie/appstream-glib;
-- 
GitLab


From dcb074ae9c8a5769d5125adcd2362ed2113d6ba0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 12 Oct 2017 23:38:57 +0200
Subject: [PATCH 776/877] =?UTF-8?q?packagekit:=201.1.3=20=E2=86=92=201.1.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/package-management/packagekit/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 180395571b2..d4e6885d8f3 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, lib
 , intltool, glib, pkgconfig, polkit, python, sqlite, systemd
-, gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive
+, gobjectIntrospection, vala_0_38, gtk_doc, autoreconfHook, autoconf-archive
 # TODO: set enableNixBackend to true, as soon as it builds
 , nix, enableNixBackend ? false, boost
 , enableCommandNotFound ? false
@@ -8,16 +8,16 @@
 
 stdenv.mkDerivation rec {
   name = "packagekit-${version}";
-  version = "1.1.3";
+  version = "1.1.7";
 
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "PackageKit";
     rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "150mpar7bhlvwfpwsr6zrjn3yggvklzr6nlhk0shaxnrfkfxvvb6";
+    sha256 = "076rrczmyhapj87pxqldsar5pbz4mid6cm9l1n91zh2q403chdkb";
   };
 
-  buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ]
+  buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ]
                   ++ lib.optional enableBashCompletion bash-completion;
   propagatedBuildInputs = [ sqlite nix boost ];
   nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ];
-- 
GitLab


From 64e34730178cc924ead9349c8e43c16acb2b95a3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 17 Sep 2017 01:35:19 +0200
Subject: [PATCH 777/877] =?UTF-8?q?nautilus-sendto:=203.8.1=20=E2=86=92=20?=
 =?UTF-8?q?3.8.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktops/gnome-3/apps/nautilus-sendto/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
index 7d71d1b7adc..2812e7673b4 100644
--- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
+++ b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
-, gobjectIntrospection, makeWrapper }:
+{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }:
 
 stdenv.mkDerivation rec {
   name = "nautilus-sendto-${version}";
 
-  version = "3.8.1";
+  version = "3.8.6";
 
   src = fetchurl {
     url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
-    sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
+    sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib gobjectIntrospection intltool makeWrapper ];
+  nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ];
+  buildInputs = [ glib ];
 
   meta = with stdenv.lib; {
     description = "Integrates Evolution and Pidgin into the Nautilus file manager";
-- 
GitLab


From 309a831e05067e436897737a51e30eb42c086365 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 17 Sep 2017 16:45:40 +0200
Subject: [PATCH 778/877] gnome3.totem-pl-parser: clean up

---
 pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
index 370fdee5381..56fef312927 100644
--- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
@@ -3,8 +3,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ file intltool gmime libxml2 libsoup ];
+  nativeBuildInputs = [ pkgconfig file intltool ];
+  buildInputs = [ gmime libxml2 libsoup ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Videos;
-- 
GitLab


From 1260fe96a69eb4ee5e50a8a0466b5633df945d27 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 17 Sep 2017 18:51:53 +0200
Subject: [PATCH 779/877] gnome3.mutter: remove stale patches

---
 pkgs/desktops/gnome-3/core/mutter/default.nix |  4 ----
 pkgs/desktops/gnome-3/core/mutter/math.patch  | 10 ----------
 pkgs/desktops/gnome-3/core/mutter/x86.patch   | 20 -------------------
 3 files changed, 34 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/core/mutter/math.patch
 delete mode 100644 pkgs/desktops/gnome-3/core/mutter/x86.patch

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index ebceb4ef706..bf91259ebad 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -28,10 +28,6 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  patches = [
-    ./x86.patch # ./math.patch
-  ];
-
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/mutter/math.patch b/pkgs/desktops/gnome-3/core/mutter/math.patch
deleted file mode 100644
index dbdfd93f5e1..00000000000
--- a/pkgs/desktops/gnome-3/core/mutter/math.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig	2015-09-23 13:54:31.297523343 +0200
-+++ mutter-3.18.0/src/backends/meta-cursor-renderer.c	2015-09-23 13:54:43.728271766 +0200
-@@ -31,6 +31,7 @@
- 
- #include <cogl/cogl.h>
- #include <clutter/clutter.h>
-+#include <math.h>
- 
- #include "meta-stage.h"
- 
diff --git a/pkgs/desktops/gnome-3/core/mutter/x86.patch b/pkgs/desktops/gnome-3/core/mutter/x86.patch
deleted file mode 100644
index 93df1e7f283..00000000000
--- a/pkgs/desktops/gnome-3/core/mutter/x86.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/core/window.c	2015-05-26 10:52:41.382834963 +0200
-+++ b/src/core/window.c	2015-05-26 10:53:03.039948034 +0200
-@@ -3499,7 +3499,7 @@
- 
- static MetaMonitorInfo *
- find_monitor_by_winsys_id (MetaWindow *window,
--                           guint       winsys_id)
-+                           gint       winsys_id)
- {
-   int i;
- 
-@@ -3618,7 +3618,7 @@
-    */
- 
-   gboolean did_placement;
--  guint old_output_winsys_id;
-+  gint old_output_winsys_id;
-   MetaRectangle unconstrained_rect;
-   MetaRectangle constrained_rect;
-   MetaMoveResizeResultFlags result = 0;
-- 
GitLab


From 4d66728328dc2e1af708d2add2683116e4cd6a8d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Sep 2017 12:33:45 +0200
Subject: [PATCH 780/877] gnome3.mutter: add libwacom dependency

---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index bf91259ebad..2b44d4112fb 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
-, libgudev, xwayland }:
+, libgudev, libwacom, xwayland }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = with gnome3;
     [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
       gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
-      gnome3.geocode_glib libudev libinput libgudev
+      gnome3.geocode_glib libudev libinput libgudev libwacom
       libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile
       libxkbcommon ];
 
-- 
GitLab


From e14e705d82fe483e31410ce9877b7485bb51cb8c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Oct 2017 22:23:30 +0200
Subject: [PATCH 781/877] telepathy_glib: cleanup

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

diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index ec26c9f567b..fffe677f6a7 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt
-, gobjectIntrospection, valaSupport ? true, vala_0_23, glibcLocales }:
+, gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-glib-0.24.1";
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   LC_ALL = "en_US.UTF-8";
   propagatedBuildInputs = [dbus_glib glib gobjectIntrospection];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23;
+  nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38;
+  buildInputs = [ glibcLocales python2 ];
 
   preConfigure = ''
     substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
-- 
GitLab


From de0cede481674d09020bde097b2504e987b5e1d5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Oct 2017 22:24:04 +0200
Subject: [PATCH 782/877] gnome3.dconf: cleanup

---
 pkgs/desktops/gnome-3/core/dconf/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 402c6c1c355..130e8255edc 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
+{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
 
 let
@@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2
-                  intltool docbook_xsl docbook_xsl_ns makeWrapper ];
+  nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ];
+  buildInputs = [ glib dbus_glib ];
 
   postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace client/Makefile \
-- 
GitLab


From 8f8de4a34bb1154c0c1407f604bc323f39435992 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 3 Nov 2017 22:09:29 +0100
Subject: [PATCH 783/877] =?UTF-8?q?libevdev:=201.5.6=20=E2=86=92=201.5.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index a91acb23052..090a12f63de 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.5.6";
+  name = "libevdev-1.5.7";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c";
+    sha256 = "08nl3p6226k51zph52fhilxvi3b31spp6fz8szzrglzhl8vrxrd1";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 716a0d6c190cfd3fcf9581f1c7fe50e33fb726f5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 3 Nov 2017 22:48:50 +0100
Subject: [PATCH 784/877] gnome3.mutter: fix libgudev 232 compatibility

---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 2b44d4112fb..5c918f964fe 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
+{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
-, libgudev, libwacom, xwayland }:
+, libgudev, libwacom, xwayland, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     libXtst
   ];
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   buildInputs = with gnome3;
     [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
       gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
@@ -23,6 +25,15 @@ stdenv.mkDerivation rec {
       libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile
       libxkbcommon ];
 
+  patches = [
+    # https://bugzilla.gnome.org/show_bug.cgi?id=760670
+    (fetchpatch {
+      name = "libgudev-232.patch";
+      url = https://bugzilla.gnome.org/attachment.cgi?id=358904;
+      sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix";
+    })
+  ];
+
   preFixup = ''
     wrapProgram "$out/bin/mutter" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-- 
GitLab


From 3c98114d6ff86b9934ca9d63a010a8b4447c4a63 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 3 Nov 2017 23:30:56 +0100
Subject: [PATCH 785/877] gnome3.mutter: cleanup

---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 5c918f964fe..208b8b75648 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -9,20 +9,30 @@ stdenv.mkDerivation rec {
   # fatal error: gio/gunixfdlist.h: No such file or directory
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare";
 
-  configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";
+  configureFlags = [
+    "--with-x"
+    "--disable-static"
+    "--enable-shape"
+    "--enable-sm"
+    "--enable-startup-notification"
+    "--enable-xsync"
+    "--enable-verbose-mode"
+    "--with-libcanberra"
+    "--with-xwayland-path=${xwayland}/bin/Xwayland"
+  ];
 
   propagatedBuildInputs = [
     # required for pkgconfig to detect mutter-clutter
     libXtst
   ];
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
 
   buildInputs = with gnome3;
-    [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
+    [ glib gobjectIntrospection gtk gsettings_desktop_schemas upower
       gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
       gnome3.geocode_glib libudev libinput libgudev libwacom
-      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile
+      libcanberra_gtk3 zenity xkeyboard_config libxkbfile
       libxkbcommon ];
 
   patches = [
-- 
GitLab


From 09bda3529d3c0be81ac9ce9d95c3e7e40c8e320d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 4 Nov 2017 19:27:40 +0100
Subject: [PATCH 786/877] libinput: enable tests

Three tests are ran, libinput-test-suite-runner is skipped because it
must be run as root.
---
 pkgs/development/libraries/libinput/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 553bb9463ed..d39a71e16da 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -2,12 +2,12 @@
 , libevdev, mtdev, udev, libwacom
 , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
 , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
-, testsSupport ? false, check ? null, valgrind ? null
+, testsSupport ? false, check ? null, valgrind ? null, python3Packages ? null
 }:
 
 assert documentationSupport -> doxygen != null && graphviz != null;
 assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
-assert testsSupport -> check != null && valgrind != null;
+assert testsSupport -> check != null && valgrind != null && python3Packages != null;
 
 let
   mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig meson ninja ]
     ++ optionals documentationSupport [ doxygen graphviz ]
-    ++ optionals testsSupport [ check valgrind ];
+    ++ optionals testsSupport [ check valgrind python3Packages.pyparsing ];
 
   buildInputs = [ libevdev mtdev libwacom ]
     ++ optionals eventGUISupport [ cairo glib gtk3 ];
@@ -42,6 +42,16 @@ stdenv.mkDerivation rec {
 
   patches = [ ./udev-absolute-path.patch ];
 
+   preBuild = ''
+    # meson setup-hook changes the directory so the files are located one level up
+    patchShebangs ../udev/parse_hwdb.py
+    patchShebangs ../test/symbols-leak-test.in
+  '';
+
+  doCheck = testsSupport;
+
+  checkPhase = "meson test";
+
   meta = {
     description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
     homepage    = http://www.freedesktop.org/wiki/Software/libinput;
-- 
GitLab


From 922b0b9629988c721bee3d271b75ebeb63164db7 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 5 Nov 2017 20:55:06 +0100
Subject: [PATCH 787/877] mkvtoolnix: 16.0.0 -> 17.0.0

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

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 2d7f7144f5f..183722beed8 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "16.0.0";
+  version = "17.0.0";
 
   src = fetchFromGitHub {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    sha256 = "0zdmjp0f7sh0bkaj0ls4sy4sg9qdq9ycrl18hlkafnj9xnbijgnn";
+    sha256 = "1v74rxf9wm0sn2illy0hp36hpwz7q04y0k32wq6wn7qrnzkzcc88";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];
-- 
GitLab


From 99cf2b6eec330a00d9cdef9070974a5a50a701e5 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 5 Nov 2017 19:08:36 +0100
Subject: [PATCH 788/877] vapoursynth: R38 -> R39

---
 .../libraries/vapoursynth/default.nix           | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index cdbecb4dc8b..6864db12f18 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook,
-  zimg, libass, yasm, python3, libiconv, ApplicationServices,
-  ocrSupport ?  false, tesseract,
-  imwriSupport? true,  imagemagick7
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
+, zimg, libass, python3, libiconv
+, ApplicationServices, nasm
+, ocrSupport ?  false, tesseract
+, imwriSupport? true,  imagemagick7
 }:
 
 assert ocrSupport   -> tesseract != null;
@@ -11,18 +12,18 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "vapoursynth-${version}";
-  version = "R38";
+  version = "R39";
 
   src = fetchFromGitHub {
     owner  = "vapoursynth";
     repo   = "vapoursynth";
     rev    = version;
-    sha256 = "0nabl6949s7awy7rnr4ck52v50xr0hwr280fyzsqixgp8w369jn0";
+    sha256 = "0cw7w8xiwhxhwykydy13m44wm9vn9hrsi30z6017ngga9d84fhqy";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook nasm ];
   buildInputs = [
-    zimg libass tesseract yasm
+    zimg libass
     (python3.withPackages (ps: with ps; [ sphinx cython ]))
   ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ]
     ++ optional ocrSupport   tesseract
-- 
GitLab


From 4874862732b036a174ab1a4d3fa9a6f4df7836e4 Mon Sep 17 00:00:00 2001
From: Markus Mueller <john.subscriber@markus.institute>
Date: Tue, 17 Jan 2017 13:45:43 +0000
Subject: [PATCH 789/877] babeld module: init

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/networking/babeld.nix | 98 ++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 nixos/modules/services/networking/babeld.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e66a2ba272a..521e2c0ca24 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -413,6 +413,7 @@
   ./services/networking/asterisk.nix
   ./services/networking/atftpd.nix
   ./services/networking/avahi-daemon.nix
+  ./services/networking/babeld.nix
   ./services/networking/bind.nix
   ./services/networking/autossh.nix
   ./services/networking/bird.nix
diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix
new file mode 100644
index 00000000000..dd76bac9df7
--- /dev/null
+++ b/nixos/modules/services/networking/babeld.nix
@@ -0,0 +1,98 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.babeld;
+
+  paramsString = params:
+    concatMapStringsSep "" (name: "${name} ${boolToString (getAttr name params)}")
+                   (attrNames params);
+
+  interfaceConfig = name:
+    let
+      interface = getAttr name cfg.interfaces;
+    in
+    "interface ${name} ${paramsString interface}\n";
+
+  configFile = with cfg; pkgs.writeText "babeld.conf" (
+    (optionalString (cfg.interfaceDefaults != null) ''
+      default ${paramsString cfg.interfaceDefaults}
+    '')
+    + (concatMapStrings interfaceConfig (attrNames cfg.interfaces))
+    + extraConfig);
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.babeld = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run the babeld network routing daemon.
+        '';
+      };
+
+      interfaceDefaults = mkOption {
+        default = null;
+        description = ''
+          A set describing default parameters for babeld interfaces.
+          See <citerefentry><refentrytitle>babeld</refentrytitle><manvolnum>8</manvolnum></citerefentry> for options.
+        '';
+        type = types.nullOr (types.attrsOf types.unspecified);
+        example =
+          {
+            wired = true;
+            "split-horizon" = true;
+          };
+      };
+
+      interfaces = mkOption {
+        default = {};
+        description = ''
+          A set describing babeld interfaces.
+          See <citerefentry><refentrytitle>babeld</refentrytitle><manvolnum>8</manvolnum></citerefentry> for options.
+        '';
+        type = types.attrsOf (types.attrsOf types.unspecified);
+        example =
+          { enp0s2 =
+            { wired = true;
+              "hello-interval" = 5;
+              "split-horizon" = "auto";
+            };
+          };
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        description = ''
+          Options that will be copied to babeld.conf.
+          See <citerefentry><refentrytitle>babeld</refentrytitle><manvolnum>8</manvolnum></citerefentry> for details.
+        '';
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.babeld.enable {
+
+    systemd.services.babeld = {
+      description = "Babel routing daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile}";
+    };
+
+  };
+
+}
-- 
GitLab


From 9e2f54a30ca1818732385d66a2534d91deed55a7 Mon Sep 17 00:00:00 2001
From: Sauyon Lee <s@uyon.co>
Date: Sun, 17 Sep 2017 08:59:56 +0100
Subject: [PATCH 790/877] python.pkgs.faulthandler: init at 2.6

---
 .../python-modules/faulthandler/default.nix   | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/faulthandler/default.nix

diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix
new file mode 100644
index 00000000000..f8d877f0655
--- /dev/null
+++ b/pkgs/development/python-modules/faulthandler/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "faulthandler";
+  version = "2.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0zywq3jaznddvqc3hnfrlv24wmpyq4xgajk9xhv6578qw1rpfj2r";
+  };
+
+  meta = {
+    description = "Dump the Python traceback";
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = with stdenv.lib.maintainers; [ sauyon ];
+    homepage = http://faulthandler.readthedocs.io/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ae7d8f2bea..f69312a7ca3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5299,6 +5299,10 @@ in {
     buildInputs = with self; [ fudge_9 nose ];
   };
 
+  faulthandler = if ! isPy3k
+    then callPackage ../development/python-modules/faulthandler {}
+    else throw "faulthandler is built into ${python.executable}";
+
   fedpkg = callPackage ../development/python-modules/fedpkg { };
 
   flit = callPackage ../development/python-modules/flit { };
-- 
GitLab


From a5f5bee85f23b581965986f1e2f70da3ff0a4359 Mon Sep 17 00:00:00 2001
From: Sauyon Lee <s@uyon.co>
Date: Sun, 17 Sep 2017 09:00:23 +0100
Subject: [PATCH 791/877] python.pkgs.pyobjc: init at 4.0b1

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

diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix
new file mode 100644
index 00000000000..0cf08319645
--- /dev/null
+++ b/pkgs/development/python-modules/pyobjc/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchPypi, isPy3k, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pyobjc";
+  version = "4.0b1";
+
+  # Gives "No matching distribution found for
+  # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)"
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16bng6960c1m57nnh1l09ycnyimrqzw9mx9pnyjxn5zzm5kalr37";
+  };
+
+  meta = {
+    description = "A bridge between the Python and Objective-C programming languages";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ sauyon ];
+    homepage = https://pythonhosted.org/pyobjc/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f69312a7ca3..b42195e3630 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16579,6 +16579,10 @@ in {
     };
   };
 
+  pyobjc = if stdenv.isDarwin
+    then callPackage ../development/python-modules/pyobjc {}
+    else throw "pyobjc can only be built on Mac OS";
+
   pyodbc = callPackage ../development/python-modules/pyodbc { };
 
   pyocr = callPackage ../development/python-modules/pyocr { };
-- 
GitLab


From 7486ae8e7ccc256873982c60445f34dfa72382e9 Mon Sep 17 00:00:00 2001
From: Sauyon Lee <s@uyon.co>
Date: Sun, 17 Sep 2017 09:00:36 +0100
Subject: [PATCH 792/877] quodlibet: 2.6.3 -> 3.9.1

---
 pkgs/applications/audio/quodlibet/default.nix | 82 +++++++------------
 .../quodlibet/quodlibet-package-plugins.patch | 18 ----
 pkgs/top-level/all-packages.nix               | 31 ++++++-
 3 files changed, 58 insertions(+), 73 deletions(-)
 delete mode 100644 pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 2e6d61b693d..fd328669846 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,64 +1,44 @@
-{ stdenv, fetchurl, python2Packages, intltool
-, gst-python, withGstPlugins ? false, gst-plugins-base ? null
-, gst-plugins-good ? null, gst-plugins-ugly ? null, gst-plugins-bad ? null }:
-
-assert withGstPlugins -> gst-plugins-base != null
-                         || gst-plugins-good != null
-                         || gst-plugins-ugly != null
-                         || gst-plugins-bad != null;
-
-let
-  version = "2.6.3";
-  inherit (python2Packages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python;
-in buildPythonApplication {
-  # call the package quodlibet and just quodlibet
-  name = "quodlibet${stdenv.lib.optionalString (!withGstPlugins) "-without-gst-plugins"}-${version}";
+{ stdenv, fetchurl, python2Packages, wrapGAppsHook, gettext, intltool, libsoup, gnome3,
+  tag ? "",
+  gst_all_1, withGstPlugins ? true,
+  xineBackend ? false, xineLib,
+  withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
+  webkitgtk ? null,
+  keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }:
+
+let optionals = stdenv.lib.optionals; in
+python2Packages.buildPythonApplication rec {
+  name = "quodlibet${tag}-${version}";
+  version = "3.9.1";
 
   # XXX, tests fail
   doCheck = false;
 
-  srcs = [
-    (fetchurl {
-      url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz";
-      sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z";
-     })
-    (fetchurl {
-      url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz";
-      sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc";
-     })
-  ];
-
-  preConfigure = ''
-    # TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc
-    sed -i /distclass/d setup.py
-  '';
-
-  sourceRoot = "quodlibet-${version}";
-
-  postUnpack = ''
-    # the patch searches for plugins in directory ../plugins
-    # so link the appropriate directory there
-    ln -sf quodlibet-plugins-${version} plugins
-  '';
+  src = fetchurl {
+    url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
+    sha256 = "d2b42df5d439213973dc97149fddc779a6c90cec389c24baf1c0bdcc39ffe591";
+  };
 
-  patches = [ ./quodlibet-package-plugins.patch ];
+  nativeBuildInputs = [ wrapGAppsHook gettext intltool ];
+  # ++ (with python2Packages; [ pytest pyflakes pycodestyle polib ]); # test deps
 
-  buildInputs = stdenv.lib.optionals withGstPlugins [
-    gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
-  ];
+  buildInputs = [ gnome3.defaultIconTheme libsoup webkitgtk keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ]
+    ++ (if xineBackend then [ xineLib ] else with gst_all_1;
+    [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
 
-  propagatedBuildInputs = [
-    mutagen pygtk pygobject2 dbus-python gst-python intltool
-  ];
+  propagatedBuildInputs = with python2Packages;
+    [ pygobject3 pycairo mutagen pygtk gst-python feedparser faulthandler futures ]
+      ++ optionals withDbusPython [ dbus-python ]
+      ++ optionals withPyInotify [ pyinotify ]
+      ++ optionals withMusicBrainzNgs [ musicbrainzngs ]
+      ++ optionals stdenv.isDarwin [ pyobjc ]
+      ++ optionals withPahoMqtt [ paho-mqtt ];
 
-  postInstall = stdenv.lib.optionalString withGstPlugins ''
-    # Wrap quodlibet so it finds the GStreamer plug-ins
-    wrapProgram "$out/bin/quodlibet" --prefix \
-      GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH"                                                     \
-  '';
+  makeWrapperArgs = optionals (kakasi != null) [ "--prefix PATH : ${kakasi}/bin" ];
 
   meta = {
     description = "GTK+-based audio player written in Python, using the Mutagen tagging library";
+    license = stdenv.lib.licenses.gpl2;
 
     longDescription = ''
       Quod Libet is a GTK+-based audio player written in Python, using
@@ -74,7 +54,7 @@ in buildPythonApplication {
       & internet radio, and all major audio formats.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.coroa ];
+    maintainers = with stdenv.lib.maintainers; [ coroa sauyon ];
     homepage = https://quodlibet.readthedocs.io/en/latest/;
   };
 }
diff --git a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch b/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch
deleted file mode 100644
index d518f857cf1..00000000000
--- a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur quodlibet-2.5.orig/setup.py quodlibet-2.5.new/setup.py
---- quodlibet-2.5.orig/setup.py	2012-12-19 08:47:41.000000000 +0000
-+++ quodlibet-2.5.new/setup.py	2013-04-22 19:27:07.152631051 +0000
-@@ -337,5 +338,14 @@
-                 }
-             }
-         })
-+    else:
-+        from os.path import join
-+
-+        data_files = []
-+        for type in ["playorder", "songsmenu", "editing", "events", "gstreamer"]:
-+            data_files.append((join('quodlibet', 'plugins', type),
-+                               glob.glob(join('..', 'plugins', type, '*.py'))))
-+        setup_kwargs.update({ 'data_files': data_files });
-+
-     setup(**setup_kwargs)
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7eed45314f..a7e1bd3fe2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16272,14 +16272,37 @@ with pkgs;
 
   quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {};
 
-  quodlibet-without-gst-plugins = callPackage ../applications/audio/quodlibet { };
+  falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { };
 
   quodlibet = callPackage ../applications/audio/quodlibet {
-    withGstPlugins = true;
-    gst-plugins-bad = null;
+    keybinder3 = null;
+    libmodplug = null;
+    kakasi = null;
+    libappindicator-gtk3 = null;
   };
 
-  falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { };
+  quodlibet-without-gst-plugins = quodlibet.override {
+    withGstPlugins = false;
+    tag = "-without-gst-plugins";
+  };
+
+  quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; };
+
+  quodlibet-full = callPackage ../applications/audio/quodlibet {
+    inherit (gnome2) gtksourceview;
+    withDbusPython = true;
+    withPyInotify = true;
+    withMusicBrainzNgs = true;
+    withPahoMqtt = true;
+    keybinder3 = keybinder3;
+    libmodplug = libmodplug;
+    kakasi = kakasi;
+    webkitgtk = webkitgtk24x-gtk3;
+    libappindicator-gtk3 = libappindicator-gtk3;
+    tag = "-full";
+  };
+
+  quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; };
 
   qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser {
     inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl attrs;
-- 
GitLab


From 8c190c3f7d49be0469645157297bb2f0773e8f87 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 5 Nov 2017 22:47:09 +0200
Subject: [PATCH 793/877] lib/types.nix: Disable 32-bit integer types for now

This file doesn't evaluate in 32-bit versions of Nix because the integer
type is a signed 32-bit integer there, so 4294967296 causes an 'invalid
integer' error.  I see no other way around than commenting this out :(

(s32 could be made to work by tweaking the expressions a bit, but didn't
do that for now since it'd be asymmetric to have s32 but no u32).
---
 lib/types.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index adbae8f08a5..46ed05d288f 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -157,14 +157,14 @@ rec {
         };
         u8 = unsign 8 256;
         u16 = unsign 16 65536;
-        u32 = unsign 32 4294967296;
-        # the biggest int the nix lexer accepts is 9223372036854775808
-        # the smallest int the nix lexer accepts is -9223372036854775807
-        # unsigned64 = unsign 64 18446744073709551616;
+        # the biggest int a 64-bit Nix accepts is 2^63 - 1 (9223372036854775808), for a 32-bit Nix it is 2^31 - 1 (2147483647)
+        # the smallest int a 64-bit Nix accepts is -2^63 (-9223372036854775807), for a 32-bit Nix it is -2^31 (-2147483648)
+        # u32 = unsign 32 4294967296;
+        # u64 = unsign 64 18446744073709551616;
 
         s8 = sign 8 256;
         s16 = sign 16 65536;
-        s32 = sign 32 4294967296;
+        # s32 = sign 32 4294967296;
       };
 
     str = mkOptionType {
-- 
GitLab


From 30f6d630f1908d05da1d22aff80c489f3c09652d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 5 Nov 2017 16:47:03 -0500
Subject: [PATCH 794/877] linux: 4.14.0-rc7 -> 4.14.0-rc8

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 8c8fd3c9733..54e37e72130 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.14-rc7";
-  modDirVersion = "4.14.0-rc7";
+  version = "4.14-rc8";
+  modDirVersion = "4.14.0-rc8";
   extraMeta.branch = "4.14";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1w7b1sc5dsxcqywsdbwgs92i8jpj7hsnss67yzb58z3bz3hb73m3";
+    sha256 = "0ir2ggflm1xjnn1kvv2c99m5zni5kg0ygzlpm588wnhkzd93nqjh";
   };
 
   # Should the testing kernels ever be built on Hydra?
-- 
GitLab


From c3786d07b16bdc7c8268a979fdcdf0307974e9d2 Mon Sep 17 00:00:00 2001
From: Fahad Sadah <92872+fahadsadah@users.noreply.github.com>
Date: Sun, 5 Nov 2017 21:37:27 +0000
Subject: [PATCH 795/877] python: fastimport 0.9.4 -> 0.9.6

---
 .../python-modules/fastimport/default.nix     | 22 ++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 ++-----------------
 2 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/fastimport/default.nix

diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix
new file mode 100644
index 00000000000..ee1048ec5fa
--- /dev/null
+++ b/pkgs/development/python-modules/fastimport/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, python, fetchurl }:
+
+buildPythonPackage rec {
+  name = "fastimport-${version}";
+  version = "0.9.6";
+
+  src = fetchurl {
+    url = "mirror://pypi/f/fastimport/${name}.tar.gz";
+    sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://launchpad.net/python-fastimport;
+    description = "VCS fastimport/fastexport parser";
+    maintainers = with maintainers; [ koral ];
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7664f422c0b..595e7dc27b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8645,30 +8645,8 @@ in {
     };
   };
 
-  fastimport = buildPythonPackage rec {
-    name = "fastimport-${version}";
-    version = "0.9.4";
-
-    # Judging from SyntaxError
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/f/fastimport/${name}.tar.gz";
-      sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d";
-    };
-
-    checkPhase = ''
-      ${python.interpreter} -m unittest discover
-    '';
-
-    meta = {
-      homepage = https://launchpad.net/python-fastimport;
-      description = "VCS fastimport/fastexport parser";
-      maintainers = with maintainers; [ koral ];
-      license = licenses.gpl2Plus;
-    };
-  };
-
+  fastimport = callPackage ../development/python-modules/fastimport { };
+ 
   feedgen = callPackage ../development/python-modules/feedgen { };
 
   feedgenerator = callPackage ../development/python-modules/feedgenerator {
-- 
GitLab


From 2ed054885b9f52868dae3571a85bb75b3c1eddcf Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Sun, 5 Nov 2017 22:57:44 +0000
Subject: [PATCH 796/877] Remove the unnecessary second conditional

---
 pkgs/build-support/cc-wrapper/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 80f794cbdde..2445753ff04 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -296,9 +296,8 @@ stdenv.mkDerivation {
           echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
         fi
 
-     if [ -n "''${dynamicLinker:-}" ]; then
-             local ldflagsBefore=(-dynamic-linker "$dynamicLinker")
-     fi
+        local ldflagsBefore=(-dynamic-linker "$dynamicLinker")
+
     '') + ''
       fi
 
-- 
GitLab


From 3a63fc1258bcd4576e20af36ad683f18224da0e5 Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Sun, 5 Nov 2017 23:00:24 +0000
Subject: [PATCH 797/877] Remove trailing line

---
 pkgs/build-support/cc-wrapper/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 2445753ff04..a12c835dd9b 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -297,7 +297,6 @@ stdenv.mkDerivation {
         fi
 
         local ldflagsBefore=(-dynamic-linker "$dynamicLinker")
-
     '') + ''
       fi
 
-- 
GitLab


From fe68ba81d28b1a8294d7c648022e3d9754d9c217 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 19 Oct 2017 19:36:29 -0500
Subject: [PATCH 798/877] sage: 6.8 -> 8.0

This "un-breaks" sage while also updating it to 8.0.

It compiles sage with its dependencies as one big pile, which is not
the best approach but definately better than nothing for now.

To be able to shrink the huge output pile a little, it also splits
docs from the rest of the output.
---
 lib/maintainers.nix                           |   1 +
 .../science/math/sage/default.nix             | 173 ++++++++++++++++--
 pkgs/applications/science/math/sage/env.patch |  22 +++
 .../science/math/sage/fetch-mirrors.sh        |  11 ++
 .../science/math/sage/spkg-giac.patch         |  11 ++
 .../science/math/sage/spkg-git.patch          |  14 +-
 .../science/math/sage/spkg-python.patch       |  11 --
 .../science/math/sage/spkg-python2.patch      |  12 ++
 .../science/math/sage/spkg-python3.patch      |  12 ++
 .../science/math/sage/spkg-singular.patch     |  36 +---
 10 files changed, 244 insertions(+), 59 deletions(-)
 create mode 100644 pkgs/applications/science/math/sage/env.patch
 create mode 100755 pkgs/applications/science/math/sage/fetch-mirrors.sh
 create mode 100644 pkgs/applications/science/math/sage/spkg-giac.patch
 delete mode 100644 pkgs/applications/science/math/sage/spkg-python.patch
 create mode 100644 pkgs/applications/science/math/sage/spkg-python2.patch
 create mode 100644 pkgs/applications/science/math/sage/spkg-python3.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e2d3c73301b..a1a6d36b698 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -627,6 +627,7 @@
   ThomasMader = "Thomas Mader <thomas.mader@gmail.com>";
   thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
   timbertson = "Tim Cuthbertson <tim@gfxmonk.net>";
+  timokau = "Timo Kaufmann <timokau@zoho.com>";
   titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
   tnias = "Philipp Bartsch <phil@grmr.de>";
   tohl = "Tomas Hlavaty <tom@logand.com>";
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index bf3c7fcea98..c1b5484da0f 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -1,42 +1,183 @@
-{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk, gnused_422
-, imagemagick, liblapack, python, openssl, libpng 
+# TODO
+# - consider writing a script to convert spkgs to nix packages, similar to vim
+#   or cabal2nix. This would allow a more efficient and "cleaner" build, greater
+#   flexibility and the possibility to select which dependencies to add and which
+#   to remove. It would also allow to use system packages for some dependencies
+#   and recompile others (optimized for the system) without recompiling everything.
+# - add optdeps:
+#   - imagemagick
+#   - texlive full for documentation
+#   - ...
+# - further seperate build outputs. Also maybe run `make doc`.
+#   Configure flags like --bindir and --libdir oculd also be used for that, see
+#   ./configure --help`.
+
+# Other resources:
+# - https://wiki.debian.org/DebianScience/Sage
+# - https://github.com/cschwan/sage-on-gentoo
+# - https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath
+
+{ stdenv
+, fetchurl
+, perl
+, gfortran
+, python
+, autoreconfHook
+, gettext
 , which
+, texlive
+, hevea
 }:
 
 stdenv.mkDerivation rec {
-  name = "sage-6.8";
+  version = "8.0";
+  name = "sage-${version}";
 
   src = fetchurl {
-    url = "http://old.files.sagemath.org/src-old/${name}.tar.gz";
-    sha256 = "102mrzzi215g1xn5zgcv501x9sghwg758jagx2jixvg1rj2jijj9";
-
+    # Note that the source is *not* fetched from github, since that doesn't
+    # the upstream folder with all the source tarballs of the spkgs.
+    # If those are not present they are fetched at build time, which breaks
+    # when building in a sandbox (and probably only works if you install the
+    # latest sage version).
+    urls = [
+      "http://mirrors.mit.edu/sage/src/sage-${version}.tar.gz"
+      "ftp://ftp.fu-berlin.de/unix/misc/sage/src/sage-${version}.tar.gz"
+      "http://sagemath.polytechnic.edu.na/src/sage-${version}.tar.gz"
+      "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/src/sage-${version}.tar.gz"
+      "http://sagemath.mirror.ac.za/src/sage-${version}.tar.gz"
+      "http://ftp.leg.uct.ac.za/pub/packages/sage/src/sage-${version}.tar.gz"
+      "http://mirror.ufs.ac.za/sagemath/src/sage-${version}.tar.gz"
+      "http://mirrors-usa.go-parts.com/sage/sagemath/src/sage-${version}.tar.gz"
+      "http://www.cecm.sfu.ca/sage/src/sage-${version}.tar.gz"
+      "http://files.sagemath.org/src/sage-${version}.tar.gz"
+      "http://mirrors.xmission.com/sage/src/sage-${version}.tar.gz"
+      "http://sagemath.c3sl.ufpr.br/src/sage-${version}.tar.gz"
+      "http://linorg.usp.br/sage/src/sage-${version}.tar.gz"
+      "http://mirror.hust.edu.cn/sagemath/src/sage-${version}.tar.gz"
+      "http://ftp.iitm.ac.in/sage/src/sage-${version}.tar.gz"
+      "http://ftp.kaist.ac.kr/sage/src/sage-${version}.tar.gz"
+      "http://ftp.riken.jp/sagemath/src/sage-${version}.tar.gz"
+      "http://mirrors.tuna.tsinghua.edu.cn/sagemath/src/sage-${version}.tar.gz"
+      "http://mirrors.ustc.edu.cn/sagemath/src/sage-${version}.tar.gz"
+      "http://ftp.tsukuba.wide.ad.jp/software/sage/src/sage-${version}.tar.gz"
+      "http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/sage-${version}.tar.gz"
+      "http://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/sage-${version}.tar.gz"
+      "http://mirror.aarnet.edu.au/pub/sage/src/sage-${version}.tar.gz"
+      "http://sage.mirror.garr.it/mirrors/sage/src/sage-${version}.tar.gz"
+      "http://www.mirrorservice.org/sites/www.sagemath.org/src/sage-${version}.tar.gz"
+      "http://mirror.switch.ch/mirror/sagemath/src/sage-${version}.tar.gz"
+      "https://mirrors.up.pt/pub/sage/src/sage-${version}.tar.gz"
+      "http://www-ftp.lip6.fr/pub/math/sagemath/src/sage-${version}.tar.gz"
+      "http://ftp.ntua.gr/pub/sagemath/src/sage-${version}.tar.gz"
+    ];
+    sha256 = "1a9rhb8jby6fdqa2s7n2fl9jwqqlsl7qz7dbpbwvg6jwlrvni7fg";
   };
 
-  buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg gnused_422 tk imagemagick liblapack
-                  python openssl libpng which ];
+  postPatch = ''
+    substituteAllInPlace src/bin/sage-env
+  '';
 
-  patches = [ ./spkg-singular.patch ./spkg-python.patch ./spkg-git.patch ];
+  installPhase = ''
+    # Sage installs during first `make`, `make install` is no-op and just takes time.
+  '';
+
+  outputs = [ "out" "doc" ];
+
+  buildInputs = [
+    perl # needed for the build
+    python # needed for the build
+    gfortran # needed to build giac
+    autoreconfHook # needed to configure sage with prefix
+    gettext # needed to build the singular spkg
+    hevea # needed to build the docs of the giac spkg
+    which # needed in configure of mpir
+    # needed to build the docs of the giac spkg
+    (texlive.combine { inherit (texlive)
+      scheme-basic
+      collection-pstricks # needed by giac
+      times # font needed by giac
+      stmaryrd # needed by giac
+      babel-greek # optional for giac, otherwise throws a bunch of latex command not founds
+      ;
+    })
+  ];
+
+  patches = [
+    # fix usages of /bin/rm
+    ./spkg-singular.patch
+    # help python find the crypt library
+    ./spkg-python2.patch
+    ./spkg-python3.patch
+    # fix usages of /usr/bin/perl
+    ./spkg-git.patch
+    # fix usages of /bin/cp and add necessary argument to function call
+    ./spkg-giac.patch
+    # environment
+    ./env.patch
+  ];
 
   enableParallelBuilding = true;
 
-  hardeningDisable = [ "format" ];
+  hardeningDisable = [
+    "format" # needed to build palp, for lines like `printf(ctime(&_NFL->TIME))`
+    # TODO could be patched with `sed s|printf(ctime(\(.*\)))|%s... or fixed upstream
+  ];
 
   preConfigure = ''
     export SAGE_NUM_THREADS=$NIX_BUILD_CORES
     export SAGE_ATLAS_ARCH=fast
-    mkdir -p $out/sageHome
-    export HOME=$out/sageHome
-    export CPPFLAGS="-P"
+
+    export HOME=$out/sage-home
+    mkdir -p $out/sage-home
+
+    mkdir -p "$out"
+
+    # we need to keep the source around
+    dir="$PWD"
+    cd ..
+    mv "$dir" "$out/sage-root"
+
+    cd "$out/sage-root" # build in target dir, since `make` is also `make install`
+  '';
+
+  # for reference: http://doc.sagemath.org/html/en/installation/source.html
+  preBuild = ''
+    # TODO do this conditionally
+    export SAGE_SPKG_INSTALL_DOCS='no'
+    patchShebangs build
+  '';
+
+  postBuild = ''
+    rm -r "$out/sage-root/upstream" # don't keep the sources of all the spkgs
+    rm -r "$out/sage-root/src/build"
+    rm -rf "$out/sage-root/src/.git"
+    rm -r "$out/sage-root/logs"
+    # Fix dependency cycle between out and doc
+    rm -f "$out/sage-root/config.status"
+    rm -f "$out/sage-root/build/make/Makefile-auto"
+    rm -f "$out/sage-home/.sage/gap/libgap-workspace-"*
   '';
 
-  preBuild = "patchShebangs build";
+  # TODO there are some doctest failures, which seem harmless.
+  # We should figure out a way to fix the failures or ignore only those tests.
+  doCheck = false;
 
-  installPhase = ''DESTDIR=$out make install'';
+  checkTarget = "ptestalllong"; # all long tests in parallell
+  preCheck = ''
+    export SAGE_TIMEOUT=0 # no timeout
+    export SAGE_TIMEOUT_LONG=0 # no timeout
+  '';
 
   meta = {
     homepage = http://www.sagemath.org;
     description = "A free open source mathematics software system";
+    # taken from the homepage
+    longDescription = ''
+      SageMath is a free open-source mathematics software system licensed under the GPL. It builds on top of many existing open-source packages: NumPy, SciPy, matplotlib, Sympy, Maxima, GAP, FLINT, R and many more. Access their combined power through a common, Python-based language or directly via interfaces or wrappers.
+      Mission: Creating a viable free open source alternative to Magma, Maple, Mathematica and Matlab.
+    '';
     license = stdenv.lib.licenses.gpl2Plus;
-    broken = true;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ timokau ];
   };
 }
diff --git a/pkgs/applications/science/math/sage/env.patch b/pkgs/applications/science/math/sage/env.patch
new file mode 100644
index 00000000000..a7f8538eac3
--- /dev/null
+++ b/pkgs/applications/science/math/sage/env.patch
@@ -0,0 +1,22 @@
+diff --git a/src/bin/sage-env b/src/bin/sage-env
+index ead308f861..ed8db9f9b7 100644
+--- a/src/bin/sage-env
++++ b/src/bin/sage-env
+@@ -111,6 +111,8 @@ resolvelinks() {
+ }
+ 
+ 
++SAGE_ROOT="@out@/sage-root"
++
+ # New value for SAGE_ROOT: either SAGE_ROOT (if given)
+ # or a guessed value based on pwd.
+ if [ -n "$SAGE_ROOT" ]; then
+@@ -185,6 +187,8 @@ fi
+ export SAGE_ENV_SOURCED=$SAGE_ENV_VERSION
+ 
+ export SAGE_ROOT="$NEW_SAGE_ROOT"
++export SAGE_LOCAL='@out@/'
++export PYTHONPATH="@out@/lib/python2.7/site-packages:$PYTHONPATH"
+ 
+ 
+ # sage-env must know where the Sage's script files are.
diff --git a/pkgs/applications/science/math/sage/fetch-mirrors.sh b/pkgs/applications/science/math/sage/fetch-mirrors.sh
new file mode 100755
index 00000000000..a1103e86beb
--- /dev/null
+++ b/pkgs/applications/science/math/sage/fetch-mirrors.sh
@@ -0,0 +1,11 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p curl go-pup
+
+# Fetches a list of all available source mirrors from the sage homepage.
+# Note that the list is sorted by country, but fetchurl doesn't offer an option
+# to customize mirror preference.
+
+curl -s http://www.sagemath.org/download-source.html \
+    | pup 'table#mirror'  \
+    | pup 'a attr{href}' \
+    | sed -e 's/index\.html/sage-${version}.tar.gz/'
diff --git a/pkgs/applications/science/math/sage/spkg-giac.patch b/pkgs/applications/science/math/sage/spkg-giac.patch
new file mode 100644
index 00000000000..15b91433d25
--- /dev/null
+++ b/pkgs/applications/science/math/sage/spkg-giac.patch
@@ -0,0 +1,11 @@
+--- old/build/pkgs/giac/spkg-install	2017-07-21 14:10:00.000000000 -0500
++++ new/build/pkgs/giac/spkg-install	2017-10-15 15:55:55.321237645 -0500
+@@ -4,6 +4,8 @@
+ ## Giac
+ ###########################################
+ 
++find . -type f -exec sed -e 's@/bin/cp@cp@g' -i '{}' ';' && echo "Patching input parser" && find . -iname 'input_parser.cc'
++sed -e 's@yylex (&yylval)@yylex (\&yyval, scanner)@gp' -i 'src/src/input_parser.cc'
+ 
+ if [ "$SAGE_LOCAL" = "" ]; then
+    echo "SAGE_LOCAL undefined ... exiting";
diff --git a/pkgs/applications/science/math/sage/spkg-git.patch b/pkgs/applications/science/math/sage/spkg-git.patch
index a3e768a7c24..ff9a7b2e491 100644
--- a/pkgs/applications/science/math/sage/spkg-git.patch
+++ b/pkgs/applications/science/math/sage/spkg-git.patch
@@ -1,10 +1,12 @@
---- old/build/pkgs/git/spkg-install	2015-07-26 15:34:43.000000000 +0200
-+++ new/build/pkgs/git/spkg-install	2015-09-17 08:28:03.586657451 +0200
-@@ -45,6 +45,8 @@
-     fi
- done
+diff --git a/build/pkgs/git/spkg-install b/build/pkgs/git/spkg-install
+index 8469cb58c2..d0dc9a1db9 100755
+--- a/build/pkgs/git/spkg-install
++++ b/build/pkgs/git/spkg-install
+@@ -35,6 +35,8 @@ fi
  
-+find . -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';'
+ cd src
+ 
++find . -type f -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';'
 +
  # We don't want to think about Fink or Macports
  export NO_FINK=1
diff --git a/pkgs/applications/science/math/sage/spkg-python.patch b/pkgs/applications/science/math/sage/spkg-python.patch
deleted file mode 100644
index 4db9427e3e0..00000000000
--- a/pkgs/applications/science/math/sage/spkg-python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- old/build/pkgs/python2/spkg-install	2015-07-26 15:34:43.000000000 +0200
-+++ new/build/pkgs/python2/spkg-install	2015-09-16 20:48:51.904555797 +0200
-@@ -32,7 +32,7 @@
- done
- 
- # We are setting LDFLAGS so that we pick up Sage's readline
--LDFLAGS="-L$SAGE_LOCAL/lib $LDFLAGS"
-+LDFLAGS="-L$SAGE_LOCAL/lib -lcrypt $LDFLAGS"
- export LDFLAGS
- 
- if [ "$SAGE_DEBUG" = "yes" ]; then
diff --git a/pkgs/applications/science/math/sage/spkg-python2.patch b/pkgs/applications/science/math/sage/spkg-python2.patch
new file mode 100644
index 00000000000..5d92d3f8bea
--- /dev/null
+++ b/pkgs/applications/science/math/sage/spkg-python2.patch
@@ -0,0 +1,12 @@
+--- old/build/pkgs/python2/spkg-install	2017-07-21 14:10:00.000000000 -0500
++++ new/build/pkgs/python2/spkg-install	2017-10-15 11:26:54.823134067 -0500
+@@ -22,6 +22,9 @@
+ 
+ cd src
+ 
++LDFLAGS="-lcrypt $LDFLAGS"
++export LDFLAGS
++
+ if [ "$SAGE_DEBUG" = "yes" ]; then
+     echo "Building Python with pydebug"
+     PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug"
diff --git a/pkgs/applications/science/math/sage/spkg-python3.patch b/pkgs/applications/science/math/sage/spkg-python3.patch
new file mode 100644
index 00000000000..51827fd11be
--- /dev/null
+++ b/pkgs/applications/science/math/sage/spkg-python3.patch
@@ -0,0 +1,12 @@
+--- old/build/pkgs/python3/spkg-install	2017-07-21 14:10:00.000000000 -0500
++++ new/build/pkgs/python3/spkg-install	2017-10-15 13:11:17.769261404 -0500
+@@ -22,6 +22,9 @@
+ 
+ cd src
+ 
++LDFLAGS="-lcrypt $LDFLAGS"		
++export LDFLAGS
++
+ if [ "$SAGE_DEBUG" = "yes" ]; then
+     echo "Building Python with pydebug"
+     PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug"
diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch
index a4c29825a4c..d561768600b 100644
--- a/pkgs/applications/science/math/sage/spkg-singular.patch
+++ b/pkgs/applications/science/math/sage/spkg-singular.patch
@@ -1,28 +1,12 @@
---- old/build/pkgs/singular/spkg-install	2015-07-26 15:34:43.000000000 +0200
-+++ new/build/pkgs/singular/spkg-install	2015-09-15 20:42:51.716505855 +0200
-@@ -115,6 +115,11 @@
-     done
- }
+--- old/build/pkgs/singular/spkg-install	2017-10-15 10:35:41.826540964 -0500
++++ new/build/pkgs/singular/spkg-install	2017-10-15 10:36:40.613743443 -0500
+@@ -4,6 +4,9 @@
+ ## Singular
+ ###########################################
  
-+nix_nuke_bin_rm()
-+{
-+    find . -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';'
-+}
++find . -type f -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';'
++#echo '#!/usr/bin/env bash\nIgnoring missing $1' > src/build-aux/missing
 +
- remove_old_version()
- {
-     rm -f "$SAGE_LOCAL"/bin/Singular*
-@@ -306,11 +311,11 @@
- 
- 
- # Actually run all the functions defined above
--for i in choose_patches apply_patches remove_old_version config \
-+for i in choose_patches apply_patches nix_nuke_bin_rm remove_old_version config \
-   build_singular build_libsingular build_factory build_libfac \
-   create_singular_script install_docs ; do
-     echo "### Singular spkg-install: $i ###"
--    cd "$SRC" && $i
-+    cd "$SRC" && pwd && $i
-     if [ $? -ne 0 ]; then
-         echo >&2 "Error building Singular (error in $i)."
-         exit 1
+ if [ -z "$SAGE_LOCAL" ]; then
+     echo >&2 "Error: SAGE_LOCAL undefined -- exiting..."
+     echo >&2 "Maybe run 'sage -sh'?"
-- 
GitLab


From 3a53ddd6933f76be8dadefd82a404caae5931b83 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 6 Nov 2017 08:21:45 +0800
Subject: [PATCH 799/877] sshguard: 2.0.0 -> 2.1.0

---
 pkgs/tools/security/sshguard/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix
index bb165e53c73..6db16c95fc8 100644
--- a/pkgs/tools/security/sshguard/default.nix
+++ b/pkgs/tools/security/sshguard/default.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, autoreconfHook, yacc, flex}:
 
-
 stdenv.mkDerivation rec {
-  version = "2.0.0";
+  version = "2.1.0";
   name = "sshguard-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sshguard/sshguard-2.0.0.tar.gz";
-    sha256 = "e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06";
+    url = "mirror://sourceforge/sshguard/${name}.tar.gz";
+    sha256 = "12h2rx40lf3p3kgazmgakkgajjk2d3sdvr2f73ghi15d6i42l991";
   };
 
   doCheck = true;
@@ -16,8 +15,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--sysconfdir=/etc" ];
 
-  patches = [ ./0001-Remove-the-unnecessary-from-ipset-cmds.patch ];
-
   meta = with stdenv.lib; {
     description = "SSHGuard protects hosts from brute-force attacks";
     longDescription = ''
-- 
GitLab


From 0cc1cf74075daaf0e510a108e1e88379fa794278 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 5 Nov 2017 18:16:48 -0600
Subject: [PATCH 800/877] qutebrowser: 1.0.2 -> 1.0.3

---
 .../networking/browsers/qutebrowser/default.nix          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index da3c826adcd..4f0e891dc49 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -28,13 +28,14 @@ let
   };
 
 in buildPythonApplication rec {
-  name = "qutebrowser-${version}";
-  version = "1.0.2";
+  name = "qutebrowser-${version}${fix_postfix}";
+  fix_postfix = "-1";
+  version = "1.0.3";
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "093nmvl9x3ykrpmvnmx98g9npg4wmq0mmf7qzgbzmg93dnyq2cpk";
+    url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "04d6hg2yf2wjwn0sd05bpx3zngnb93g7rizbdq17bbpmnwxchzap";
   };
 
   # Needs tox
-- 
GitLab


From 85eac6ff730d33c50d6ca02b42d34d2aba4ef641 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 6 Nov 2017 01:25:04 +0000
Subject: [PATCH 801/877] Restrict platforms to what is known to work.

---
 pkgs/applications/science/math/sage/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index c1b5484da0f..24dc4436b0f 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -177,7 +177,7 @@ stdenv.mkDerivation rec {
       Mission: Creating a viable free open source alternative to Magma, Maple, Mathematica and Matlab.
     '';
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ timokau ];
   };
 }
-- 
GitLab


From 0711fe96f2005064c55d4f2e9cbb8baca8646dff Mon Sep 17 00:00:00 2001
From: Sean Zicari <sean.zicari@gmail.com>
Date: Sun, 5 Nov 2017 19:55:23 -0600
Subject: [PATCH 802/877] xosview2: init at 2.2.2 (#30629)

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d6031330b4f..45f7f8f51d1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -566,6 +566,7 @@
   schristo = "Scott Christopher <schristopher@konputa.com>";
   scolobb = "Sergiu Ivanov <sivanov@colimite.fr>";
   sdll = "Sasha Illarionov <sasha.delly@gmail.com>";
+  SeanZicari = "Sean Zicari <sean.zicari@gmail.com>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
   seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>";
   shanemikel = "Shane Pearlman <shanemikel1@gmail.com>";
diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix
new file mode 100644
index 00000000000..3850a6b022e
--- /dev/null
+++ b/pkgs/tools/X11/xosview2/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = "xosview2-${version}";
+  version = "2.2.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge.net/xosview/${name}.tar.gz";
+    sha256 = "3502e119a5305ff2396f559340132910807351c7d4e375f13b5c338404990406";
+  };
+
+  # The software failed to buid with this enabled; it seemed tests were not implemented
+  doCheck = false;
+
+  buildInputs = [ libX11 ];
+
+  meta = with stdenv.lib; {
+    description = "Lightweight program that gathers information from your operating system and displays it in graphical form";
+    longDescription = ''
+      xosview is a lightweight program that gathers information from your
+      operating system and displays it in graphical form. It attempts to show
+      you in a quick glance an overview of how your system resources are being
+      utilized.
+
+      It can be configured to be nothing more than a small strip showing a
+      couple of parameters on a desktop task bar. Or it can display dozens of
+      meters and rolling graphical charts over your entire screen.
+
+      Since xosview renders all graphics with core X11 drawing methods, you can
+      run it on one machine and display it on another. This works even if your
+      other host is an operating system not running an X server inside a
+      virtual machine running on a physically different host. If you can
+      connect to it on a network, then you can popup an xosview instance and
+      monitor what is going on.
+    '';
+    homepage = "http://xosview.sourceforge.net/index.html";
+    license = licenses.gpl1;
+    maintainers = [ maintainers.SeanZicari ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7e1bd3fe2d..4189496fb0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19692,6 +19692,8 @@ with pkgs;
 
   xosd = callPackage ../misc/xosd { };
 
+  xosview2 = callPackage ../tools/X11/xosview2 { };
+
   xpad = callPackage ../applications/misc/xpad {
     inherit (gnome3) gtksourceview;
   };
-- 
GitLab


From 3d8f6400ecc45a70462a77f6989463b18e75a9ae Mon Sep 17 00:00:00 2001
From: Sean Zicari <sean.zicari@gmail.com>
Date: Sun, 5 Nov 2017 20:09:24 -0600
Subject: [PATCH 803/877] Remove .net from mirror URL.

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

diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix
index 3850a6b022e..c8b658d4350 100644
--- a/pkgs/tools/X11/xosview2/default.nix
+++ b/pkgs/tools/X11/xosview2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.2.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge.net/xosview/${name}.tar.gz";
+    url = "mirror://sourceforge/xosview/${name}.tar.gz";
     sha256 = "3502e119a5305ff2396f559340132910807351c7d4e375f13b5c338404990406";
   };
 
-- 
GitLab


From 8b0014ae5ac042b2308d5c008513b513e72acbc5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 22 Sep 2017 18:48:13 +0800
Subject: [PATCH 804/877] freetds: 0.91 -> 1.00.70

---
 .../development/libraries/freetds/default.nix | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 2e06c3bbec7..d764121e8d6 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -1,34 +1,35 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, autoreconfHook, pkgconfig
+, openssl
 , odbcSupport ? false, unixODBC ? null }:
 
 assert odbcSupport -> unixODBC != null;
 
 stdenv.mkDerivation rec {
-  name = "freetds-0.91";
+  name = "freetds-${version}";
+  version = "1.00.70";
 
   src = fetchurl {
-    url = "http://mirrors.ibiblio.org/freetds/stable/${name}.tar.gz";
-    sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba";
+    url    = "http://www.freetds.org/files/stable/${name}.tar.bz2";
+    sha256 = "1ydh0c89nb6wh6wakbkqad7mdwpymygvgbcrk8c2mp7abgv1jqzp";
   };
 
-  hardeningDisable = [ "format" ];
+  configureFlags = [
+    "--with-tdsver=7.3"
+  ];
 
-  buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ];
+  buildInputs = [
+    openssl
+  ] ++ stdenv.lib.optional odbcSupport unixODBC;
 
-  configureFlags = stdenv.lib.optionalString odbcSupport "--with-odbc=${unixODBC}";
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  doDist = true;
+  enableParallelBuilding = true;
 
-  distPhase = ''
-    touch $out/include/tds.h
-    touch $out/lib/libtds.a
-  '';
-
-  meta = {
-    description =
-      "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
-    homepage = http://www.freetds.org;
-    license = "lgpl";
-    platforms = stdenv.lib.platforms.all;
+  meta = with stdenv.lib; {
+    description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
+    homepage    = http://www.freetds.org;
+    license     = licenses.lgpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.all;
   };
 }
-- 
GitLab


From 762f2ea4b0450bcf90f0ba7a20c8a67f41fd8e0a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 4 Nov 2017 11:26:29 +0800
Subject: [PATCH 805/877] sqsh: fix build with new freetds

---
 pkgs/development/tools/sqsh/default.nix | 39 ++++++++++++++-----------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix
index c55f76f9b7f..636d8ef7b78 100644
--- a/pkgs/development/tools/sqsh/default.nix
+++ b/pkgs/development/tools/sqsh/default.nix
@@ -1,33 +1,38 @@
-{ stdenv, fetchurl, freetds, readline }:
+{ stdenv, fetchurl, autoreconfHook, freetds, readline }:
 
-stdenv.mkDerivation rec {
-  version = "2.5.16.1";
+let
+  mainVersion = "2.5";
+
+in stdenv.mkDerivation rec {
   name = "sqsh-${version}";
+  version = "${mainVersion}.16.1";
 
   src = fetchurl {
-    url = "http://www.mirrorservice.org/sites/downloads.sourceforge.net/s/sq/sqsh/sqsh/sqsh-2.5/${name}.tgz";
+    url    = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${name}.tgz";
     sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n";
   };
 
-  preConfigure =
-    ''
+  preConfigure = ''
     export SYBASE=${freetds}
-    '';
 
-  buildInputs = [
-    freetds
-    readline
-  ];
+    substituteInPlace src/cmd_connect.c \
+      --replace CS_TDS_80 CS_TDS_73
+  '';
+
+  enableParallelBuilding = true;
 
-  meta = {
+  buildInputs = [ freetds readline ];
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
     description = "Command line tool for querying Sybase/MSSQL databases";
-    longDescription = 
-      ''
+    longDescription = ''
       Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell),
       it is intended as a replacement for the venerable 'isql' program supplied
       by Sybase.
-      '';
-    homepage = http://www.cs.washington.edu/~rose/sqsh/sqsh.html;
-    platforms = stdenv.lib.platforms.all;
+    '';
+    homepage = http://sourceforge.net/projects/sqsh/;
+    platforms = platforms.all;
   };
 }
-- 
GitLab


From 2902e8c5ca3869cf5fe72af7644c76f0d6bab5d9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 4 Nov 2017 11:51:44 +0800
Subject: [PATCH 806/877] calligra2: broken due to freetds upgrade but we
 already have calligra 3

---
 pkgs/applications/office/calligra/2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix
index 76027f29a70..959a44a35c1 100644
--- a/pkgs/applications/office/calligra/2.nix
+++ b/pkgs/applications/office/calligra/2.nix
@@ -51,5 +51,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ phreedom ebzzry ];
     inherit (kdelibs4.meta) platforms;
     license = licenses.gpl2;
+    broken = true;
   };
 }
-- 
GitLab


From dd18e063ef681aab4f67454ad385fe4b21331458 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 2 Nov 2017 15:16:24 +0800
Subject: [PATCH 807/877] sqlitebrowser: 3.10.0 -> 3.10.1 and make it work with
 Qt 5.9

---
 .../tools/database/sqlitebrowser/default.nix  | 27 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index adeb377dccd..74adac9f8a3 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,32 +1,39 @@
-{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, antlr
+, qtbase, qttools, qscintilla, sqlite }:
 
 mkDerivation rec {
-  version = "3.10.0";
+  version = "3.10.1";
   name = "sqlitebrowser-${version}";
 
   src = fetchFromGitHub {
     repo   = "sqlitebrowser";
     owner  = "sqlitebrowser";
     rev    = "v${version}";
-    sha256 = "1fwr7p4b6glc3s0a06i7cg8l9p1mrcm4vyhyf2wi89cyg22rrf5c";
+    sha256 = "1brzam8yv6sbdmbqsp7vglhd6wlx49g2ap8llr271zrkld4k3kar";
   };
 
-  buildInputs = [ qtbase qttools sqlite ];
-  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qtbase qscintilla sqlite ];
 
-  cmakeFlags = [ "-DUSE_QT5=TRUE" ];
+  nativeBuildInputs = [ cmake antlr qttools ];
 
-  # A regression was introduced in CMakeLists.txt on v3.9.x
-  # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755
+  enableParallelBuilding = true;
+
+  # We have to patch out Test and PrintSupport to make this work with Qt 5.9
+  # It can go when the application supports 5.9
   postPatch = ''
-    substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)'
+    substituteInPlace CMakeLists.txt \
+      --replace Test         "" \
+      --replace PrintSupport ""
+
+    substituteInPlace libs/qcustomplot-source/CMakeLists.txt \
+      --replace PrintSupport ""
   '';
 
   meta = with lib; {
     description = "DB Browser for SQLite";
     homepage = http://sqlitebrowser.org/;
     license = licenses.gpl3;
-    maintainers = [ maintainers.matthiasbeyer ];
+    maintainers = with maintainers; [ matthiasbeyer ];
     platforms = platforms.linux; # can only test on linux
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7383df20c0e..56e57ca42bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7588,7 +7588,7 @@ with pkgs;
     flex = flex_2_5_35;
   };
 
-  sqlitebrowser = libsForQt56.callPackage ../development/tools/database/sqlitebrowser { };
+  sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };
 
   sselp = callPackage ../tools/X11/sselp{ };
 
-- 
GitLab


From 4b9e73c6cf03be8da7f36df11ad18f9a7e333128 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Sun, 5 Nov 2017 02:22:57 +0800
Subject: [PATCH 808/877] all-cabal-hashes: 2017-10-08T03:25:59Z ->
 2017-11-04T17:56:01Z

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 14ae22798c2..c3cd9bdb4b3 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -7,8 +7,8 @@
   src-spec ?
     { owner = "commercialhaskell";
       repo = "all-cabal-hashes";
-      rev = "901c2522e6797270f5ded4495b1a529e6c16ef45";
-      sha256 = "05jmwsgrk77nz9vvgfbpsps0l320qgjpkr2c9zhkn9sc3d275lfb";
+      rev = "5e87c40f2cd96bd5dd953758e82f302107c7895e";
+      sha256 = "12rw5fld64s0a2zjsdijfs0dv6vc6z7gcf24h4m2dmymzms4namg";
     }
 , lib
 }:
-- 
GitLab


From 1a38312dae311561c95c898a0ed7826fc9d989db Mon Sep 17 00:00:00 2001
From: Christopher Singley <csingley@gmail.com>
Date: Mon, 30 Oct 2017 07:13:58 -0500
Subject: [PATCH 809/877] plexpy: add user id

---
 nixos/modules/misc/ids.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 7d9d9984cf2..beb91a7c150 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -212,6 +212,7 @@
       lambdabot = 191;
       asterisk = 192;
       plex = 193;
+      plexpy = 195;
       grafana = 196;
       skydns = 197;
       # ripple-rest = 198; # unused, removed 2017-08-12
-- 
GitLab


From 29c182f2b27e5f8a2e8df92483e26e459d0c6905 Mon Sep 17 00:00:00 2001
From: Richard Wallace <rwallace@thewallacepack.net>
Date: Tue, 31 Oct 2017 13:27:48 -0700
Subject: [PATCH 810/877] sbt-extras: make sure which and curl are available in
 the PATH

---
 .../development/tools/build-managers/sbt-extras/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index cd9635ab614..fbbca9a0cfe 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, which, curl, makeWrapper }:
 
 let
   rev = "77686b3dfa20a34270cc52377c8e37c3a461e484";
@@ -17,9 +17,13 @@ stdenv.mkDerivation {
 
   dontBuild = true;
 
+  buildInputs = [ makeWrapper ];
+
   installPhase = ''
     mkdir -p $out/bin
     install bin/sbt $out/bin
+
+    wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl]}
   '';
 
   meta = {
-- 
GitLab


From 03bcadd40c4f47b272791a549b46ff7098307027 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Mon, 2 Oct 2017 18:10:55 -0400
Subject: [PATCH 811/877] splint: Add darwin support

---
 pkgs/development/tools/analysis/splint/darwin.patch | 13 +++++++++++++
 pkgs/development/tools/analysis/splint/default.nix  |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/analysis/splint/darwin.patch

diff --git a/pkgs/development/tools/analysis/splint/darwin.patch b/pkgs/development/tools/analysis/splint/darwin.patch
new file mode 100644
index 00000000000..8c435707571
--- /dev/null
+++ b/pkgs/development/tools/analysis/splint/darwin.patch
@@ -0,0 +1,13 @@
+diff --git a/src/osd.c b/src/osd.c
+index ebe214a..4ba81d5 100644
+--- a/src/osd.c
++++ b/src/osd.c
+@@ -516,7 +516,7 @@ osd_getPid ()
+ # if defined (WIN32) || defined (OS2) && defined (__IBMC__)
+   int pid = _getpid ();
+ # else
+-  __pid_t pid = getpid ();
++  pid_t pid = getpid ();
+ # endif
+ 
+   return (int) pid;
diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix
index e8a056bca5a..2d6129dd376 100644
--- a/pkgs/development/tools/analysis/splint/default.nix
+++ b/pkgs/development/tools/analysis/splint/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7";
   };
 
-  patches = [ ./tmpdir.patch ];
+  patches = [ ./tmpdir.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
 
   buildInputs = [ flex ];
 
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     '';
 
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From a1449ea180d34622340f7523fb8a6b4a7f3b545b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 5 Nov 2017 08:39:59 +0000
Subject: [PATCH 812/877] omake: 0.10.2 -> 0.10.3

---
 pkgs/development/tools/ocaml/omake/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index 93d96005d35..0f536c489eb 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "omake-${version}";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/${name}.tar.gz";
-    sha256 = "1znnlkpz89hk44byvnl1pr92ym6hwfyyw2qm9clq446r6l2z4m64";
+    sha256 = "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz";
   };
 
   buildInputs = [ ocaml ncurses ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4189496fb0d..d58ecda7135 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7426,9 +7426,7 @@ with pkgs;
 
   obuild = callPackage ../development/tools/ocaml/obuild { };
 
-  omake = callPackage ../development/tools/ocaml/omake {
-    inherit (ocamlPackages_4_02) ocaml;
-  };
+  omake = callPackage ../development/tools/ocaml/omake { };
 
   inherit (ocamlPackages) omake_rc1;
 
-- 
GitLab


From 030223237ab88229246d7fbb5dd62602849eb3e7 Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Mon, 6 Nov 2017 08:33:59 +0000
Subject: [PATCH 813/877] flexget: fix build with updated dependencies

---
 pkgs/applications/networking/flexget/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 9e5e90996bc..105239aca02 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -24,9 +24,6 @@ buildPythonApplication rec {
   # unicode-capable filesystem (and setting LC_ALL doesn't work).
   # setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
   postPatch = ''
-    sed -i '/def test_non_ascii/i\    import pytest\
-        @pytest.mark.skip' flexget/tests/test_filesystem.py
-
     substituteInPlace requirements.txt \
       --replace "chardet==3.0.3" "chardet" \
       --replace "rebulk==0.8.2" "rebulk" \
@@ -35,7 +32,13 @@ buildPythonApplication rec {
       --replace "sqlalchemy==1.1.10" "sqlalchemy" \
       --replace "zxcvbn-python==4.4.15" "zxcvbn-python" \
       --replace "flask-cors==3.0.2" "flask-cors" \
-      --replace "certifi==2017.4.17" "certifi"
+      --replace "certifi==2017.4.17" "certifi" \
+      --replace "apscheduler==3.3.1" "apscheduler" \
+      --replace "path.py==10.3.1" "path.py" \
+      --replace "tempora==1.8" "tempora" \
+      --replace "cheroot==5.5.0" "cheroot" \
+      --replace "six==1.10.0" "six" \
+      --replace "aniso8601==1.2.1" "aniso8601"
   '';
 
   checkPhase = ''
@@ -47,7 +50,8 @@ buildPythonApplication rec {
                                           and not test_double_episodes \
                                           and not test_inject_force \
                                           and not test_double_prefered \
-                                          and not test_double"
+                                          and not test_double \
+                                          and not test_non_ascii"
   '';
 
   buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ];
-- 
GitLab


From eece8755d1f5da1a5be319edf37c1a6244289010 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Mon, 6 Nov 2017 14:29:56 +0800
Subject: [PATCH 814/877] ihaskell: re-enable

---
 nixos/modules/misc/ids.nix                    |  4 ++--
 nixos/modules/module-list.nix                 |  2 +-
 .../tools/haskell/ihaskell/wrapper.nix        | 23 ++++++++++---------
 pkgs/top-level/all-packages.nix               | 12 ++++------
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index beb91a7c150..7d0cbf6aad0 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -207,7 +207,7 @@
       ripple-data-api = 186;
       mediatomb = 187;
       rdnssd = 188;
-      # ihaskell = 189; # unused
+      ihaskell = 189;
       i2p = 190;
       lambdabot = 191;
       asterisk = 192;
@@ -484,7 +484,7 @@
       #ripple-data-api = 186; #unused
       mediatomb = 187;
       #rdnssd = 188; # unused
-      # ihaskell = 189; # unused
+      ihaskell = 189;
       i2p = 190;
       lambdabot = 191;
       asterisk = 192;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 521e2c0ca24..99d3c0112f2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -304,7 +304,7 @@
   ./services/misc/gogs.nix
   ./services/misc/gollum.nix
   ./services/misc/gpsd.nix
-  #./services/misc/ihaskell.nix
+  ./services/misc/ihaskell.nix
   ./services/misc/irkerd.nix
   ./services/misc/jackett.nix
   ./services/misc/logkeys.nix
diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index f1a4f219682..75ad33e72f6 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -1,27 +1,28 @@
-{ stdenv, writeScriptBin, makeWrapper, buildEnv, ghcWithPackages, ihaskell, ipython, packages }:
+{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, ihaskell, jupyter, packages }:
 let
   ihaskellEnv = ghcWithPackages (self: [
     self.ihaskell
-    self.ihaskell-blaze
-    self.ihaskell-diagrams
-    self.ihaskell-display
+    (haskell.lib.doJailbreak self.ihaskell-blaze)
+    (haskell.lib.doJailbreak self.ihaskell-diagrams)
+    (haskell.lib.doJailbreak self.ihaskell-display)
   ] ++ packages self);
   ihaskellSh = writeScriptBin "ihaskell-notebook" ''
     #! ${stdenv.shell}
     export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
-    export PATH="${stdenv.lib.makeBinPath [ ihaskell ihaskellEnv ipython ]}"
-    ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell
+    export PATH="${stdenv.lib.makeBinPath ([ ihaskell ihaskellEnv jupyter ])}"
+    ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook
   '';
-  profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar";
 in
 buildEnv {
   name = "ihaskell-with-packages";
-  paths = [ ihaskellEnv ipython ];
+  buildInputs = [ makeWrapper ];
+  paths = [ ihaskellEnv jupyter ];
   postBuild = ''
-    . "${makeWrapper}/nix-support/setup-hook"
-    ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/.
+    ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/
     for prg in $out/bin"/"*;do
-      wrapProgram $prg --set PYTHONPATH "$(echo ${ipython}/lib/*/site-packages)"
+      if [[ -f $prg && -x $prg ]]; then
+        wrapProgram $prg --set PYTHONPATH "$(echo ${jupyter}/lib/*/site-packages)"
+      fi
     done
   '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d58ecda7135..ebb9831d3ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2684,15 +2684,13 @@ with pkgs;
   };
 
 
-  # ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
-  #   inherit (haskellPackages) ihaskell ghcWithPackages;
+  ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
+    inherit (haskellPackages) ihaskell ghcWithPackages;
 
-  #   ipython = python3.buildEnv.override {
-  #     extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ];
-  #   };
+    jupyter = python3.withPackages (ps: [ ps.jupyter ps.notebook ]);
 
-  #   packages = config.ihaskell.packages or (self: []);
-  # };
+    packages = config.ihaskell.packages or (self: []);
+  };
 
   imapproxy = callPackage ../tools/networking/imapproxy { };
 
-- 
GitLab


From 0af15f6f45b88aeb6f4e2f237d9f2e98adf007f8 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 6 Nov 2017 17:20:23 +0800
Subject: [PATCH 815/877] firejail: 0.9.48 -> 0.9.50

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

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 9230e6920f9..5ee8ab564b0 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.48";
+    version="0.9.50";
     name="${baseName}-${version}";
-    hash="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
-    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.48.tar.xz";
-    sha256="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
+    hash="005q7f1h7z4c1wg8vzb1zh0xi4msz6z0fcph0y3ywhlbxjvpam61";
+    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.50.tar.xz";
+    sha256="005q7f1h7z4c1wg8vzb1zh0xi4msz6z0fcph0y3ywhlbxjvpam61";
   };
   buildInputs = [
     which
-- 
GitLab


From 7100c1a0e02cca0259c33ed0bd2d96263ae233f0 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 6 Nov 2017 10:26:55 +0100
Subject: [PATCH 816/877] pythonPackages.devpi_common: remove one test

---
 pkgs/development/python-modules/devpi-common/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
index 082f2baeceb..67f8debc43a 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -14,6 +14,8 @@ with pythonPackages;buildPythonPackage rec {
   checkInputs = [ pytest ];
 
   checkPhase = ''
+    # Don't know why this test is failing!
+    substituteInPlace testing/test_request.py --replace "test_env" "noop_test_env"
     py.test
   '';
 
-- 
GitLab


From a0f01a5f0b1dc7d0bd1794ea93380600f44e6a51 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 6 Nov 2017 10:48:09 +0100
Subject: [PATCH 817/877] bitcoin-abc: 0.15.0 -> 0.16.0

---
 pkgs/applications/altcoins/bitcoin-abc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index a113aadcd62..011e3cd7c87 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
     rev = "v${version}";
-    sha256 = "1fygn6cc99iasg5g5jyps5ps873hfnn4ln4hsmcwlwiqd591qxyv";
+    sha256 = "0wwcgvd8zgl5qh6z1sa3kdv1lr9cwwbs9j2gaad5mqr9sfwbbxdh";
   };
 
   patches = [ ./fix-bitcoin-qt-build.patch ];
-- 
GitLab


From a5eaa1cfea3585e16fab1a47f823be43245dfeba Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Mon, 6 Nov 2017 12:15:33 +0200
Subject: [PATCH 818/877] feh: 2.21 -> 2.22

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index f68162de4e3..88dc24a97fa 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.21";
+  version = "2.22";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j";
+    sha256 = "0yqcczb9c126zgfvjq2fpzqz0rg16yad8mfr3gryxwlbymy2cmxj";
   };
 
   outputs = [ "out" "man" "doc" ];
-- 
GitLab


From 8c4dc462af8c54132eed73bf5e8f50126154fc25 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Mon, 6 Nov 2017 10:44:19 +0000
Subject: [PATCH 819/877] vim-plugins: update command no longer requires user
 input

---
 pkgs/misc/vim-plugins/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index eab2efbb6be..e821ce123f1 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -16,7 +16,7 @@ in
 
 # TL;DR
 # Add your plugin to ./vim-plugin-names
-# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix"`
+# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix </dev/null"`
 # Copy the generated expression(s) into this file.
 # If plugin is complicated then make changes to ./vim2nix/additional-nix-code
 
-- 
GitLab


From db06695dd7c73c1a5cabc45b19f07791dd7350aa Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Mon, 6 Nov 2017 11:13:56 +0000
Subject: [PATCH 820/877] vimPlugins.command-t: 2017-06-23 -> 2017-09-29

---
 pkgs/misc/vim-plugins/default.nix                 | 15 +++++++--------
 .../vim2nix/additional-nix-code/command-t         |  7 +++----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index e821ce123f1..5d4adaaad9e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -3,7 +3,7 @@
 , which, fetchgit, llvmPackages
 , xkb_switch, rustracerd, fzf
 , python3, boost, icu
-, ycmd
+, ycmd, makeWrapper, rake
 , pythonPackages, python3Packages
 , Cocoa ? null, git
 }:
@@ -1903,18 +1903,17 @@ rec {
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2017-06-23";
+    name = "command-t-2017-09-29";
     src = fetchgit {
       url = "https://github.com/wincent/command-t";
-      rev = "29f2606a9665058a98b56f2d8062ba614a3f246e";
-      sha256 = "0q6kqjy88w1478k2q6vqyyid69whd72746i0cd33xnslgykwm2hn";
+      rev = "c5882de56f0ca3ce8e891c434f192519aca5c7bb";
+      sha256 = "0dbghh7fwy49zyjick7840dkbybqchjw2sg9c6p0kmp5w3j46b92";
     };
     dependencies = [];
-    buildInputs = [ perl ruby git ];
+    buildInputs = [ ruby rake ];
     buildPhase = ''
-      pushd ruby/command-t
-      gem build ./command-t.gemspec
-      popd
+      rake make
+      rm ruby/command-t/ext/command-t/*.o
     '';
   };
 
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
index 5c96e11de7a..f850425cba7 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
@@ -1,6 +1,5 @@
-    buildInputs = [ perl ruby git ];
+    buildInputs = [ ruby rake ];
     buildPhase = ''
-      pushd ruby/command-t
-      gem build ./command-t.gemspec
-      popd
+      rake make
+      rm ruby/command-t/ext/command-t/*.o
     '';
-- 
GitLab


From c755d83c4766a9721a00dad8eddff144d9108c21 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Mon, 6 Nov 2017 11:24:35 +0000
Subject: [PATCH 821/877] vimPlugins: update all

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 5d4adaaad9e..5ce78702148 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -105,6 +105,17 @@ rec {
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
 
+  # do not auto-update this one, as the name clashes with vim-snippets
+  vim-docbk-snippets = buildVimPluginFrom2Nix {
+    name = "vim-docbk-snippets-2017-11-02";
+    src = fetchgit {
+      url = "https://github.com/jhradilek/vim-snippets";
+      rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
+      sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc";
+    };
+    dependencies = [];
+  };
+
   fzfWrapper = buildVimPluginFrom2Nix {
     name = fzf.name;
     src = fzf.src;
@@ -147,11 +158,11 @@ rec {
   };
 
   Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Hoogle-2017-03-01";
+    name = "Hoogle-2017-11-04";
     src = fetchgit {
       url = "git://github.com/Twinside/vim-hoogle";
-      rev = "cfb0c864dbacf6f916ba05c4a688e21154aa971b";
-      sha256 = "0gddyh47gwy684kjs9yxfnc0lg8jq9w5pdyv3yrvypyiqi51vw1b";
+      rev = "14256fa4f482bb40f55311a6d8037103549c7844";
+      sha256 = "1dhfy9s6q11cb424x595anj17sgsqywdyrcw3ynmk3949iiwaqhb";
     };
     dependencies = [];
 
@@ -180,11 +191,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2017-07-07";
+    name = "Syntastic-2017-11-06";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "e1161a723a353db99780f9a9351340df7abbb106";
-      sha256 = "00gvx33yz199n7lynli0fb8cf58lb5cs0jxrqggjjy261xv2lcq1";
+      rev = "206b616c8e49f948d18231799c469aa3e6e2c29c";
+      sha256 = "0q6k00x2gxd1lryqj80pqd0g9q1nmzz1fxacs81gxhx8c8hpxmcy";
     };
     dependencies = [];
 
@@ -202,33 +213,33 @@ rec {
   };
 
   Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2017-06-15";
+    name = "Tagbar-2017-10-19";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "f5792732de16b8a2cc202f920e363eb413d7241d";
-      sha256 = "188xdmrp2g7bfzg95pv1qa2l17sqwy1g2p4syj7546fksddmwgms";
+      rev = "dc155af2fdd20e081680d777bde558c56f8d55c3";
+      sha256 = "0xicazayayp208qv7ln4shj41favj5a6aysvz29pwqy28svmg3xd";
     };
     dependencies = [];
 
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2017-04-07";
+    name = "The_NERD_Commenter-2017-10-31";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "285902752f7ab2052ac700a6d29b263dd5788afb";
-      sha256 = "1hd5ibpvxra8asr4zp0l68wc4djjgfbvh7kzmxc1r7jqr70wj8dl";
+      rev = "63ba1a1123609c9bfb9f5d76debcd34afe429096";
+      sha256 = "01aq0n5028kyvjzgb0yrzwnp0r3jiayahmbvkfakg3vw9hgapggr";
     };
     dependencies = [];
 
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2017-07-17";
+    name = "The_NERD_tree-2017-11-02";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "e2a9929bbea0ec2050f2ea44b7e7bae3ccac66e6";
-      sha256 = "03mygl8ic4awx4js04x0nw2l96kjv4vsldkgrdx0n43sh5i4z7nk";
+      rev = "97433edd43f3a4a95c84389bcaafbe7a047cf756";
+      sha256 = "04z45bs1a37mdck80bcqj3d0bp2zz5xyjkys0zv925mpq9rwx22s";
     };
     dependencies = [];
 
@@ -246,11 +257,11 @@ rec {
   };
 
   VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "VimOutliner-2017-05-03";
+    name = "VimOutliner-2017-08-02";
     src = fetchgit {
       url = "git://github.com/vimoutliner/vimoutliner";
-      rev = "fd2ca709acc161a9e65e75577c2bfefde173401a";
-      sha256 = "13cqhajfz6rag7qwj2rws5gjs1f2jlrb2s30kyjrx227i05vikkn";
+      rev = "c13141d604959d84225c3a53dc4b0ef5ae8b2bfe";
+      sha256 = "1bg45cnpvnk2k7r6l2n3sz0cw2lhrglphak10yp11yqf4q1rxl7x";
     };
     dependencies = [];
 
@@ -284,11 +295,11 @@ rec {
   };
 
   clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clang_complete-2017-07-15";
+    name = "clang_complete-2017-09-25";
     src = fetchgit {
       url = "git://github.com/Rip-Rip/clang_complete";
-      rev = "c41eea05317526a4ddd3bd389f3723390b196d4d";
-      sha256 = "0bfalbzhy3n1k8bsvnh6aykgj6d17n6qgi9ahp0d8plvbjjvfw6j";
+      rev = "fb8f4f25ab808bc83bc7c704f23171cb6b020737";
+      sha256 = "0y80ds4l5gqqdm56ymkgsfpizpx96kzrr0ivx29q7ahd4ry847xa";
     };
     dependencies = [];
     # In addition to the arguments you pass to your compiler, you also need to
@@ -305,11 +316,11 @@ rec {
   };
 
   commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "commentary-2017-03-12";
+    name = "commentary-2017-10-09";
     src = fetchgit {
       url = "git://github.com/tpope/vim-commentary";
-      rev = "be79030b3e8c0ee3c5f45b4333919e4830531e80";
-      sha256 = "1msbmbz96wa88ymjvcrbr07mxdrsjy1w2hl7z4pihf318ryq98cm";
+      rev = "89f43af18692d22ed999c3097e449f12fdd8b299";
+      sha256 = "0nqm4s00c607r58fz29n67r2z5p5r9qayl5y1chy8bcrl59m17a2";
     };
     dependencies = [];
 
@@ -331,11 +342,11 @@ rec {
   };
 
   ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-py-matcher-2017-01-05";
+    name = "ctrlp-py-matcher-2017-11-01";
     src = fetchgit {
       url = "git://github.com/FelikZ/ctrlp-py-matcher";
-      rev = "a0710a4937ab9dc10bc0a8b56b41fcc88534147c";
-      sha256 = "198y8998sx2maarn2vawx8hqldsfbnn4i6rlg56qw6brsrssssx2";
+      rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13";
+      sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1";
     };
     dependencies = [];
 
@@ -364,11 +375,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2017-07-12";
+    name = "fugitive-2017-10-21";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "913fff1cea3aa1a08a360a494fa05555e59147f5";
-      sha256 = "1qxzxk5szm25r7wi39n5s91fjnjgz5xib67risjcwhk6jdv0vzyd";
+      rev = "7c9b87a3c3ef4b53425aca4a27e11a7359caae9f";
+      sha256 = "1kpgnn3pmy82kqy9vcvd1vi9jjmfj03p4606pvh42ky4y0m0qmms";
     };
     dependencies = [];
 
@@ -397,11 +408,11 @@ rec {
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2017-06-26";
+    name = "vim-autoformat-2017-10-23";
     src = fetchgit {
       url = "https://github.com/Chiel92/vim-autoformat";
-      rev = "ad189cdde5a50699a1d6b2b4b669e73942e47710";
-      sha256 = "0jk1qigvz2xkpr13ii0pg0nszrnzwn51gckxjvgaqwbsz967ccsj";
+      rev = "c32b27cd4059770ff6f4639082b69e76ada948bd";
+      sha256 = "1sy1bjrk560qww97538m883r8gkmfl114lbp68gdl0j48fdhmh78";
     };
     dependencies = [];
 
@@ -419,22 +430,22 @@ rec {
   };
 
   tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2017-05-31";
+    name = "tsuquyomi-2017-11-01";
     src = fetchgit {
       url = "https://github.com/Quramy/tsuquyomi";
-      rev = "46dfcd72b9701a52331349ba0d5c7596167093ab";
-      sha256 = "12rvkc3wf959siijrgld56xvfhgacglxb69z4q567fsjv3ynqnrv";
+      rev = "fb5a5fd26bcca3c3a9fcde732b969e34c1ae89ea";
+      sha256 = "0pg2w250fksnj168ygkdniryyr4asrr8y5fh2gq2hpyx6wpph7f8";
     };
     dependencies = [];
 
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2017-07-22";
+    name = "deoplete-nvim-2017-11-04";
     src = fetchgit {
       url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "5cef0e6b607d3acb742d1de07a4ddd3a5bfa3036";
-      sha256 = "0mh8zjaw369djffi1vzy124pwnrcxg4pbyjnhy3pq2j6k579znc2";
+      rev = "bea8e1c122d31ab6f2dd6f7d9a5b4545d08b2c4f";
+      sha256 = "0y88h7w8d3h43yfjkawgn9inkyky5llrk8gmdfax5fqvgjgz4jg9";
     };
     dependencies = [];
 
@@ -463,11 +474,11 @@ rec {
   };
 
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-closetag-2017-07-24";
+    name = "vim-closetag-2017-11-01";
     src = fetchgit {
       url = "https://github.com/alvan/vim-closetag";
-      rev = "2cacc501df30586c0f96f40f24d1a1239529198c";
-      sha256 = "00fayl6bnrf8b80xk73r1009z6hpzfc2jaih042hmnybx8k70byg";
+      rev = "277e21d04c417112da6ecd3485373c6d3ff93b90";
+      sha256 = "1wx9qqas0gd301pn9zabbl4b9v41i1hwbnd8fyy8kxxf0cbpdwaf";
     };
     dependencies = [];
 
@@ -485,35 +496,36 @@ rec {
   };
 
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-css-color-2017-02-09";
+    name = "vim-css-color-2017-11-03";
     src = fetchgit {
       url = "https://github.com/ap/vim-css-color";
-      rev = "2411b84298eb6db034001f35ce7cc32c36f9b43b";
-      sha256 = "1igqshk7wkh1wgihnmxnlh84fb98fm9lm8lfyjpcz6x8rg5vpmwc";
+      rev = "fcf5829daa7817994fb856dbaa905e6fd8beb50c";
+      sha256 = "1a617ji11395zimqjgpcq2qciyjzq5ixm85vc8rkj8jda0qgm91c";
     };
     dependencies = [];
 
   };
 
   LanguageClient-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "LanguageClient-neovim-2017-09-05";
+    name = "LanguageClient-neovim-2017-11-06";
     src = fetchgit {
       url = "https://github.com/autozimu/LanguageClient-neovim";
-      rev = "5bfc3492d50c3c48c6e0b0d1899ed2bbca2cf48f";
-      sha256 = "1zi3v4yx4hgzfr23377z84yngiqvdwjpdpkn12lpi6irb04q6641";
+      rev = "a42cad5247417a1dbe7517748df14a76bd795fc1";
+      sha256 = "1dk44xmxpq7yix0vpy8pzabk90l0cqxjm79w1zh8vqmpcp27z4jd";
     };
     dependencies = [];
 
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-07-23";
+    name = "clighter8-2017-09-30";
     src = fetchgit {
       url = "https://github.com/bbchung/clighter8";
-      rev = "a75644681c3a25f9441c482fd0b1c983d12da7e1";
-      sha256 = "0hl14l8d0c0rwh7pv1d9bxkrvh1wjxdgjyi7cnhn75m7x9fd3ijh";
+      rev = "193512aaa722d1f3dfd3c07bd60942e59c753f25";
+      sha256 = "1xl1ggkvwg8j6xhfgs1vcah9wksw2z03b1333iyfbgcjdxrdail6";
     };
     dependencies = [];
+    buildInputs = [ makeWrapper ];
     preFixup = ''
       sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \
         -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
@@ -521,11 +533,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-07-25";
+    name = "neomake-2017-11-04";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "0d1f1508ce2c9cfcffbf74a6bdea9c5766301fd6";
-      sha256 = "0wc9b63s4j80f6irf2g6dmk2nx8w9il4dccbgmzirchmymndw4vh";
+      rev = "ef4e5be7315ffcb536b855974c91b1378beda62d";
+      sha256 = "1xma1isbk7b3gccddfphvyxpi2sih6i1jgk69p8cig5rbggkrc4a";
     };
     dependencies = [];
 
@@ -543,22 +555,22 @@ rec {
   };
 
   vim-trailing-whitespace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-trailing-whitespace-2016-03-27";
+    name = "vim-trailing-whitespace-2017-09-22";
     src = fetchgit {
       url = "https://github.com/bronson/vim-trailing-whitespace";
-      rev = "733fb64337b6da4a51c85a43450cd620d8b617b5";
-      sha256 = "1469bd744lf8vk1nnw7kyq4ahpw84crp614mkpq88cs6rhvjhcyw";
+      rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6";
+      sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9";
     };
     dependencies = [];
 
   };
 
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sort-motion-2017-04-27";
+    name = "vim-sort-motion-2017-10-03";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-sort-motion";
-      rev = "9833b22b24b469574178bff4a305472d52bd93b8";
-      sha256 = "1rvg4c89vlhqdy0p76rn51hz5mz7qv5pckdacs5zz3g8rcpqxxwq";
+      rev = "7384f20d829b4abde28ced40975f0beb319dce27";
+      sha256 = "1x4hxa7dijb5g7vmrbgs2zi8aiqc759ljmh8qqwk6lafc016plnj";
     };
     dependencies = [];
 
@@ -587,11 +599,11 @@ rec {
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2017-07-18";
+    name = "ctrlp-vim-2017-08-30";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "3a048e85d3c2f72b1564e2dc43ed5b1d67bd59a9";
-      sha256 = "10i2lwjizd74b3zi1ahinz2h8qbd18jzw93xrpw0iswrynfsprjv";
+      rev = "bde7a2950adaa82e894d7bdf69e3e7383e40d229";
+      sha256 = "19q3cfs3rd3q1xfhyz55r1c3750nrjvwz7jxnhqqn751zgimnsyl";
     };
     dependencies = [];
 
@@ -631,11 +643,11 @@ rec {
   };
 
   pony-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pony-vim-syntax-2016-01-23";
+    name = "pony-vim-syntax-2017-09-26";
     src = fetchgit {
       url = "https://github.com/dleonard0/pony-vim-syntax";
-      rev = "a0ab2e14d5a3796ebec01ce196392dc1de349cb3";
-      sha256 = "1wraray7870hq75jqxyilxb125flhcgk9ysz437qbg75c495znl0";
+      rev = "caa34b3d7a15d9bfbfbb2f5944c85eb1eddcfafc";
+      sha256 = "0r2lv99hkm95dv8wy9rkrkcwz5wkmwggfwi5vakgw497l3a9jskr";
     };
     dependencies = [];
 
@@ -664,22 +676,22 @@ rec {
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2017-07-22";
+    name = "neco-ghc-2017-08-17";
     src = fetchgit {
       url = "https://github.com/eagletmt/neco-ghc";
-      rev = "1c7bf1b544f295d066863b9f193de709aec5bbad";
-      sha256 = "1vbl75s0zvbw6zvs790yla06rl8akpamm0p98s5mbj7mdnivkqhb";
+      rev = "faa033c05e6a6470d3d780e3931b4c9c72042009";
+      sha256 = "01l5n4x94sb6bhjhjx2sibs8gm3zla7hb6szdfgbdmdf7jlzazak";
     };
     dependencies = [];
 
   };
 
   editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "editorconfig-vim-2017-05-13";
+    name = "editorconfig-vim-2017-10-14";
     src = fetchgit {
       url = "https://github.com/editorconfig/editorconfig-vim";
-      rev = "a069da8426ec5b9fc4d9f83c783c999e9d20f7d0";
-      sha256 = "1zx5a8if3r77dnyidix7j0gi04y4pmmi5kfzlr3kjazj00606l79";
+      rev = "0abb0634a8bf3c760a283e9e7475594b83869a46";
+      sha256 = "1wazl37ivn9nhsy296g1ncvvwc78930lbp8arhwavr52mzpfji21";
     };
     dependencies = [];
 
@@ -697,11 +709,11 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2017-07-19";
+    name = "vim-elixir-2017-10-20";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "7c16ab889d12a32a7d15c54c36c0f47809b06e06";
-      sha256 = "0h9gqxqyl6p6ckknn8838wz71xz5v2jqkc2swjdkfbff2n9k1gwb";
+      rev = "3066d5fb5e1c694e607b2bb5d8277266ca524262";
+      sha256 = "1j5sic3rssh2kaj73lv4m5sck3irn1jzgkpdr5qw7qi0gyfgpg81";
     };
     dependencies = [];
 
@@ -741,11 +753,11 @@ rec {
   };
 
   ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ensime-vim-2017-07-06";
+    name = "ensime-vim-2017-08-27";
     src = fetchgit {
       url = "https://github.com/ensime/ensime-vim";
-      rev = "a8a2f024283af8e0b69165960ba59d850d1b80a4";
-      sha256 = "0vn7iv05jil7j1k4wgnnb9b1b4yqlxjkqmmz8a71291qg17bs5c8";
+      rev = "d992b971a84afdfb2d99896d8aed537030e09a80";
+      sha256 = "1rhrq3zplvpyli1ymqjmhq91p61ixpjz1v5xf68nvq4ax50nl45z";
     };
     dependencies = ["vimproc" "vimshell" "self" "forms"];
     pythonDependencies = with pythonPackages; [ sexpdata websocket_client ];
@@ -763,44 +775,44 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-07-25";
+    name = "vim-go-2017-11-05";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "76cd99db6a88e825f361df0043cbff777c4a14fb";
-      sha256 = "1pda9dmaacnzwm92a7vsly053dq2c1bcsqx99rwr41mkpzsk649l";
+      rev = "c0d209cce7f0eb0af250d2471ae9495a8bf1f19e";
+      sha256 = "1ci8nhsnda4wrpqi0knara1dqjjba6bccbqiw6va8d9mzsr12ivn";
     };
     dependencies = [];
 
   };
 
   vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-colorschemes-2016-08-01";
+    name = "vim-colorschemes-2017-08-22";
     src = fetchgit {
       url = "https://github.com/flazz/vim-colorschemes";
-      rev = "b8dff40f69f1873effbed97c759a8452ecb240ed";
-      sha256 = "1mb08l2crl5mal0jllh9s099w2bqcb88vfjw3z5zj1jn8bbpniaj";
+      rev = "eab315701f4627967fd62582eefc4e37a3745786";
+      sha256 = "12jfqfs6lqd6jijxrdx3k76bzxrh9517zwczb73qjaqbg286fh5k";
     };
     dependencies = [];
 
   };
 
   floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "floobits-neovim-2017-07-25";
+    name = "floobits-neovim-2017-08-02";
     src = fetchgit {
       url = "https://github.com/floobits/floobits-neovim";
-      rev = "5b83fc75e4241911649782fd5b87ac7da30e77bd";
-      sha256 = "05jrybkhg39v3z295l55aasb074wvm3pnyp7l38jqk7z4432gdc4";
+      rev = "9ccd5a8d5d28261b9686717d61a32b756f38f189";
+      sha256 = "02njg49qz9bfzggpn7z5c7w1wa1k5hxly66904wizl601fa6c664";
     };
     dependencies = [];
 
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2017-07-14";
+    name = "psc-ide-vim-2017-10-24";
     src = fetchgit {
       url = "https://github.com/frigoeu/psc-ide-vim";
-      rev = "0ff0c0a4e4087cb4444d0a19f2b2e436e723b186";
-      sha256 = "0kq8iqhv8flyc12m9ajmbrfk7k6zl3gnnxg5j8sw69aqy6pqvd0p";
+      rev = "23bf302de91181d409fb988ce372ab703b119bc5";
+      sha256 = "1yjnc6173zdxbcbszrv7184rk5jax6d187c1klsm8b6lx4j1jv4d";
     };
     dependencies = [];
 
@@ -840,11 +852,11 @@ rec {
   };
 
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2017-06-05";
+    name = "idris-vim-2017-08-02";
     src = fetchgit {
       url = "https://github.com/idris-hackers/idris-vim";
-      rev = "0709927e689f4f4158661d4eb8ac6ce310cd7548";
-      sha256 = "05fiamb92l7d08kxv1jk5xpqvkxphr9vqi3bfa203mjkvymd3x34";
+      rev = "7f1363b65e14a8918d17f98b7f16de8f44f6bd00";
+      sha256 = "07ws5c1yfv4kp1yl4fa634l9w162pp784zg12r2953xzwwmgwr83";
     };
     dependencies = [];
 
@@ -862,11 +874,11 @@ rec {
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2017-05-30";
+    name = "lightline-vim-2017-11-05";
     src = fetchgit {
       url = "https://github.com/itchyny/lightline.vim";
-      rev = "ff74d6561487d220ed9d878172d8b55a79a4c17e";
-      sha256 = "0j8pn42vfc1ka6hjnfsanl98vlk2839am5d4ynz9p1j1hichiqzv";
+      rev = "73f125dcf24db4baabe9be76d02de63be22dbd44";
+      sha256 = "1aj0sn3fs78993nk8qfvyfbbny3586fnmsvkqkg7n9j2gd7dfn93";
     };
     dependencies = [];
 
@@ -938,6 +950,17 @@ rec {
 
   };
 
+  vim-docbk = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-docbk-2015-04-01";
+    src = fetchgit {
+      url = "https://github.com/jhradilek/vim-docbk";
+      rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e";
+      sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d";
+    };
+    dependencies = [];
+
+  };
+
   auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "auto-pairs-2017-07-03";
     src = fetchgit {
@@ -994,11 +1017,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2017-07-24";
+    name = "fzf-vim-2017-11-02";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "685f9aae97072a190a1230a5c79692e15b7f46c9";
-      sha256 = "1064qwypq8hl0dx65fhvx0aq4jp7hc60rzb0vy98zjr3sr4wshbh";
+      rev = "5c6cee878a71ed27b137aafa7993624a357c0b82";
+      sha256 = "07wavw8j170siysjvpmm2znv6c1q72w1m0cgs908v9pr1fh1bghj";
     };
     dependencies = [];
 
@@ -1049,11 +1072,11 @@ rec {
   };
 
   typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "typescript-vim-2017-03-15";
+    name = "typescript-vim-2017-10-24";
     src = fetchgit {
       url = "https://github.com/leafgarland/typescript-vim";
-      rev = "4dc79bd1b0c43c16cae146bee065f2acc6d2b789";
-      sha256 = "1hm7cpkx7na106xpivzi5cqb322nanpa0sdjmvnkhgll244q5vy4";
+      rev = "fbd0e9e508535f7d89778f7280dc76505348dcc6";
+      sha256 = "1psxdkr35m1x6lpsrn2v482sn9n4pysw1i0j9nr1g7r4nh1058fk";
     };
     dependencies = [];
 
@@ -1071,22 +1094,22 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-07-25";
+    name = "vimtex-2017-11-01";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "1bba731f008a0905c1cf34e185c3f299d1f1759b";
-      sha256 = "0gcsfdc2rrdaylsqz6hn9smchndb4y22f4sm230ljdf1rda6v57v";
+      rev = "b56537a229d74fab815090e8e4b4ae873121e69c";
+      sha256 = "1d94i19bkgqay7n5108majla2bx3nw5s230a2nw761v327bp65wd";
     };
     dependencies = [];
 
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2017-07-14";
+    name = "vim-easymotion-2017-10-20";
     src = fetchgit {
       url = "https://github.com/lokaltog/vim-easymotion";
-      rev = "e4d71c7ba45baf860fdaaf8c06cd9faebdccbd50";
-      sha256 = "16ww4myvgh7is5fbwm67v87bbdyhldvr9d4vqkvnn8v9mbj7p7vd";
+      rev = "342549e7a1e5b07a030803e0e4b6f0415aa51275";
+      sha256 = "1glv4s95v8xxj47n0jzjxd0pxphnnpgzyd384d2bh0ql1xgf320v";
     };
     dependencies = [];
 
@@ -1130,22 +1153,22 @@ rec {
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-highlightedyank-2017-03-25";
+    name = "vim-highlightedyank-2017-10-03";
     src = fetchgit {
       url = "https://github.com/machakann/vim-highlightedyank";
-      rev = "d656e1e62d2b4e1abd66c5f3a13a2be31a5a80ed";
-      sha256 = "0rcd2q8f49iyv93s5g95brml7sng7lr8k9s5m4mxq3y0m9yf68fd";
+      rev = "5fb7d0f2cb9e25397b1a6e1a5345584a6975b724";
+      sha256 = "19jzaiv4iqgqvbwj6r5m6037qfm5nhk6jcwciyfacispdycmpkp7";
     };
     dependencies = [];
 
   };
 
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Jenkinsfile-vim-syntax-2017-05-16";
+    name = "Jenkinsfile-vim-syntax-2017-08-29";
     src = fetchgit {
       url = "https://github.com/martinda/Jenkinsfile-vim-syntax";
-      rev = "d3ad4bc4888740c524bfa2f8b3192cfb23ddec3f";
-      sha256 = "1sw1rwxspa94aak9gq6i1z47cqhkm2nbbj8xlkzbk3c04mqljksf";
+      rev = "e3d2e19ad1c8f79872380901c0392c2671757831";
+      sha256 = "18bfyjsxgqg562n8kkcnyd05pp17ipap7ray9az92fapzhw5q4x9";
     };
     dependencies = [];
 
@@ -1185,11 +1208,11 @@ rec {
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-06-15";
+    name = "vim-startify-2017-11-02";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-startify";
-      rev = "7f910ed4367de96310fedc98d5a12b97173a405f";
-      sha256 = "1l5q8mqqp6gzmxqm5i0lx6lbm181vmkcg8w24ypa77vnid0ihd93";
+      rev = "22ccf5861397dd2365756c24ce1952736632cd8c";
+      sha256 = "1np32vz56hz19hd6zpz154dim2mzw3x1lx1vyhkkyda8rd9w4rmb";
     };
     dependencies = [];
 
@@ -1207,11 +1230,11 @@ rec {
   };
 
   ack-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ack-vim-2017-05-07";
+    name = "ack-vim-2017-11-05";
     src = fetchgit {
       url = "https://github.com/mileszs/ack.vim";
-      rev = "a16a9b63eb85cc0960a7f25c54647ac1f99f3360";
-      sha256 = "09bwawm2csliancl281y6wgalrrmaqq7d0baz4dq1cw18x657mk7";
+      rev = "6e04746a63dd2453601ae36c83d53fe2021a45f4";
+      sha256 = "0453ghmaaqwv6z8a3sncd3jxs9j050sp9ymiw2aqpc1a28kdlrv8";
     };
     dependencies = [];
 
@@ -1276,22 +1299,22 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2017-07-18";
+    name = "haskell-vim-2017-10-16";
     src = fetchgit {
       url = "https://github.com/neovimhaskell/haskell-vim";
-      rev = "21c48768f1c5986d4f2351784b119eb9a5f925db";
-      sha256 = "1dd18plhahkdz782d7y8w8265di2wvs78w2q2hx2m68686abmn0h";
+      rev = "d877d5cd5f2f5747fa835d4b639499187fa4ae9e";
+      sha256 = "16iihz0jy61s5dyzzf5dbvd6ii1zna98pckqkjlpxcqqx636sm5c";
     };
     dependencies = [];
 
   };
 
   cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "cpsm-2017-02-12";
+    name = "cpsm-2017-10-30";
     src = fetchgit {
       url = "https://github.com/nixprime/cpsm";
-      rev = "8e61bf3e30868c57ad7cf1fe4315b2352d61467c";
-      sha256 = "0qcc10dx48wyvcgz9q3nid9l1wxvl9m97608s289lj4zps8iqpcs";
+      rev = "3744240ca48f98eea064f3cbc1a62b3f25f44030";
+      sha256 = "0x5jac7x85bqdh38vggi1fvxjw2z29b2227n471f3cxy8arvylrw";
     };
     dependencies = [];
     buildInputs = [
@@ -1320,11 +1343,11 @@ rec {
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2017-06-23";
+    name = "vim-watchdogs-2017-10-23";
     src = fetchgit {
       url = "https://github.com/osyo-manga/vim-watchdogs";
-      rev = "22a08dcd33223ddbe95c977ca72e77d62d2c75d9";
-      sha256 = "0d3i39cz5kpps2gxlbz2l73bz0rs67lhh6qrpzl3a2p014hixbyi";
+      rev = "4ba5e8f2d456d36ef4e660580245c648a6f106ff";
+      sha256 = "1736m48yp41p2kwn6n0jmkzvxi84mf4llk1zw38n0v8npzcc2lnp";
     };
     dependencies = [];
 
@@ -1353,44 +1376,44 @@ rec {
   };
 
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2017-07-19";
+    name = "vim-racer-2017-10-15";
     src = fetchgit {
       url = "https://github.com/racer-rust/vim-racer";
-      rev = "c729b895885c9ef548ed4f9c1cec7c7c741b5869";
-      sha256 = "1r0idhc7yj5r4h2rfmbb5p0i1yckr3mckif3ijy6sm9rhwi242sw";
+      rev = "da725d38a6f0dd223771018c05e62a33c4a92f09";
+      sha256 = "16m9iw6x6wr26ilm72vwjsm9p346hbjd6md62mqk6ranln8rdirp";
     };
     dependencies = [];
 
   };
 
   purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "purescript-vim-2016-08-31";
+    name = "purescript-vim-2017-10-19";
     src = fetchgit {
       url = "https://github.com/raichoo/purescript-vim";
-      rev = "2c55bcefd63bc40ed2aa9d6ce9d89a590dfa3477";
-      sha256 = "1y96w8p865gd6zr29wpxn1qwsk833y06x1qp586gylgi0jp1ybzv";
+      rev = "ece34d9782a075761f31854a33eccd932eb2cf57";
+      sha256 = "0x6hpibmhgw5aqq25rcpvgz2a60jh7i8x23gigakmmrxv51cjcrj";
     };
     dependencies = [];
 
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2017-07-02";
+    name = "vim-grammarous-2017-08-25";
     src = fetchgit {
       url = "https://github.com/rhysd/vim-grammarous";
-      rev = "d117cd139b58319d8ac94f2fd36ee548b6ea1e88";
-      sha256 = "0a5a65j9a3s54z9asjmfbqsvawx014bq772jqgpsxww53lap3s5x";
+      rev = "51ef5190813c0d9d8aaebd5191f183cff767f805";
+      sha256 = "1mm8hd39q2sl4hi83c4zvrl27a8djr1pv35ch0pivg84ad9p7qq5";
     };
     dependencies = [];
 
   };
 
   vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-puppet-2017-07-02";
+    name = "vim-puppet-2017-08-25";
     src = fetchgit {
       url = "https://github.com/rodjek/vim-puppet";
-      rev = "cb1863af2ba4de9fb1c1d952d82692502348fb92";
-      sha256 = "0a3q6f8jplxbvpjaz9vnh589al64vg567nc00xabp46vcm83nk4x";
+      rev = "0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e3";
+      sha256 = "1jgn9vahyn80zz0wfzx9abamsahh9wrrq1nf9qghljm4si3fq766";
     };
     dependencies = [];
 
@@ -1408,44 +1431,44 @@ rec {
   };
 
   nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nvim-completion-manager-2017-09-05";
+    name = "nvim-completion-manager-2017-10-26";
     src = fetchgit {
       url = "https://github.com/roxma/nvim-completion-manager";
-      rev = "d9db97f7e5a4ab8af905bc00a4501d770368dee4";
-      sha256 = "1aaclyz1ss2iv0lwcxkz8x5x4wivsixmlk5xakwy989q9g9ps2f1";
+      rev = "a56d17bcfc107bed851c9a36f1a6fc8e93c04acd";
+      sha256 = "18zd7sigp93057lw4mx9jfqrp1l31kwhh8df5kfimbyh75xpj469";
     };
     dependencies = [];
 
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2017-07-14";
+    name = "rust-vim-2017-09-20";
     src = fetchgit {
       url = "https://github.com/rust-lang/rust.vim";
-      rev = "5a6133680ecf9e22eeba35c35e62ea6210225b02";
-      sha256 = "0mxzl8lghq7bnwp8qs3haxq83ds5q8s8br0ajn40a3c3ns2hkhla";
+      rev = "b6d88adcf9867aa69f4d20d45d49bb54979842a4";
+      sha256 = "0n0hiqlv3amnzn69wyyq6z3r8zr0gcg86hw6flk7z39cxjhjv3vr";
     };
     dependencies = [];
 
   };
 
   vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-devicons-2017-05-29";
+    name = "vim-devicons-2017-10-13";
     src = fetchgit {
       url = "https://github.com/ryanoasis/vim-devicons";
-      rev = "153266275acc4f4615407a18e90f58780ebaef92";
-      sha256 = "1zjrra0q5c7lmgxzlz7ddd7vi6k2vhz69fdy2s7d873nnmmd7kgn";
+      rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8";
+      sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m";
     };
     dependencies = [];
 
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2017-07-22";
+    name = "neoformat-2017-11-01";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "a0c8e1f3c8b917afd175fc9ed9b2685ce5f952e9";
-      sha256 = "1w2m54ag1g1czfwa8y2vq4p05wysvb1qhgfnbzqvlwb1mn9sh2kf";
+      rev = "0e2cfe93a14639b9e26373593a4a61b30e5e96ff";
+      sha256 = "1nzc8yjpbimbg0sn3cmn4jkb1f91lk0iqg4c38czlzlvbfb2xasq";
     };
     dependencies = [];
 
@@ -1463,66 +1486,66 @@ rec {
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2017-06-12";
+    name = "vim-polyglot-2017-10-27";
     src = fetchgit {
       url = "https://github.com/sheerun/vim-polyglot";
-      rev = "8eab5f5403afc1c33a7593459a27f7ff625fa60b";
-      sha256 = "0q2xfmqk5iad6gv8zzlpcv48xpv7lwr6mswc7mdllzkgaqilz75g";
+      rev = "a61ab44810a0cb78223a179d78eff16d2e0b8bf6";
+      sha256 = "0q3h46blqv963c4m636hr48j9ka1x2qv4naja7q2rr4f2pndhd23";
     };
     dependencies = [];
 
   };
 
   neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-vim-2017-07-23";
+    name = "neco-vim-2017-10-01";
     src = fetchgit {
       url = "https://github.com/shougo/neco-vim";
-      rev = "7c188577ebf65bfb9e27affce8158e0f5af2ec3e";
-      sha256 = "1jb9vw2gkag2fg18vxqj3rc6y4zqgrn0kf6vb5z8kgkbsam0cybk";
+      rev = "f5397c5e800d65a58c56d8f1b1b92686b05f4ca9";
+      sha256 = "0yb7ja6qgrazszk4i01cwjj00j9vd43zs2r11b08iy8n10jnzr73";
     };
     dependencies = [];
 
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2017-07-23";
+    name = "neocomplete-vim-2017-10-22";
     src = fetchgit {
       url = "https://github.com/shougo/neocomplete.vim";
-      rev = "d8caad4fc14fc1be5272bf6ebc12048212d67d2c";
-      sha256 = "1ab1p4w6187r15alb34mnvaq43mikk7ic05ysgilx4f4zz6dgz5y";
+      rev = "46791e7692e07384a089d125c5c536246698d04c";
+      sha256 = "1iqd6fqlkm8bvibsapcvqqmyklzjad2l0c745lppdgdb959v016a";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2017-07-05";
+    name = "neosnippet-snippets-2017-09-26";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet-snippets";
-      rev = "b89c544264912b064c79da2a90fc5d4e69d621b2";
-      sha256 = "1cqgagzxl559mf06kkggdm90g27is0x80qqrrha09ng16hf6qf7a";
+      rev = "8dbb78599984140c50418d3dd23d0de4c8f13e74";
+      sha256 = "1hs4xvr9x03ccrcczhly4qlvr5bfxfvdk3ir4821mlg1gsgclkwh";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-07-15";
+    name = "neosnippet-vim-2017-10-01";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "4bf88a9e497dc7180e9fe58551ad340de0192f39";
-      sha256 = "0mj14cninszfw95zb0rwcmzf40851i49lj6vk8gz4iq9y0hxsnx7";
+      rev = "ddd01d0ee3d965d9a30051f2e12b14234c83b3ae";
+      sha256 = "0475ilqyg0ppk276awvva2iaslm993l364vqcxqrl31x7ir2qa7f";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2017-07-01";
+    name = "unite-vim-2017-10-22";
     src = fetchgit {
       url = "https://github.com/shougo/unite.vim";
-      rev = "ad15f96365b5cb43a45d0ca779df6a497f954f15";
-      sha256 = "0pigwfwyas4zdzrazk08p9bnbmi51np4gb0mf5dy434glw9rrvjz";
+      rev = "c5c69d5d94e61a67d61730d04c82763196f63b10";
+      sha256 = "1zn23x1bx40z0anl42v8ac8dv0c7f29rd1vwdqsmwdrkyxlyi1n1";
     };
     dependencies = [];
 
@@ -1569,11 +1592,11 @@ rec {
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2017-07-23";
+    name = "alchemist-vim-2017-10-31";
     src = fetchgit {
       url = "https://github.com/slashmili/alchemist.vim";
-      rev = "35b0e59b4ae45baeef7fc46b6faf9b96515d35cb";
-      sha256 = "021iwhnjjsfhmpbimm91jgmcrlj1hjh8rxcdqxwcwxc92h73wl58";
+      rev = "15e6439439997a02fddb65fd3db51c1eb62207c0";
+      sha256 = "03hvkj6957hcmlfqpzlddhm675ljqb7ka5r3j95ykl80npmqrnml";
     };
     dependencies = [];
 
@@ -1613,11 +1636,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2017-03-21";
+    name = "vim-quickrun-2017-08-14";
     src = fetchgit {
       url = "https://github.com/thinca/vim-quickrun";
-      rev = "98889e1fc0f7136262c4dd7c312b82879df16486";
-      sha256 = "1drv53fwp24z0yb79lj2nyapyndw1yirg202hg7px9jvxjr4k8a0";
+      rev = "13e60587a503620bd7d0dd1b822c29e18350e461";
+      sha256 = "185pqahvpmag01vzr2xh68vnfz6fybpd3qlpr2qdq8712x11apwi";
     };
     dependencies = [];
 
@@ -1635,11 +1658,11 @@ rec {
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2017-07-12";
+    name = "vim-dispatch-2017-10-10";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "14a1695f844a320dd28a7706710325773d1046a8";
-      sha256 = "1whmqikg5ch523ffs2apkrd4clwl7s0y98gmxgaqq6gm2fa2wmfp";
+      rev = "be7b194f47bdee6baa4460ccd030b860ada548dd";
+      sha256 = "0lxhk6y1lf625i8hnsl44wzh8mfxi2h1hswrmisbmm2dbmyy84hd";
     };
     dependencies = [];
 
@@ -1701,11 +1724,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-07-24";
+    name = "youcompleteme-2017-10-27";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "998303e2fd5e762c3bc2aee8c23af1b388fb459c";
-      sha256 = "158wnxgnjir4n5p1jnpxqq4qwl6hapd9kpdd3gklihxvbj1zqskc";
+      rev = "bade99f5e9c5ba2f848cffb2d1a905e85d3ddb05";
+      sha256 = "0rf9gd4asq9bddhp3c6qvvjcm6zpiadjhvslknkqh1i9aq01kj7a";
     };
     dependencies = [];
     buildPhase = ''
@@ -1727,22 +1750,22 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2017-07-10";
+    name = "vim-airline-themes-2017-10-29";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline-themes";
-      rev = "5d75d76ca2e17edd68f89ac4f547009d477570c6";
-      sha256 = "15vq8fjax69wi447vhirj7vzqxppxcpvq2v8dhi0pf39gbzcd229";
+      rev = "26f67b926553555e505ac60e992c97ab5fdfc83f";
+      sha256 = "0gzhi7l0cwzd66mzkrs6pgbzm9vqkkyhv4cwblywh5dkqqa9q71x";
     };
     dependencies = [];
 
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2017-04-26";
+    name = "vim-pandoc-2017-11-04";
     src = fetchgit {
       url = "https://github.com/vim-pandoc/vim-pandoc";
-      rev = "fc209c66e937172efdd6db39ee64fcb3980ce329";
-      sha256 = "19x8hf78833hcg508sn5a4g79h47ynqzzas998rqr2cmmpsc4mzs";
+      rev = "e9a24376c17817632951088838a3c3bdc1c5da30";
+      sha256 = "17mmvsvdzmx9xqhxiryvv8l67m52bd4xl9lyrg0h9vk8s58cy0ig";
     };
     dependencies = [];
 
@@ -1881,22 +1904,22 @@ rec {
   };
 
   ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ale-2017-07-23";
+    name = "ale-2017-11-05";
     src = fetchgit {
       url = "https://github.com/w0rp/ale";
-      rev = "a0059cfe0362e8ba55bad1f4fa8a310c74b55280";
-      sha256 = "0hjli8ww0i4yxa7gxiyvy9xgc9s8krr7vhdh8036nwwnrzrmcc5h";
+      rev = "fa7d041c26aa6616c13a62274a7fc8458f6096dd";
+      sha256 = "13h4pcahnfm0b5f7zbyfg7w2ailv8id58v59sp7h2qk3cx7zwb9k";
     };
     dependencies = [];
 
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2017-07-03";
+    name = "vim-wakatime-2017-11-05";
     src = fetchgit {
       url = "https://github.com/wakatime/vim-wakatime";
-      rev = "0c5368cf01f4d452a05eb5e5569e6fe78dca2657";
-      sha256 = "025d0gz0fs3jb062jp7js11b8vb20zyxa32llqsjkyy4gr8kv53b";
+      rev = "23e92a5701bad21f3604b3ab129546aef51a9b80";
+      sha256 = "0hmpjrqy1w4qimpfg1l6sj5h9zbyz7lfzs3mjv1d3d2sp413warh";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -1940,22 +1963,22 @@ rec {
   };
 
   nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nim-vim-2016-05-19";
+    name = "nim-vim-2017-10-31";
     src = fetchgit {
       url = "https://github.com/zah/nim.vim";
-      rev = "dcf25798f4a3f75e9538f9915959061edbff97cf";
-      sha256 = "1jaiqkspfz2a4ny130dl0h6x9752flpcwwy0kscrqmlqf5fqiyvm";
+      rev = "ae63bd21211b68d21b176ad5ea0cc4fc8f90eda5";
+      sha256 = "1i5yxddwlcr3d2bzv5g9jz1z2lg7xnd6i038ph02rvllngcfsv00";
     };
     dependencies = [];
 
   };
 
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2017-05-26";
+    name = "deoplete-go-2017-09-08";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-go";
-      rev = "aef73fdf275053a6fb00c3f66d1f18821bc74bd3";
-      sha256 = "1ixav3d78wy9zs9a8hg8yqk812srkbkwsaz17lg5sxjq6azljgvq";
+      rev = "9330737f365bcf430a9481561f24271ea2ab120b";
+      sha256 = "1j8i2ahpwa0v9mjwl45a6bdqdsksyh0fpwpl96jgylq58d2g5gzb";
     };
     dependencies = [];
     buildInputs = [ python3 ];
@@ -1968,11 +1991,22 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2017-07-16";
+    name = "deoplete-jedi-2017-10-24";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-jedi";
-      rev = "56528fd1238bbf2f9363f16710d0936703dc9eab";
-      sha256 = "1kwwbr1w3865rlqs04hpxrqv67a14mzyf85pa29djmryi2156wxb";
+      rev = "436624ce43d1424d4efef42e0990ac5fd19b5029";
+      sha256 = "0phgjf6v90lwcbx2lks461ny6v4x5ypcs2cidg51w2jav2xvlqrq";
+    };
+    dependencies = [];
+
+  };
+
+  zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "zig-vim-2017-10-17";
+    src = fetchgit {
+      url = "https://github.com/zig-lang/zig.vim";
+      rev = "6059db59f61b517f5d65303b61f03324e01fdc2f";
+      sha256 = "0w3pa63s0r6h6w1iqmc444qrsc99xcccwapd6nyh3gb72z228d7z";
     };
     dependencies = [];
 
@@ -1990,11 +2024,11 @@ rec {
   };
 
   gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gruvbox-2016-09-28";
+    name = "gruvbox-2017-10-01";
     src = fetchgit {
       url = "git://github.com/morhetz/gruvbox";
-      rev = "127c9d14d4bac1bac31e328b835a8919a255789c";
-      sha256 = "19wg9143wvlynblpxm0cnk3ars2hgss3y745hligqgvfy308f7sm";
+      rev = "16504d394e145e0372d2491e02769d241350399a";
+      sha256 = "0yhas9lnsn9lfld37lvm5msmmkj6c7d8ajgarazc5rykbl8bw8rg";
     };
     dependencies = [];
 
@@ -2023,11 +2057,11 @@ rec {
   };
 
   pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2017-05-27";
+    name = "pathogen-2017-08-04";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
-      rev = "ddfb1f14d7597e6aedc749be06b559a673c437ab";
-      sha256 = "0fdd88gj75bzq6ifaddz3sl71w8ljnnci9npm04jmyvf048gnjg8";
+      rev = "e7857bed4e0705f91f781dbe99706f07d08d104b";
+      sha256 = "15s08q1chrdywj7fdiwzygxywg4cpcbvk5r1r8zvw6d82kyhadw1";
     };
     dependencies = [];
 
@@ -2067,11 +2101,11 @@ rec {
   };
 
   sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sleuth-2017-07-23";
+    name = "sleuth-2017-10-24";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sleuth";
-      rev = "dfe0a33253c61dd8fac455baea4ec492e6cf0fe3";
-      sha256 = "0576k4l2wbzy9frvv268vdix4k6iz9pw6n6626ifvg8hk6gbc5g9";
+      rev = "d56a4302358359ddf9845252addf637a5e6bd6d5";
+      sha256 = "1klp2lqsql90v156kih0mnm0j957pc4r0zy5y6srww2q3wkkjgr2";
     };
     dependencies = [];
 
@@ -2111,11 +2145,11 @@ rec {
   };
 
   table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2017-04-20";
+    name = "table-mode-2017-10-26";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "4e41af8e5f0bf53326d1b83c2feb1eff89fe90d4";
-      sha256 = "0l83j3963lzkmn54vcagkwm2rhk96cl9v42l5r7zcgjign28cfzw";
+      rev = "40fe641708c58476c3a1b9aeafb68dd888d4920b";
+      sha256 = "1rb2jq81965gpziqxlljr2bqjyfbikqa9ncxaaak3x61prn4z084";
     };
     dependencies = [];
 
@@ -2143,33 +2177,33 @@ rec {
   };
 
   tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2017-05-20";
+    name = "tlib-2017-08-13";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "6f9d75b54478bcaab722d33cbec69d8a1fe49f32";
-      sha256 = "1mh2m3c9xi7g650s06qxfpz57g493n0qjq35inad9y62yb1gsidm";
+      rev = "c96db6151fde9d06a8fed71b7df05c6dbb3f14fe";
+      sha256 = "1dhvf1v2mkmq8aifwq57ylm7nnk3zz3hna33q2gj6p7v70vay7v8";
     };
     dependencies = [];
 
   };
 
   undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "undotree-2017-03-24";
+    name = "undotree-2017-10-26";
     src = fetchgit {
       url = "git://github.com/mbbill/undotree";
-      rev = "ad08a88df70c1865b8c9ef6eeac5cdb051d2a18a";
-      sha256 = "1i1sss8vzsym44amq19rfy95wm7143ks5h9imm7z7rah7xkcqv9l";
+      rev = "cdbb9022b8972d3e156b8d60af33bf795625b058";
+      sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253";
     };
     dependencies = [];
 
   };
 
   vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-actions-2014-09-22";
+    name = "vim-addon-actions-2017-09-23";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-actions";
-      rev = "a5d20500fb8812958540cf17862bd73e7af64936";
-      sha256 = "1wfkwr89sn2w97i94d0dqylcg9mr6pirjadi0a4l492nfnsh99bc";
+      rev = "7f48bea57fd9dfb06498422bc1cbe9f7553efa6e";
+      sha256 = "0q9w2x49zd3a43cm4ikgpwrqiz0k9a6pss0zrvskaxhh6mifpxpg";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -2286,11 +2320,11 @@ rec {
   };
 
   vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-nix-2015-03-10";
+    name = "vim-addon-nix-2017-09-11";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-nix";
-      rev = "2aed79ba5d8c5e6abd102de77e55e242f61b17f1";
-      sha256 = "0zx1q9994py6jmm0qbbx6fc1dy5la8zfskkbvqqxssxrl5dx7vvi";
+      rev = "3001a9db5f816dd7af11384f15415bddd146ef86";
+      sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy";
     };
     dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"];
 
@@ -2374,11 +2408,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2017-07-21";
+    name = "vim-airline-2017-11-06";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "72e5f04f7c422e21cb6f6856c4e94cef25ea2288";
-      sha256 = "0pkdlmil0lqwwi7anzn7r1zxxqbip9zy1pbwri031yksff6v2096";
+      rev = "396cc9226171f8dbf1069800a0ae56700bbf3913";
+      sha256 = "1km9cvvrip5z8xzaa1r83n7w0kdw21zrxax27qmvnhlnq74s24zb";
     };
     dependencies = [];
 
@@ -2418,11 +2452,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2017-06-08";
+    name = "vim-gitgutter-2017-11-01";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "dcac1f74ee5c26125363dca164463bde6657c838";
-      sha256 = "0knkdv0sbdwf4p82g438l7pylwzxfbxcj44np3v15wr97w95wmlv";
+      rev = "1e60667322b7cd1bfcba98762fbba746a888d21a";
+      sha256 = "1g9giir7gmkp6n6w4z20qm2dyq00w2a8f573c0b8b27cj36ri0wq";
     };
     dependencies = [];
 
@@ -2440,88 +2474,66 @@ rec {
   };
 
   vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-latex-live-preview-2017-07-19";
+    name = "vim-latex-live-preview-2017-09-22";
     src = fetchgit {
       url = "git://github.com/xuhdev/vim-latex-live-preview";
-      rev = "172b03cd0677f1fe55abeab86fa4a4c484e4c3b5";
-      sha256 = "1wgnq1kbx80xqwm9rx3z4i9fldj965046s4hh62rdi5585hh6aps";
+      rev = "63abf0f2361e332597a5278b2dbd0fef980ebdb2";
+      sha256 = "0pk2nx04bl8ym77mlylb6q5n3vz0y96jzs72gydjiffp1nm062l9";
     };
     dependencies = [];
 
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2017-06-02";
+    name = "vim-multiple-cursors-2017-08-04";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "3afc475cc64479a406ce73d3333df1f67db3c73f";
-      sha256 = "04dijb4hgidypppphcy83bacmfrd9ikyjc761hqq6bl4kc49f5kc";
+      rev = "a97dab5bc440bf0a7b62bb2de4479963a888f4ff";
+      sha256 = "1ac5l5h138ns9z9ni4qbcykkg9yfpjjalk0g9wrra4rp0nlakaqk";
     };
     dependencies = [];
 
   };
 
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2017-06-20";
+    name = "vim-signature-2017-09-24";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "c6decc68d644a66a34345ea09677469d6e482e1f";
-      sha256 = "1iflyvskimq74hzb6l8mzjv3rh0i15bw9jv5x6arns86q3201l23";
+      rev = "eaa8af20ac4d46f911a083298d7a19e27be180e0";
+      sha256 = "1vha52bmbs88lnwjfvkbx2jb74k8gqjky0c9gv8gqy74lypcdas5";
     };
     dependencies = [];
 
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2017-07-19";
+    name = "vim-signify-2017-08-19";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "748cb0ddab1b7e64bb81165c733a7b752b3d36e4";
-      sha256 = "0kc4nbf3a7ab0an4r1j37bvzjarr4135qqhkz348r7zdhmqkyyfm";
+      rev = "1a8a15d835d8f2da56cd793a0222227af6c89839";
+      sha256 = "13yvwy2vw64g4v08k83svhp26nmmir0qd21wpp89qclbzwb2q2k2";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2017-07-07";
+    name = "vim-snippets-2017-11-02";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "0817950a4fb8ccd48ec38a2b65cf046b597eecb3";
-      sha256 = "0hxd96zl5gjkx5d381yzyrbahwbz3r9dljzn2cxbdbjsb7im6aks";
+      rev = "a7670a7b71e44fd93e0b97fe2c24739a20732f94";
+      sha256 = "0bm4475x723bk9q6snl5d804pn3vvsk0p9bvgil6c0q24ams6abh";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2017-05-29";
+    name = "vim-webdevicons-2017-10-13";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "153266275acc4f4615407a18e90f58780ebaef92";
-      sha256 = "1zjrra0q5c7lmgxzlz7ddd7vi6k2vhz69fdy2s7d873nnmmd7kgn";
-    };
-    dependencies = [];
-
-  };
-
-  vim-docbk = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-docbk-2015-04-01";
-    src = fetchgit {
-      url = "https://github.com/jhradilek/vim-docbk";
-      rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e";
-      sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d";
-    };
-    dependencies = [];
-
-  };
-
-  vim-docbk-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-docbk-snippets-2017-11-02";
-    src = fetchgit {
-      url = "https://github.com/jhradilek/vim-snippets";
-      rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
-      sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc";
+      rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8";
+      sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m";
     };
     dependencies = [];
 
@@ -2539,11 +2551,11 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2017-07-15";
+    name = "vimwiki-2017-11-04";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "976cbbcd23dcd19ddb5dc5544645da8a51dbdfe6";
-      sha256 = "1mna3qavwj1jcjnvmw8hngrfccpk5krj2z0v2grp97i9m2kmkifx";
+      rev = "7c2ae8a714a71956297cb291dbaefb6a0ce47da3";
+      sha256 = "1sis3g7v5ck9gan3x6i64kdfmn6r40zvxp2jyw0qxaha1kfb1qa1";
     };
     dependencies = [];
 
@@ -2570,15 +2582,4 @@ rec {
     dependencies = [];
 
   };
-
-  zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zig-vim-2017-10-17";
-    src = fetchgit {
-      url = "https://github.com/zig-lang/zig.vim";
-      rev = "6059db59f61b517f5d65303b61f03324e01fdc2f";
-      sha256 = "0w3pa63s0r6h6w1iqmc444qrsc99xcccwapd6nyh3gb72z228d7z";
-    };
-    dependencies = [];
-
-  };
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b2273221e90..dd5cc1ba100 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -72,7 +72,6 @@
 "github:jeetsukumaran/vim-buffergator"
 "github:jgdavey/tslime.vim"
 "github:jhradilek/vim-docbk"
-"github:jhradilek/vim-snippets"
 "github:jiangmiao/auto-pairs"
 "github:jistr/vim-nerdtree-tabs"
 "github:jnurmine/zenburn"
-- 
GitLab


From 2c50340575a4b91bd983894d294e5619ae4aee96 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Mon, 6 Nov 2017 14:47:33 +0100
Subject: [PATCH 822/877] elm-format: 0.5.2 -> 0.7.0

---
 .../compilers/elm/packages/elm-format.nix     | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix
index a9340fc94fe..56db835ac10 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -1,37 +1,40 @@
-{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary
-, bytestring, containers, directory, edit-distance, fetchgit
-, filemanip, filepath, HUnit, indents, mtl, optparse-applicative
-, parsec, pretty, process, QuickCheck, quickcheck-io
-, regex-applicative, split, stdenv, tasty, tasty-golden
-, tasty-hunit, tasty-quickcheck, text, union-find, wl-pprint
+{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary
+, bytestring, Cabal, cmark, containers, directory, fetchgit
+, filepath, free, HUnit, indents, json, mtl, optparse-applicative
+, parsec, process, QuickCheck, quickcheck-io, split, stdenv, tasty
+, tasty-golden, tasty-hunit, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "elm-format";
-  version = "0.5.2";
+  version = "0.7.0";
   src = fetchgit {
     url = "http://github.com/avh4/elm-format";
-    sha256 = "0lman7h6wr75y90javcc4y1scvwgv125gqqaqvfrd5xrfmm43gg8";
-    rev = "e452ed9342620e7bb0bc822983b96411d57143ef";
+    sha256 = "1snl2lrrzdwgzi68agi3sdw84aslj04pzzxpm1mam9ic6dzhn3jf";
+    rev = "da4b415c6a2b7e77b7d9f00beca3e45230e603fb";
   };
-  isLibrary = false;
+
+  doHaddock = false;
+  isLibrary = true;
   isExecutable = true;
-  executableHaskellDepends = [
-    aeson ansi-terminal ansi-wl-pprint base binary bytestring
-    containers directory edit-distance filemanip filepath indents mtl
-    optparse-applicative parsec pretty process regex-applicative split
-    text
+  setupHaskellDepends = [ base Cabal directory filepath process ];
+  libraryHaskellDepends = [
+    ansi-terminal ansi-wl-pprint base binary bytestring containers
+    directory filepath free indents json mtl optparse-applicative
+    parsec process split text
   ];
+  executableHaskellDepends = [ base ];
   testHaskellDepends = [
-    aeson ansi-terminal ansi-wl-pprint base binary bytestring
-    containers directory edit-distance filemanip filepath HUnit indents
-    mtl optparse-applicative parsec pretty process QuickCheck
-    quickcheck-io regex-applicative split tasty tasty-golden
-    tasty-hunit tasty-quickcheck text union-find wl-pprint
+    base cmark containers HUnit mtl parsec QuickCheck quickcheck-io
+    split tasty tasty-golden tasty-hunit tasty-quickcheck text
   ];
   jailbreak = true;
   postInstall = ''
     ln -s $out/bin/elm-format-0.18 $out/bin/elm-format
   '';
+  postPatch = ''
+    sed -i "s|desc <-.*||" ./Setup.hs
+    sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"da4b415c\\\\\"\"|" ./Setup.hs
+  '';
   homepage = http://elm-lang.org;
   description = "A source code formatter for Elm";
   license = stdenv.lib.licenses.bsd3;
-- 
GitLab


From 294bb6daeae973ab087aa54b7811caa1d1ed68ac Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Mon, 6 Nov 2017 13:55:56 +0100
Subject: [PATCH 823/877] nixos/tests/gitlab.nix: Unbreak config, still times
 out

---
 nixos/tests/gitlab.nix | 54 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 35791104696..7268636b62a 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -9,9 +9,57 @@ import ./make-test.nix ({ pkgs, ...} : {
   nodes = {
     gitlab = { config, pkgs, ... }: {
       virtualisation.memorySize = 768;
-      services.gitlab.enable = true;
-      services.gitlab.databasePassword = "gitlab";
+
+      services.nginx = {
+        enable = true;
+        virtualHosts = {
+          "localhost" = {
+            locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
+          };
+        };
+      };
+
       systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min";
+      services.gitlab = {
+        enable = true;
+        databasePassword = "dbPassword";
+        secrets = {
+          secret = "secret";
+          otp = "otpsecret";
+          db = "dbsecret";
+
+          # nix-shell -p openssl --run "openssl genrsa 2048"
+          jws = ''
+            -----BEGIN RSA PRIVATE KEY-----
+            MIIEpAIBAAKCAQEA13/qEio76OWUtWO0WIz9lWnsTWOU8Esv4sQHDq9PCEFsLt21
+            PAXrlWhLjjWcxGfsrDwnh7YErGHYL62BMSxMdFJolaknlQK/O/V8UETDe45VoHM+
+            Znk270RfUcfYFgiihnXUZXVmL0om9TsQSk646wCcjCY9LxtxUyKNhvT7KjgYw2aX
+            z34aw7M+Js3T2p1TjZPSC82GtmtKkJEKFMi5EjprLTDE7EdcUzr9Xuw+kQ+gRm9k
+            7FE+JQqSoprwE3Q0v2OAn3UhLMgg0gNFRnsc5l6IAshDzV+H22RPqKKlJjVjjfPY
+            0TQSvYLVApigHbDPH0BoCXfjFfQazbbP3OUHrwIDAQABAoIBAQCMU+tkcMQaYIV5
+            qLdjgkwO467QpivyXcOM8wF1eosIYTHFQvIlZ+WEoSmyLQ8shlADyBgls01Pw1c3
+            lNAv6RzQEmmwKzpvOh61OKH+0whIiOMRXHoh2IUBQZCgfHYlwvGyhUAN4WjtGmhM
+            AG4XNTQNM5S9Xpkw97nP3Qwz+YskbbkrfqtCEVy9ro+4nhbjqPsuO3adbnkva4zR
+            cyurRhrHgHU6LPjn5NHnHH4qw2faY2oAsL8pmpkTbO5IqWDvOcbjNfjVPgVoq26O
+            bbaa1qs4nmc80qQgMjRPJef535xyf3eLsSlDvpf6O8sPrJzVR1zaqEqixpQCZDac
+            +kRiSBrhAoGBAOwHiq0PuyJh6VzBu7ybqX6+gF/wA4Jkwzx6mbfaBgurvU1aospp
+            kisIonAkxSbxllZMnjbkShZEdATYKeT9o5NEhnU4YnHfc5bJZbiWOZAzYGLcY7g8
+            vDQ31pBItyY4pFgPbSpNlbUvUsoPVJ45RasRADDTNCzMzdjFQQXst2V9AoGBAOm7
+            sSpzYfFPLEAhieAkuhtbsX58Boo46djiKVfzGftfp6F9aHTOfzGORU5jrZ16mSbS
+            qkkC6BEFrATX2051dzzXC89fWoJYALrsffE5I3KlKXsCAWSnCP1MMxOfH+Ls61Mr
+            7pK/LKfvJt53mUH4jIdbmmFUDwbg18oBEH+x9PmbAoGAS/+JqXu9N67rIxDGUE6W
+            3tacI0f2+U9Uhe67/DTZaXyc8YFTlXU0uWKIWy+bw5RaYeM9tlL/f/f+m2i25KK+
+            vrZ7zNag7CWU5GJovGyykDnauTpZaYM03mN0VPT08/uc/zXIYqyknbhlIeaZynCK
+            fDB3LUF0NVCknz20WCIGU0kCgYEAkxY0ZXx61Dp4pFr2wwEZxQGs7uXpz64FKyEX
+            12r6nMATY4Lh6y/Px0W6w5vis8lk+5Ny6cNUevHQ0LNuJS+yu6ywl+1vrbrnqroM
+            f3LvpcPeGLSoX8jl1VDQi7aFgG6LoKly1xJLbdsH4NPutB9PgBbbTghx9GgmI88L
+            rPA2M6UCgYBOmkYJocNgxg6B1/n4Tb9fN1Q/XuJrFDE6NxVUoke+IIyMPRH7FC3m
+            VMYzu+b7zTVJjaBb1cmJemxl/xajziWDofJYPefhdbOVU7HXtmJFY0IG3pVxU1zW
+            3bmDj5QAtCUDpuuNa6GEIT0YR4+D/V7o3DmlZ0tVIwKJmVJoQ2f5dw==
+            -----END RSA PRIVATE KEY-----
+          '';
+        };
+      };
     };
   };
 
@@ -19,6 +67,6 @@ import ./make-test.nix ({ pkgs, ...} : {
     $gitlab->start();
     $gitlab->waitForUnit("gitlab.service");
     $gitlab->waitForUnit("gitlab-sidekiq.service");
-    $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in");
+    $gitlab->waitUntilSucceeds("curl http://localhost:80/users/sign_in");
   '';
 })
-- 
GitLab


From b0d193f596d055b69435ece4b3cea0fb3d06dde5 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 1 Nov 2017 09:36:56 +0300
Subject: [PATCH 824/877] SDL2: wayland support

---
 pkgs/development/libraries/SDL2/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 3216a130f67..d2ffa45626b 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -2,6 +2,7 @@
 , openglSupport ? false, mesa_noglu
 , alsaSupport ? true, alsaLib
 , x11Support ? true, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
+, waylandSupport ? true, wayland, wayland-protocols, libxkbcommon
 , dbusSupport ? false, dbus
 , udevSupport ? false, udev
 , ibusSupport ? false, ibus
@@ -17,7 +18,7 @@ assert openglSupport -> (stdenv.isDarwin || mesa_noglu != null && x11Support);
 
 let
   configureFlagsFun = attrs: [
-      "--disable-oss" "--disable-x11-shared"
+      "--disable-oss" "--disable-x11-shared" "--disable-wayland-shared"
       "--disable-pulseaudio-shared" "--disable-alsa-shared"
     ] ++ lib.optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"
       ++ lib.optional (!x11Support) "--without-x";
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
 
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
   propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++
+    lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++
     lib.optional pulseaudioSupport libpulseaudio;
 
   buildInputs = [ audiofile ] ++
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d35b429f2a..acff92fc86c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10579,6 +10579,7 @@ with pkgs;
     openglSupport = mesaSupported;
     alsaSupport = stdenv.isLinux;
     x11Support = !stdenv.isCygwin;
+    waylandSupport = stdenv.isLinux;
     udevSupport = stdenv.isLinux;
     pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
     inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
-- 
GitLab


From cac4cb401c2f3190fb8ddae27fcb5a9c9fc9da8a Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Mon, 6 Nov 2017 14:15:43 +0000
Subject: [PATCH 825/877] debootstrap: 1.0.87 -> 1.0.92

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

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index e70efe6c4f1..a65862a7845 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,13 +4,13 @@
 # There is also cdebootstrap now. Is that easier to maintain?
 stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.87";
+  version = "1.0.92";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "1amk3wghx4f7zfp7d8r0hgqn5gvph50qa6nvh32q2j8aihdr7374";
+    sha256 = "06gp6ivmfh0ks4mibx1mz0pwzjyxqas319s741pp9b3k091jkip1";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];
-- 
GitLab


From 217257c835ebda5ff189108adddeb72fc82a58da Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Mon, 6 Nov 2017 14:40:12 +0000
Subject: [PATCH 826/877] dfeet: 0.3.11 -> 0.3.12

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

diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index bd08c6c4c05..14a52f4e08a 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -2,7 +2,7 @@
 , pythonPackages, makeWrapper, gnome3, libwnck3 }:
 
 let
-  version = "${major}.11";
+  version = "${major}.12";
   major = "0.3";
 in pythonPackages.buildPythonApplication rec {
   name = "d-feet-${version}";
@@ -10,7 +10,7 @@ in pythonPackages.buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
-    sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2";
+    sha256 = "054hl56rii9ff7rzl42h7993ywjbxmhlcd7bk8fi1c2bx98c6s68";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 6c3bae563e9e046e4d6d4a89cac10d5a0be34e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 6 Nov 2017 17:05:33 +0100
Subject: [PATCH 827/877] icu: fix build with glibc-2.26

---
 pkgs/development/libraries/icu/base.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index 78e0c574044..b12e76a90a9 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -25,6 +25,9 @@ stdenv.mkDerivation {
     echo Source root reset to ''${sourceRoot}
   '';
 
+  # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
+  postPatch = "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'";
+
   inherit patchFlags patches;
 
   preConfigure = ''
-- 
GitLab


From 40b347f2051b158e4d077eb95eff02df8a65524f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 6 Nov 2017 17:52:08 +0100
Subject: [PATCH 828/877] i3lock-color: limit to i686 and x86-64 platforms

Compilation fails for other CPU architectures due to requiring the
SSE2 instruction set. See [1] for upstream issue.

[1]: https://github.com/chrjguill/i3lock-color/issues/44
---
 pkgs/applications/window-managers/i3/lock-color.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index fd47a104326..a589e21be98 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
     homepage = https://i3wm.org/i3lock/;
     maintainers = with maintainers; [ garbas malyn ];
     license = licenses.bsd3;
-    platforms = platforms.all;
+
+    # Needs the SSE2 instruction set. See upstream issue
+    # https://github.com/chrjguill/i3lock-color/issues/44
+    platforms = platforms.i686 ++ platforms.x86_64;
   };
 }
-- 
GitLab


From 05b90907a7b134ab8e4c51dce87fff2c4ac3a85a Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Mon, 6 Nov 2017 18:18:19 +0100
Subject: [PATCH 829/877] openra: Add python to bin PATH, fixing launcher

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

diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
index fb01346d84e..5665dfc9e94 100644
--- a/pkgs/games/openra/default.nix
+++ b/pkgs/games/openra/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, mono, makeWrapper, lua
 , SDL2, freetype, openal, systemd, pkgconfig,
-  dotnetPackages, gnome3, curl, unzip, which
+  dotnetPackages, gnome3, curl, unzip, which, python
 }:
 
 stdenv.mkDerivation rec {
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   postInstall = with stdenv.lib; let
     runtime = makeLibraryPath [ SDL2 freetype openal systemd lua ];
-    binaries= makeBinPath [ which mono gnome3.zenity ];
+    binaries= makeBinPath [ which mono gnome3.zenity python ];
   in ''
     wrapProgram $out/lib/openra/launch-game.sh \
       --prefix PATH : "${binaries}" \
-- 
GitLab


From 6949cfa58edacf1e9fb83f69ba60aae18a3c851c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 6 Nov 2017 19:07:36 +0100
Subject: [PATCH 830/877] nix-zsh-completions: 0.3.1 -> 0.3.2

Adds support for nix1.12 and various improvements.
---
 lib/maintainers.nix                         | 1 +
 pkgs/shells/nix-zsh-completions/default.nix | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 45f7f8f51d1..514709082fc 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -265,6 +265,7 @@
   hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
   hce = "Hans-Christian Esperer <hc@hcesperer.org>";
   hectorj = "Hector Jusforgues <hector.jusforgues+nixos@gmail.com>";
+  hedning = "Tor Hedin Brønner <torhedinbronner@gmail.com>";
   heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>";
   henrytill = "Henry Till <henrytill@gmail.com>";
   hhm = "hhm <heehooman+nixpkgs@gmail.com>";
diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix
index eaae85990b2..af055266293 100644
--- a/pkgs/shells/nix-zsh-completions/default.nix
+++ b/pkgs/shells/nix-zsh-completions/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 let
-  version = "0.3.1";
+  version = "0.3.2";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "spwhitt";
     repo = "nix-zsh-completions";
     rev = "${version}";
-    sha256 = "1sbc52f5818bcygljrji84dyvgw727x50m9v6qfrsdaji3zkqga1";
+    sha256 = "0i306k50g07n9smy68npma1k90sv173zy12jdi8wm7h1sj53m5rv";
   };
 
   installPhase = ''
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     description = "ZSH completions for Nix, NixOS, and NixOps";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb ];
+    maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb stdenv.lib.maintainers.hedning ];
   };
 }
-- 
GitLab


From 6535f0bca658d772efffbfe04ba5f9e625a9b31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 6 Nov 2017 19:20:21 +0100
Subject: [PATCH 831/877] flex: fix with glibc-2.26

It caused segfaults, e.g. when building doxygen.
---
 pkgs/development/tools/parsing/flex/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index 92fba47b756..354126b5457 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, bison, m4 }:
+{ stdenv, fetchurl, bison, m4
+, fetchpatch, autoreconfHook, help2man
+}:
 
 stdenv.mkDerivation rec {
   name = "flex-${version}";
@@ -9,6 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8";
   };
 
+  patches = [(fetchpatch {
+    name = "glibc-2.26.patch";
+    url = "https://raw.githubusercontent.com/lede-project/source/0fb14a2b1ab2f82c"
+        + "/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch";
+    sha256 = "1aarhcmz7mfrgh15pkj6f7ikxa2m0mllw1i1vscsf1kw5d05lw6f";
+  })];
+  nativeBuildInputs = [ autoreconfHook help2man ];
+
   buildInputs = [ bison ];
 
   propagatedBuildInputs = [ m4 ];
-- 
GitLab


From 880a636ef4e18d10abdf50f3485b5624ff0d4299 Mon Sep 17 00:00:00 2001
From: James Edington <jedingto@peraton.com>
Date: Mon, 6 Nov 2017 12:22:17 -0600
Subject: [PATCH 832/877] palemoon: 27.5.0 -> 27.6.0

Version bump because apparently Moonchild published 27.6.0_Release
---
 pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index d5e6e47e928..e24c21b535b 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   name = "palemoon-${version}";
-  version = "27.5.0";
+  version = "27.6.0";
 
   src = fetchFromGitHub {
     name   = "palemoon-src";
     owner  = "MoonchildProductions";
     repo   = "Pale-Moon";
     rev    = version + "_Release";
-    sha256 = "0m4fgwxn6hs8r240i6acaajx76cvqy1b7cqmdsxd33qpjrrj1h9d";
+    sha256 = "1v5rbam93fcc7c1l69clr9chi2l0zv0dhjq12v535n8vv9lhahhl";
   };
 
   desktopItem = makeDesktopItem {
-- 
GitLab


From 3562c2cfa721576a38a9c6783d551015c3242613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 6 Nov 2017 19:25:14 +0100
Subject: [PATCH 833/877] flex: add notes about the glibc-2.26 patch

---
 pkgs/development/tools/parsing/flex/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index 354126b5457..4ea11a622ea 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8";
   };
 
+  # Also upstream, will be part of 2.6.5
+  # https://github.com/westes/flex/commit/24fd0551333e
   patches = [(fetchpatch {
     name = "glibc-2.26.patch";
     url = "https://raw.githubusercontent.com/lede-project/source/0fb14a2b1ab2f82c"
-- 
GitLab


From 967ecb802ea4f07c50514d1642f4fa83a1dc6327 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 5 Nov 2017 19:20:46 +0200
Subject: [PATCH 834/877] raspberrypifw: 1.20170811 -> 1.20171029

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

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index bb714f60c2d..c71f1c0ea2e 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-firmware-${version}";
-  version = "1.20170811";
+  version = "1.20171029";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "1lrbbslpwjgvrn7hk3l104gkl07qxh7qd4cdyqccqhqzip9wqhkn";
+    sha256 = "12aisha8rlr28310hakps04z9p45kd2wvks0w1vxw1kwfh1ncy9s";
   };
 
   dontStrip = true;    # Stripping breaks some of the binaries
-- 
GitLab


From bf585f288100b5cf08499f3053b811581b0fa1a6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 5 Nov 2017 19:28:00 +0200
Subject: [PATCH 835/877] linux_rpi: 1.20170811 -> 1.20171029

---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 2d8a3f0afcd..fb97aa579df 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  modDirVersion = "4.9.41";
-  tag = "1.20170811";
+  modDirVersion = "4.9.59";
+  tag = "1.20171029";
 in
 stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
   version = "${modDirVersion}-${tag}";
@@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
     owner = "raspberrypi";
     repo = "linux";
     rev = "raspberrypi-kernel_${tag}-1";
-    sha256 = "1ly0x7a43zvig0fv7lc6rpq49pcdb7i9sdb78p4gi5485zap40kb";
+    sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk";
   };
 
   features = {
-- 
GitLab


From 1ac1581253579ee49e469752ec0c0172c6cced7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 6 Nov 2017 20:18:15 +0100
Subject: [PATCH 836/877] libselinux: fix missing include after glibc-2.26

---
 pkgs/os-specific/linux/libselinux/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index f20efcb3237..541ead7258f 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
 
   postPatch = optionalString enablePython ''
     sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile
+  ''
+  + ''
+    sed '1i#include <sys/uio.h>' -i src/setrans_client.c
   '';
 
   preBuild = ''
-- 
GitLab


From f35f995fff3cf6d0436b1f3d94259769a1e3a266 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 6 Nov 2017 19:22:38 +0000
Subject: [PATCH 837/877] dns-root-data: 2017-08-29 -> 2017-10-24

---
 pkgs/data/misc/dns-root-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix
index dade4be1aaf..88b608c7815 100644
--- a/pkgs/data/misc/dns-root-data/default.nix
+++ b/pkgs/data/misc/dns-root-data/default.nix
@@ -4,7 +4,7 @@ let
 
   rootHints = fetchurl {
     url = "https://www.internic.net/domain/named.root";
-    sha256 = "01n4bqf95kbvig1hahqzmmdkpn4v7mzfc1p944gq922i5j3fjr92";
+    sha256 = "0vdrff4l8s8grif52dnh091s8qydhh88k25zqd9rj66sf1qwcwxl";
   };
 
   rootKey = ./root.key;
@@ -13,7 +13,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "dns-root-data-2017-08-29";
+  name = "dns-root-data-2017-10-24";
 
   buildCommand = ''
     mkdir $out
-- 
GitLab


From f47e13866d8fe80aef8d1d367cac6d478dece6ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 6 Nov 2017 20:33:36 +0100
Subject: [PATCH 838/877] libtirpc: fix missing include after glibc-2.26

---
 pkgs/development/libraries/ti-rpc/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index d66b5d82ff5..0d6674cce81 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j";
   };
 
+  postPatch = ''
+    sed '1i#include <stdint.h>' -i src/xdr_sizeof.c
+  '';
+
   nativeBuildInputs = [ autoreconfHook ];
   propagatedBuildInputs = [ libkrb5 ];
 
-- 
GitLab


From 2aa4517d4fd8ff50a3f9f9a5a9631b4618eb6f37 Mon Sep 17 00:00:00 2001
From: Servilio Afre Puentes <afrepues@sharcnet.ca>
Date: Mon, 6 Nov 2017 13:13:35 -0500
Subject: [PATCH 839/877] gitaly: 0.38.0 -> 0.43.1

---
 .../version-management/gitaly/Gemfile         |   4 +
 .../version-management/gitaly/Gemfile.lock    |  26 +++++
 .../version-management/gitaly/default.nix     |   4 +-
 .../version-management/gitaly/gemset.nix      | 102 ++++++++++++++++++
 4 files changed, 134 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index 88b7120d6f9..7e8f9f2b255 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -3,3 +3,7 @@ source 'https://rubygems.org'
 gem 'github-linguist', '~> 4.7.0', require: 'linguist'
 gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly'
 gem 'activesupport'
+
+group :development, :test do
+  gem 'gitlab-styles', '~> 2.0.0', require: false
+end
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index 68433fc6878..5ea14855b97 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -8,6 +8,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
+    ast (2.3.0)
     charlock_holmes (0.7.5)
     concurrent-ruby (1.0.5)
     escape_utils (1.1.1)
@@ -21,6 +22,10 @@ GEM
       escape_utils (~> 1.1.0)
       mime-types (>= 1.19)
       rugged (>= 0.23.0b)
+    gitlab-styles (2.0.0)
+      rubocop (~> 0.49)
+      rubocop-gitlab-security (~> 0.1.0)
+      rubocop-rspec (~> 1.15)
     google-protobuf (3.4.0.2)
     googleauth (0.5.3)
       faraday (~> 0.12)
@@ -47,7 +52,26 @@ GEM
     multi_json (1.12.1)
     multipart-post (2.0.0)
     os (0.9.6)
+    parallel (1.12.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
     public_suffix (2.0.5)
+    rainbow (2.2.2)
+      rake
+    rake (12.1.0)
+    rubocop (0.50.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-gitlab-security (0.1.0)
+      rubocop (>= 0.47.1)
+    rubocop-rspec (1.17.0)
+      rubocop (>= 0.50.0)
+    ruby-progressbar (1.8.3)
     rugged (0.26.0)
     signet (0.7.3)
       addressable (~> 2.3)
@@ -57,6 +81,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unicode-display_width (1.3.0)
 
 PLATFORMS
   ruby
@@ -65,6 +90,7 @@ DEPENDENCIES
   activesupport
   gitaly-proto (~> 0.37.0)
   github-linguist (~> 4.7.0)
+  gitlab-styles (~> 2.0.0)
 
 BUNDLED WITH
    1.15.4
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index ba8831d370c..63e5758107f 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
     gemdir = ./.;
   };
 in buildGoPackage rec {
-  version = "0.38.0";
+  version = "0.43.1";
   name = "gitaly-${version}";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "02s5gjxbjvm990n4h5zkyqj71a9mp4yj83hfl8mma0g7gx00icsf";
+    sha256 = "19ggfc5nwv8q1wq739ab8qdfdngpi33431dgfa9593p6ad7v6hyq";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix
index 6dc3eb59666..57480f3f337 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -17,6 +17,14 @@
     };
     version = "2.5.1";
   };
+  ast = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
   charlock_holmes = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -68,6 +76,15 @@
     };
     version = "4.7.6";
   };
+  gitlab-styles = {
+    dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k8xrkjx8rcny8p0gsp18wskvn1qbw4rfgdp1f6x0p4xp6dlhjf4";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
   google-protobuf = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -184,6 +201,31 @@
     };
     version = "0.9.6";
   };
+  parallel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd";
+      type = "gem";
+    };
+    version = "1.12.0";
+  };
+  parser = {
+    dependencies = ["ast"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq";
+      type = "gem";
+    };
+    version = "2.4.0.0";
+  };
+  powerpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
   public_suffix = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -192,6 +234,58 @@
     };
     version = "2.0.5";
   };
+  rainbow = {
+    dependencies = ["rake"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w";
+      type = "gem";
+    };
+    version = "2.2.2";
+  };
+  rake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw";
+      type = "gem";
+    };
+    version = "12.1.0";
+  };
+  rubocop = {
+    dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hpd7zcv4y9y750wj630abvmcjwv39dsrj1fjff60ik7gfri0xlz";
+      type = "gem";
+    };
+    version = "0.50.0";
+  };
+  rubocop-gitlab-security = {
+    dependencies = ["rubocop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  rubocop-rspec = {
+    dependencies = ["rubocop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hf48ng67yswvshmv4cyysj1rs1z3fnvlycr50jdcgwlynpyxkhs";
+      type = "gem";
+    };
+    version = "1.17.0";
+  };
+  ruby-progressbar = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "029kv0q3kfq53rjyak4ypn7196l8z4hflfmv4p5787n78z7baiqf";
+      type = "gem";
+    };
+    version = "1.8.3";
+  };
   rugged = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -226,4 +320,12 @@
     };
     version = "1.2.2";
   };
+  unicode-display_width = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
 }
\ No newline at end of file
-- 
GitLab


From 3e90cbe2688c34ccad9a155abc2525605c887b7b Mon Sep 17 00:00:00 2001
From: Servilio Afre Puentes <afrepues@sharcnet.ca>
Date: Mon, 6 Nov 2017 14:02:26 -0500
Subject: [PATCH 840/877] gitlab-shell: make the patches apply cleanly

---
 .../gitlab-shell/remove-hardcoded-locations.patch             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
index e88dbad071f..dd1ecafb8bf 100644
--- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
@@ -3,7 +3,7 @@ index 0b11ce3..ffc3faf 100644
 --- a/lib/gitlab_projects.rb
 +++ b/lib/gitlab_projects.rb
 @@ -8,7 +8,7 @@ require_relative 'gitlab_metrics'
- require_relative 'gitlab_reference_counter'
+ require_relative 'gitlab_metrics'
  
  class GitlabProjects
 -  GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks')
@@ -15,7 +15,7 @@ diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
 index e7d0254..181ec8a 100644
 --- a/lib/gitlab_shell.rb
 +++ b/lib/gitlab_shell.rb
-@@ -163,7 +163,8 @@ class GitlabShell
+@@ -188,7 +188,8 @@ class GitlabShell
      end
  
      # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
-- 
GitLab


From c9bb6ac1fd13d5e7a346f5b3c65b07441530705b Mon Sep 17 00:00:00 2001
From: Servilio Afre Puentes <afrepues@sharcnet.ca>
Date: Mon, 6 Nov 2017 14:04:27 -0500
Subject: [PATCH 841/877] gitlab-shell: 5.9.0 -> 5.9.3

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

diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index 1fdb529d9ac..ac05ca4c484 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
 { stdenv, ruby, bundler, fetchFromGitLab, go }:
 
 stdenv.mkDerivation rec {
-  version = "5.9.0";
+  version = "5.9.3";
   name = "gitlab-shell-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "1zjlwivksaqlfxxhxjgpqa3293nhijw76fj7nv0l11820wplc7yf";
+    sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p";
   };
 
   buildInputs = [
-- 
GitLab


From fa0148abf83873b27667346f95b9f76fa09b7a31 Mon Sep 17 00:00:00 2001
From: Servilio Afre Puentes <afrepues@sharcnet.ca>
Date: Mon, 6 Nov 2017 14:39:03 -0500
Subject: [PATCH 842/877] gitlab-workhorse: 3.0.0 -> 3.2.0

---
 .../version-management/gitlab-workhorse/default.nix           | 4 ++--
 .../gitlab-workhorse/remove-hardcoded-paths.patch             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index a91a15e66b8..1f3407eddcf 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitLab, git, go }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.0";
+  version = "3.2.0";
   name = "gitlab-workhorse-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "0lz3bgwww640c7gh97vf40a8h6cz4znscl0r00z6iiwkc0xxzp7j";
+    sha256 = "1ivqlhvmxhdb8359yh469zl45j00n94b53naqi8jx06kijfsdz4r";
   };
 
   buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch b/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch
index 37f3d2deef5..d8313ecb433 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch
+++ b/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch
@@ -2,11 +2,11 @@ diff --git a/internal/git/command.go b/internal/git/command.go
 index 0e5496c..5778294 100644
 --- a/internal/git/command.go
 +++ b/internal/git/command.go
-@@ -16,6 +16,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd {
+@@ -19,6 +19,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd {
  	cmd.Env = []string{
  		fmt.Sprintf("HOME=%s", os.Getenv("HOME")),
  		fmt.Sprintf("PATH=%s", os.Getenv("PATH")),
 +		fmt.Sprintf("GITLAB_SHELL_CONFIG_PATH=%s", os.Getenv("GITLAB_SHELL_CONFIG_PATH")),
  		fmt.Sprintf("LD_LIBRARY_PATH=%s", os.Getenv("LD_LIBRARY_PATH")),
- 		fmt.Sprintf("GL_ID=%s", gl_id),
+ 		fmt.Sprintf("GL_PROTOCOL=http"),
  	}
-- 
GitLab


From f2ac5e0acf7ecd32d87696c9d8d2aeb8d6896eb5 Mon Sep 17 00:00:00 2001
From: Servilio Afre Puentes <afrepues@sharcnet.ca>
Date: Fri, 3 Nov 2017 17:27:58 -0400
Subject: [PATCH 843/877] gitlab: 10.0.2 -> 10.1.1

---
 .../version-management/gitlab/Gemfile         |  17 +-
 .../version-management/gitlab/Gemfile.lock    | 102 +++++------
 .../version-management/gitlab/default.nix     |   6 +-
 .../version-management/gitlab/gemset.nix      | 166 +++++++++++-------
 .../gitlab/nulladapter.patch                  |   6 +-
 .../gitlab/remove-hardcoded-locations.patch   |  20 +--
 6 files changed, 182 insertions(+), 135 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 97af3413b15..b4a457bff6e 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -23,10 +23,10 @@ gem 'faraday', '~> 0.12'
 # Authentication libraries
 gem 'devise', '~> 4.2'
 gem 'doorkeeper', '~> 4.2.0'
-gem 'doorkeeper-openid_connect', '~> 1.1.0'
+gem 'doorkeeper-openid_connect', '~> 1.2.0'
 gem 'omniauth', '~> 1.4.2'
 gem 'omniauth-auth0', '~> 1.4.1'
-gem 'omniauth-azure-oauth2', '~> 0.0.6'
+gem 'omniauth-azure-oauth2', '~> 0.0.9'
 gem 'omniauth-cas3', '~> 1.1.4'
 gem 'omniauth-facebook', '~> 4.0.0'
 gem 'omniauth-github', '~> 1.1.1'
@@ -105,7 +105,7 @@ gem 'fog-rackspace', '~> 0.1.1'
 gem 'fog-aliyun', '~> 0.1.0'
 
 # for Google storage
-gem 'google-api-client', '~> 0.8.6'
+gem 'google-api-client', '~> 0.13.6'
 
 # for aws storage
 gem 'unf', '~> 0.1.4'
@@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.5'
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 1.11.0'
 gem 'deckar01-task_list', '2.0.0'
-gem 'gitlab-markup', '~> 1.5.1'
+gem 'gitlab-markup', '~> 1.6.2'
 gem 'redcarpet', '~> 3.4'
 gem 'RedCloth', '~> 4.3.2'
 gem 'rdoc', '~> 4.2'
@@ -239,7 +239,7 @@ gem 'rack-proxy', '~> 0.6.0'
 gem 'sass-rails', '~> 5.0.6'
 gem 'uglifier', '~> 2.7.2'
 
-gem 'addressable', '~> 2.3.8'
+gem 'addressable', '~> 2.5.2'
 gem 'bootstrap-sass', '~> 3.3.0'
 gem 'font-awesome-rails', '~> 4.7'
 gem 'gemojione', '~> 3.3'
@@ -281,7 +281,7 @@ group :metrics do
   gem 'influxdb', '~> 0.2', require: false
 
   # Prometheus
-  gem 'prometheus-client-mmap', '~>0.7.0.beta14'
+  gem 'prometheus-client-mmap', '~>0.7.0.beta18'
   gem 'raindrops', '~> 0.18'
 end
 
@@ -356,12 +356,13 @@ end
 group :test do
   gem 'shoulda-matchers', '~> 3.1.2', require: false
   gem 'email_spec', '~> 1.6.0'
-  gem 'json-schema', '~> 2.6.2'
+  gem 'json-schema', '~> 2.8.0'
   gem 'webmock', '~> 2.3.2'
   gem 'test_after_commit', '~> 1.1'
   gem 'sham_rack', '~> 1.3.6'
   gem 'timecop', '~> 0.8.0'
   gem 'concurrent-ruby', '~> 1.0.5'
+  gem 'test-prof', '~> 0.2.5'
 end
 
 gem 'octokit', '~> 4.6.2'
@@ -397,7 +398,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.33.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly'
 
 gem 'toml-rb', '~> 0.3.15', require: false
 
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 61c5335962b..fd3aab2d54a 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -47,7 +47,8 @@ GEM
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
-    addressable (2.3.8)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     akismet (2.0.0)
     allocations (1.0.5)
     arel (6.0.4)
@@ -64,10 +65,6 @@ GEM
     attr_encrypted (3.0.3)
       encryptor (~> 3.0.0)
     attr_required (1.0.0)
-    autoparse (0.3.3)
-      addressable (>= 2.3.1)
-      extlib (>= 0.9.15)
-      multi_json (>= 1.0.0)
     autoprefixer-rails (6.2.3)
       execjs
       json
@@ -85,7 +82,7 @@ GEM
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
-    bindata (2.3.5)
+    bindata (2.4.1)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     bootstrap-sass (3.3.6)
@@ -148,6 +145,8 @@ GEM
     debugger-ruby_core_source (1.3.8)
     deckar01-task_list (2.0.0)
       html-pipeline
+    declarative (0.0.10)
+    declarative-option (0.1.0)
     default_value_for (3.0.2)
       activerecord (>= 3.2.0, < 5.1)
     descendants_tracker (0.0.4)
@@ -169,9 +168,9 @@ GEM
     docile (1.1.5)
     domain_name (0.5.20161021)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (4.2.0)
+    doorkeeper (4.2.6)
       railties (>= 4.2)
-    doorkeeper-openid_connect (1.1.2)
+    doorkeeper-openid_connect (1.2.0)
       doorkeeper (~> 4.0)
       json-jwt (~> 1.6)
     dropzonejs-rails (0.7.2)
@@ -190,13 +189,12 @@ GEM
     excon (0.57.1)
     execjs (2.6.0)
     expression_parser (0.9.0)
-    extlib (0.9.16)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.7.0)
       factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
-    faraday (0.12.1)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.11.0.1)
       faraday (>= 0.7.4, < 1.0)
@@ -277,7 +275,7 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     gherkin-ruby (0.3.2)
-    gitaly-proto (0.33.0)
+    gitaly-proto (0.39.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -290,12 +288,12 @@ GEM
       flowdock (~> 0.7)
       gitlab-grit (>= 2.4.1)
       multi_json
-    gitlab-grit (2.8.1)
+    gitlab-grit (2.8.2)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
-      mime-types (>= 1.16, < 3)
+      mime-types (>= 1.16)
       posix-spawn (~> 0.3)
-    gitlab-markup (1.5.1)
+    gitlab-markup (1.6.2)
     gitlab_omniauth-ldap (2.0.4)
       net-ldap (~> 0.16)
       omniauth (~> 1.3)
@@ -321,20 +319,16 @@ GEM
       json
       multi_json
       request_store (>= 1.0)
-    google-api-client (0.8.7)
-      activesupport (>= 3.2, < 5.0)
-      addressable (~> 2.3)
-      autoparse (~> 0.3)
-      extlib (~> 0.9)
-      faraday (~> 0.9)
-      googleauth (~> 0.3)
-      launchy (~> 2.4)
-      multi_json (~> 1.10)
-      retriable (~> 1.4)
-      signet (~> 0.6)
+    google-api-client (0.13.6)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.5)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
     google-protobuf (3.4.0.2)
-    googleauth (0.5.1)
-      faraday (~> 0.9)
+    googleauth (0.5.3)
+      faraday (~> 0.12)
       jwt (~> 1.4)
       logging (~> 2.0)
       memoist (~> 0.12)
@@ -359,7 +353,7 @@ GEM
       rake
     grape_logging (1.7.0)
       grape
-    grpc (1.4.5)
+    grpc (1.6.0)
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
     haml (4.0.7)
@@ -418,14 +412,14 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.6)
-    json-jwt (1.7.1)
+    json-jwt (1.7.2)
       activesupport
       bindata
       multi_json (>= 1.3)
       securecompare
       url_safe_base64
-    json-schema (2.6.2)
-      addressable (~> 2.3.8)
+    json-schema (2.8.0)
+      addressable (>= 2.4)
     jwt (1.5.6)
     kaminari (1.0.1)
       activesupport (>= 4.1.0)
@@ -477,18 +471,20 @@ GEM
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
     mail_room (0.9.1)
-    memoist (0.15.0)
+    memoist (0.16.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
-    mime-types (2.99.3)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
     mini_mime (0.1.4)
     mini_portile2 (2.3.0)
     minitest (5.7.0)
     mmap2 (2.2.7)
     mousetrap-rails (1.4.6)
-    multi_json (1.12.1)
+    multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     mustermann (1.0.0)
@@ -518,10 +514,10 @@ GEM
       omniauth-oauth2 (~> 1.1)
     omniauth-authentiq (0.3.1)
       omniauth-oauth2 (~> 1.3, >= 1.3.1)
-    omniauth-azure-oauth2 (0.0.6)
+    omniauth-azure-oauth2 (0.0.9)
       jwt (~> 1.0)
       omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.1)
+      omniauth-oauth2 (~> 1.4)
     omniauth-cas3 (1.1.4)
       addressable (~> 2.3)
       nokogiri (~> 1.7, >= 1.7.1)
@@ -547,7 +543,7 @@ GEM
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-oauth2 (1.3.1)
+    omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
     omniauth-oauth2-generic (0.2.2)
@@ -626,7 +622,7 @@ GEM
       parser
       unparser
     procto (0.0.3)
-    prometheus-client-mmap (0.7.0.beta14)
+    prometheus-client-mmap (0.7.0.beta18)
       mmap2 (~> 2.2, >= 2.2.7)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -637,6 +633,7 @@ GEM
       pry (~> 0.10)
     pry-rails (0.3.5)
       pry (>= 0.9.10)
+    public_suffix (3.0.0)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.6.8)
     rack-accept (0.4.5)
@@ -686,7 +683,7 @@ GEM
     rainbow (2.2.2)
       rake
     raindrops (0.18.0)
-    rake (12.0.0)
+    rake (12.1.0)
     rblineprof (0.3.6)
       debugger-ruby_core_source (~> 1.3)
     rbnacl (4.0.2)
@@ -719,6 +716,10 @@ GEM
       redis-store (~> 1.2.0)
     redis-store (1.2.0)
       redis (>= 2.2)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
     request_store (1.3.1)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
@@ -726,7 +727,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    retriable (1.4.1)
+    retriable (3.1.1)
     rinku (2.0.0)
     rotp (2.1.2)
     rouge (2.2.1)
@@ -884,6 +885,7 @@ GEM
       ffi
     sysexits (1.2.0)
     temple (0.7.7)
+    test-prof (0.2.5)
     test_after_commit (1.1.0)
       activerecord (>= 3.2)
     text (1.3.1)
@@ -904,12 +906,13 @@ GEM
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     u2f (0.2.1)
+    uber (0.1.0)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.4)
     unicode-display_width (1.3.0)
     unicorn (5.1.0)
       kgio (~> 2.6)
@@ -965,7 +968,7 @@ DEPENDENCIES
   activerecord-nulldb-adapter
   activerecord_sane_schema_dumper (= 0.2)
   acts-as-taggable-on (~> 4.0)
-  addressable (~> 2.3.8)
+  addressable (~> 2.5.2)
   akismet (~> 2.0)
   allocations (~> 1.0)
   asana (~> 0.6.0)
@@ -1002,7 +1005,7 @@ DEPENDENCIES
   devise-two-factor (~> 3.0.0)
   diffy (~> 3.1.0)
   doorkeeper (~> 4.2.0)
-  doorkeeper-openid_connect (~> 1.1.0)
+  doorkeeper-openid_connect (~> 1.2.0)
   dropzonejs-rails (~> 0.7.1)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 1.6.0)
@@ -1027,15 +1030,15 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.2.0)
-  gitaly-proto (~> 0.33.0)
+  gitaly-proto (~> 0.39.0)
   github-linguist (~> 4.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab-markup (~> 1.5.1)
+  gitlab-markup (~> 1.6.2)
   gitlab_omniauth-ldap (~> 2.0.4)
   gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.4)
   gon (~> 6.1.0)
-  google-api-client (~> 0.8.6)
+  google-api-client (~> 0.13.6)
   gpgme
   grape (~> 1.0)
   grape-entity (~> 0.6.0)
@@ -1053,7 +1056,7 @@ DEPENDENCIES
   jira-ruby (~> 1.4)
   jquery-atwho-rails (~> 1.3.2)
   jquery-rails (~> 4.1.0)
-  json-schema (~> 2.6.2)
+  json-schema (~> 2.8.0)
   jwt (~> 1.5.6)
   kaminari (~> 1.0)
   knapsack (~> 1.11.0)
@@ -1077,7 +1080,7 @@ DEPENDENCIES
   omniauth (~> 1.4.2)
   omniauth-auth0 (~> 1.4.1)
   omniauth-authentiq (~> 0.3.1)
-  omniauth-azure-oauth2 (~> 0.0.6)
+  omniauth-azure-oauth2 (~> 0.0.9)
   omniauth-cas3 (~> 1.1.4)
   omniauth-facebook (~> 4.0.0)
   omniauth-github (~> 1.1.1)
@@ -1103,7 +1106,7 @@ DEPENDENCIES
   pg (~> 0.18.2)
   poltergeist (~> 1.9.0)
   premailer-rails (~> 1.9.7)
-  prometheus-client-mmap (~> 0.7.0.beta14)
+  prometheus-client-mmap (~> 0.7.0.beta18)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
   rack-attack (~> 4.4.1)
@@ -1166,6 +1169,7 @@ DEPENDENCIES
   stackprof (~> 0.2.10)
   state_machines-activerecord (~> 0.4.0)
   sys-filesystem (~> 1.1.6)
+  test-prof (~> 0.2.5)
   test_after_commit (~> 1.1)
   thin (~> 1.7.0)
   timecop (~> 0.8.0)
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 657221d4b42..bc3ca9192bc 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -18,11 +18,11 @@ let
     };
   };
 
-  version = "10.0.2";
+  version = "10.1.1";
 
   gitlabDeb = fetchurl {
     url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
-    sha256 = "0jsqjarvjzbxv1yiddzp5xwsqqrq5cvam0xn749p1vzqhcp8pahc";
+    sha256 = "0xvzxcygy6ffqm24rk6v9gs6g9r744vpwwvk9d00wjla7hwmq3w2";
   };
 
 in
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "1602d6nkb41gg80n6p0wqxrjsn79s0z3817461d8dw2ha2dmbl34";
+    sha256 = "0p118msad6l12pd4q3vkvjggiiasbkh6pnl94riqyb5zkb7yrb1a";
   };
 
   patches = [
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 34567ddb3ea..4fb4c48b0de 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -115,12 +115,13 @@
     version = "0.2.0";
   };
   addressable = {
+    dependencies = ["public_suffix"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1533axm85gpz267km9gnfarf9c78g2scrysd6b8yw33vmhkz2km6";
+      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
       type = "gem";
     };
-    version = "2.3.8";
+    version = "2.5.2";
   };
   akismet = {
     source = {
@@ -205,15 +206,6 @@
     };
     version = "1.0.0";
   };
-  autoparse = {
-    dependencies = ["addressable" "extlib" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1q5wkd8gc2ckmgry9fba4b8vxb5kr8k8gqq2wycbirgq06mbllb6";
-      type = "gem";
-    };
-    version = "0.3.3";
-  };
   autoprefixer-rails = {
     dependencies = ["execjs" "json"];
     source = {
@@ -292,10 +284,10 @@
   bindata = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07i51jzq9iamw40xmmcgkrdq4m8f0vb5gp53p6q1vggj7z53q3v7";
+      sha256 = "0anbg203zjr4crql20ss5b9xg2c6a7j8nm6hs8w3ll1h1akkpp2z";
       type = "gem";
     };
-    version = "2.3.5";
+    version = "2.4.1";
   };
   binding_of_caller = {
     dependencies = ["debug_inspector"];
@@ -592,6 +584,22 @@
     };
     version = "2.0.0";
   };
+  declarative = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j";
+      type = "gem";
+    };
+    version = "0.0.10";
+  };
+  declarative-option = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
   default_value_for = {
     dependencies = ["activerecord"];
     source = {
@@ -665,19 +673,19 @@
     dependencies = ["railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hs8r280k7a1kibzxrhifjps880n43jfrybf4mqpffw669jrwk3v";
+      sha256 = "0r5rfvjjnlf9cn97cdrfw260zkg785k4197xqidgb35445k62mah";
       type = "gem";
     };
-    version = "4.2.0";
+    version = "4.2.6";
   };
   doorkeeper-openid_connect = {
     dependencies = ["doorkeeper" "json-jwt"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pla85j5wxra0k9rhj04g2ai5d5jg97fiavi0s9v2hjba2l54cni";
+      sha256 = "13k0xlr1grjj8ri26qy2zwbgi3fqxinvnygh53bnyi9qcynx5827";
       type = "gem";
     };
-    version = "1.1.2";
+    version = "1.2.0";
   };
   dropzonejs-rails = {
     dependencies = ["rails"];
@@ -778,14 +786,6 @@
     };
     version = "0.9.0";
   };
-  extlib = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1cbw3vgb189z3vfc1arijmsd604m3w5y5xvdfkrblc9qh7sbk2rh";
-      type = "gem";
-    };
-    version = "0.9.16";
-  };
   factory_girl = {
     dependencies = ["activesupport"];
     source = {
@@ -808,10 +808,10 @@
     dependencies = ["multipart-post"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wkx9844vacsk2229xbc27djf6zw15kqd60ifr78whf9mp9v6l03";
+      sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2";
       type = "gem";
     };
-    version = "0.12.1";
+    version = "0.12.2";
   };
   faraday_middleware = {
     dependencies = ["faraday"];
@@ -1071,10 +1071,10 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0f15idw1850kwi0na6x3xlk13ljwx3mpfnxfv58631cmb3ac7wf8";
+      sha256 = "0irc3yfyr5li2ki6w03znsklnk0qx3srk4wrb7jav042c4kw325k";
       type = "gem";
     };
-    version = "0.33.0";
+    version = "0.39.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1106,18 +1106,18 @@
     dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n";
+      sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
       type = "gem";
     };
-    version = "2.8.1";
+    version = "2.8.2";
   };
   gitlab-markup = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1aam7zvvbai5nv7vf0c0640pvik6s71f276lip4yb4slbg0pfpn2";
+      sha256 = "114jfbyyfwad609k1l1fcmbzszb3frdchh83gdwndkglllvprhjz";
       type = "gem";
     };
-    version = "1.5.1";
+    version = "1.6.2";
   };
   gitlab_omniauth-ldap = {
     dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
@@ -1174,13 +1174,13 @@
     version = "6.1.0";
   };
   google-api-client = {
-    dependencies = ["activesupport" "addressable" "autoparse" "extlib" "faraday" "googleauth" "launchy" "multi_json" "retriable" "signet"];
+    dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11wr57j9fp6x6fym4k1a7jqp72qgc8l24mfwb4y55bbvdmkv1b2d";
+      sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y";
       type = "gem";
     };
-    version = "0.8.7";
+    version = "0.13.6";
   };
   google-protobuf = {
     source = {
@@ -1194,10 +1194,10 @@
     dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nzkg63s161c6jsia92c1jfwpayzbpwn588smd286idn07y0az2m";
+      sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.5.3";
   };
   gpgme = {
     dependencies = ["mini_portile2"];
@@ -1248,10 +1248,10 @@
     dependencies = ["google-protobuf" "googleauth"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38";
+      sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52";
       type = "gem";
     };
-    version = "1.4.5";
+    version = "1.6.0";
   };
   haml = {
     dependencies = ["tilt"];
@@ -1471,19 +1471,19 @@
     dependencies = ["activesupport" "bindata" "multi_json" "securecompare" "url_safe_base64"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ylvlnb6assan9qkhz1vq1gbfwxg35q9a8f8qhlyx0fak5fyks23";
+      sha256 = "15a3v498lvsshzgjnk2dmyvjv87y3lffq71axj5xq3iz4mp1r4b2";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   json-schema = {
     dependencies = ["addressable"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15bva4w940ckan3q89in5f98s8zz77nxglylgm98697wa4fbfqp9";
+      sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz";
       type = "gem";
     };
-    version = "2.6.2";
+    version = "2.8.0";
   };
   jwt = {
     source = {
@@ -1662,10 +1662,10 @@
   memoist = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q";
+      sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
       type = "gem";
     };
-    version = "0.15.0";
+    version = "0.16.0";
   };
   memoizable = {
     dependencies = ["thread_safe"];
@@ -1685,12 +1685,21 @@
     version = "0.8.2";
   };
   mime-types = {
+    dependencies = ["mime-types-data"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
+      sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
       type = "gem";
     };
-    version = "2.99.3";
+    version = "3.1";
+  };
+  mime-types-data = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
+      type = "gem";
+    };
+    version = "3.2016.0521";
   };
   mimemagic = {
     source = {
@@ -1743,10 +1752,10 @@
   multi_json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
+      sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x";
       type = "gem";
     };
-    version = "1.12.1";
+    version = "1.12.2";
   };
   multi_xml = {
     source = {
@@ -1895,10 +1904,10 @@
     dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s";
+      sha256 = "0ck5616fjik0dw89xvak1mi8ijcv10lsh6n9h4107l5dys2g3jfx";
       type = "gem";
     };
-    version = "0.0.6";
+    version = "0.0.9";
   };
   omniauth-cas3 = {
     dependencies = ["addressable" "nokogiri" "omniauth"];
@@ -1976,10 +1985,10 @@
     dependencies = ["oauth2" "omniauth"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mskwlw5ibx9mz7ywqji6mm56ikf7mglbnfc02qhg6ry527jsxdm";
+      sha256 = "0aykbg5qfm37ywrq34dydrhxa5jwpski71dpspgp2fi6dinx09f5";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.4.0";
   };
   omniauth-oauth2-generic = {
     dependencies = ["omniauth-oauth2"];
@@ -2247,10 +2256,10 @@
     dependencies = ["mmap2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1r9s30hypcpw4abxlzcjlkcwkckqvr5sbph3blbl0rq2r8c8h25p";
+      sha256 = "1fgkilpiha338mvfkj5rwhny3vld0nb3v1vgbrlxbhnvch26wakh";
       type = "gem";
     };
-    version = "0.7.0.beta14";
+    version = "0.7.0.beta18";
   };
   pry = {
     dependencies = ["coderay" "method_source" "slop"];
@@ -2279,6 +2288,14 @@
     };
     version = "0.3.5";
   };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
   pyu-ruby-sasl = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2431,10 +2448,10 @@
   rake = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
+      sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw";
       type = "gem";
     };
-    version = "12.0.0";
+    version = "12.1.0";
   };
   rblineprof = {
     dependencies = ["debugger-ruby_core_source"];
@@ -2575,6 +2592,15 @@
     };
     version = "1.2.0";
   };
+  representable = {
+    dependencies = ["declarative" "declarative-option" "uber"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
+      type = "gem";
+    };
+    version = "3.0.4";
+  };
   request_store = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2604,10 +2630,10 @@
   retriable = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cmhwgv5r4vn7iqy4bfbnbb73pzl8ik69zrwq9vdim45v8b13gsj";
+      sha256 = "0pnriyn9zh120hxm92vb12hfsf7c98nawyims1shxj3ldpl0l3ar";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "3.1.1";
   };
   rinku = {
     source = {
@@ -3195,6 +3221,14 @@
     };
     version = "0.7.7";
   };
+  test-prof = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3";
+      type = "gem";
+    };
+    version = "0.2.5";
+  };
   test_after_commit = {
     dependencies = ["activerecord"];
     source = {
@@ -3296,6 +3330,14 @@
     };
     version = "0.2.1";
   };
+  uber = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
   uglifier = {
     dependencies = ["execjs" "json"];
     source = {
@@ -3317,10 +3359,10 @@
   unf_ext = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04d13bp6lyg695x94whjwsmzc2ms72d94vx861nx1y40k3817yp8";
+      sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb";
       type = "gem";
     };
-    version = "0.0.7.2";
+    version = "0.0.7.4";
   };
   unicode-display_width = {
     source = {
diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch
index 70195fe821a..3b30ff03346 100644
--- a/pkgs/applications/version-management/gitlab/nulladapter.patch
+++ b/pkgs/applications/version-management/gitlab/nulladapter.patch
@@ -14,7 +14,7 @@ diff --git a/Gemfile.lock b/Gemfile.lock
 index 38944248f9..08ce4486ba 100644
 --- a/Gemfile.lock
 +++ b/Gemfile.lock
-@@ -32,6 +32,8 @@ GEM
+@@ -33,6 +33,8 @@ GEM
        activemodel (= 4.2.8)
        activesupport (= 4.2.8)
        arel (~> 6.0)
@@ -23,11 +23,11 @@ index 38944248f9..08ce4486ba 100644
      activerecord_sane_schema_dumper (0.2)
        rails (>= 4, < 5)
      activesupport (4.2.8)
-@@ -926,6 +928,7 @@ PLATFORMS
+@@ -963,6 +965,7 @@ PLATFORMS
  DEPENDENCIES
    RedCloth (~> 4.3.2)
    ace-rails-ap (~> 4.1.0)
 +  activerecord-nulldb-adapter
    activerecord_sane_schema_dumper (= 0.2)
    acts-as-taggable-on (~> 4.0)
-   addressable (~> 2.3.8)
+   addressable (~> 2.5.2)
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index c88f525715e..39c7c28847c 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -27,20 +27,20 @@ diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
 index 0b33783869..cd4e41d9bd 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
-@@ -521,7 +521,7 @@ production: &base
+@@ -574,7 +574,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:
 -    bin_path: /usr/bin/git
 +    bin_path: git
-     # The next value is the maximum memory size grit can use
-     # Given in number of bytes per git object (e.g. a commit)
-     # This value can be increased if you have very large commits
+ 
+   ## Webpack settings
+   # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
 index 8ddf8e4d2e..559cf9adf7 100644
 --- a/config/initializers/1_settings.rb
 +++ b/config/initializers/1_settings.rb
-@@ -219,7 +219,7 @@ Settings.gitlab['user']       ||= 'git'
+@@ -252,7 +252,7 @@ Settings.gitlab['user']       ||= 'git'
  Settings.gitlab['user_home']  ||= begin
    Etc.getpwnam(Settings.gitlab['user']).dir
  rescue ArgumentError # no user configured
@@ -49,15 +49,15 @@ index 8ddf8e4d2e..559cf9adf7 100644
  end
  Settings.gitlab['time_zone'] ||= nil
  Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
-@@ -454,7 +454,7 @@ Settings.backup['upload']['storage_class'] ||= nil
+@@ -491,7 +491,7 @@ Settings.backup['upload']['storage_class'] ||= nil
+ # Git
  #
  Settings['git'] ||= Settingslogic.new({})
- Settings.git['max_size']  ||= 20971520 # 20.megabytes
--Settings.git['bin_path']  ||= '/usr/bin/git'
-+Settings.git['bin_path']  ||= 'git'
- Settings.git['timeout']   ||= 10
+-Settings.git['bin_path'] ||= '/usr/bin/git'
++Settings.git['bin_path'] ||= 'git'
  
  # Important: keep the satellites.path setting until GitLab 9.0 at
+ # least. This setting is fed to 'rm -rf' in
 diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
 index 59b21149a9..4f4a39a06c 100644
 --- a/lib/gitlab/logger.rb
-- 
GitLab


From 5d5eb6aba4189a0cb13dbf9b127fac91c6df2b9c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 7 Nov 2017 00:17:31 +0200
Subject: [PATCH 844/877] lcdproc: Disable parallel build

https://hydra.nixos.org/build/63628044
---
 pkgs/servers/monitoring/lcdproc/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix
index 027e1090157..859849f7b2c 100644
--- a/pkgs/servers/monitoring/lcdproc/default.nix
+++ b/pkgs/servers/monitoring/lcdproc/default.nix
@@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ freetype libX11 libftdi libusb libusb1 ncurses ];
   nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ];
-  enableParallelBuilding = true;
+
+  # In 0.5.9: gcc: error: libbignum.a: No such file or directory
+  enableParallelBuilding = false;
 
   postFixup = ''
     for f in $out/bin/*.pl ; do
-- 
GitLab


From 97f816dc56f4205b3689011b8837bab889ff0474 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 6 Nov 2017 17:53:35 -0500
Subject: [PATCH 845/877] pythonPackages.fuse: fix infinite recursion in
 expression

I believe this resolves #31338.
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d76c836734c..8cba91324a0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8991,7 +8991,7 @@ in {
     };
   };
 
-  fuse = callPackage ../development/python-modules/python-fuse { };
+  fuse = callPackage ../development/python-modules/python-fuse { fuse = pkgs.fuse; };
 
   fusepy = buildPythonPackage rec {
     name = "fusepy-2.0.4";
-- 
GitLab


From 471175e0be6ef55b368363e132ff8cee09c3ca1c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 6 Nov 2017 17:38:29 +0000
Subject: [PATCH 846/877] ocamlPackages.zed: 1.5 -> 1.6

---
 pkgs/development/ocaml-modules/zed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix
index 85977792b4d..1ddb6d18040 100644
--- a/pkgs/development/ocaml-modules/zed/default.nix
+++ b/pkgs/development/ocaml-modules/zed/default.nix
@@ -3,8 +3,8 @@
 let param =
   if stdenv.lib.versionAtLeast ocaml.version "4.02" then
   {
-    version = "1.5";
-    sha256 = "1nq884cxl1k4daa549bk7bxarwivbpp51k4blbiwyxwfhs29xgfr";
+    version = "1.6";
+    sha256 = "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v";
     buildInputs = [ jbuilder ];
     extra = {
      buildPhase = "jbuilder build -p zed";
-- 
GitLab


From 37fc1fcd4557eb45924c7c8747b6ec0e953d300a Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Mon, 6 Nov 2017 20:38:18 -0500
Subject: [PATCH 847/877] rtags: 2.12 -> 2.15

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

diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 32be2a503bf..8fe47bd0cb5 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "rtags-${version}";
-  version = "2.12";
+  version = "2.15";
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ llvmPackages.llvm openssl emacs ]
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     rev = "refs/tags/v${version}";
     fetchSubmodules = true;
     url = "https://github.com/andersbakken/rtags.git";
-    sha256 = "0bgjcvyvkpqcgw4571iz39sqydmcaz6ymx7kxcmq6j7rffs6qs7l";
+    sha256 = "12nnyav2q1ddkz9wm0aclhn7r74xj4ibrb0x05k7mcf694bg79c0";
     # unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation
     postFetch = ''
-- 
GitLab


From 2d3149f4a808c2f90ed1dbf188f7371d193e7964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Nov 2017 06:33:09 +0100
Subject: [PATCH 848/877] icu: only patch-out xlocale if using glibc

---
 pkgs/development/libraries/icu/base.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index b12e76a90a9..8a7cf8365a5 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -26,7 +26,9 @@ stdenv.mkDerivation {
   '';
 
   # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
-  postPatch = "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'";
+  postPatch = if stdenv ? glibc
+    then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'"
+    else null; # won't find locale_t on darwin
 
   inherit patchFlags patches;
 
-- 
GitLab


From 7ccad2a4f2f89081903bc467bbd8b2fae41370ed Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 7 Nov 2017 00:34:44 -0500
Subject: [PATCH 849/877] vboot_reference: build all the tools

This expands the build to include more things that are useful on
chromebooks, like `crossystem`
---
 pkgs/tools/system/vboot_reference/default.nix | 16 +++++-----
 .../vboot_reference/dont_static_link.patch    | 30 +++++++++++++++++++
 2 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/tools/system/vboot_reference/dont_static_link.patch

diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index 0b8933bb7af..e410ef1cee5 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -17,17 +17,17 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildPhase = ''
+  patches = [ ./dont_static_link.patch ];
+
+  preBuild = ''
     patchShebangs scripts
-    make -j''${NIX_BUILD_CORES:-1} \
-         `pwd`/build/cgpt/cgpt \
-         `pwd`/build/futility/futility
   '';
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp build/cgpt/cgpt $out/bin
-    cp build/futility/futility $out/bin
+  makeFlags = [
+    "DESTDIR=$(out)"
+  ];
+
+  postInstall = ''
     mkdir -p $out/share/vboot
     cp -r tests/devkeys* $out/share/vboot/
   '';
diff --git a/pkgs/tools/system/vboot_reference/dont_static_link.patch b/pkgs/tools/system/vboot_reference/dont_static_link.patch
new file mode 100644
index 00000000000..506b942e246
--- /dev/null
+++ b/pkgs/tools/system/vboot_reference/dont_static_link.patch
@@ -0,0 +1,30 @@
+---
+--- a/Makefile
++++ b/Makefile
+@@ -964,7 +964,7 @@ ${UTILLIB21}: ${UTILLIB21_OBJS} ${FWLIB2
+ # Link tests for external repos
+ ${BUILD}/host/linktest/extern: ${HOSTLIB}
+ ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB}
+-${BUILD}/host/linktest/extern: LDLIBS += -static
++#${BUILD}/host/linktest/extern: LDLIBS += -static
+ TEST_OBJS += ${BUILD}/host/linktest/extern.o
+ 
+ .PHONY: hostlib
+@@ -1056,7 +1056,7 @@ ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTIL
+ ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB}
+ 
+ # Utilities for auto-update toolkits must be statically linked.
+-${UTIL_BINS_STATIC}: LDFLAGS += -static
++${UTIL_BINS_STATIC}:
+ 
+ 
+ .PHONY: utils
+@@ -1089,7 +1089,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
+ 
+ ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
+ 	@${PRINTF} "    LD            $(subst ${BUILD}/,,$@)\n"
+-	${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS}
++	${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
+ 
+ ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS}
+ ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB}
-- 
GitLab


From 7ba482a74a4bbdfa907b781776ccc85bb48aff75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Nov 2017 07:27:32 +0100
Subject: [PATCH 850/877] live555: fixup build with glibc-2.26

---
 pkgs/development/libraries/live555/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index de4d295ebe3..e0f84f5080d 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -12,7 +12,12 @@ stdenv.mkDerivation {
     sha256 = "02z2f8z5cy0ajnh9pgar40lsxdknfw5cbyw52138hxnpr6adrvak";
   };
 
-  postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles";
+  postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles"
+  + stdenv.lib.optionalString (stdenv ? glibc) ''
+
+    substituteInPlace liveMedia/include/Locale.hh \
+      --replace '<xlocale.h>' '<locale.h>'
+  '';
 
   configurePhase = ''
     sed \
-- 
GitLab


From 81c50404702c7ed7236107acc4b3c8587a967487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Nov 2017 08:33:48 +0100
Subject: [PATCH 851/877] gpm: fixup build with glibc-2.26

---
 pkgs/servers/gpm/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
index e260ccfb761..6096aa1ed74 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
     sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh";
   };
 
+  postPatch = ''
+    sed '1i#include <sys/types.h>' -i src/daemon/open_console.c
+    substituteInPlace src/prog/gpm-root.y --replace __sigemptyset sigemptyset
+  '';
+
   nativeBuildInputs = [ automake autoconf libtool flex bison texinfo ];
   buildInputs = [ ncurses ];
 
-- 
GitLab


From e0a36522a752694dbe5da303b44a2cc69fea0d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Nov 2017 09:17:00 +0100
Subject: [PATCH 852/877] llvm 3.7--4: fixup build with glibc-2.26

---
 pkgs/development/compilers/llvm/3.7/llvm.nix | 13 +++++++++++++
 pkgs/development/compilers/llvm/3.8/llvm.nix | 13 +++++++++++++
 pkgs/development/compilers/llvm/3.9/llvm.nix | 14 ++++++++++++++
 pkgs/development/compilers/llvm/4/llvm.nix   | 14 ++++++++++++++
 4 files changed, 54 insertions(+)

diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index b600665cd8f..54ab8c10877 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetch
+, fetchpatch
 , perl
 , groff
 , cmake
@@ -45,6 +46,18 @@ in stdenv.mkDerivation rec {
   # those always succeed has the net effect of disabling all bindings.
   prePatch = ''
     substituteInPlace cmake/config-ix.cmake --replace "if(WIN32)" "if(1)"
+  ''
+  + stdenv.lib.optionalString (stdenv ? glibc) ''
+    (
+      cd projects/compiler-rt
+      patch -p1 < ${
+        fetchpatch {
+          name = "sigaltstack.patch"; # for glibc-2.26
+          url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
+          sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
+        }
+      }
+    )
   '';
 
   # hacky fix: created binaries need to be run before installation
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index f8b8948e749..a0fbdf2b706 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetch
+, fetchpatch
 , perl
 , groff
 , cmake
@@ -49,6 +50,18 @@ in stdenv.mkDerivation rec {
     substituteInPlace CMakeLists.txt \
       --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \
       --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' ""
+  ''
+  + stdenv.lib.optionalString (stdenv ? glibc) ''
+    (
+      cd projects/compiler-rt
+      patch -p1 < ${
+        fetchpatch {
+          name = "sigaltstack.patch"; # for glibc-2.26
+          url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
+          sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
+        }
+      }
+    )
   '';
 
   # hacky fix: created binaries need to be run before installation
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 809c49ac24a..495f95a5bbd 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -91,6 +91,20 @@ in stdenv.mkDerivation rec {
   + stdenv.lib.optionalString (enableSharedLibraries) ''
     substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
     patch -p1 < ./llvm-outputs.patch
+  ''
+  + stdenv.lib.optionalString (stdenv ? glibc) ''
+    (
+      cd projects/compiler-rt
+      patch -p1 < ${
+        fetchpatch {
+          name = "sigaltstack.patch"; # for glibc-2.26
+          url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
+          sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
+        }
+      }
+      substituteInPlace lib/esan/esan_sideline_linux.cpp \
+        --replace 'struct sigaltstack' 'stack_t'
+    )
   '';
 
   # hacky fix: created binaries need to be run before installation
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index e90603ffefa..332fee8529b 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -67,6 +67,20 @@ in stdenv.mkDerivation rec {
   + stdenv.lib.optionalString (enableSharedLibraries) ''
     substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
     patch -p1 < ./llvm-outputs.patch
+  ''
+  + stdenv.lib.optionalString (stdenv ? glibc) ''
+    (
+      cd projects/compiler-rt
+      patch -p1 < ${
+        fetchpatch {
+          name = "sigaltstack.patch"; # for glibc-2.26
+          url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
+          sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
+        }
+      }
+      substituteInPlace lib/esan/esan_sideline_linux.cpp \
+        --replace 'struct sigaltstack' 'stack_t'
+    )
   '';
 
   # hacky fix: created binaries need to be run before installation
-- 
GitLab


From 52d6eecc241a26f5a0ecb9ed04c76d2fd924255a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 7 Nov 2017 08:47:48 +0100
Subject: [PATCH 853/877] iniparser: 4.0 -> 4.1

---
 .../libraries/iniparser/default.nix           | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index a09bcd6f039..e586b30393e 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -1,17 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
-let
-  inherit (stdenv.lib) optional;
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "iniparser-${version}";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "ndevilla";
     repo = "iniparser";
     rev = "v${version}";
-    sha256 = "0339qa0qxa5z02xjcs5my8v91v0r9jm4piswrl1sa29kwyxgv5nb";
+    sha256 = "0dhab6pad6wh816lr7r3jb6z273njlgw2vpw8kcfnmi7ijaqhnr5";
   };
 
   patches = ./no-usr.patch;
@@ -19,9 +16,6 @@ in stdenv.mkDerivation rec {
   doCheck = true;
   preCheck = "patchShebangs test/make-tests.sh";
 
-  # TODO: Build dylib on Darwin
-  buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) ++ [ "CC=cc" ];
-
   installPhase = ''
     mkdir -p $out/lib
 
@@ -34,17 +28,16 @@ in stdenv.mkDerivation rec {
     done;
     cp -r html $out/share/doc/${name}
 
-  '' + (if stdenv.isDarwin then ''
     cp libiniparser.a $out/lib
-  '' else ''
-    cp libiniparser.so.0 $out/lib
-    ln -s libiniparser.so.0 $out/lib/libiniparser.so
-  '');
+    cp libiniparser.so.1 $out/lib
+    ln -s libiniparser.so.1 $out/lib/libiniparser.so
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Free standalone ini file parsing library";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.primeos ];
   };
 }
-- 
GitLab


From 2b995c544de793df1b86d7dfdf386637a3e3012f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 30 Oct 2017 12:45:36 +0000
Subject: [PATCH 854/877] osx_private_sdk: reduce output size and remove it
 from runtime closures

---
 .../libsecurity_filedb/default.nix            |  2 +-
 .../libsecurity_generic/default.nix           |  2 +-
 .../libsecurity_keychain/default.nix          |  4 +--
 .../libsecurity_utilities/default.nix         |  5 ++--
 .../os-specific/darwin/cf-private/default.nix | 23 ++++-----------
 .../darwin/osx-private-sdk/default.nix        | 29 +++++++++++++++----
 .../darwin/security-tool/default.nix          |  2 +-
 7 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix
index 0234cbc6279..fb1ea2509d7 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix
@@ -6,7 +6,7 @@ appleDerivation {
     libsecurity_cdsa_plugin
   ];
   patchPhase = ''
-    cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/sandbox_private.h .
+    cp ${osx_private_sdk}/include/sandbox_private.h .
     substituteInPlace sandbox_private.h --replace '<sandbox.h>' '"${apple_sdk.sdk}/include/sandbox.h"'
     substituteInPlace lib/AtomicFile.cpp --replace '<sandbox.h>' '"sandbox_private.h"'
   '';
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
index ef449a7d415..93857ea792c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
@@ -10,7 +10,7 @@ name: version: sha256: args: let
 
       patchPhase = ''
         # allows including <Security/some-private-header.h>
-        ln -s ${pkgs.darwin.osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders Security
+        cp -R ${pkgs.darwin.osx_private_sdk}/include/SecurityPrivateHeaders Security
 
         grep -Rl MacErrors.h . | while read file; do
           substituteInPlace "''$file" --replace \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
index 34a2a49ea0e..06137879410 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
@@ -18,9 +18,9 @@ appleDerivation {
 
     substituteInPlace lib/SecCertificate.cpp --replace '#include <Security/SecCertificatePriv.h>' ""
 
-    cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/xpc/private.h xpc
+    cp ${osx_private_sdk}/include/xpc/private.h xpc
     cp ${apple_sdk.sdk}/include/xpc/*.h xpc
-    cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/sandbox_private.h lib/sandbox.h
+    cp ${osx_private_sdk}/include/sandbox_private.h lib/sandbox.h
 
     substituteInPlace lib/SecItemPriv.h \
       --replace "extern CFTypeRef kSecAttrAccessGroup" "extern const CFTypeRef kSecAttrAccessGroup" \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
index 8dae6072413..bb55fd48d8b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
@@ -17,9 +17,8 @@ appleDerivation {
     substituteInPlace lib/powerwatch.h --replace \
       '<IOKit/pwr_mgt/IOPMLibPrivate.h>' \
       '"${IOKit}/Library/Frameworks/IOKit.framework/Headers/pwr_mgt/IOPMLibPrivate.h"'
-
-    cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/security_utilities/utilities_dtrace.h lib
-    cp -R ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/bsm lib
+    cp -R ${osx_private_sdk}/include/bsm lib
+    cp ${osx_private_sdk}/include/utilities_dtrace.h lib
   '' + stdenv.lib.optionalString (!stdenv.cc.nativeLibc) ''
     substituteInPlace lib/vproc++.cpp --replace /usr/local/include/vproc_priv.h ${stdenv.libc}/include/vproc_priv.h
   '';
diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix
index 48860504f73..f8c25339370 100644
--- a/pkgs/os-specific/darwin/cf-private/default.nix
+++ b/pkgs/os-specific/darwin/cf-private/default.nix
@@ -1,31 +1,18 @@
 { stdenv, osx_private_sdk, CF }:
 
-let
-  headers = [
-    "CFAvailability.h"
-    "CFAttributedString.h"
-    "CFFileDescriptor.h"
-    "CFFileSecurity.h"
-    "CFNotificationCenter.h"
-    "CFStringTokenizer.h"
-    "CFURLEnumerator.h"
-    "CFURL.h"
-    "CoreFoundation.h"
-  ];
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
   name = "${CF.name}-private";
   phases = [ "installPhase" "fixupPhase" ];
   installPhase = ''
     dest=$out/Library/Frameworks/CoreFoundation.framework/Headers
     mkdir -p $dest
     pushd $dest
-    for file in ${CF}/Library/Frameworks/CoreFoundation.framework/Headers/*; do
-      ln -s $file
-    done
+      cp -Lv ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* $dest
+      for file in ${CF}/Library/Frameworks/CoreFoundation.framework/Headers/*; do
+        ln -sf $file 
+      done
     popd
 
-    install -m 0644 ${osx_private_sdk}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/{${stdenv.lib.concatStringsSep "," headers}} $dest
   '';
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/os-specific/darwin/osx-private-sdk/default.nix b/pkgs/os-specific/darwin/osx-private-sdk/default.nix
index c2c2aea54f8..1eecdbc5618 100644
--- a/pkgs/os-specific/darwin/osx-private-sdk/default.nix
+++ b/pkgs/os-specific/darwin/osx-private-sdk/default.nix
@@ -1,8 +1,27 @@
 { stdenv, fetchFromGitHub }:
 
-fetchFromGitHub {
-  owner = "samdmarshall";
-  repo = "OSXPrivateSDK";
-  rev = "f4d52b60e86b496abfaffa119a7d299562d99783";
-  sha256 = "0bv0884yxpvk2ishxj8gdy1w6wb0gwfq55q5qjp0s8z0z7f63zqh";
+stdenv.mkDerivation {
+  name = "OSXPrivateSDK";
+
+  src = fetchFromGitHub {
+    owner = "samdmarshall";
+    repo = "OSXPrivateSDK";
+    rev = "f4d52b60e86b496abfaffa119a7d299562d99783";
+    sha256 = "0bv0884yxpvk2ishxj8gdy1w6wb0gwfq55q5qjp0s8z0z7f63zqh";
+  };
+
+  # NOTE: we install only headers that are really needed to keep closure sie
+  # reasonable.
+  installPhase = ''
+    mkdir -p $out/include
+    sdk10=PrivateSDK10.10.sparse.sdk
+    sdk=PrivateSDK10.9.sparse.sdk
+    cp $sdk/usr/local/include/sandbox_private.h $out/include/sandbox_private.h
+    # this can be removed once we dtrace binary
+    cp $sdk/usr/local/include/security_utilities/utilities_dtrace.h $out/include/utilities_dtrace.h
+    cp -RL $sdk/usr/include/xpc $out/include/xpc
+    cp -RL $sdk/usr/local/include/bsm $out/include/bsm
+    cp -RL $sdk/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders $out/include/SecurityPrivateHeaders
+    cp -RL $sdk10/System/Library/Frameworks/CoreFoundation.framework/Headers $out/include/CoreFoundationPrivateHeaders
+  '';
 }
diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix
index 5a89940c9da..2b8c7718aee 100644
--- a/pkgs/os-specific/darwin/security-tool/default.nix
+++ b/pkgs/os-specific/darwin/security-tool/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     # copied from libsecurity_generic
-    ln -s ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders Security
+    cp -R ${osx_private_sdk}/include/SecurityPrivateHeaders Security
 
     substituteInPlace cmsutil.c --replace \
       '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
-- 
GitLab


From 27c8fd24e509d7ab0d80c7da1ab1f9ebb739c442 Mon Sep 17 00:00:00 2001
From: Raphael Das Gupta <git@raphael.dasgupta.ch>
Date: Mon, 6 Nov 2017 22:33:37 +0100
Subject: [PATCH 855/877] nixos/mysql: fix typo in description of mysql.bind
 option

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

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 845e6d4c22e..c6c463bce7d 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -67,7 +67,7 @@ in
         type = types.nullOr types.str;
         default = null;
         example = literalExample "0.0.0.0";
-        description = "Address to bind to. The default it to bind to all addresses";
+        description = "Address to bind to. The default is to bind to all addresses";
       };
 
       port = mkOption {
-- 
GitLab


From d2df286df7657c5be9bb1801ff9d5d099d8b0d0d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 7 Nov 2017 12:25:17 +0100
Subject: [PATCH 856/877] nixUnstable: nix-1.12pre5663_c7af84ce ->
 nix-1.12pre5732_fd10f6f2

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 4359682d96a..efe239224ae 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -161,12 +161,12 @@ in rec {
 
   nixUnstable = (lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre5663_c7af84ce";
+    suffix = "pre5732_fd10f6f2";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "c7af84ce846a9deefa5b4db1b1bce1c091ca2a1e";
-      sha256 = "1sc6rkx0500jz4fyfqm7443s1q24whmpx10mfs12wdk516f0q8qh";
+      rev = "fd10f6f2414521947ca60b9d1508d909f50e9faa";
+      sha256 = "17561jll94c8hdpxnyvdbjslnwr9g7ii4wqvrla7gfza236j9hff";
     };
     fromGit = true;
   })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
-- 
GitLab


From 139d931d4dc6f7da75cb66094c204526961a9633 Mon Sep 17 00:00:00 2001
From: Raphael Das Gupta <git@raphael.dasgupta.ch>
Date: Tue, 7 Nov 2017 11:34:03 +0100
Subject: [PATCH 857/877] nox: add license information: MIT

nox was licensed under MIT License
since at least 0.0.2. See
https://github.com/madjar/nox/commit/b7e084a7c507aff4c56afb4d719eefb142393d1a
---
 pkgs/tools/package-management/nox/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix
index ed7ec74483f..f6c5c7b53e1 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@@ -25,6 +25,7 @@ pythonPackages.buildPythonApplication rec {
     homepage = https://github.com/madjar/nox;
     description = "Tools to make nix nicer to use";
     maintainers = [ lib.maintainers.madjar ];
+    license = lib.licenses.mit;
     platforms = lib.platforms.all;
   };
 }
-- 
GitLab


From 8da04338d799cafb394984e02166772f3218393c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Nov 2017 12:55:10 +0100
Subject: [PATCH 858/877] gcc-4.9: fixup build with glibc-2.26

Upstream didn't backport this, but fortunately it wasn't too hard.
---
 .../development/compilers/gcc/4.9/default.nix |  1 +
 .../gcc/struct-sigaltstack-4.9.patch          | 78 +++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc/struct-sigaltstack-4.9.patch

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index d7684a61a2a..4675787912e 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -72,6 +72,7 @@ let version = "4.9.4";
       # target libraries and tools.
       ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
+      ++ [ ../struct-ucontext.patch ../struct-sigaltstack-4.9.patch ] # glibc-2.26
       ;
 
     javaEcj = fetchurl {
diff --git a/pkgs/development/compilers/gcc/struct-sigaltstack-4.9.patch b/pkgs/development/compilers/gcc/struct-sigaltstack-4.9.patch
new file mode 100644
index 00000000000..fc126b4813d
--- /dev/null
+++ b/pkgs/development/compilers/gcc/struct-sigaltstack-4.9.patch
@@ -0,0 +1,78 @@
+hand-resolved trivial conflicts for 4.9 from the upstream patch
+72edc2c02f8b4768ad660f46a1c7e2400c0a8e06
+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc
+index 69c9c10..8e53673 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc
+@@ -599,8 +599,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {
+   return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5);
+ }
+ 
+-uptr internal_sigaltstack(const struct sigaltstack *ss,
+-                         struct sigaltstack *oss) {
++uptr internal_sigaltstack(const void *ss, void *oss) {
+   return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss);
+ }
+ 
+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h
+index 6422df1..8e111d1 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_linux.h
++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h
+@@ -18,7 +18,6 @@
+ #include "sanitizer_platform_limits_posix.h"
+ 
+ struct link_map;  // Opaque type returned by dlopen().
+-struct sigaltstack;
+ 
+ namespace __sanitizer {
+ // Dirent structure for getdents(). Note that this structure is different from
+@@ -28,8 +27,7 @@ struct linux_dirent;
+ // Syscall wrappers.
+ uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
+ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5);
+-uptr internal_sigaltstack(const struct sigaltstack* ss,
+-                          struct sigaltstack* oss);
++uptr internal_sigaltstack(const void* ss, void* oss);
+ uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act,
+     __sanitizer_kernel_sigaction_t *oldact);
+ uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set,
+diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+index 891386dc..234e8c6 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+@@ -273,7 +273,7 @@ static int TracerThread(void* argument) {
+ 
+   // Alternate stack for signal handling.
+   InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
+-  struct sigaltstack handler_stack;
++  stack_t handler_stack;
+   internal_memset(&handler_stack, 0, sizeof(handler_stack));
+   handler_stack.ss_sp = handler_stack_memory.data();
+   handler_stack.ss_size = kHandlerStackSize;
+diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc
+index 2ed5718..6f972ab 100644
+--- a/libsanitizer/tsan/tsan_platform_linux.cc
++++ b/libsanitizer/tsan/tsan_platform_linux.cc
+@@ -287,7 +287,7 @@ void InitializePlatform() {
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+   int cnt = 0;
+-  __res_state *statp = (__res_state*)state;
++  struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
+       fds[cnt++] = statp->_u._ext.nssocks[i];
+
+error: 'SIGSEGV' was not declared in this scope
+diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc
+index 0692eb1..472f734 100644
+--- a/libsanitizer/asan/asan_linux.cc
++++ b/libsanitizer/asan/asan_linux.cc
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <pthread.h>
++#include <signal.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <unwind.h>
-- 
GitLab


From 5a43ac2c601f870cc3b5eeee027712ed74726bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Sun, 22 Oct 2017 16:15:12 +0200
Subject: [PATCH 859/877] coqPackages.mathcomp: 1.6.1 -> 1.6.4

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

diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index a80c934c6c1..046c3b2f795 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -2,9 +2,9 @@
 
 let param =
   {
-    version = "1.6.1";
-    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
-    sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
+    version = "1.6.4";
+    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
+    sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
   }; in
 
 callPackage ./generic.nix {
-- 
GitLab


From 90d33e4eaa5248e640fa9f8836a7876a34d14c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Sun, 22 Oct 2017 16:15:57 +0200
Subject: [PATCH 860/877] coqPackages.ssreflect: 1.6.1 -> 1.6.4

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

diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 352b98ab88b..49f999fc20b 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -2,9 +2,9 @@
 
 let param =
   {
-    version = "1.6.1";
-    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
-    sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
+    version = "1.6.4";
+    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
+    sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
   }; in
 
 callPackage ./generic.nix {
-- 
GitLab


From 3c3e1db36408277e6b8590c822146978d59868b2 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <ixmatus@users.noreply.github.com>
Date: Tue, 7 Nov 2017 06:26:45 -0600
Subject: [PATCH 861/877] signal-desktop: init at 1.0.35 (#31335)

* signal-desktop: init at 1.0.35
---
 .../signal-desktop/default.nix                | 88 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 90 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
new file mode 100644
index 00000000000..0376fb79c9b
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -0,0 +1,88 @@
+{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype,
+fontconfig, dbus, libX11, xlibs, libXi, libXcursor, libXdamage, libXrandr,
+libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
+nspr, alsaLib, cups, expat, udev
+}:
+let
+  rpath = lib.makeLibraryPath [
+    alsaLib
+    atk
+    cairo
+    cups
+    dbus
+    expat
+    fontconfig
+    freetype
+    gdk_pixbuf
+    glib
+    gnome2.GConf
+    gnome2.gtk
+    gnome2.pango
+    libX11
+    libXScrnSaver
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libXrandr
+    libXrender
+    libXtst
+    nspr
+    nss
+    stdenv.cc.cc
+    udev
+    xlibs.libxcb
+  ];
+
+in
+  stdenv.mkDerivation rec {
+    name = "signal-desktop-${version}";
+
+    version = "1.0.35";
+
+    src =
+      if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
+          sha256 = "d9f9d4d54f4121efc8eadf1cf0ff957828088b313e53b66dc540b851c44c1860";
+        }
+      else
+        throw "Signal for Desktop is not currently supported on ${stdenv.system}";
+
+    phases = [ "unpackPhase" "installPhase" ];
+    nativeBuildInputs = [ dpkg ];
+    unpackPhase = "dpkg-deb -x $src .";
+    installPhase = ''
+      mkdir -p $out
+      cp -R opt $out
+
+      mv ./usr/share $out/share
+      mv $out/opt/Signal $out/libexec
+      rmdir $out/opt
+
+      chmod -R g-w $out
+
+      # Patch signal
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+               --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop
+
+      # Symlink to bin
+      mkdir -p $out/bin
+      ln -s $out/libexec/signal-desktop $out/bin/signal-desktop
+
+      # Fix the desktop link
+      substituteInPlace $out/share/applications/signal-desktop.desktop \
+        --replace /opt/Signal/signal-desktop $out/bin/signal-desktop
+    '';
+
+    meta = {
+      description = "Signal Private Messenger for the Desktop.";
+      homepage = https://signal.org/;
+      license = lib.licenses.gpl3;
+      platforms = [
+        "x86_64-linux"
+      ];
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94522d50e46..a99e007f733 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4379,6 +4379,8 @@ with pkgs;
 
   sigil = libsForQt56.callPackage ../applications/editors/sigil { };
 
+  signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { };
+
   # aka., pgp-tools
   signing-party = callPackage ../tools/security/signing-party { };
 
-- 
GitLab


From 3339a7dc7c047c79d71ea58f98cd9817612aa435 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Tue, 7 Nov 2017 12:36:48 +0000
Subject: [PATCH 862/877] python.pkgs.textfixtures: 4.5.0 -> 5.3.0

---
 .../python-modules/testfixtures/default.nix   | 23 +++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +------------------
 2 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/testfixtures/default.nix

diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
new file mode 100644
index 00000000000..23b5a5aa9e2
--- /dev/null
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, mock, manuel, pytest, sybil, zope_component, django }:
+
+buildPythonPackage rec {
+  pname = "testfixtures";
+  version = "5.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1xfar653qmikwb94xj3f0xfp8dh2llxjsxipx1272d8qwl0aknnx";
+  };
+
+  checkInputs = [ mock manuel pytest sybil zope_component ];
+
+  checkPhase = ''
+    # django is too much hasle to setup at the moment
+    pytest --ignore=testfixtures/tests/test_django testfixtures/tests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/Simplistix/testfixtures";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8cba91324a0..2cfe3f6087f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21809,30 +21809,7 @@ EOF
     };
   };
 
-  testfixtures = buildPythonPackage rec {
-    name = "testfixtures-${version}";
-    version = "4.5.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/testfixtures/testfixtures-${version}.tar.gz";
-      sha256 = "0my8zq9d27mc7j78pz9971cn5wz6zi4vxlqa50szr2vq9j2xxkll";
-    };
-
-    buildInputs = with self; [ nose mock manuel ];
-
-    checkPhase = ''
-      nosetests -v
-    '';
-
-    # Test suite seems broken
-    # TypeError: TestSuite() missing 1 required positional argument: 'm'
-    # Haven't checked with newer version
-    doCheck = false;
-
-    meta = with stdenv.lib; {
-      homepage = "https://github.com/Simplistix/testfixtures";
-    };
-  };
+  testfixtures = callPackage ../development/python-modules/testfixtures {};
 
   tissue = buildPythonPackage rec {
     name = "tissue-0.9.2";
-- 
GitLab


From 8fb1ec1af424236fc3e6abfca70fc60b9cff5fbb Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Tue, 7 Nov 2017 12:41:27 +0000
Subject: [PATCH 863/877] python.pkgs.update_checker: 0.11 -> 0.16

---
 .../python-modules/update_checker/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +---------------
 2 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/update_checker/default.nix

diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix
new file mode 100644
index 00000000000..ad401d80190
--- /dev/null
+++ b/pkgs/development/python-modules/update_checker/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, requests}:
+
+buildPythonPackage rec {
+  pname = "update_checker";
+  version = "0.16";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1f38l40d32dm0avcidf3dmikma8z0la84yngj88v4xygzi399qvh";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # requires network
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A python module that will check for package updates";
+    homepage = https://github.com/bboe/update_checker;
+    license = licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2cfe3f6087f..8f39040f4bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20556,24 +20556,7 @@ in {
     };
   };
 
-  update_checker = buildPythonPackage rec {
-    name = "update_checker-0.11";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/u/update_checker/${name}.tar.gz";
-      sha256 = "681bc7c26cffd1564eb6f0f3170d975a31c2a9f2224a32f80fe954232b86f173";
-    };
-
-    propagatedBuildInputs = with self; [ requests ];
-
-    doCheck = false;
-
-    meta = {
-      description = "A python module that will check for package updates";
-      homepage = https://github.com/bboe/update_checker;
-      license = licenses.bsd2;
-    };
-  };
+  update_checker = callPackage ../development/python-modules/update_checker {};
 
   uritemplate = buildPythonPackage rec {
     name = "uritemplate-${version}";
-- 
GitLab


From b0225f8cbc1ae6a07bd35b020a17301a2d5787a9 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Tue, 7 Nov 2017 12:47:24 +0000
Subject: [PATCH 864/877] python.pkgs.sybil: init at 1.0.5

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

diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix
new file mode 100644
index 00000000000..b1fe22df476
--- /dev/null
+++ b/pkgs/development/python-modules/sybil/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonApplication, fetchPypi
+, pytest, nose }:
+
+buildPythonApplication rec {
+  pname   = "sybil";
+  version = "1.0.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0x8qd5p5qliv8wmdglda2iy3f70i4jg8zqyk8yhklm5hrxm8jdl6";
+  };
+
+  checkInputs = [ pytest nose ];
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Automated testing for the examples in your documentation.";
+    homepage    = https://github.com/cjw296/sybil/;
+    license     = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f39040f4bf..8cc46bc2589 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19733,6 +19733,8 @@ in {
     };
   };
 
+  sybil = callPackage ../development/python-modules/sybil { };
+
   syncthing-gtk = buildPythonPackage rec {
     version = "0.9.2.3";
     name = "syncthing-gtk-${version}";
-- 
GitLab


From af9e6c1634de3a0f256cbcf788dd8b16d7de8618 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Tue, 7 Nov 2017 12:50:11 +0000
Subject: [PATCH 865/877] python.pkgs.prawcore: init at 0.12.0

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

diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix
new file mode 100644
index 00000000000..eb3fb784dc9
--- /dev/null
+++ b/pkgs/development/python-modules/prawcore/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, requests
+, testfixtures, mock, requests_toolbelt
+, betamax, betamax-serializers, betamax-matchers
+}:
+
+buildPythonPackage rec {
+  pname = "prawcore";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "praw-dev";
+    repo = "prawcore";
+    rev = "v${version}";
+    sha256 = "1z5fz6v4bv6xw84l4q3rpw3j63bb2dldl0fd6ckz8wqlpb2l45br";
+  };
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  checkInputs = [
+    testfixtures
+    mock
+    betamax
+    betamax-serializers
+    betamax-matchers
+    requests_toolbelt
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Low-level communication layer for PRAW";
+    homepage = http://praw.readthedocs.org/;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8cc46bc2589..dbfb52b1fad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15095,6 +15095,8 @@ in {
     };
   };
 
+  prawcore = callPackage ../development/python-modules/prawcore { };
+
   premailer = callPackage ../development/python-modules/premailer { };
 
   prettytable = buildPythonPackage rec {
-- 
GitLab


From a5744101a2a1e01901e8a82a4a0654bdaff5ff9a Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Tue, 7 Nov 2017 12:53:19 +0000
Subject: [PATCH 866/877] python.pkgs.praw: 3.5.0 -> 5.2.0

---
 .../python-modules/praw/default.nix           | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 29 +------------
 2 files changed, 44 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/python-modules/praw/default.nix

diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix
new file mode 100644
index 00000000000..c0be1009b06
--- /dev/null
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore
+, pytest, betamax, betamax-serializers, betamax-matchers, requests_toolbelt
+}:
+
+buildPythonPackage rec {
+  pname = "praw";
+  version = "5.2.0";
+
+  src = fetchFromGitHub {
+    owner = "praw-dev";
+    repo = "praw";
+    rev = "v${version}";
+    sha256 = "0nwfadczxa1fyq65zc3sfv8g2r4w3xrx3bdi5fv9xpn97wh2ifgw";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    decorator
+    flake8
+    mock
+    six
+    update_checker
+    pytestrunner
+    prawcore
+  ];
+
+  checkInputs = [
+    pytest
+    betamax
+    betamax-serializers
+    betamax-matchers
+    requests_toolbelt
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Python Reddit API wrapper";
+    homepage = http://praw.readthedocs.org/;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dbfb52b1fad..727a2b25adb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15066,34 +15066,7 @@ in {
     };
   };
 
-  praw = buildPythonPackage rec {
-    name = "praw-3.5.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/praw/${name}.zip";
-      sha256 = "1hwdzqbrjdkicqhyxpcpsmld21k0ndpy8d2gk6l5mv9isw3dm8qa";
-    };
-
-    propagatedBuildInputs = with self; [
-      requests
-      decorator
-      flake8
-      mock
-      six
-      update_checker
-    ];
-
-    # can't find the tests module?
-    doCheck = false;
-
-    meta = {
-      description = "Python Reddit API wrapper";
-      homepage = http://praw.readthedocs.org/;
-      license = licenses.gpl3;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ jgeerds ];
-    };
-  };
+  praw = callPackage ../development/python-modules/praw { };
 
   prawcore = callPackage ../development/python-modules/prawcore { };
 
-- 
GitLab


From 5413be5645d688a2dd56c024a796e8f213bc657c Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Tue, 7 Nov 2017 12:59:22 +0000
Subject: [PATCH 867/877] python.pkgs.betamax-serializers: init at 0.2.0

---
 .../betamax-serializers/default.nix           | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/betamax-serializers/default.nix

diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix
new file mode 100644
index 00000000000..2ad23f1f9e6
--- /dev/null
+++ b/pkgs/development/python-modules/betamax-serializers/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, betamax, pyyaml }:
+
+buildPythonPackage rec {
+  pname = "betamax-serializers";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yqzwx204m4lxlpg04cwv6iwzmcpdzr19wvj97vvxchp0g4qg83d";
+  };
+
+  buildInputs = [ betamax pyyaml ];
+
+  meta = with stdenv.lib; {
+    homepage = https://gitlab.com/betamax/serializers;
+    description = "A set of third-party serializers for Betamax";
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 727a2b25adb..475b3a2ea40 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1329,6 +1329,7 @@ in {
       maintainers = with maintainers; [ pSub ];
     };
   };
+  betamax-serializers = callPackage ../development/python-modules/betamax-serializers { };
 
   bibtexparser = callPackage ../development/python-modules/bibtexparser { };
 
-- 
GitLab


From b71500ef5ae25a8ae7a445302dfeb1ca3b71b415 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Tue, 7 Nov 2017 13:00:05 +0000
Subject: [PATCH 868/877] python.pkgs.betamax-matchers: 0.3.0 -> 0.4.0

---
 .../betamax-matchers/default.nix              | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +---------------
 2 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/betamax-matchers/default.nix

diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix
new file mode 100644
index 00000000000..762154ac45d
--- /dev/null
+++ b/pkgs/development/python-modules/betamax-matchers/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, betamax, requests_toolbelt }:
+
+buildPythonPackage rec {
+  pname = "betamax-matchers";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43";
+  };
+
+  buildInputs = [ betamax requests_toolbelt ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sigmavirus24/betamax_matchers;
+    description = "A group of experimental matchers for Betamax";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 475b3a2ea40..9941a80dd6b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1311,24 +1311,8 @@ in {
     };
   };
 
-  betamax-matchers = buildPythonPackage rec {
-    name = "betamax-matchers-${version}";
-    version = "0.3.0";
-
-    src = pkgs.fetchurl {
-       url = "mirror://pypi/b/betamax-matchers/${name}.tar.gz";
-      sha256 = "039kvqsdcvvlfxjc3n1x2xvjg6qkqbql0p7rc4z7bnxm9kcm88la";
-    };
-
-    buildInputs = with self; [ betamax requests_toolbelt ];
+  betamax-matchers = callPackage ../development/python-modules/betamax-matchers { };
 
-    meta = with stdenv.lib; {
-      homepage = https://github.com/sigmavirus24/betamax_matchers;
-      description = "A group of experimental matchers for Betamax";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ pSub ];
-    };
-  };
   betamax-serializers = callPackage ../development/python-modules/betamax-serializers { };
 
   bibtexparser = callPackage ../development/python-modules/bibtexparser { };
-- 
GitLab


From 54c14e2fa37f0ecb22469a16aff0e76d99ecf75c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Nov 2017 14:53:10 +0100
Subject: [PATCH 869/877] gcc-4.8: fix with glibc-2.26

---
 .../development/compilers/gcc/4.8/default.nix |   6 +-
 .../gcc/res_state-not-declared.patch          |  13 ++
 .../compilers/gcc/sigsegv-not-declared.patch  |  13 ++
 .../compilers/gcc/struct-ucontext-4.8.patch   | 177 ++++++++++++++++++
 4 files changed, 208 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/res_state-not-declared.patch
 create mode 100644 pkgs/development/compilers/gcc/sigsegv-not-declared.patch
 create mode 100644 pkgs/development/compilers/gcc/struct-ucontext-4.8.patch

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 72e37f18a17..3031df56150 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -78,7 +78,11 @@ let version = "4.8.5";
           sha256 = "01jd7pdarh54ki498g6sz64ijl9a1l5f9v8q2696aaxalvh2vwzl";
           excludes = [ "gcc/cp/ChangeLog" ];
         })]
-      ;
+      ++ [ # glibc-2.26
+        ../struct-ucontext-4.8.patch
+        ../sigsegv-not-declared.patch
+        ../res_state-not-declared.patch
+      ];
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
diff --git a/pkgs/development/compilers/gcc/res_state-not-declared.patch b/pkgs/development/compilers/gcc/res_state-not-declared.patch
new file mode 100644
index 00000000000..e970487786d
--- /dev/null
+++ b/pkgs/development/compilers/gcc/res_state-not-declared.patch
@@ -0,0 +1,13 @@
+diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc
+index fe69430..49f5270 100644
+--- a/libsanitizer/tsan/tsan_platform_linux.cc
++++ b/libsanitizer/tsan/tsan_platform_linux.cc
+@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) {
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+   int cnt = 0;
+-  __res_state *statp = (__res_state*)state;
++  struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
+       fds[cnt++] = statp->_u._ext.nssocks[i];
diff --git a/pkgs/development/compilers/gcc/sigsegv-not-declared.patch b/pkgs/development/compilers/gcc/sigsegv-not-declared.patch
new file mode 100644
index 00000000000..f9cfaec8202
--- /dev/null
+++ b/pkgs/development/compilers/gcc/sigsegv-not-declared.patch
@@ -0,0 +1,13 @@
+error: 'SIGSEGV' was not declared in this scope
+diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc
+index 0692eb1..472f734 100644
+--- a/libsanitizer/asan/asan_linux.cc
++++ b/libsanitizer/asan/asan_linux.cc
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <pthread.h>
++#include <signal.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <unwind.h>
diff --git a/pkgs/development/compilers/gcc/struct-ucontext-4.8.patch b/pkgs/development/compilers/gcc/struct-ucontext-4.8.patch
new file mode 100644
index 00000000000..630ef6586e4
--- /dev/null
+++ b/pkgs/development/compilers/gcc/struct-ucontext-4.8.patch
@@ -0,0 +1,177 @@
+From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001
+From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 4 Jul 2017 10:23:57 +0000
+Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files.
+
+Current glibc no longer gives the ucontext_t type the tag struct
+ucontext, to conform with POSIX namespace rules.  This requires
+various linux-unwind.h files in libgcc, that were previously using
+struct ucontext, to be fixed to use ucontext_t instead.  This is
+similar to the removal of the struct siginfo tag from siginfo_t some
+years ago.
+
+This patch changes those files to use ucontext_t instead.  As the
+standard name that should be unconditionally safe, so this is not
+restricted to architectures supported by glibc, or conditioned on the
+glibc version.
+
+Tested compilation together with current glibc with glibc's
+build-many-glibcs.py.
+
+	* config/aarch64/linux-unwind.h (aarch64_fallback_frame_state),
+	config/alpha/linux-unwind.h (alpha_fallback_frame_state),
+	config/bfin/linux-unwind.h (bfin_fallback_frame_state),
+	config/i386/linux-unwind.h (x86_64_fallback_frame_state,
+	x86_fallback_frame_state), config/m68k/linux-unwind.h (struct
+	uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext),
+	config/pa/linux-unwind.h (pa32_fallback_frame_state),
+	config/sh/linux-unwind.h (sh_fallback_frame_state),
+	config/tilepro/linux-unwind.h (tile_fallback_frame_state),
+	config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use
+	ucontext_t instead of struct ucontext.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ libgcc/ChangeLog     (REMOVED)       | 14 ++++++++++++++
+ libgcc/config/aarch64/linux-unwind.h |  2 +-
+ libgcc/config/alpha/linux-unwind.h   |  2 +-
+ libgcc/config/bfin/linux-unwind.h    |  2 +-
+ libgcc/config/i386/linux-unwind.h    |  4 ++--
+ libgcc/config/m68k/linux-unwind.h    |  2 +-
+ libgcc/config/nios2/linux-unwind.h   |  2 +-
+ libgcc/config/pa/linux-unwind.h      |  2 +-
+ libgcc/config/sh/linux-unwind.h      |  2 +-
+ libgcc/config/tilepro/linux-unwind.h |  2 +-
+ libgcc/config/xtensa/linux-unwind.h  |  2 +-
+ 11 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
+index 4512efb..06de45a 100644
+--- a/libgcc/config/aarch64/linux-unwind.h
++++ b/libgcc/config/aarch64/linux-unwind.h
+@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
+   struct rt_sigframe
+   {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   };
+ 
+   struct rt_sigframe *rt_;
+diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
+index bdbba4a..e84812e 100644
+--- a/libgcc/config/alpha/linux-unwind.h
++++ b/libgcc/config/alpha/linux-unwind.h
+@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       sc = &rt_->uc.uc_mcontext;
+     }
+diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
+index 77b7c23..8bf5e82 100644
+--- a/libgcc/config/bfin/linux-unwind.h
++++ b/libgcc/config/bfin/linux-unwind.h
+@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+ 	void *puc;
+ 	char retcode[8];
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+ 
+       /* The void * cast is necessary to avoid an aliasing warning.
+diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
+index 540a0a2..29efbe3 100644
+--- a/libgcc/config/i386/linux-unwind.h
++++ b/libgcc/config/i386/linux-unwind.h
+@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+   if (*(unsigned char *)(pc+0) == 0x48
+       && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
+     {
+-      struct ucontext *uc_ = context->cfa;
++      ucontext_t *uc_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+          because it does not alias anything.  */
+@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+ 	siginfo_t *pinfo;
+ 	void *puc;
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
+index 75b7cf7..f964e24 100644
+--- a/libgcc/config/m68k/linux-unwind.h
++++ b/libgcc/config/m68k/linux-unwind.h
+@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ /* <sys/ucontext.h> is unfortunately broken right now.  */
+ struct uw_ucontext {
+ 	unsigned long	  uc_flags;
+-	struct ucontext  *uc_link;
++	ucontext_t	 *uc_link;
+ 	stack_t		  uc_stack;
+ 	mcontext_t	  uc_mcontext;
+ 	unsigned long	  uc_filler[80];
+diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
+index 9a2657f..e47493d 100644
+--- a/libgcc/config/pa/linux-unwind.h
++++ b/libgcc/config/pa/linux-unwind.h
+@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+   struct sigcontext *sc;
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *frame;
+ 
+   /* rt_sigreturn trampoline:
+diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
+index e389cac..0bf43ba 100644
+--- a/libgcc/config/sh/linux-unwind.h
++++ b/libgcc/config/sh/linux-unwind.h
+@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
+index 796e976..75f8890 100644
+--- a/libgcc/config/tilepro/linux-unwind.h
++++ b/libgcc/config/tilepro/linux-unwind.h
+@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
+   struct rt_sigframe {
+     unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *rt_;
+ 
+   /* Return if this is not a signal handler.  */
+diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
+index 9872492..586a9d4 100644
+--- a/libgcc/config/xtensa/linux-unwind.h
++++ b/libgcc/config/xtensa/linux-unwind.h
+@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+ 
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *rt_;
+ 
+   /* movi a2, __NR_rt_sigreturn; syscall */
+-- 
+2.9.3
+
-- 
GitLab


From d51f9b364e5aa2a35da4e8ad12efe01a031ec545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Nov 2017 15:27:53 +0100
Subject: [PATCH 870/877] checkpolicy: fixup includes with glibc-2.26

---
 pkgs/os-specific/linux/checkpolicy/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
index 9fbed50f3b9..8e01bb2a5c8 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -10,16 +10,17 @@ stdenv.mkDerivation rec {
     sha256 = "1m5wjm43lzp6bld8higsvdm2dkddydihhwv9qw2w9r4dm0largcv";
   };
 
+  # Don't build tests
+  postPatch = ''
+    sed '/-C test/d' -i Makefile
+    sed '1i#include <ctype.h>' -i checkpolicy.c
+  '';
+
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ libsepol ];
 
   NIX_CFLAGS_COMPILE = "-fstack-protector-all";
 
-  # Don't build tests
-  postPatch = ''
-    sed -i '/-C test/d' Makefile
-  '';
-
   preBuild = ''
     makeFlagsArray+=("LEX=flex")
     makeFlagsArray+=("LIBDIR=${libsepol}/lib")
-- 
GitLab


From f04b64c1e97fcacf6a6272de5a0562ced97db436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Nov 2017 15:39:24 +0100
Subject: [PATCH 871/877] gcc-4.5: fixup build with glibc-2.26

The older the GCC, the easier the backporting :-)
---
 .../development/compilers/gcc/4.5/default.nix |   1 +
 .../compilers/gcc/struct-ucontext-4.5.patch   | 107 ++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc/struct-ucontext-4.5.patch

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 5bad03d3025..41d31888bde 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -153,6 +153,7 @@ stdenv.mkDerivation ({
     # target libraries and tools.
     ++ optional langAda ../gnat-cflags.patch
     ++ optional langVhdl ./ghdl-ortho-cflags.patch
+    ++ [ ../struct-ucontext-4.5.patch ] # glibc-2.26
     ;
 
   postPatch =
diff --git a/pkgs/development/compilers/gcc/struct-ucontext-4.5.patch b/pkgs/development/compilers/gcc/struct-ucontext-4.5.patch
new file mode 100644
index 00000000000..a84e9ffe268
--- /dev/null
+++ b/pkgs/development/compilers/gcc/struct-ucontext-4.5.patch
@@ -0,0 +1,107 @@
+Trivally backported the upstream commit
+b685411208e0aaa79190d54faf945763514706b8
+(different directory, some files not present, etc.)
+We only really use x86* from those, probably, so I didn't bother much.
+diff --git a/gcc/config/alpha/linux-unwind.h b/gcc/config/alpha/linux-unwind.h
+index bdbba4a..e84812e 100644
+--- a/gcc/config/alpha/linux-unwind.h
++++ b/gcc/config/alpha/linux-unwind.h
+@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       sc = &rt_->uc.uc_mcontext;
+     }
+diff --git a/gcc/config/bfin/linux-unwind.h b/gcc/config/bfin/linux-unwind.h
+index 77b7c23..8bf5e82 100644
+--- a/gcc/config/bfin/linux-unwind.h
++++ b/gcc/config/bfin/linux-unwind.h
+@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+ 	void *puc;
+ 	char retcode[8];
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+ 
+       /* The void * cast is necessary to avoid an aliasing warning.
+diff --git a/gcc/config/i386/linux-unwind.h b/gcc/config/i386/linux-unwind.h
+index 540a0a2..29efbe3 100644
+--- a/gcc/config/i386/linux-unwind.h
++++ b/gcc/config/i386/linux-unwind.h
+@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+   if (*(unsigned char *)(pc+0) == 0x48
+       && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
+     {
+-      struct ucontext *uc_ = context->cfa;
++      ucontext_t *uc_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+          because it does not alias anything.  */
+@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+ 	siginfo_t *pinfo;
+ 	void *puc;
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/gcc/config/m68k/linux-unwind.h b/gcc/config/m68k/linux-unwind.h
+index 75b7cf7..f964e24 100644
+--- a/gcc/config/m68k/linux-unwind.h
++++ b/gcc/config/m68k/linux-unwind.h
+@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ /* <sys/ucontext.h> is unfortunately broken right now.  */
+ struct uw_ucontext {
+ 	unsigned long	  uc_flags;
+-	struct ucontext  *uc_link;
++	ucontext_t	 *uc_link;
+ 	stack_t		  uc_stack;
+ 	mcontext_t	  uc_mcontext;
+ 	unsigned long	  uc_filler[80];
+diff --git a/gcc/config/pa/linux-unwind.h b/gcc/config/pa/linux-unwind.h
+index 9a2657f..e47493d 100644
+--- a/gcc/config/pa/linux-unwind.h
++++ b/gcc/config/pa/linux-unwind.h
+@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+   struct sigcontext *sc;
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *frame;
+ 
+   /* rt_sigreturn trampoline:
+diff --git a/gcc/config/sh/linux-unwind.h b/gcc/config/sh/linux-unwind.h
+index e389cac..0bf43ba 100644
+--- a/gcc/config/sh/linux-unwind.h
++++ b/gcc/config/sh/linux-unwind.h
+@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/gcc/config/xtensa/linux-unwind.h b/gcc/config/xtensa/linux-unwind.h
+index 9872492..586a9d4 100644
+--- a/gcc/config/xtensa/linux-unwind.h
++++ b/gcc/config/xtensa/linux-unwind.h
+@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+ 
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *rt_;
+ 
+   /* movi a2, __NR_rt_sigreturn; syscall */
+-- 
+2.9.3
+
-- 
GitLab


From c7e3555d8b0f8ba96c9e8772b73107617adfe24a Mon Sep 17 00:00:00 2001
From: James Earl Douglas <james@earldouglas.com>
Date: Tue, 7 Nov 2017 07:56:14 -0700
Subject: [PATCH 872/877] jenkins: 2.87 -> 2.88

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index e6f01ba5c93..f3385b26111 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.87";
+  version = "2.88";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "1nzs9nn1nr2jav59v1xj39rzmrh1zmwaqnpaiqsll8kixkr9rb8f";
+    sha256 = "062hnbyj73311sxhkwla6sl33zb43v8p7hjssgbh0bfvgmnlayim";
   };
 
   buildCommand = ''
-- 
GitLab


From 0e5014def922ba9224b8d8eecf8b66b81a296a6f Mon Sep 17 00:00:00 2001
From: James Earl Douglas <james@earldouglas.com>
Date: Tue, 7 Nov 2017 07:56:37 -0700
Subject: [PATCH 873/877] jenkins: add earldouglas as a maintainer

---
 .../tools/continuous-integration/jenkins/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index f3385b26111..ea5a5e37017 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = http://jenkins-ci.org;
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ coconnor fpletz ];
+    maintainers = with maintainers; [ coconnor fpletz earldouglas ];
   };
 }
-- 
GitLab


From 0f8c85d5d0f6c10f41f369641ced5ed707580fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Nov 2017 16:40:12 +0100
Subject: [PATCH 874/877] strongswan: fixup includes with glibc-2.26

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

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 7ef278e359c..89019986bca 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
     # the configuration files. In the absence of that we patch swanctl to look
     # for configuration files in /etc/swanctl.
     substituteInPlace src/swanctl/swanctl.h --replace "SWANCTLDIR" "\"/etc/swanctl\""
+    # glibc-2.26 reorganized internal includes
+    sed '1i#include <stdint.h>' -i src/libstrongswan/utils/utils/memory.h
     '';
 
   preConfigure = ''
-- 
GitLab


From d0c8c66068ffaa0bc10f4749c7e4d8df728fc9c3 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 7 Nov 2017 16:10:18 +0100
Subject: [PATCH 875/877] cvs: fix CVE-2017-12836

This patch is based on the work of the patch from Thorsten Glaser (MirBSD) [1]

[1] http://www.mirbsd.org/cvs.cgi/src/gnu/usr.bin/cvs/src/rsh-client.c.diff?r1=1.6;r2=1.7
---
 .../cvs/CVE-2017-12836.patch                  | 29 +++++++++++++++++++
 .../version-management/cvs/default.nix        |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/version-management/cvs/CVE-2017-12836.patch

diff --git a/pkgs/applications/version-management/cvs/CVE-2017-12836.patch b/pkgs/applications/version-management/cvs/CVE-2017-12836.patch
new file mode 100644
index 00000000000..95007942368
--- /dev/null
+++ b/pkgs/applications/version-management/cvs/CVE-2017-12836.patch
@@ -0,0 +1,29 @@
+--- a/src/rsh-client.c.orig	2005-10-02 17:17:21.000000000 +0200
++++ b/src/rsh-client.c	2017-11-07 16:56:06.957370469 +0100
+@@ -53,7 +53,7 @@
+     char *cvs_server = (root->cvs_server != NULL
+ 			? root->cvs_server : getenv ("CVS_SERVER"));
+     int i = 0;
+-    /* This needs to fit "rsh", "-b", "-l", "USER", "host",
++    /* This needs to fit "rsh", "-b", "-l", "USER", "--", "host",
+        "cmd (w/ args)", and NULL.  We leave some room to grow. */
+     char *rsh_argv[10];
+ 
+@@ -97,6 +97,9 @@
+ 	rsh_argv[i++] = root->username;
+     }
+ 
++    /* Only non-option arguments from here. (CVE-2017-12836) */
++    rsh_argv[i++] = "--";
++
+     rsh_argv[i++] = root->hostname;
+     rsh_argv[i++] = cvs_server;
+     rsh_argv[i++] = "server";
+@@ -171,6 +174,7 @@
+ 	    *p++ = root->username;
+ 	}
+ 
++	*p++ = "--";
+ 	*p++ = root->hostname;
+ 	*p++ = command;
+ 	*p++ = NULL;
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 8c69517a750..a330db6a8d6 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
   patches = [
     ./getcwd-chroot.patch
     ./CVE-2012-0804.patch
+    ./CVE-2017-12836.patch
   ];
 
   hardeningDisable = [ "fortify" "format" ];
-- 
GitLab


From 198fd526ca69873b9808202e2e8dffa6813823e7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <NeQuissimus@users.noreply.github.com>
Date: Tue, 7 Nov 2017 17:15:09 +0000
Subject: [PATCH 876/877] Revert "coqPackages.{ssreflect,mathcomp}: 1.6.1 ->
 1.6.4"

---
 pkgs/development/coq-modules/mathcomp/default.nix  | 6 +++---
 pkgs/development/coq-modules/ssreflect/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 046c3b2f795..a80c934c6c1 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -2,9 +2,9 @@
 
 let param =
   {
-    version = "1.6.4";
-    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
-    sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
+    version = "1.6.1";
+    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
+    sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
   }; in
 
 callPackage ./generic.nix {
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 49f999fc20b..352b98ab88b 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -2,9 +2,9 @@
 
 let param =
   {
-    version = "1.6.4";
-    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
-    sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
+    version = "1.6.1";
+    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
+    sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
   }; in
 
 callPackage ./generic.nix {
-- 
GitLab


From 7e571b9a9910d56356aadd8f11c6a4518de9410e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Nov 2017 18:54:55 +0100
Subject: [PATCH 877/877] mesos: fixup includes with glibc-2.26

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

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 116e7432690..90924227393 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -60,6 +60,8 @@ in stdenv.mkDerivation rec {
       "CXXFLAGS=-O2 -Wno-error=strict-aliasing"
     )
 
+    substituteInPlace 3rdparty/stout/include/stout/jsonify.hpp \
+      --replace '<xlocale.h>' '<locale.h>'
     # Fix cases where makedev(),major(),minor() are referenced through
     # <sys/types.h> instead of <sys/sysmacros.h>
     sed 1i'#include <sys/sysmacros.h>' -i src/linux/fs.cpp
-- 
GitLab