summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--doc/languages-frameworks/texlive.xml1
-rw-r--r--lib/maintainers.nix6
-rw-r--r--nixos/doc/manual/release-notes/rl-1609.xml8
-rw-r--r--nixos/doc/manual/release-notes/rl-1703.xml7
-rw-r--r--nixos/modules/module-list.nix3
-rw-r--r--nixos/modules/security/acme.xml21
-rw-r--r--nixos/modules/services/databases/openldap.nix9
-rw-r--r--nixos/modules/services/misc/gitlab.nix1
-rw-r--r--nixos/modules/services/misc/nix-optimise.nix2
-rw-r--r--nixos/modules/services/monitoring/riemann-tools.nix1
-rw-r--r--nixos/modules/services/network-filesystems/cachefilesd.nix59
-rw-r--r--nixos/modules/services/networking/avahi-daemon.nix15
-rw-r--r--nixos/modules/services/networking/ssh/sshd.nix40
-rw-r--r--nixos/modules/services/networking/supplicant.nix3
-rw-r--r--nixos/modules/services/networking/syncthing.nix115
-rw-r--r--nixos/modules/services/networking/wpa_supplicant.nix6
-rw-r--r--nixos/modules/services/search/hound.nix4
-rw-r--r--nixos/modules/services/web-apps/quassel-webserver.nix99
-rw-r--r--nixos/modules/services/web-servers/nginx/default.nix2
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm.nix3
-rw-r--r--nixos/modules/services/x11/window-managers/bspwm-unstable.nix48
-rw-r--r--nixos/modules/services/x11/window-managers/default.nix1
-rw-r--r--nixos/modules/services/x11/xserver.nix1
-rw-r--r--nixos/modules/system/boot/kernel.nix4
-rw-r--r--nixos/modules/system/boot/systemd-nspawn.nix71
-rw-r--r--nixos/modules/system/boot/systemd-unit-options.nix3
-rw-r--r--nixos/modules/system/boot/systemd.nix4
-rw-r--r--pkgs/applications/audio/mpg123/default.nix4
-rw-r--r--pkgs/applications/audio/puddletag/default.nix22
-rw-r--r--pkgs/applications/editors/atom/default.nix4
-rw-r--r--pkgs/applications/editors/brackets/default.nix10
-rw-r--r--pkgs/applications/editors/deadpixi-sam/default.nix10
-rw-r--r--pkgs/applications/editors/eclipse/default.nix388
-rw-r--r--pkgs/applications/editors/emacs-modes/elpa-generated.nix54
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-generated.nix2496
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix734
-rw-r--r--pkgs/applications/editors/emacs-modes/org-generated.nix12
-rw-r--r--pkgs/applications/editors/hecate/default.nix26
-rw-r--r--pkgs/applications/editors/hecate/deps.nix29
-rw-r--r--pkgs/applications/editors/vis/default.nix6
-rw-r--r--pkgs/applications/graphics/kipi-plugins/5.x.nix34
-rw-r--r--pkgs/applications/misc/buku/default.nix11
-rw-r--r--pkgs/applications/misc/calibre/default.nix4
-rw-r--r--pkgs/applications/misc/electrum/default.nix4
-rw-r--r--pkgs/applications/misc/keepassx/reboot.nix (renamed from pkgs/applications/misc/keepassx/2.0-http.nix)16
-rw-r--r--pkgs/applications/misc/mlterm/default.nix4
-rw-r--r--pkgs/applications/misc/mlterm/x_shortcut.c.patch26
-rw-r--r--pkgs/applications/misc/roxterm/default.nix1
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/sources.nix366
-rw-r--r--pkgs/applications/networking/browsers/firefox/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix4
-rw-r--r--pkgs/applications/networking/drive/default.nix21
-rw-r--r--pkgs/applications/networking/drive/deps.nix156
-rw-r--r--pkgs/applications/networking/dropbox/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/scudcloud/default.nix24
-rw-r--r--pkgs/applications/networking/irc/hexchat/default.nix4
-rw-r--r--pkgs/applications/networking/irc/quassel-webserver/default.nix43
-rw-r--r--pkgs/applications/networking/irc/quassel-webserver/quassel-webserver.nix2436
-rw-r--r--pkgs/applications/networking/irc/weechat/default.nix6
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird/default.nix5
-rw-r--r--pkgs/applications/networking/remote/remmina/default.nix11
-rw-r--r--pkgs/applications/networking/syncthing/default.nix19
-rw-r--r--pkgs/applications/networking/syncthing/inotify.nix21
-rw-r--r--pkgs/applications/office/beancount/default.nix9
-rw-r--r--pkgs/applications/office/fava/default.nix45
-rw-r--r--pkgs/applications/office/homebank/default.nix9
-rw-r--r--pkgs/applications/office/marp/default.nix4
-rw-r--r--pkgs/applications/office/mmex/default.nix24
-rw-r--r--pkgs/applications/science/misc/root/default.nix5
-rw-r--r--pkgs/applications/science/physics/sacrifice/compat.patch12
-rw-r--r--pkgs/applications/science/physics/sacrifice/default.nix39
-rw-r--r--pkgs/applications/science/robotics/yarp/default.nix17
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-cola/default.nix16
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix30
-rw-r--r--pkgs/applications/version-management/gource/default.nix4
-rw-r--r--pkgs/applications/video/mkvtoolnix/default.nix4
-rw-r--r--pkgs/applications/virtualization/rancher-compose/default.nix44
-rw-r--r--pkgs/applications/virtualization/rkt/default.nix2
-rw-r--r--pkgs/applications/window-managers/bspwm/unstable.nix31
-rw-r--r--pkgs/applications/window-managers/sxhkd/unstable.nix23
-rw-r--r--pkgs/build-support/kernel/modules-closure.nix4
-rw-r--r--pkgs/data/documentation/zeal/default.nix4
-rw-r--r--pkgs/data/fonts/font-awesome-ttf/default.nix24
-rw-r--r--pkgs/data/fonts/league-of-moveable-type/default.nix6
-rw-r--r--pkgs/data/fonts/raleway/default.nix6
-rw-r--r--pkgs/desktops/enlightenment/efl.nix4
-rw-r--r--pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix4
-rw-r--r--pkgs/desktops/kde-5/applications/default.nix4
-rw-r--r--pkgs/desktops/kde-5/applications/fetch.sh2
-rw-r--r--pkgs/desktops/kde-5/applications/gwenview.nix13
-rw-r--r--pkgs/desktops/kde-5/applications/kwalletmanager.nix35
-rw-r--r--pkgs/desktops/kde-5/applications/spectacle.nix10
-rw-r--r--pkgs/desktops/kde-5/applications/srcs.nix2064
-rw-r--r--pkgs/desktops/kde-5/plasma/fetch.sh2
-rw-r--r--pkgs/desktops/kde-5/plasma/srcs.nix320
-rw-r--r--pkgs/desktops/xfce/default.nix3
-rw-r--r--pkgs/development/compilers/glslang/default.nix25
-rw-r--r--pkgs/development/compilers/glslang/install-headers.patch26
-rw-r--r--pkgs/development/compilers/go/1.7.nix2
-rw-r--r--pkgs/development/compilers/llvm/3.9/default.nix2
-rw-r--r--pkgs/development/compilers/llvm/3.9/llvm.nix20
-rw-r--r--pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix6
-rw-r--r--pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix6
-rw-r--r--pkgs/development/compilers/ponyc/default.nix67
-rw-r--r--pkgs/development/compilers/ponyc/disable-tests.patch17
-rw-r--r--pkgs/development/compilers/shaderc/default.nix31
-rw-r--r--pkgs/development/guile-modules/guile-ncurses/default.nix7
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix24
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix6
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix5
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix7
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix5
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml36
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix1718
-rw-r--r--pkgs/development/interpreters/guile/default.nix4
-rw-r--r--pkgs/development/interpreters/php/default.nix11
-rw-r--r--pkgs/development/interpreters/python/cpython/2.7/default.nix2
-rw-r--r--pkgs/development/libraries/avro-c++/default.nix14
-rw-r--r--pkgs/development/libraries/dbus/default.nix4
-rw-r--r--pkgs/development/libraries/ffmpeg/3.1.nix4
-rw-r--r--pkgs/development/libraries/flatbuffers/default.nix34
-rw-r--r--pkgs/development/libraries/ijs/default.nix9
-rw-r--r--pkgs/development/libraries/kirigami/default.nix23
-rw-r--r--pkgs/development/libraries/libgumbo/default.nix25
-rw-r--r--pkgs/development/libraries/libtiff/default.nix34
-rw-r--r--pkgs/development/libraries/nspr/default.nix4
-rw-r--r--pkgs/development/libraries/opencv/default.nix6
-rw-r--r--pkgs/development/libraries/physics/fastjet/default.nix22
-rw-r--r--pkgs/development/libraries/physics/hepmc/default.nix29
-rw-r--r--pkgs/development/libraries/physics/hepmc/in_source.patch25
-rw-r--r--pkgs/development/libraries/physics/herwig/default.nix45
-rw-r--r--pkgs/development/libraries/physics/lhapdf/default.nix31
-rw-r--r--pkgs/development/libraries/physics/lhapdf/distutils-c++.patch24
-rwxr-xr-xpkgs/development/libraries/physics/lhapdf/maintainer.sh11
-rw-r--r--pkgs/development/libraries/physics/lhapdf/pdf_sets.nix668
-rw-r--r--pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh5
-rw-r--r--pkgs/development/libraries/physics/nlojet/default.nix23
-rw-r--r--pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch30
-rw-r--r--pkgs/development/libraries/physics/pythia/default.nix32
-rw-r--r--pkgs/development/libraries/physics/rivet/default.nix74
-rw-r--r--pkgs/development/libraries/physics/rivet/key_val.patch12
-rw-r--r--pkgs/development/libraries/physics/rivet/zaxis_fix.patch42
-rw-r--r--pkgs/development/libraries/physics/thepeg/default.nix28
-rw-r--r--pkgs/development/libraries/physics/yoda/default.nix31
-rw-r--r--pkgs/development/libraries/vulkan-loader/default.nix52
-rw-r--r--pkgs/development/libraries/wxGTK-3.0/default.nix10
-rw-r--r--pkgs/development/ocaml-modules/uchar/default.nix27
-rw-r--r--pkgs/development/python-modules/bootstrapped-pip/default.nix2
-rw-r--r--pkgs/development/tools/activator/default.nix4
-rw-r--r--pkgs/development/tools/ammonite/default.nix37
-rw-r--r--pkgs/development/tools/analysis/cppcheck/default.nix6
-rw-r--r--pkgs/development/tools/deis/default.nix22
-rw-r--r--pkgs/development/tools/deis/deps.nix29
-rw-r--r--pkgs/development/tools/deisctl/default.nix31
-rw-r--r--pkgs/development/tools/misc/hound/default.nix6
-rw-r--r--pkgs/development/tools/spirv-tools/default.nix42
-rw-r--r--pkgs/development/web/nodejs/v4.nix5
-rw-r--r--pkgs/games/frotz/default.nix25
-rw-r--r--pkgs/misc/ghostscript/default.nix34
-rw-r--r--pkgs/os-specific/linux/broadcom-sta/default.nix9
-rw-r--r--pkgs/os-specific/linux/cachefilesd/default.nix25
-rw-r--r--pkgs/os-specific/linux/facetimehd/default.nix41
-rw-r--r--pkgs/os-specific/linux/google-authenticator/default.nix9
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix8
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.4.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.7.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.8.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-grsecurity.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-testing.nix8
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix6
-rw-r--r--pkgs/os-specific/linux/libselinux/default.nix8
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/default.nix4
-rw-r--r--pkgs/servers/apcupsd/default.nix4
-rw-r--r--pkgs/servers/dns/bind/default.nix5
-rw-r--r--pkgs/servers/dns/nsd/default.nix4
-rw-r--r--pkgs/servers/emby/default.nix4
-rw-r--r--pkgs/servers/fleet/default.nix10
-rw-r--r--pkgs/servers/mail/opensmtpd/default.nix4
-rw-r--r--pkgs/servers/nextcloud/default.nix2
-rw-r--r--pkgs/servers/quagga/default.nix4
-rw-r--r--pkgs/servers/samba/4.x-fix-ctdb-deps.patch13
-rw-r--r--pkgs/servers/samba/4.x-no-persistent-install.patch68
-rw-r--r--pkgs/servers/samba/4.x.nix6
-rw-r--r--pkgs/servers/sql/mysql/5.5.x.nix4
-rw-r--r--pkgs/servers/sql/mysql/5.7.x.nix4
-rw-r--r--pkgs/servers/web-apps/shaarli/default.nix60
-rw-r--r--pkgs/servers/x11/xorg/default.nix12
-rw-r--r--pkgs/servers/x11/xorg/tarballs-7.7.list4
-rw-r--r--pkgs/stdenv/darwin/make-bootstrap-tools.nix56
-rw-r--r--pkgs/tools/admin/dehydrated/default.nix31
-rw-r--r--pkgs/tools/filesystems/vmfs-tools/default.nix24
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix14
-rw-r--r--pkgs/tools/misc/bibtex2html/default.nix21
-rw-r--r--pkgs/tools/misc/ipxe/default.nix6
-rw-r--r--pkgs/tools/misc/peruse/default.nix42
-rw-r--r--pkgs/tools/misc/screenfetch/default.nix18
-rw-r--r--pkgs/tools/misc/svtplay-dl/default.nix4
-rw-r--r--pkgs/tools/misc/youtube-dl/default.nix4
-rw-r--r--pkgs/tools/networking/aria2/default.nix4
-rw-r--r--pkgs/tools/networking/cmst/default.nix10
-rw-r--r--pkgs/tools/networking/httpie/default.nix4
-rw-r--r--pkgs/tools/networking/openssh/default.nix3
-rw-r--r--pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch11
-rw-r--r--pkgs/tools/networking/shadowsocks-libev/default.nix7
-rw-r--r--pkgs/tools/networking/ssldump/default.nix30
-rw-r--r--pkgs/tools/networking/statsd/node-packages.nix110
-rw-r--r--pkgs/tools/package-management/nixops/generic.nix26
-rw-r--r--pkgs/tools/security/fpm2/default.nix25
-rw-r--r--pkgs/tools/security/nitrokey-app/FixInstallDestination.patch35
-rw-r--r--pkgs/tools/security/nitrokey-app/HeaderPath.patch13
-rw-r--r--pkgs/tools/security/nitrokey-app/default.nix39
-rw-r--r--pkgs/tools/security/tor/default.nix4
-rw-r--r--pkgs/top-level/aliases.nix2
-rw-r--r--pkgs/top-level/all-packages.nix105
-rw-r--r--pkgs/top-level/ocaml-packages.nix5
-rw-r--r--pkgs/top-level/perl-packages.nix12
-rw-r--r--pkgs/top-level/python-packages.nix71
221 files changed, 10733 insertions, 4383 deletions
diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml
index 0e3c1dd13d7..fdee1e405ec 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -35,6 +35,7 @@ texlive.combine {
       You can list packages e.g. by <command>nix-repl</command>.
       <programlisting>
 $ nix-repl
+nix-repl> :l &lt;nixpkgs>
 nix-repl> texlive.collection-&lt;TAB>
       </programlisting>
     </para></listitem>
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 79f50a94a07..309a35bcaf2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -213,6 +213,7 @@
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
   jzellner = "Jeff Zellner <jeffz@eml.cc>";
+  kaiha = "Kai Harries <kai.harries@gmail.com>";
   kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
   kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>";
   kevincox = "Kevin Cox <kevincox@kevincox.ca>";
@@ -302,6 +303,7 @@
   nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
   nhooyr = "Anmol Sethi <anmol@aubble.com>";
   nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
+  nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   NikolaMandic = "Ratko Mladic <nikola@mandic.email>";
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
@@ -344,6 +346,7 @@
   proglodyte = "Proglodyte <proglodyte23@gmail.com>";
   pshendry = "Paul Hendry <paul@pshendry.com>";
   psibi = "Sibi <sibi@psibi.in>";
+  pstn = "Philipp Steinpaß <philipp@xndr.de>";
   pSub = "Pascal Wittmann <mail@pascal-wittmann.de>";
   puffnfresh = "Brian McKenna <brian@brianmckenna.org>";
   pxc = "Patrick Callahan <patrick.callahan@latitudeengineering.com>";
@@ -442,15 +445,18 @@
   twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
   uralbash = "Svintsov Dmitry <root@uralbash.ru>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
+  uwap = "uwap <me@uwap.name>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";
   vanzef = "Ivan Solyankin <vanzef@gmail.com>";
   vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>";
   vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>";
   vcunat = "Vladimír Čunát <vcunat@gmail.com>";
+  veprbl = "Dmitry Kalinkin <veprbl@gmail.com>";
   viric = "Lluís Batlle i Rossell <viric@viric.name>";
   vizanto = "Danny Wilson <danny@prime.vc>";
   vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
   vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
+  volhovm = "Mikhail Volkhov <volhovm.cs@gmail.com>";
   vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
   vrthra = "Rahul Gopinath <rahul@gopinath.org>";
   wedens = "wedens <kirill.wedens@gmail.com>";
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index 18b9a333e23..ade7d5581ce 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -164,14 +164,6 @@ following incompatible changes:</para>
       PHP has been upgraded to 7.0
     </para>
   </listitem>
-
-  <listitem>
-    <para>PHP now scans for extra configuration .ini files in /etc/php.d
-    instead of /etc. This prevents accidentally loading non-PHP .ini files
-    that may be in /etc.
-    </para>
-  </listitem>
-
 </itemizedlist>
 
 
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 21cea77f876..efff8b895a1 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -61,6 +61,13 @@ following incompatible changes:</para>
       <literal>strippedName</literal>.
     </para>
   </listitem>
+
+  <listitem>
+    <para>PHP now scans for extra configuration .ini files in /etc/php.d
+    instead of /etc. This prevents accidentally loading non-PHP .ini files
+    that may be in /etc.
+    </para>
+  </listitem>
 </itemizedlist>
 
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 09b938a69fe..7c5030c9479 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -313,6 +313,7 @@
   ./services/monitoring/uptime.nix
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
+  ./services/network-filesystems/cachefilesd.nix
   ./services/network-filesystems/drbd.nix
   ./services/network-filesystems/netatalk.nix
   ./services/network-filesystems/nfsd.nix
@@ -494,6 +495,7 @@
   ./services/web-apps/pump.io.nix
   ./services/web-apps/tt-rss.nix
   ./services/web-apps/selfoss.nix
+  ./services/web-apps/quassel-webserver.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/caddy.nix
   ./services/web-servers/fcgiwrap.nix
@@ -533,6 +535,7 @@
   ./services/x11/window-managers/fluxbox.nix
   ./services/x11/window-managers/icewm.nix
   ./services/x11/window-managers/bspwm.nix
+  ./services/x11/window-managers/bspwm-unstable.nix
   ./services/x11/window-managers/metacity.nix
   ./services/x11/window-managers/none.nix
   ./services/x11/window-managers/twm.nix
diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index 15ed4c04a23..226cf0382da 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -74,9 +74,30 @@ options for the <literal>security.acme</literal> module.</para>
 </para>
 
 <programlisting>
+security.acme.certs."foo.example.com" = {
+  webroot = "/var/www/challenges";
+  email = "foo@example.com";
+  user = "nginx";
+  group = "nginx";
+  postRun = "systemctl restart nginx.service";
+};
 services.nginx.httpConfig = ''
   server {
     server_name foo.example.com;
+    listen 80;
+    listen [::]:80;
+
+    location /.well-known/acme-challenge {
+      root /var/www/challenges;
+    }
+
+    location / {
+      return 301 https://$host$request_uri;
+    }
+  }
+
+  server {
+    server_name foo.example.com;
     listen 443 ssl;
     ssl_certificate     ${config.security.acme.directory}/foo.example.com/fullchain.pem;
     ssl_certificate_key ${config.security.acme.directory}/foo.example.com/key.pem;
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 9f22aa7c92b..875ed0f39db 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -53,6 +53,13 @@ in
         description = "The database directory.";
       };
 
+      configDir = mkOption {
+        type = types.path;
+        default = "";
+        description = "Use this optional config directory instead of using slapd.conf";
+        example = "/var/db/slapd.d";
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -96,7 +103,7 @@ in
         mkdir -p ${cfg.dataDir}
         chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
       '';
-      serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" -f ${configFile}";
+      serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" ${if cfg.configDir == "" then "-f "+configFile else "-F "+cfg.configDir}";
     };
 
     users.extraUsers.openldap =
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index f8881233dce..3e4584c7a51 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -463,6 +463,7 @@ in {
 
     systemd.services.gitlab = {
       after = [ "network.target" "postgresql.service" "redis.service" ];
+      requires = [ "gitlab-sidekiq.service" ];
       wantedBy = [ "multi-user.target" ];
       environment = gitlabEnv;
       path = with pkgs; [
diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix
index 87ce05c5a11..a76bfd9f1f1 100644
--- a/nixos/modules/services/misc/nix-optimise.nix
+++ b/nixos/modules/services/misc/nix-optimise.nix
@@ -41,7 +41,7 @@ in
     systemd.services.nix-optimise =
       { description = "Nix Store Optimiser";
         serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise";
-        startAt = optional cfg.automatic cfg.dates;
+        startAt = optionals cfg.automatic cfg.dates;
       };
 
   };
diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix
index ce277f09464..de858813a76 100644
--- a/nixos/modules/services/monitoring/riemann-tools.nix
+++ b/nixos/modules/services/monitoring/riemann-tools.nix
@@ -50,6 +50,7 @@ in {
 
     systemd.services.riemann-health = {
       wantedBy = [ "multi-user.target" ];
+      path = [ procps ];
       serviceConfig = {
         User = "riemanntools";
         ExecStart = "${healthLauncher}/bin/riemann-health";
diff --git a/nixos/modules/services/network-filesystems/cachefilesd.nix b/nixos/modules/services/network-filesystems/cachefilesd.nix
new file mode 100644
index 00000000000..61981340840
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/cachefilesd.nix
@@ -0,0 +1,59 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.cachefilesd;
+
+  cfgFile = pkgs.writeText "cachefilesd.conf" ''
+    dir ${cfg.cacheDir}
+    ${cfg.extraConfig}
+  '';
+
+in
+
+{
+  options = {
+    services.cachefilesd = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable cachefilesd network filesystems caching daemon.";
+      };
+
+      cacheDir = mkOption {
+        type = types.str;
+        default = "/var/cache/fscache";
+        description = "Directory to contain filesystem cache.";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = "brun 10%";
+        description = "Additional configuration file entries. See cachefilesd.conf(5) for more information.";
+      };
+
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.cachefilesd = {
+      description = "Local network file caching management daemon";
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.kmod pkgs.cachefilesd ];
+      script = ''
+        modprobe -qab cachefiles
+        mkdir -p ${cfg.cacheDir}
+        chmod 700 ${cfg.cacheDir}
+        exec cachefilesd -n -f ${cfgFile}
+      '';
+    };
+
+  };
+}
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index ecc091d1d03..6a786e75bbc 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -175,11 +175,20 @@ in
 
     environment.systemPackages = [ pkgs.avahi ];
 
+    systemd.sockets.avahi-daemon =
+      { description = "Avahi mDNS/DNS-SD Stack Activation Socket";
+        listenStreams = [ "/var/run/avahi-daemon/socket" ];
+        wantedBy = [ "sockets.target" ];
+      };
+
     systemd.services.avahi-daemon =
-      { description = "Avahi daemon";
+      { description = "Avahi mDNS/DNS-SD Stack";
         wantedBy = [ "multi-user.target" ];
-        # Receive restart event after resume
-        partOf = [ "post-resume.target" ];
+        requires = [ "avahi-daemon.socket" ];
+
+        serviceConfig."NotifyAccess" = "main";
+        serviceConfig."BusName" = "org.freedesktop.Avahi";
+        serviceConfig."Type" = "dbus";
 
         path = [ pkgs.coreutils pkgs.avahi ];
 
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 3e9fae35847..81941ce1cfb 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -242,7 +242,7 @@ in
 
     systemd =
       let
-        service =
+        sshd-service =
           { description = "SSH Daemon";
 
             wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target";
@@ -253,16 +253,8 @@ in
 
             environment.LD_LIBRARY_PATH = nssModulesPath;
 
-            preStart =
-              ''
-                mkdir -m 0755 -p /etc/ssh
-
-                ${flip concatMapStrings cfg.hostKeys (k: ''
-                  if ! [ -f "${k.path}" ]; then
-                      ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N ""
-                  fi
-                '')}
-              '';
+            wants = [ "sshd-keygen.service" ];
+            after = [ "sshd-keygen.service" ];
 
             serviceConfig =
               { ExecStart =
@@ -278,6 +270,26 @@ in
                 PIDFile = "/run/sshd.pid";
               });
           };
+
+        sshd-keygen-service =
+          { description = "SSH Host Key Generation";
+            path = [ cfgc.package ];
+            script =
+            ''
+              mkdir -m 0755 -p /etc/ssh
+              ${flip concatMapStrings cfg.hostKeys (k: ''
+                if ! [ -f "${k.path}" ]; then
+                  ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N ""
+                fi
+              '')}
+            '';
+
+            serviceConfig = {
+              Type = "oneshot";
+              RemainAfterExit = "yes";
+            };
+          };
+
       in
 
       if cfg.startWhenNeeded then {
@@ -289,11 +301,13 @@ in
             socketConfig.Accept = true;
           };
 
-        services."sshd@" = service;
+        services.sshd-keygen = sshd-keygen-service;
+        services."sshd@" = sshd-service;
 
       } else {
 
-        services.sshd = service;
+        services.sshd-keygen = sshd-keygen-service;
+        services.sshd = sshd-service;
 
       };
 
diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix
index e433ec7c5b9..0c459fb1dd0 100644
--- a/nixos/modules/services/networking/supplicant.nix
+++ b/nixos/modules/services/networking/supplicant.nix
@@ -34,7 +34,8 @@ let
       '';
     in
       { description = "Supplicant ${iface}${optionalString (iface=="WLAN"||iface=="LAN") " %I"}";
-        wantedBy = [ "network.target" ] ++ deps;
+        wantedBy = [ "multi-user.target" ] ++ deps;
+        wants = [ "network.target" ];
         bindsTo = deps;
         after = deps;
         before = [ "network.target" ];
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 8a430734319..dcdc203bdc6 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -3,46 +3,11 @@
 with lib;
 
 let
-
   cfg = config.services.syncthing;
   defaultUser = "syncthing";
-
-  header = {
-    description = "Syncthing service";
-    after = [ "network.target" ];
-    environment = {
-      STNORESTART = "yes";
-      STNOUPGRADE = "yes";
-      inherit (cfg) all_proxy;
-    } // config.networking.proxy.envVars;
-  };
-
-  service = {
-    Restart = "on-failure";
-    SuccessExitStatus = "2 3 4";
-    RestartForceExitStatus="3 4";
-  };
-
-  iNotifyHeader = {
-    description = "Syncthing Inotify File Watcher service";
-    after = [ "network.target" "syncthing.service" ];
-    requires = [ "syncthing.service" ];
-  };
-
-  iNotifyService = {
-    SuccessExitStatus = "2";
-    RestartForceExitStatus = "3";
-    Restart = "on-failure";
-  };
-
-in
-
-{
-
+in {
   ###### interface
-
   options = {
-
     services.syncthing = {
 
       enable = mkEnableOption ''
@@ -100,6 +65,19 @@ in
         '';
       };
 
+      openDefaultPorts = mkOption {
+        type = types.bool;
+        default = false;
+        example = literalExample "true";
+        description = ''
+          Open the default ports in the firewall:
+            - TCP 22000 for transfers
+            - UDP 21027 for discovery
+          If multiple users are running syncthing on this machine, you will need to manually open a set of ports for each instance and leave this disabled.
+          Alternatively, if are running only a single instance on this machine using the default ports, enable this.
+        '';
+      };
+
       package = mkOption {
         type = types.package;
         default = pkgs.syncthing;
@@ -117,6 +95,14 @@ in
 
   config = mkIf cfg.enable {
 
+    networking.firewall = mkIf cfg.openDefaultPorts {
+      allowedTCPPorts = [ 22000 ];
+      allowedUDPPorts = [ 21027 ];
+    };
+
+    systemd.packages = [ pkgs.syncthing ]
+                       ++ lib.optional cfg.useInotify pkgs.syncthing-inotify;
+
     users = mkIf (cfg.user == defaultUser) {
       extraUsers."${defaultUser}" =
         { group = cfg.group;
@@ -131,39 +117,44 @@ in
     };
 
     systemd.services = {
-      syncthing = mkIf cfg.systemService (header // {
-          wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ];
-          wantedBy = [ "multi-user.target" ];
-          serviceConfig = service // {
-            User = cfg.user;
-            Group = cfg.group;
-            PermissionsStartOnly = true;
-            ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}";
-          };
-      });
-
-      syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) (iNotifyHeader // {
+      syncthing = mkIf cfg.systemService {
+        description = "Syncthing service";
+        after = [ "network.target" ];
+        environment = {
+          STNORESTART = "yes";
+          STNOUPGRADE = "yes";
+          inherit (cfg) all_proxy;
+        } // config.networking.proxy.envVars;
+        wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ];
         wantedBy = [ "multi-user.target" ];
-        serviceConfig = iNotifyService // {
+        serviceConfig = {
+          Restart = "on-failure";
+          SuccessExitStatus = "2 3 4";
+          RestartForceExitStatus="3 4";
           User = cfg.user;
-          ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0";
+          Group = cfg.group;
+          PermissionsStartOnly = true;
+          ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}";
         };
-      });
-    };
+      };
 
-    systemd.user.services = {
-      syncthing = header // {
-        serviceConfig = service // {
-          ExecStart = "${cfg.package}/bin/syncthing -no-browser";
-        };
+      syncthing-resume = {
+        wantedBy = [ "suspend.target" ];
       };
 
-      syncthing-inotify = mkIf cfg.useInotify (iNotifyHeader // {
-        serviceConfig = iNotifyService // {
-          ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -logflags=0";
+      syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) {
+        description = "Syncthing Inotify File Watcher service";
+        after = [ "network.target" "syncthing.service" ];
+        requires = [ "syncthing.service" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          SuccessExitStatus = "2";
+          RestartForceExitStatus = "3";
+          Restart = "on-failure";
+          User = cfg.user;
+          ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0";
         };
-      });
+      };
     };
-
   };
 }
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index a344d785546..5657b91c1e7 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -128,9 +128,11 @@ in {
     in {
       description = "WPA Supplicant";
 
-      after = [ "network.target" ] ++ lib.concatMap deviceUnit ifaces;
+      after = lib.concatMap deviceUnit ifaces;
+      before = [ "network.target" ];
+      wants = [ "network.target" ];
       requires = lib.concatMap deviceUnit ifaces;
-      wantedBy = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
 
       path = [ pkgs.wpa_supplicant ];
 
diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix
index 4389f17668b..708f57a5eb7 100644
--- a/nixos/modules/services/search/hound.nix
+++ b/nixos/modules/services/search/hound.nix
@@ -57,6 +57,10 @@ in {
 
       config = mkOption {
         type = types.str;
+        description = ''
+          The full configuration of the Hound daemon. Note the dbpath
+          should be an absolute path to a writable location on disk.
+        '';
         example = ''
           {
              "max-concurrent-indexers" : 2,
diff --git a/nixos/modules/services/web-apps/quassel-webserver.nix b/nixos/modules/services/web-apps/quassel-webserver.nix
new file mode 100644
index 00000000000..7de9480d4c4
--- /dev/null
+++ b/nixos/modules/services/web-apps/quassel-webserver.nix
@@ -0,0 +1,99 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.quassel-webserver;
+  quassel-webserver = cfg.pkg;
+  settings = ''
+    module.exports = {
+      default: {
+        host: '${cfg.quasselCoreHost}',  // quasselcore host
+        port: ${toString cfg.quasselCorePort},  // quasselcore port
+        initialBacklogLimit: ${toString cfg.initialBacklogLimit},  // Amount of backlogs to fetch per buffer on connection
+        backlogLimit: ${toString cfg.backlogLimit},  // Amount of backlogs to fetch per buffer after first retrieval
+        securecore: ${if cfg.secureCore then "true" else "false"},  // Connect to the core using SSL
+        theme: '${cfg.theme}'  // Default UI theme
+      },
+      themes: ['default', 'darksolarized'],  //  Available themes
+      forcedefault: ${if cfg.forceHostAndPort then "true" else "false"},  // Will force default host and port to be used, and will hide the corresponding fields in the UI
+      prefixpath: '${cfg.prefixPath}'  // Configure this if you use a reverse proxy
+    };
+  '';
+  settingsFile = pkgs.writeText "settings-user.js" settings;
+in {
+  options = {
+    services.quassel-webserver = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether to enable the quassel webclient service";
+      };
+      pkg = mkOption {
+        default = pkgs.quassel-webserver;
+        description = "The quassel-webserver package";
+      };
+      quasselCoreHost = mkOption {
+        default = "";
+        type = types.str;
+        description = "The default host of the quassel core";
+      };
+      quasselCorePort = mkOption {
+        default = 4242;
+        type = types.int;
+        description = "The default quassel core port";
+      };
+      initialBacklogLimit = mkOption {
+        default = 20;
+        type = types.int;
+        description = "Amount of backlogs to fetch per buffer on connection";
+      };
+      backlogLimit = mkOption {
+        default = 100;
+        type = types.int;
+        description = "Amount of backlogs to fetch per buffer after first retrieval";
+      };
+      secureCore = mkOption {
+        default = true;
+        type = types.bool;
+        description = "Connect to the core using SSL";
+      };
+      theme = mkOption {
+        default = "default";
+        type = types.str;
+        description = "default or darksolarized";
+      };
+      prefixPath = mkOption {
+        default = "";
+        type = types.str;
+        description = "Configure this if you use a reverse proxy. Must start with a '/'";
+        example = "/quassel";
+      };
+      port = mkOption {
+        default = 60443;
+        type = types.int;
+        description = "The port the quassel webserver should listen on";
+      };
+      useHttps = mkOption {
+        default = true;
+        type = types.bool;
+        description = "Whether the quassel webserver connection should be a https connection";
+      };
+      forceHostAndPort = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Force the users to use the quasselCoreHost and quasselCorePort defaults";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.quassel-webserver = {
+      description = "A web server/client for Quassel";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${quassel-webserver}/lib/node_modules/quassel-webserver/bin/www -p ${toString cfg.port} -m ${if cfg.useHttps == true then "https" else "http"} -c ${settingsFile}";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 7b822619a2f..166e5a6b2ce 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -392,6 +392,8 @@ in
     security.acme.certs = filterAttrs (n: v: v != {}) (
       mapAttrs (vhostName: vhostConfig:
         optionalAttrs vhostConfig.enableACME {
+          user = cfg.user;
+          group = cfg.group;
           webroot = vhostConfig.acmeRoot;
           extraDomains = genAttrs vhostConfig.serverAliases (alias: null);
           postRun = ''
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 33cd51f37c6..1d309aa3429 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -207,6 +207,9 @@ in
     services.dbus.enable = true;
     services.dbus.packages = [ lightdm ];
 
+    # lightdm uses the accounts daemon to rember language/window-manager per user
+    services.accounts-daemon.enable = true;
+
     security.pam.services.lightdm = {
       allowNullPassword = true;
       startSession = true;
diff --git a/nixos/modules/services/x11/window-managers/bspwm-unstable.nix b/nixos/modules/services/x11/window-managers/bspwm-unstable.nix
new file mode 100644
index 00000000000..3282e0d0851
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/bspwm-unstable.nix
@@ -0,0 +1,48 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.bspwm-unstable;
+in
+
+{
+  options = {
+    services.xserver.windowManager.bspwm-unstable = {
+        enable = mkEnableOption "bspwm-unstable";
+        startThroughSession = mkOption {
+            type = with types; bool;
+            default = false;
+            description = "
+                Start the window manager through the script defined in 
+                sessionScript. Defaults to the the bspwm-session script
+                provided by bspwm
+            ";
+        };
+        sessionScript = mkOption {
+            default = "${pkgs.bspwm-unstable}/bin/bspwm-session";
+            defaultText = "(pkgs.bspwm-unstable)/bin/bspwm-session";
+            description = "
+                The start-session script to use. Defaults to the
+                provided bspwm-session script from the bspwm package.
+
+                Does nothing unless `bspwm.startThroughSession` is enabled
+            ";
+        };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
+      name = "bspwm-unstable";
+      start = if cfg.startThroughSession
+        then cfg.sessionScript
+        else ''
+            export _JAVA_AWT_WM_NONREPARENTING=1
+            SXHKD_SHELL=/bin/sh ${pkgs.sxhkd-unstable}/bin/sxhkd -f 100 &
+            ${pkgs.bspwm-unstable}/bin/bspwm
+        '';
+    };
+    environment.systemPackages = [ pkgs.bspwm-unstable ];
+  };
+}
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index f005decfa33..dabe2c26a72 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -10,6 +10,7 @@ in
   imports = [
     ./afterstep.nix
     ./bspwm.nix
+    ./bspwm-unstable.nix
     ./compiz.nix
     ./dwm.nix
     ./exwm.nix
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 298f30858ce..db60e47c3ea 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -515,6 +515,7 @@ in
       { description = "X11 Server";
 
         after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" "systemd-logind.service" ];
+        wants = [ "systemd-udev-settle.service" ];
 
         restartIfChanged = false;
 
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 51b3b8a3dca..e751ff141f7 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -214,8 +214,8 @@ in
         "hid_generic" "hid_lenovo"
         "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
 
-        # Misc. stuff.
-        "pcips2" "atkbd"
+        # Misc. keyboard stuff.
+        "pcips2" "atkbd" "i8042"
 
         # Temporary fix for https://github.com/NixOS/nixpkgs/issues/18451
         # Remove as soon as upstream gets fixed - marking it:
diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index 2527ab35719..f765db275e7 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -41,41 +41,43 @@ let
   ];
 
   instanceOptions = {
+    options = {
+
+      execConfig = mkOption {
+        default = {};
+        example = { Parameters = "/bin/sh"; };
+        type = types.addCheck (types.attrsOf unitOption) checkExec;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[Exec]</literal> section of this unit. See
+          <citerefentry><refentrytitle>systemd.nspawn</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for details.
+        '';
+      };
 
-    execConfig = mkOption {
-      default = {};
-      example = { Parameters = "/bin/sh"; };
-      type = types.addCheck (types.attrsOf unitOption) checkExec;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Exec]</literal> section of this unit. See
-        <citerefentry><refentrytitle>systemd.nspawn</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    filesConfig = mkOption {
-      default = {};
-      example = { Bind = [ "/home/alice" ]; };
-      type = types.addCheck (types.attrsOf unitOption) checkFiles;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Files]</literal> section of this unit. See
-        <citerefentry><refentrytitle>systemd.nspawn</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
+      filesConfig = mkOption {
+        default = {};
+        example = { Bind = [ "/home/alice" ]; };
+        type = types.addCheck (types.attrsOf unitOption) checkFiles;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[Files]</literal> section of this unit. See
+          <citerefentry><refentrytitle>systemd.nspawn</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for details.
+        '';
+      };
 
-    networkConfig = mkOption {
-      default = {};
-      example = { Private = false; };
-      type = types.addCheck (types.attrsOf unitOption) checkNetwork;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Network]</literal> section of this unit. See
-        <citerefentry><refentrytitle>systemd.nspawn</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
+      networkConfig = mkOption {
+        default = {};
+        example = { Private = false; };
+        type = types.addCheck (types.attrsOf unitOption) checkNetwork;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[Network]</literal> section of this unit. See
+          <citerefentry><refentrytitle>systemd.nspawn</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for details.
+        '';
+      };
     };
 
   };
@@ -99,8 +101,7 @@ in {
 
     systemd.nspawn = mkOption {
       default = {};
-      type = types.attrsOf types.optionSet;
-      options = [ instanceOptions ];
+      type = with types; attrsOf (submodule instanceOptions);
       description = "Definition of systemd-nspawn configurations.";
     };
 
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 731b1701e00..4c3fc30358c 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -316,7 +316,7 @@ in rec {
 
     startAt = mkOption {
       type = with types; either str (listOf str);
-      default = "";
+      default = [];
       example = "Sun 14:00:00";
       description = ''
         Automatically start this unit at the given date/time, which
@@ -326,6 +326,7 @@ in rec {
         to adding a corresponding timer unit with
         <option>OnCalendar</option> set to the value given here.
       '';
+      apply = v: if isList v then v else [ v ];
     };
 
   };
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d44c2e234b0..d1f3f923e5e 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -777,7 +777,7 @@ in
         { wantedBy = [ "timers.target" ];
           timerConfig.OnCalendar = service.startAt;
         })
-        (filterAttrs (name: service: service.enable && service.startAt != "") cfg.services);
+        (filterAttrs (name: service: service.enable && service.startAt != []) cfg.services);
 
     # Generate timer units for all services that have a ‘startAt’ value.
     systemd.user.timers =
@@ -785,7 +785,7 @@ in
         { wantedBy = [ "timers.target" ];
           timerConfig.OnCalendar = service.startAt;
         })
-        (filterAttrs (name: service: service.startAt != "") cfg.user.services);
+        (filterAttrs (name: service: service.startAt != []) cfg.user.services);
 
     systemd.sockets.systemd-journal-gatewayd.wantedBy =
       optional config.services.journald.enableHttpGateway "sockets.target";
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 9ff4aef6083..9004a46115e 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "mpg123-1.22.2";
+  name = "mpg123-1.23.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
-    sha256 = "0i1phi6fdjas37y00h3j8rb0b8ngr9az6hy5ff5bl53ify3j87kd";
+    sha256 = "13ngfzk84k4ks7ymanmq8f6707yrybra5h0mk3ir6mdnxk4068yy";
   };
 
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index 3bbed303aec..b8213f4d9f4 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,33 +1,31 @@
-{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, chromaprint }:
+{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
 
-with lib;
-with pythonPackages;
+let
+  pypkgs = python2Packages;
 
-buildPythonApplication rec {
-  version = "1.1.1";
+in pypkgs.buildPythonApplication rec {
   name = "puddletag-${version}";
-  namePrefix = "";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "keithgg";
     repo = "puddletag";
-    rev = "1.1.1";
+    rev = version;
     sha256 = "0zmhc01qg64fb825b3kj0mb0r0d9hms30nqvhdks0qnv7ahahqrx";
   };
 
   sourceRoot = "${name}-src/source";
 
-  disabled = isPy3k;
+  disabled = pypkgs.isPy3k; # work to support python 3 has not begun
 
   outputs = [ "out" ];
 
-  propagatedBuildInputs = [
-    chromaprint
+  propagatedBuildInputs = [ chromaprint ] ++ (with pypkgs; [
     configobj
     mutagen
     pyparsing
     pyqt4
-  ];
+  ]);
 
   doCheck = false;   # there are no tests
   dontStrip = true;  # we are not generating any binaries
@@ -36,7 +34,7 @@ buildPythonApplication rec {
     siteDir=$(toPythonPath $out)
     mkdir -p $siteDir
     PYTHONPATH=$PYTHONPATH:$siteDir
-    ${python.interpreter} setup.py install --prefix $out
+    ${pypkgs.python.interpreter} setup.py install --prefix $out
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 455400aad84..a044f82baaf 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.11.1";
+  version = "1.11.2";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1wpfpj9dv4l710758gcx05s2aj8mn21fr7wah2xv5qildx2qy31q";
+    sha256 = "1mvlj1j0hyvm5di95nn0x99lm5arw2amm1s1va1m73zss3bzlhpm";
     name = "${name}.deb";
   };
 
diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index 4237ce73f21..e9f36b19195 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -4,22 +4,22 @@ let
   bracketsEnv = buildEnv {
     name = "env-brackets";
     paths = [
-      gtk2 glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5
-      dbus systemd.lib
+      gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5
+      dbus.lib systemd.lib
     ];
   };
 in
 stdenv.mkDerivation rec {
   name = "brackets-${version}";
-  version = "1.5";
+  version = "1.7";
 
   src = fetchurl {
     url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb";
-    sha256 = "1fc8wvh9wbcydd1sw20yfnwlfv7nllb6vrssr6hgn80m7i0zl3db";
+    sha256 = "0nsiy3gvp8rd71a0misf6v1kz067kxnszr5mpch9fj4jqmg6nj8m";
     name = "${name}.deb";
   };
 
-  phases = [ "installPhase" ];
+  phases = [ "installPhase" "fixupPhase" ];
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix
index 03b920ffab0..d1ed4826c68 100644
--- a/pkgs/applications/editors/deadpixi-sam/default.nix
+++ b/pkgs/applications/editors/deadpixi-sam/default.nix
@@ -1,14 +1,16 @@
 { stdenv, fetchFromGitHub, freetype, libX11, libXt, libXft
+, version ? "2016-10-08"
+, rev ? "a17c4a9c2a1af2de0a756fe16d482e0db88c0541"
+, sha256 ? "03xmfzlijz4gbmr7l0pb1gl9kmlz1ab3hr8d51innvlasy4g6xgj"
 }:
 
 stdenv.mkDerivation rec {
-  name = "deadpixi-sam-unstable";
-  version = "2016-09-15";
+  inherit version;
+  name = "deadpixi-sam-unstable-${version}";
     src = fetchFromGitHub {
+      inherit sha256 rev;
       owner = "deadpixi";
       repo = "sam";
-      rev = "a6a8872246e8634d884b0ce52bc3be9770ab1b0f";
-      sha256 = "1zr8dl0vp1xic3dq69h4bp2fcxsjhrzasfl6ayvkibjd6z5dn07p";
     };
 
   postPatch = ''
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index c688065e6ea..48e6a34d8a5 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -12,73 +12,59 @@ rec {
 
   buildEclipse = callPackage ./build-eclipse.nix { };
 
-  eclipse-sdk-35 = buildEclipse {
-    name = "eclipse-sdk-3.5.2";
-    description = "Eclipse Classic";
+  ### Eclipse CPP
+
+  eclipse-cpp-46 = buildEclipse {
+    name = "eclipse-cpp-4.6.0";
+    description = "Eclipse IDE for C/C++ Developers, Neon release";
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "1ndvanxw62b5ywi6ww0dyimabfmjdsw9q3xpy95zd8d5ygj2qsgq";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz;
+          sha256 = "09fqsgvbjfdqvn7z03crkii34z4bsb34y272q68ib8741bxk0i6m";
         }
-      else
+      else if stdenv.system == "i686-linux" then
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz;
-          sha256 = "0y5n0cyr9lgjmmzkfmav7j5w66rc1jq3300hcw3vrfjiv1k6ng3w";
-        };
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz;
+          sha256 = "0a12qmqq22v7sbmwn1hjv1zcrkmp64bf0ajmdjljhs9ac79mxn5h";
+        }
+      else throw "Unsupported system: ${stdenv.system}";
   };
-  eclipse_sdk_35 = eclipse-sdk-35; # backward compatibility, added 2016-01-30
 
-  eclipse-sdk-36 = buildEclipse {
-    name = "eclipse-sdk-3.6.2";
-    description = "Eclipse Classic";
+  eclipse-cpp-37 = buildEclipse {
+    name = "eclipse-cpp-3.7";
+    description = "Eclipse IDE for C/C++ Developers";
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "0dfcfadcd6337c897fbfd5b292de481931dfce12d43289ecb93691fd27dd47f4";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz;
+          sha256 = "14ppc9g9igzvj1pq7jl01vwhzb66nmzbl9wsdl1sf3xnwa9wnqk3";
         }
       else
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk.tar.gz;
-          sha256 = "1bh8ykliqr8wbciv13vpiy50rvm7yszk7y8dslr796dbwhi5b1cj";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk.tar.gz;
+          sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b";
         };
   };
-  eclipse_sdk_36 = eclipse-sdk-36; # backward compatibility, added 2016-01-30
+  eclipse_cpp_37 = eclipse-cpp-37; # backward compatibility, added 2016-01-30
 
-  eclipse-scala-sdk-40 = buildEclipse {
-    name = "eclipse-scala-sdk-4.0.0";
-    description = "Eclipse IDE for Scala Developers";
-    src =
-      if stdenv.system == "x86_64-linux" then
-        fetchurl { # tested
-          url = http://downloads.typesafe.com/scalaide-pack/4.0.0.vfinal-luna-211-20150305/scala-SDK-4.0.0-vfinal-2.11-linux.gtk.x86_64.tar.gz;
-          sha256  = "b65c5e8160e72c8389537e9e427138e6daa2065f9df3a943a86e40dd1543dd83";
-        }
-      else
-        fetchurl { # untested
-          url = http://downloads.typesafe.com/scalaide-pack/4.0.0.vfinal-luna-211-20150305/scala-SDK-4.0.0-vfinal-2.11-linux.gtk.x86.tar.gz;
-          sha256 = "f422aea5903c97d212264a5a43c6ebc638aecbd4ce5e6078d92618725bc5d31e";
-        };
-  };
-  eclipse_scala_sdk_40 = eclipse-scala-sdk-40; # backward compatibility, added 2016-01-30
+  ### Eclipse Modeling
 
-  eclipse-cpp-36 = buildEclipse {
-    name = "eclipse-cpp-3.6.2";
-    description = "Eclipse IDE for C/C++ Developers";
+  eclipse-modeling-46 = buildEclipse {
+    name = "eclipse-modeling-4.6";
+    description = "Eclipse Modeling Tools";
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz;
-          sha1 = "6f914e11fa15a900c46825e4aa8299afd76e7e65";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk-x86_64.tar.gz;
+          sha1 = "3695fd049c4cca2d235f424557e19877795a8183";
         }
       else
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk.tar.gz;
-          sha1 = "1156e4bc0253ae3a3a4e54839e4944dc64d3108f";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk.tar.gz;
+          sha1 = "fa0694a0b44e8e9c2301417f84dba45cf9ac6e61";
         };
   };
-  eclipse_cpp_36 = eclipse-cpp-36; # backward compatibility, added 2016-01-30
 
   eclipse-modeling-36 = buildEclipse {
     name = "eclipse-modeling-3.6.2";
@@ -97,253 +83,45 @@ rec {
   };
   eclipse_modeling_36 = eclipse-modeling-36; # backward compatibility, added 2016-01-30
 
-  eclipse-sdk-37 = buildEclipse {
-    name = "eclipse-sdk-3.7";
-    description = "Eclipse Classic";
+  ### Eclipse Platform
+
+  eclipse-platform = eclipse-platform-46;
+
+  eclipse-platform-46 = buildEclipse {
+    name = "eclipse-platform-4.6";
+    description = "Eclipse platform";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "0nf4nv7awhp1k8b1hjb7chpjyjrqnyszsjbc4dlk9phpjv3j4wg5";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk-x86_64.tar.gz;
+          sha256 = "02lfa0f4j53q4ks3nal4jxnm1vc6xck2k9zng58izfh49v73jyjd";
         };
       "i686-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk.tar.gz;
-          sha256 = "1isn7i45l9kyn2yx6vm88jl1gnxph8ynank0aaa218cg8kdygk7j";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk.tar.gz;
+          sha256 = "053hsy87jmr9phn934a4qny959d6inxjx8nlcmxa2165ra8d7qfr";
         };
     };
   };
-  eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30
 
-  eclipse-cpp-37 = buildEclipse {
-    name = "eclipse-cpp-3.7";
-    description = "Eclipse IDE for C/C++ Developers";
-    src =
-      if stdenv.system == "x86_64-linux" then
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz;
-          sha256 = "14ppc9g9igzvj1pq7jl01vwhzb66nmzbl9wsdl1sf3xnwa9wnqk3";
-        }
-      else
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk.tar.gz;
-          sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b";
-        };
-  };
-  eclipse_cpp_37 = eclipse-cpp-37; # backward compatibility, added 2016-01-30
-
-  eclipse-cpp-42 = buildEclipse {
-    name = "eclipse-cpp-4.2";
-    description = "Eclipse IDE for C/C++ Developers";
-    src =
-      if stdenv.system == "x86_64-linux" then
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk-x86_64.tar.gz;
-          sha256 = "1qq04926pf7v9sf3s0z53zvlbl1j0rmmjmbmhqi49473fnjikh7y";
-        }
-      else
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk.tar.gz;
-          sha256 = "1a4s9qlhfpfpdhvffyglnfdr3dq5r2ywcxqywhqi95yhq5nmsgyk";
-        };
-  };
-  eclipse_cpp_42 = eclipse-cpp-42; # backward compatibility, added 2016-01-30
-
-  eclipse-cpp-43 = buildEclipse {
-    name = "eclipse-cpp-4.3.2";
-    description = "Eclipse IDE for C/C++ Developers";
-    src =
-      if stdenv.system == "x86_64-linux" then
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk-x86_64.tar.gz;
-          sha256 = "16zhjm6bx78263b1clg75kfiliahkhwg0k116vp9fj039nlpc30l";
-        }
-      else
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk.tar.gz;
-          sha256 = "0d6jlj7hwz8blx6csrlyi2h2prql0wckbh7ihwjmgclwpcpj84g6";
-        };
-  };
-  eclipse_cpp_43 = eclipse-cpp-43; # backward compatibility, added 2016-01-30
-  
-  eclipse-cpp-44 = buildEclipse {
-    name = "eclipse-cpp-4.4.2";
-    description = "Eclipse IDE for C/C++ Developers";
-    src =
-      if stdenv.system == "x86_64-linux" then
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/SR2/eclipse-cpp-luna-SR2-linux-gtk-x86_64.tar.gz;
-          sha256 = "1vxwj7yihgipvrb3gksmddqkarzazpwk3mh1mjnw0i5xz2y32ba4";
-        }
-      else
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/SR2/eclipse-cpp-luna-SR2-linux-gtk.tar.gz;
-          sha256 = "1yn7yzzx8izc199c8w4f7vrc0b08idyq0dn113i8123b0mxw5lkp";
-        };
-  };
-  eclipse_cpp_44 = eclipse-cpp-44; # backward compatibility, added 2016-01-30
-
-  eclipse-cpp-45 = buildEclipse {
-    name = "eclipse-cpp-4.5.1";
-    description = "Eclipse IDE for C/C++ Developers, Mars release";
-    src =
-      if stdenv.system == "x86_64-linux" then
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/1/eclipse-cpp-mars-1-linux-gtk-x86_64.tar.gz;
-          sha256 = "1j6rsgr44kya2v7y34ifscajqk7lnq1w9m9fx4i0qgby84sy4xj7";
-        }
-      else if stdenv.system == "i686-linux" then
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/1/eclipse-cpp-mars-1-linux-gtk.tar.gz;
-          sha256 = "0qsbvjkq0ssxbnafh4gs8pfclynqis3nf7xlxx4w3k20jcjx7sr2";
-        }
-      else throw "Unsupported system: ${stdenv.system}";
-  };
-  eclipse_cpp_45 = eclipse-cpp-45; # backward compatibility, added 2016-01-30
-
-  eclipse-cpp-46 = buildEclipse {
-    name = "eclipse-cpp-4.6.0";
-    description = "Eclipse IDE for C/C++ Developers, Neon release";
-    src =
-      if stdenv.system == "x86_64-linux" then
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz;
-          sha256 = "09fqsgvbjfdqvn7z03crkii34z4bsb34y272q68ib8741bxk0i6m";
-        }
-      else if stdenv.system == "i686-linux" then
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz;
-          sha256 = "0a12qmqq22v7sbmwn1hjv1zcrkmp64bf0ajmdjljhs9ac79mxn5h";
-        }
-      else throw "Unsupported system: ${stdenv.system}";
-  };
+  ### Eclipse Scala SDK
 
-  eclipse-sdk-421 = buildEclipse {
-    name = "eclipse-sdk-4.2.1";
-    description = "Eclipse Classic";
+  eclipse-scala-sdk-441 = buildEclipse {
+    name = "eclipse-scala-sdk-4.4.1";
+    description = "Eclipse IDE for Scala Developers";
     src =
       if stdenv.system == "x86_64-linux" then
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk-x86_64.tar.gz;
-          sha256 = "1mlyy90lk08lb2971ynglgi3nqvqfq1k70md2kb39jk160wd1xrk";
+        fetchurl { # tested
+          url = http://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86_64.tar.gz;
+          sha256  = "4c2d1ac68384e12a11a851cf0fc7757aea087eba69329b21d539382a65340d27";
         }
       else
-        fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk.tar.gz;
-          sha256 = "1av6qm9wkbyk123qqf38f0jq4jv2bj9wp6fmpnl55zg6qr463c1w";
-        };
-    };
-  eclipse_sdk_421 = eclipse-sdk-421; # backward compatibility, added 2016-01-30
-
-  eclipse-sdk-422 = buildEclipse {
-    name = "eclipse-sdk-4.2.2";
-    description = "Eclipse Classic";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.2-201302041200/eclipse-SDK-4.2.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "0ysa6ymk4h3k1vn59dc909iy197kmx132671kbzfwbim87jmgnqb";
-        };
-      "i686-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.2-201302041200/eclipse-SDK-4.2.2-linux-gtk.tar.gz;
-          sha256 = "038yibbrcia38wi72qrdl03g7l35mpvl5nxdfdnvpqxrkfffb826";
-        };
-    };
-  };
-  eclipse_sdk_422 = eclipse-sdk-422; # backward compatibility, added 2016-01-30
-
-  eclipse-sdk-431 = buildEclipse {
-    name = "eclipse-sdk-4.3.1";
-    description = "Eclipse Classic";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk-x86_64.tar.gz;
-          sha256 = "0ncm56ylwxw9z8rk8ccgva68c2yr9yrf1kcr1zkgw6p87xh1yczd";
-        };
-      "i686-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk.tar.gz;
-          sha256 = "1zxsh838khny7mvl01h28xna6xdh01yi4mvls28zj22v0340lgsg";
-        };
-    };
-  };
-  eclipse_sdk_431 = eclipse-sdk-431; # backward compatibility, added 2016-01-30
-
-  eclipse-sdk-44 = buildEclipse {
-    name = "eclipse-sdk-4.4";
-    description = "Eclipse Classic";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz;
-          sha256 = "14hdkijsjq0hhzi9ijpwjjkhz7wm0pry86l3dniy5snlh3l5bsb2";
-        };
-      "i686-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz;
-          sha256 = "0hjc4zrsmik6vff851p0a4ydnx99840j2xrx8348kk6h0af8vx6z";
-        };
-    };
-  };
-  eclipse_sdk_44 = eclipse-sdk-44; # backward compatibility, added 2016-01-30
-
-  eclipse-sdk-442 = buildEclipse {
-    name = "eclipse-sdk-4.4.2";
-    description = "Eclipse Classic";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "0g00alsixfaakmn4khr0m9fxvkrbhbg6qqfa27xr6a9np6gzg98l";
-        };
-      "i686-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz;
-          sha256 = "1hacyjjwhhxi7r3xyhpqgjqpd5r0irw9bfkalz5s5l6shb0lq4i7";
+        fetchurl { # untested
+          url = http://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86.tar.gz;
+          sha256 = "35383cb09567187e14a30c15de9fd9aa0eef99e4bbb342396ce3acd11fb5cbac";
         };
-    };
   };
-  eclipse_sdk_442 = eclipse-sdk-442; # backward compatibility, added 2016-01-30
 
-  eclipse-sdk-45 = buildEclipse {
-    name = "eclipse-sdk-4.5";
-    description = "Eclipse Mars Classic";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk-x86_64.tar.gz;
-          sha256 = "0vfql4gh263ms8bg7sgn05gnjajplx304cn3nr03jlacgr3pkarf";
-        };
-      "i686-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk.tar.gz;
-          sha256 = "0xv66l6hdlvxpswcqrsh398wg6xhy30f833dr7jvvz45s5437hm3";
-        };
-    };
-  };
-  eclipse_sdk_45 = eclipse-sdk-45; # backward compatibility, added 2016-01-30
+  ### Eclipse SDK
 
-  eclipse-sdk-451 = buildEclipse {
-    name = "eclipse-sdk-4.5.1";
-    description = "Eclipse Mars Classic";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-SDK-4.5.1-linux-gtk-x86_64.tar.gz;
-          sha256 = "b56503ab4b86f54e1cdc93084ef8c32fb1eaabc6f6dad9ef636153b14c928e02";
-        };
-      "i686-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-SDK-4.5.1-linux-gtk.tar.gz;
-          sha256 = "f2e41da52e138276f8f121fd4d57c3f98839817836b56f8424e99b63c9b1b025";
-        };
-    };
-  };
-  eclipse_sdk_451 = eclipse-sdk-451; # backward compatibility, added 2016-01-30
-  
-  eclipse-sdk-452 = buildEclipse {
-    name = "eclipse-sdk-4.5.2";
-    description = "Eclipse Mars Classic";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "87f82b0c13c245ee20928557dbc4435657d1e029f72d9135683c8d585c69ba8d";
-        };
-      "i686-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk.tar.gz;
-          sha256 = "78f7e537b34333401fc782fbd1260087c586ff93b17b88da5b177642f3aa5a02";
-        };
-    };
-  };
-  
   eclipse-sdk-46 = buildEclipse {
     name = "eclipse-sdk-4.6";
     description = "Eclipse Neon Classic";
@@ -359,68 +137,26 @@ rec {
     };
   };
 
-  eclipse-platform = eclipse-platform-46;
-
-  eclipse-platform-45 = buildEclipse {
-    name = "eclipse-platform-4.5";
-    description = "Eclipse platform";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk-x86_64.tar.gz;
-          sha256 = "1510j41yr86pbzwf48kjjdd46nkpkh8zwn0hna0cqvsw1gk2vqcg";
-        };
-      "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk.tar.gz;
-          sha256 = "1f97jd3qbi3830y3djk8bhwzd9whsq8gzfdk996chxc55prn0qbd";
-        };
-    };
-  };
-
-  eclipse-platform-451 = buildEclipse {
-    name = "eclipse-platform-4.5.1";
-    description = "Eclipse platform";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-platform-4.5.1-linux-gtk-x86_64.tar.gz;
-          sha256 = "1m7bzyi20yss6cz74d7hvhxj1cddcpgzxjia5wcjycsvq33kkny0";
-        };
-      "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-platform-4.5.1-linux-gtk.tar.gz;
-          sha256 = "17x8w4k0rba0c0v9ghxdl0zqfadla5c1aakfd5k0q9q3x3qi6rxp";
-        };
-    };
-  };
-
-  eclipse-platform-452 = buildEclipse {
-    name = "eclipse-platform-4.5.2";
-    description = "Eclipse platform";
+  eclipse-sdk-37 = buildEclipse {
+    name = "eclipse-sdk-3.7";
+    description = "Eclipse Classic";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "13dsd5f5i39wd0sr2bgp57hd2msn8g2dnmw5j8hfwif22c62py47";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk-x86_64.tar.gz;
+          sha256 = "0nf4nv7awhp1k8b1hjb7chpjyjrqnyszsjbc4dlk9phpjv3j4wg5";
         };
       "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk.tar.gz;
-          sha256 = "00jsmbrl4xhpbgd8hyxijgzqdic700kd3yw2qwgl0cs3ncvybxvq";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk.tar.gz;
+          sha256 = "1isn7i45l9kyn2yx6vm88jl1gnxph8ynank0aaa218cg8kdygk7j";
         };
     };
   };
+  eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30
 
-  eclipse-platform-46 = buildEclipse {
-    name = "eclipse-platform-4.6";
-    description = "Eclipse platform";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk-x86_64.tar.gz;
-          sha256 = "02lfa0f4j53q4ks3nal4jxnm1vc6xck2k9zng58izfh49v73jyjd";
-        };
-      "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk.tar.gz;
-          sha256 = "053hsy87jmr9phn934a4qny959d6inxjx8nlcmxa2165ra8d7qfr";
-        };
-    };
-  };
+  ### Environments
 
+  # Function that assembles a complete Eclipse environment from an
+  # Eclipse package and list of Eclipse plugins.
   eclipseWithPlugins = { eclipse, plugins ? [], jvmArgs ? [] }:
     let
       # Gather up the desired plugins.
@@ -455,6 +191,8 @@ rec {
         ln -s ${eclipse}/share $out/
       '';
 
+  ### Plugins
+
   plugins = callPackage ./plugins.nix { };
 
 }
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index d54b686244e..88b8fe0a073 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -81,10 +81,10 @@
     aggressive-indent = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "aggressive-indent";
-        version = "1.8.1";
+        version = "1.8.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/aggressive-indent-1.8.1.el";
-          sha256 = "07d311dwg6rpzydh9bw9dn1djf4x4f00ma41jmsl35mcd2m0bpz8";
+          url = "https://elpa.gnu.org/packages/aggressive-indent-1.8.3.el";
+          sha256 = "0jnzccl50x0wapprgwxinp99pwwa6j43q6msn4gv437j7swy8wnj";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -228,10 +228,10 @@
       }) {};
     beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
         pname = "beacon";
-        version = "1.3.1";
+        version = "1.3.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/beacon-1.3.1.el";
-          sha256 = "19dw9650kk4rch2qpp42wdq9687m3svj1addbp3yz4dijy7lx2mj";
+          url = "https://elpa.gnu.org/packages/beacon-1.3.2.el";
+          sha256 = "0ldja8xrrninm588f27bhxvp0b12cngazyz688lkxvwx28cpqb7n";
         };
         packageRequires = [ seq ];
         meta = {
@@ -698,10 +698,10 @@
     excorporate = callPackage ({ elpaBuild, emacs, fetchurl, fsm, lib, soap-client, url-http-ntlm }:
     elpaBuild {
         pname = "excorporate";
-        version = "0.7.5";
+        version = "0.7.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/excorporate-0.7.5.tar";
-          sha256 = "0w828zv8968ryphhi1zaizrs6fnxkgxdwjlhpriyc9129qnwx0cg";
+          url = "https://elpa.gnu.org/packages/excorporate-0.7.6.tar";
+          sha256 = "02bp0z6vpssc12vxxs1g4whmfxf88wsk0bcq4422vvz256l6vpf9";
         };
         packageRequires = [ emacs fsm soap-client url-http-ntlm ];
         meta = {
@@ -1203,10 +1203,10 @@
       }) {};
     nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "nameless";
-        version = "1.0.1";
+        version = "1.0.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nameless-1.0.1.el";
-          sha256 = "0gb97pjmis4fx48lsm7clp9fw0h2w4p3kdfq3z9vq4fwy5hjsn74";
+          url = "https://elpa.gnu.org/packages/nameless-1.0.2.el";
+          sha256 = "13c1payc46ry5bf8ia8cwqpshm2ya74fi5r4sxq5n410z5f0pgqx";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1270,10 +1270,10 @@
       }) {};
     ntlm = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "ntlm";
-        version = "2.0.0";
+        version = "2.1.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ntlm-2.0.0.el";
-          sha256 = "1n602yi60rwsacqw20kqbm97x6bhzjxblxbdprm36f31qmym8si4";
+          url = "https://elpa.gnu.org/packages/ntlm-2.1.0.el";
+          sha256 = "01d0bcmh8a36qf871w6bc05kjk9bmnh843m9869xw06zyvqwg9mv";
         };
         packageRequires = [];
         meta = {
@@ -1336,10 +1336,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20161003";
+        version = "20161010";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20161003.tar";
-          sha256 = "077v69l3w5q0rfbj1mm92cs2pz5yh3p89qnxxj0zn3g5m0dg9yjm";
+          url = "https://elpa.gnu.org/packages/org-20161010.tar";
+          sha256 = "1f007wvwgr9mkx8djr4lc7a1x84s702hwlahb76w8yi80s81anlx";
         };
         packageRequires = [];
         meta = {
@@ -1661,10 +1661,10 @@
       }) {};
     sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "sotlisp";
-        version = "1.5.2";
+        version = "1.6.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sotlisp-1.5.2.el";
-          sha256 = "1kv161rmg71wjizd359s8l6d1z2ybyc8sbbvbwcbr778dj7x6wld";
+          url = "https://elpa.gnu.org/packages/sotlisp-1.6.2.el";
+          sha256 = "05cr4dmhg4wbmw7jbcfh0yrnbq6dhzp2wrbzvhwrfznz51j03nhi";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1861,10 +1861,10 @@
     url-http-ntlm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, ntlm ? null }:
     elpaBuild {
         pname = "url-http-ntlm";
-        version = "2.0.2";
+        version = "2.0.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.2.el";
-          sha256 = "0jci5cl31hw4dj0j9ljq0iplg530wnwbw7b63crrwn3mza5cb2wf";
+          url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.3.el";
+          sha256 = "01ivfcxrxiqs8dlqg4s3q17y4mxx0kpin60fkwrs18pca4hni203";
         };
         packageRequires = [ cl-lib ntlm ];
         meta = {
@@ -1875,10 +1875,10 @@
     validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "validate";
-        version = "0.5";
+        version = "1.0.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/validate-0.5.el";
-          sha256 = "1gzphvcqih5zz80mmnc2wx2kgc13g9hv98kqsfpndbdd3bw3blph";
+          url = "https://elpa.gnu.org/packages/validate-1.0.0.el";
+          sha256 = "10js4qds5xi5a89s4v4fz6f71b25g3x8jm1lcpf9s75i1q1xiysk";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 92ef4d0393c..df1e40e9733 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -2,12 +2,12 @@
     _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "_0blayout";
-        version = "20160919.823";
+        version = "20161007.2307";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "0blayout-mode";
-          rev = "b8bb44b5336965b5519b9a826a0f46f8ee31c471";
-          sha256 = "1apv5zd3zzni2llj9is7h2bzq1xxbx67kr7c07dfjd26n7l0zvfi";
+          rev = "873732ddb99a3ec18845a37467ee06bce4e61d87";
+          sha256 = "1ymv9lqsn5xznyhax1pizw1i6h0pr7ckxhl28pix73wvzb5fl8mn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout";
@@ -23,12 +23,12 @@
     _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "_0xc";
-        version = "20161001.1852";
+        version = "20161007.954";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "0xc";
-          rev = "9a05fcafe6727df0844feba7fbeb75e39ffe15a4";
-          sha256 = "0yy83di1jc5nnnvfxd2l0pnzikp07m0d5szz2pkl88yrpacpnndn";
+          rev = "ccce729078a2c1ef28adb82393289a09d28d570d";
+          sha256 = "0shjx7xw2glz52fssq089ab5s11q1970bj53bhpn45z85s31p08f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc";
@@ -295,12 +295,12 @@
     ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ac-cider";
-        version = "20160810.2358";
+        version = "20161006.19";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "ac-cider";
-          rev = "8c652adebb0432e7aaafa2ff71200798b95e3a42";
-          sha256 = "1lfdggd5mf5r623b3l0r6xwabikgxqyia7ym1x198lavxxvlrq1d";
+          rev = "d8670939bbf88079263d5ace2b8bc04cf325be36";
+          sha256 = "01g1h2j0rfih8v0yvvr5gjh3abcj2mz3jmfbis8a60ivmngab732";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8adefaf2e284ef91baec3dbd3e10c868de69926/recipes/ac-cider";
@@ -422,8 +422,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-ac-emoji";
-          rev = "f4b3a5b3548dc36f69daeff742f53b5bda538bae";
-          sha256 = "19981mzxnqqdb8dsdizy2i8byb8sx9138x3nrvi6ap2qbcsabjmz";
+          rev = "92b691efea755c32574f9f7d88f14191971c3981";
+          sha256 = "1x7l2wm76xbrwzskk4jfd2g3smr4cvhdy4zks7h3n2mhf8k6hx83";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15f591f9cba367b071046fef5ae01bbbd0475ce3/recipes/ac-emoji";
@@ -1278,12 +1278,12 @@
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "20160608.1625";
+        version = "20161016.1016";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "6c3842eb4501bf6f39ea9b21c50aadd0339c4e6e";
-          sha256 = "168p898flmvczqqh1ql46lgm8cw5y0ydzg5mxpylfiqa26gq3f20";
+          rev = "a8c462fbc03ef74e65f4d4a323ae3581f99e9683";
+          sha256 = "00j7mvzn1qsbk5xcw4h2wzwp1wzjvdn9qa3s0laa9x33k6kpxbha";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1298,11 +1298,11 @@
       }) {};
     ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "ahg";
-        version = "20160822.144";
+        version = "20161010.9";
         src = fetchhg {
           url = "https://bitbucket.com/agriggio/ahg";
-          rev = "38f9f9740e19";
-          sha256 = "0wcg03n9ddrh79r98i1pl59wncak7bb46cqcrv60hn239karsdaa";
+          rev = "5d878053fcbd";
+          sha256 = "1jisl6nh3c75fyzmr3azpf5sp8cdcfw8hd4aczbrgpjbii6127np";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg";
@@ -1525,22 +1525,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20160921.935";
+        version = "20161007.132";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "21b2e084a8779a6eb2e800add37671e21e5fc5d8";
-          sha256 = "1zw6mkayf9dqxkk6pfb6niarkxk1jcwdln45jp7q7n8vq3cqg6rp";
+          rev = "692ac0816783725600b80b5307bf48a83053a378";
+          sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
           sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
           name = "all-the-icons";
         };
-        packageRequires = [ dash emacs ];
+        packageRequires = [ dash emacs font-lock-plus ];
         meta = {
           homepage = "https://melpa.org/#/all-the-icons";
           license = lib.licenses.free;
@@ -1549,12 +1549,12 @@
     amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
     melpaBuild {
         pname = "amd-mode";
-        version = "20160923.134";
+        version = "20161014.822";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "amd-mode.el";
-          rev = "c610c1a85728d161d28854d7373fc13b3dec311b";
-          sha256 = "1ghs3gh410c9w2v17zb93wk184lwl5izpkzrm0qn37qz8i87jqcr";
+          rev = "4024a69f39794b4c894c9c175270ef71e1e19471";
+          sha256 = "026hk4jv4sddpibbw9pjfj9bsxrp94r50idjngr8bya8apvjsas7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode";
@@ -1642,12 +1642,12 @@
     anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "anaconda-mode";
-        version = "20160901.1423";
+        version = "20161009.1046";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "359c9d62649ad3f2cb007c4d8871e5b051d695f6";
-          sha256 = "1kwn5lln7l754x5l3glij7ci3r2g6p9sapc43bm2gmwbgxa9fgis";
+          rev = "3f473150009f86dac68edb02e2f22850788289a5";
+          sha256 = "16c2q6c44qc3bdaxq835rrbyq49z6rd3h6cgss50p4gqwfwxfxn7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1787,12 +1787,12 @@
     annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "annotate";
-        version = "20160906.2352";
+        version = "20161006.16";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "annotate.el";
-          rev = "9616c55812c4b6f11365e0f4e90f9357c95280ff";
-          sha256 = "0wkdvmszabx1rcwqbm6rw07niwd7n4bdb9h2iav2miljwy68s40x";
+          rev = "e6af7f8ef7d241fdc9f866d57dce24beb4bb6b87";
+          sha256 = "19a419rnqqsmvrcl2vwy3gl7mvbfg669vyin2h2xpm56rxsinvy1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate";
@@ -1871,12 +1871,12 @@
     ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ansible";
-        version = "20160326.831";
+        version = "20161016.1658";
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-ansible";
-          rev = "950e24319940526aa14ac33e2b67f7567dd5dc17";
-          sha256 = "0k927pwhmn1cfl6jqs7ww1g6f64nq5i8f6a732d4q2rbl3aqzbdi";
+          rev = "c5e4c00135ae8860b8301d1227c3382a7c05ab09";
+          sha256 = "0v1asp6q1c744nad3hvhyw3llmpr0jz5yp8dlzfi82pdxk66qhp4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible";
@@ -1913,12 +1913,12 @@
     ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ansible-vault";
-        version = "20161001.1001";
+        version = "20161008.1435";
         src = fetchFromGitHub {
           owner = "zellio";
           repo = "ansible-vault-mode";
-          rev = "8b4cdebb817c979b13eab625e3bbeebb08ddf026";
-          sha256 = "1gqga59qinmkjalk1jkbh8w70sqvb3p033sbx69qljc2mivs8rh8";
+          rev = "57fd8017ab93cc6a1f9bbc795d494a069557a1cb";
+          sha256 = "04sdgg98z9gydgx8sf4nfmkwazm799gyvywssfa0mkcvza2z7s21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
@@ -2224,22 +2224,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    anzu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anzu";
-        version = "20160818.619";
+        version = "20161016.750";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-anzu";
-          rev = "1965307a41aac029db2be007120e0c743226dba4";
-          sha256 = "0xizn58wplk7r7zmfm12b0rkkl4nhlskbk6h20pdfic3xvad9zyk";
+          rev = "d257c79a7a852fb67c7358db94621c35ca82dab7";
+          sha256 = "0f47cqvzmix8k5nvv2mxii7w71qnky038skksim2h0r5ipvkyg2i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04ac359d02d91725c8fc451b17bc2f06a7fe57a5/recipes/anzu";
           sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
           name = "anzu";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/anzu";
           license = lib.licenses.free;
@@ -2485,26 +2485,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    aria2 = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "aria2";
-        version = "20141107.1517";
-        src = fetchgit {
-          url = "https://bitbucket.org/ukaszg/aria2.git";
-          rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0";
-          sha256 = "1xkgz3l7idw5bk1xlffdaddf5v1q6fm3grbryl4xvssrbwgnyisf";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9444cfcdf2ea01891e63c599bcbba36a6bf47cce/recipes/aria2";
-          sha256 = "10x2k99m3kl6y0k0mw590gq1ac162nmdwk58i8i7a4mb72zmsmhc";
-          name = "aria2";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/aria2";
-          license = lib.licenses.free;
-        };
-      }) {};
     ariadne = callPackage ({ bert, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ariadne";
@@ -2652,12 +2632,12 @@
     assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
     melpaBuild {
         pname = "assess";
-        version = "20160628.1539";
+        version = "20161012.753";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "assess";
-          rev = "61771edab753d5469d4bb9b8273f55e79b3fda04";
-          sha256 = "1phhjq40fwb4vv35wkdphbc676y8gqxh25iqnrd3km818md5mqlb";
+          rev = "e2e5f1cbbdeb4bdeb7a474f0ec1b038c3786b1ef";
+          sha256 = "1pv8q88f5aj6qxqv0n8knfb3gk079wgk6l0nkch8518pq00vwnif";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess";
@@ -2673,12 +2653,12 @@
     async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "async";
-        version = "20160711.2235";
+        version = "20161010.2322";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "emacs-async";
-          rev = "8bc0678ebca97e7b1c6e78e75e03f8dfd502d63a";
-          sha256 = "1b56qfggajh2a3aanq3q40wa88nj5adpj6v85x2v4y5bi01r5nib";
+          rev = "31b169150c58b8d40db552094018ed7b053d234d";
+          sha256 = "0m9kqyd0krfvp5vliqj3rcdd9j32r4hlxhhvb6mx2lvjxfmdi1wi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async";
@@ -2859,27 +2839,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    aurora-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "aurora-theme";
-        version = "20151015.1102";
-        src = fetchFromGitHub {
-          owner = "xzerocode";
-          repo = "aurora-theme";
-          rev = "3cd8c3359b7b15148e5cea503f3d071e1ed7fc79";
-          sha256 = "1z2n6gd63mgj2wj45n6g1gmfrk0iwzlrzb6g1rdd9r9a03c03qi6";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a687ff55ba0f473484b9dadf98d5ea4961f346b9/recipes/aurora-theme";
-          sha256 = "1fhlng30v25ycr502vfvajl70vimscqkipva6ghr670j35ac5vz5";
-          name = "aurora-theme";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/aurora-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
     melpaBuild {
         pname = "auth-password-store";
@@ -3258,12 +3217,12 @@
     auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-dim-other-buffers";
-        version = "20160811.548";
+        version = "20161004.539";
         src = fetchFromGitHub {
           owner = "mina86";
           repo = "auto-dim-other-buffers.el";
-          rev = "b797afadb48f69671d167050243e086923dcd364";
-          sha256 = "0qx4db2m6xpz9j9p2jj49dilqzikbz16b4gf1p38r48w51ff8779";
+          rev = "31c13e7ed87dd862c73b836d11c127164edb1458";
+          sha256 = "0snkc7pkiv8iiy7xb64mg8ja7ig0rzkp5b6qkbalgxk9m4l8nmcb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/auto-dim-other-buffers";
@@ -3776,12 +3735,12 @@
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "20161001.845";
+        version = "20161005.720";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "74d57be48c29a05e79a920f890a083ab0da75769";
-          sha256 = "0s9lhg6kjm51h4wzv2rz6rbl2wr7k54i4bhvsifq6c66cmwz5phl";
+          rev = "591102f3826b1ab0731866a4926e708e6fc014cc";
+          sha256 = "0cwrk8iaibd280w4c5yr0swfglsx9fwjqqshky2m1fc5kf332vpv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -3833,22 +3792,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    aws-ec2 = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, tablist }:
+    aws-ec2 = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tblui }:
     melpaBuild {
         pname = "aws-ec2";
-        version = "20161002.628";
+        version = "20161007.1214";
         src = fetchFromGitHub {
           owner = "Yuki-Inoue";
           repo = "aws.el";
-          rev = "2bac460bd54cefe4d1781255ea4800a9037fc520";
-          sha256 = "0d8n7ii5z81cc4i5fhbs31b0wfh492qmi8n207cy0ndvpm774l8v";
+          rev = "5601d4f268fc34b86a02ca90cde7d3771619a368";
+          sha256 = "15idbbxsghzn737s9jppnx820nnm1srcl1418458hwfy3wqhq38g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90ac00160cbf692baa1f3953122ac828356944e0/recipes/aws-ec2";
           sha256 = "040c69g8rhpcmrdjjg4avdmqarxx3dfzylmz62yxhfpn02qh48xd";
           name = "aws-ec2";
         };
-        packageRequires = [ cl-lib dash emacs magit-popup tablist ];
+        packageRequires = [ dash emacs tblui ];
         meta = {
           homepage = "https://melpa.org/#/aws-ec2";
           license = lib.licenses.free;
@@ -4007,12 +3966,12 @@
     badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "badwolf-theme";
-        version = "20160920.839";
+        version = "20161004.15";
         src = fetchFromGitHub {
           owner = "bkruczyk";
           repo = "badwolf-emacs";
-          rev = "436f48df120530f4eab7c9f02e0b55805122b970";
-          sha256 = "0hnb3a4yyz4q94cgbmv1ygpir7azgmzd70l7zafibbxvsp4zir43";
+          rev = "ea01a3d9358e968f75e3ed15dec6a2a96ce3d9a1";
+          sha256 = "0a6adsxvmw3mgji17is75jrq3ifmzpch8rwqqyfgc99xzndvab7l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme";
@@ -4070,12 +4029,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20160930.2031";
+        version = "20161012.1122";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "4a50d7fce61c96865d603829f5fe1003848e8fbb";
-          sha256 = "1v0ayygk51m292b4vb677v1mafma6a68zxfkhv9a0825ax8w42ix";
+          rev = "df75fdf19e9159d1249b1708c0d416dc334c97cb";
+          sha256 = "0zqhcm3i2aldhwrrd8wgq85jr5lxgwqvmd34zwykb76pcj0a21a4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4443,12 +4402,12 @@
     beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "beacon";
-        version = "20160708.2012";
+        version = "20161004.756";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "beacon";
-          rev = "c9cc62d42ef0c14079c97890bdd402c8efa4e52b";
-          sha256 = "0j9l2j22nj1dddqa9ykdcv4an3xipn1zwp8kaw84ac18fql0br7x";
+          rev = "c9d86457d43decf61810006752544d7f7bd5a61d";
+          sha256 = "132ixmzjz3sg15qvdbv3s8p6dv3bz7vwlhs50dax0z19dr79cda0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
@@ -4650,12 +4609,12 @@
     biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "biblio";
-        version = "20160901.1115";
+        version = "20161014.1604";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "biblio.el";
-          rev = "0036495a2e0d4b02b9e957e498f9437e394d6ed9";
-          sha256 = "1f0p5fgvabdpafil7s8sy82hgcfzg1skxfgj72ylv3crq36bn4vp";
+          rev = "a5a68fcf677f286f205f32dc7486f6c9f66aa6af";
+          sha256 = "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fbaa8c59b0e64d13beb0e0f18b0734afa84f51/recipes/biblio";
@@ -4675,8 +4634,8 @@
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "biblio.el";
-          rev = "0036495a2e0d4b02b9e957e498f9437e394d6ed9";
-          sha256 = "1f0p5fgvabdpafil7s8sy82hgcfzg1skxfgj72ylv3crq36bn4vp";
+          rev = "a5a68fcf677f286f205f32dc7486f6c9f66aa6af";
+          sha256 = "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f086d3e8fd6a95ce198e148cd3ede35dd73fb8/recipes/biblio-core";
@@ -4885,8 +4844,8 @@
         src = fetchFromGitHub {
           owner = "canatella";
           repo = "bitbake-el";
-          rev = "da272d5c32e1ff45c6bfe4163e4013b402e3d0e7";
-          sha256 = "038cyx0pfkqc4fgf07ks6ph3v7zfjqag603387010csn7f0z02is";
+          rev = "4ab424d970bee0f6b91a1fc545b14ded173e3476";
+          sha256 = "0xqi5s8536hajjl3g1a2i8p9ll4vq9gdx2jjbjzlid65h669bny8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da099b66180ed537f8962ab4ca727d2441f9691d/recipes/bitbake";
@@ -5211,12 +5170,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20160929.1310";
+        version = "20161013.2331";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "dde68b2e64ea7192d313d57536960237ce2db1fd";
-          sha256 = "1mbma82ikhywfk71x3y0y49ys101aidxikgsmxyiy26ngfvkm9ml";
+          rev = "bd3f79f3f1c1aaef942ee5d2ef053534bd3adbff";
+          sha256 = "0jrrfrs277spd1h3gha9fp3jbyafj4cxzg7gdzxj9px04iyyn4zs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5746,6 +5705,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    build-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "build-helper";
+        version = "20161009.1055";
+        src = fetchFromGitHub {
+          owner = "afonso360";
+          repo = "build-helper";
+          rev = "7a6fe71125a26ed1c492dab77cc688a7fe1d68ac";
+          sha256 = "0pipdzjf7arli6b88fp21as5d4v8ylsy19hixywhfgb7917qsrkv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/af56cde18ae0efb0ae91c818e6804c55cdb3b8c2/recipes/build-helper";
+          sha256 = "1asgpf2k4i7p88ask1i6ra4krhsxr6j2d2qv0gfxlsa5p330mmgh";
+          name = "build-helper";
+        };
+        packageRequires = [ projectile ];
+        meta = {
+          homepage = "https://melpa.org/#/build-helper";
+          license = lib.licenses.free;
+        };
+      }) {};
     bundler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "bundler";
@@ -6444,8 +6424,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "c06ead712c4c0f44c809552014ba6f12f36102fb";
-          sha256 = "1ixg1871v9k755yflh4c92bp00ylip5aax5zgsqhbxj7mpi535pd";
+          rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07";
+          sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6486,8 +6466,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "c06ead712c4c0f44c809552014ba6f12f36102fb";
-          sha256 = "1ixg1871v9k755yflh4c92bp00ylip5aax5zgsqhbxj7mpi535pd";
+          rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07";
+          sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -6673,8 +6653,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "2029d3e544c83a43ef785ab59a3969bb6992186a";
-          sha256 = "0vfaxdf87ry4ykvmnyk5b5skmrmz207slpf9nm94zi9lq40nscdd";
+          rev = "9c3e6f29d169d9955598f884b7ddd21a052ff8c6";
+          sha256 = "18cmrr9v6rm65bhfppx1qs0qabwf3qagw0lfp95xnwbjsbgar4h8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6713,7 +6693,7 @@
         version = "20160801.615";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11758";
+          rev = "11795";
           sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
         };
         recipeFile = fetchurl {
@@ -6900,8 +6880,8 @@
         src = fetchFromGitHub {
           owner = "eikek";
           repo = "chee";
-          rev = "d15d10c32447edb528b9e6e00091ab326a100a25";
-          sha256 = "0y0k30pmrdfkadxp3j60i9bjiai8ds7l5a6iy6xmkkmiksgjdv4k";
+          rev = "a12c679f28828eedfc69d920b902223bd72a906d";
+          sha256 = "0jgvhczixjr8vlj35mmk6yqynv6dxjmd2hxm1iq2vn6pjf4g3p28";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee";
@@ -7022,12 +7002,12 @@
     chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
-        version = "20160915.1934";
+        version = "20161008.450";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-fonts-setup";
-          rev = "dc7a7bfb2ed5f26d99bfe416f2586aba50082c64";
-          sha256 = "0rghbg1a8bqll5zn6r2gff94l8jn22q52aac7hpcw5n53ypqk4c1";
+          rev = "3f1e8d13837d22109a0eb0af4ee85fb2e90b31a1";
+          sha256 = "0xx692nbnw6wkdh84i59kfr0nzq6jh4iarzzqppd60rr48r3l9wx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
@@ -7040,6 +7020,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    chinese-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chinese-number";
+        version = "20161007.2209";
+        src = fetchFromGitHub {
+          owner = "zhcosin";
+          repo = "chinese-number";
+          rev = "7311c2a0c5eea5f016a90d733dfe75144c302fb2";
+          sha256 = "01i7nycjnx4cpfgwakj14jv9dwybjl5jnslcxic9pr1n77mz53wk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6c2e447028dbae2dfefc47859c185af254210fe8/recipes/chinese-number";
+          sha256 = "0qj7lh7asic77dsdlsv4pg2jzickqa0m5lvn8f184qq98yfmj6d6";
+          name = "chinese-number";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/chinese-number";
+          license = lib.licenses.free;
+        };
+      }) {};
     chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
@@ -7250,12 +7251,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20160927.2135";
+        version = "20161016.424";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "cb2ec12357ab84c04b91b9dd17a007ae78a04afd";
-          sha256 = "0jf7d5mjwkykvn9zfbwq2knmk9axfmyz8m20h3m9ih7f5bvsxci0";
+          rev = "0803409db2957c2ad1131deaa7004b8eb35d0bb9";
+          sha256 = "0pl7mbhj7pg953w75p4h5g7g8wl4qp8rwvrjw2b1306w50snx5mj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7296,8 +7297,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider-eval-sexp-fu";
-          rev = "06fefc17ea8a87997d1f18b25e78d874b10299ad";
-          sha256 = "1lhf5g5gi31pv2c80fsnw62zfikj3prbs6xwaikbywp48dzhx02y";
+          rev = "5687e7b33e17f2be40b036dac82da4a5bc6705fb";
+          sha256 = "0wyx51vggs76wj1gawwv1za6sa5gv1pj60vmc1ymzaw153ryhdq8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu";
@@ -7502,11 +7503,11 @@
     clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clang-format";
-        version = "20160912.302";
+        version = "20161004.253";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "283173";
-          sha256 = "0fp1q99rrc5c8y9n3bvxqjmfpapkl5qbm47cijipb25bv189gqym";
+          rev = "284382";
+          sha256 = "00fp6k7j7wyjv7xafxyj0cdbfzv06pwl20hmhyv6s2n9qi4whyb8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -7711,12 +7712,12 @@
     clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20160922.329";
+        version = "20161005.344";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "85feb15737823e1bdc07c39088cc3a4f7b18168e";
-          sha256 = "16r7ymh4i3n890zi5z4a7s4ryybgml8jhjfnacv47yfgx7x5flds";
+          rev = "8bacd65fb89a530f8e72b5ee78593e7dfcef57e3";
+          sha256 = "1pj72q9mqjj22h5cplxgplp1wcljcyg46ni8j6xh3ys3j8bs3jyp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -7870,12 +7871,12 @@
     clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-cheatsheet";
-        version = "20160707.118";
+        version = "20161004.2328";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-cheatsheet";
-          rev = "11544e07d788df0fe82a2cf6c496f73fbda4955c";
-          sha256 = "1gzfgzykyj9nsi970j9v2fpdlll8by7dg308yh8q3ahq5jk09p92";
+          rev = "57e877d9466934b5319989b542f93b42dffec9ae";
+          sha256 = "1d61q50h4vxk8i3jwxf71rbqah7ydfsd0dny59zq0klszfz2q26b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0569da79bd8145df334965c5d4364a50b6b548fa/recipes/clojure-cheatsheet";
@@ -7891,12 +7892,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20160803.140";
+        version = "20161004.2314";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "464c9de6734cb4b426137674041d695c2a7c7ef9";
-          sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm";
+          rev = "3c7f3b774371c6cdc885bd5f470299513870c38f";
+          sha256 = "12mhd68hky73zc26jghqaqx5mhdyl42l6v96fbzpp27n3ynk9axp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -7916,8 +7917,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "464c9de6734cb4b426137674041d695c2a7c7ef9";
-          sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm";
+          rev = "3c7f3b774371c6cdc885bd5f470299513870c38f";
+          sha256 = "12mhd68hky73zc26jghqaqx5mhdyl42l6v96fbzpp27n3ynk9axp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -7954,12 +7955,12 @@
     clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "clojure-snippets";
-        version = "20160728.29";
+        version = "20161017.58";
         src = fetchFromGitHub {
           owner = "mpenet";
           repo = "clojure-snippets";
-          rev = "c5220e978709bc7234e3adfe336b66eff2b89b4b";
-          sha256 = "08zrmbhczr08s8ni76i9g338250rgk95vz7sl22rj5fxln3zn6xz";
+          rev = "1ff5114196ffb2333cb0711604cb3c65e1418619";
+          sha256 = "113waahf20jkb63yaf5579wpm7ziphr4y3yj2938fjfw4d3v15kl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
@@ -8147,8 +8148,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "484dc1e5d85f4f468e27816eab0fccc9c7d6ec11";
-          sha256 = "0f66d728xb5dwpac4pz1x9ghhndd4axflbgy369snz38sw57hyn3";
+          rev = "0cbe2edb23d581233c518beafe92a2c9d4f529ac";
+          sha256 = "0r6lmqxvzxshi6hn0dd2x0d9l72hn9gbifgwng1pdc0wj573wqi1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8704,12 +8705,12 @@
     column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "column-enforce-mode";
-        version = "20140902.949";
+        version = "20161014.658";
         src = fetchFromGitHub {
           owner = "jordonbiondo";
           repo = "column-enforce-mode";
-          rev = "f43263e50ae83db099d83ea445f93e248a3207a0";
-          sha256 = "0ay4wrnyrdp4v3vjxr99hy8fpq6zsyh246c0gbp7bh63l5fx8nwr";
+          rev = "f7bea84f35ed1b9ca3f953d512047e20b90d5cbd";
+          sha256 = "1ziymwsi0sfv28xd5vgifd51yn791s1sbd1phzjx086qvwzz7v90";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode";
@@ -9000,6 +9001,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
+    melpaBuild {
+        pname = "company-bibtex";
+        version = "20161016.1044";
+        src = fetchFromGitHub {
+          owner = "gbgar";
+          repo = "company-bibtex";
+          rev = "359cc6860652d5c323b90a64f94f5ce241e8f6f1";
+          sha256 = "1wxykbd7ijqz539w1sjmabmc464h2b79j24cfhisa1b2d2rdgk7d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7c366ac2949eae48766fce70a7b01bbada6fcc27/recipes/company-bibtex";
+          sha256 = "14s3hxm7avpw59v4sz0d3drjzin745rczp93rcv4s7i3a7kdmn30";
+          name = "company-bibtex";
+        };
+        packageRequires = [ cl-lib company parsebib ];
+        meta = {
+          homepage = "https://melpa.org/#/company-bibtex";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-c-headers";
@@ -9028,8 +9050,8 @@
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "company-cabal";
-          rev = "f458de88cad16ed48a605e8347e56433e73dcef8";
-          sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0";
+          rev = "05886d6f2621b019fafb40cff4d2567e5d8045b4";
+          sha256 = "1yxp6l8a16d6g2sfwrpfx97ds7nfrgk2akwydal1dzr2bjq02pc6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal";
@@ -9245,8 +9267,8 @@
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "company-ghc";
-          rev = "4d1f1e3c9529b1a833fa58e835226cebf0e415b7";
-          sha256 = "1mc7y4j772x54n2wc2dskb5wjc46r7sg2jwyvmnj44cyaasxqmck";
+          rev = "976f10fca813e851d395b8c52ae6edf23d35ae63";
+          sha256 = "1gmnll0m9lh4p9i44ddnxlnbg5lf20410imyfbk88jwhidx1pg7s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc";
@@ -9283,12 +9305,12 @@
     company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "company-go";
-        version = "20160306.1355";
+        version = "20161006.1616";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "7a0b9e99156df54d06a720e3a2a9f55618e5a25a";
-          sha256 = "0hlbga620b2mr03vnrgmz8yd0n3sviyz03idz2jwbrrlk50qsbkl";
+          rev = "478b96fe0e77b4451b866559e2adb407fbce7120";
+          sha256 = "1ymhpiklyqxi79h65yarmh1hgyswsdx5jahg9pmhg4jww34778y3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -9427,22 +9449,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, names, nand2tetris }:
+    company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }:
     melpaBuild {
         pname = "company-nand2tetris";
-        version = "20151027.1436";
+        version = "20161011.1748";
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "0297cd8d76cad072cb64318ffacdc65d8a1ad948";
-          sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
+          rev = "9c5161c840f30f01647c188699dacba5e51b3b44";
+          sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris";
           sha256 = "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886";
           name = "company-nand2tetris";
         };
-        packageRequires = [ cl-lib company names nand2tetris ];
+        packageRequires = [ cl-lib company nand2tetris ];
         meta = {
           homepage = "https://melpa.org/#/company-nand2tetris";
           license = lib.licenses.free;
@@ -9451,12 +9473,12 @@
     company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-ngram";
-        version = "20160826.1722";
+        version = "20161013.805";
         src = fetchFromGitHub {
           owner = "kshramt";
           repo = "company-ngram";
-          rev = "1f5a36ffdc19c77e2fcbe790be2332d16fd4c35f";
-          sha256 = "03jap56722rp9sbb5chad9nbvqmimcjipr0rfhqz5szd9xahpihc";
+          rev = "6a39e9c22d6f1e5d5a725c6a1c276f9ecfacdad4";
+          sha256 = "1cjrw0g8hjbk8d2vmgy8brfvamswf24iylgwvqpz90x4si22xrzc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
@@ -9602,8 +9624,8 @@
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "company-restclient";
-          rev = "752f39490178832f6a09abd82e10d9356636350a";
-          sha256 = "04829y7510zxjww9pq8afvnzwyyv30c0b3a71mxwf6ympfxb9rx5";
+          rev = "3955ad1792e17e7af9c886aae5e4bce0c160808f";
+          sha256 = "11siamfl62q2fv608p4slc72zdincp68klcm1fkvr50g808hwd7h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient";
@@ -9667,12 +9689,12 @@
     company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
     melpaBuild {
         pname = "company-tern";
-        version = "20160713.541";
+        version = "20161004.1147";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-tern";
-          rev = "d285b4d3ff96493cb7d7ff129e6dd9ff0ac7be88";
-          sha256 = "1v43cp8x6w73i2c3lsm6xryqzf23k3rbyga4rrv2nf5n5cxdb6x6";
+          rev = "b20b3e490bf277c8480712210e3c92ea489859ef";
+          sha256 = "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern";
@@ -9755,8 +9777,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "a8ca68b508c448f6ac5ed6fa35ee3fe0a4771098";
-          sha256 = "0v8by6y25sl7528vvrb1xsmm184xbqivqvllykx3kmaxpdh5hvih";
+          rev = "066506314805ea863d4a46a9dc7e66febbf45263";
+          sha256 = "11rka7xwbvkzj455v0ijx4pb4w91vnf1lyawlybwmla9wilsr5n4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -10086,12 +10108,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20161001.543";
+        version = "20161013.840";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5";
-          sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4";
+          rev = "9f5f6e02e4b33f36652588903a8bab8ae3e28667";
+          sha256 = "162imzajrvws0980l6acr5l1mh3bbm4avajhsn1p1qic4ps8zajk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10149,12 +10171,12 @@
     counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "counsel-projectile";
-        version = "20160926.547";
+        version = "20161012.1407";
         src = fetchFromGitHub {
           owner = "ericdanan";
           repo = "counsel-projectile";
-          rev = "e5f2f20a167941d212b98b95a52c776c42704baf";
-          sha256 = "0fh4w52q42mafbc1lv41x6v6qv8zq04yy15nqf808q7n0xakmssa";
+          rev = "7b9a81ce5cf8a897b887efa8530f8093e02dd93f";
+          sha256 = "140ysa923apzhpvqmll69yh54nzmyzq5ifqijhv2l5camhrjm362";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -10483,12 +10505,12 @@
     crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "crux";
-        version = "20160725.59";
+        version = "20161005.634";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "crux";
-          rev = "3e03d7272f99939eb669c59f5b8843912e1e49cf";
-          sha256 = "0s4b2qljac3d7lilmfxk3j385g95fm4jsg64kn21n7dqqwqljpiv";
+          rev = "b60d9f49e4874a9f333a9477e2c2440f4e419782";
+          sha256 = "04dnlsfachgigpz8q5nprk2hflh0vabkavhbk8n6fzslaxvxys33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
@@ -10913,12 +10935,12 @@
     cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyberpunk-theme";
-        version = "20160930.815";
+        version = "20161012.1855";
         src = fetchFromGitHub {
           owner = "n3mo";
           repo = "cyberpunk-theme.el";
-          rev = "db5e86634d25cf0740f3d070cf2d521378fdf910";
-          sha256 = "17y28k5p0in2silrxi9yc1873k9g5lw58rnwab8dyfgda3lw7i7y";
+          rev = "eb6ee11315180ae27b17b351163f47a1014348a0";
+          sha256 = "0s9ja6l2y75lnkd1js4x3ks6pj5p6x7i9sm5vlcr5yq4qvmamn3h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
@@ -11061,8 +11083,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "b1d7b0de9e4cdc1eb866661e34f3da8892993fba";
-          sha256 = "0m00lbxaa8gd79v8a11mhp89d0hn9sz7fxgksr41hkwpby6wfd1f";
+          rev = "15a40e21bdc53f9421c0d90eb0b54dcf6c796e39";
+          sha256 = "0qd3wb5h8allw1bgna9d8vfvxh341qfnybqiwlzgwiibabw2f6rw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11099,12 +11121,12 @@
     d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "d-mode";
-        version = "20160504.955";
+        version = "20161011.1257";
         src = fetchFromGitHub {
           owner = "Emacs-D-Mode-Maintainers";
           repo = "Emacs-D-Mode";
-          rev = "3e733780e96b8e72bc624677f242aff67fb26e89";
-          sha256 = "1568jqcrw3xks1pvvn6dyn6jiam26vmp5m53jf8q4165ic2lazi8";
+          rev = "98af62e67026fee1dda9155e1a463917fc83802e";
+          sha256 = "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode";
@@ -11183,12 +11205,12 @@
     darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darcula-theme";
-        version = "20160305.221";
+        version = "20161004.2218";
         src = fetchFromGitLab {
           owner = "fommil";
           repo = "emacs-darcula-theme";
-          rev = "eb799be242a9420a8e6730d659939d4703d44b43";
-          sha256 = "128a9iv1vrassmk4sy4cs4nj6lggr5v4rhjj04v1xssj5nn5flxf";
+          rev = "834202004507221c3bdf49457219a56760b13d22";
+          sha256 = "1j2g94cz9b3ivv0w88gw1hcf236kc0c7hnrf13yyspxjm5jfdmd5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -11330,12 +11352,12 @@
     darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20160929.1724";
+        version = "20161014.8";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "825a61d8d65dbbe9fca44f865dc0a57dbd6bf3db";
-          sha256 = "1b2i5fvg3q4fwg5inp08ivznv97cvz2x073i21pv82rk1p8f39q7";
+          rev = "eb398c9b0500384f9e6d512f4be38f8bc6ff47ed";
+          sha256 = "05a6bz0pmdy8wzggifwzcx31lqlknwhihd6yccjqgbplys8snxmd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -11477,12 +11499,12 @@
     datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "datetime";
-        version = "20160521.1303";
+        version = "20161007.1137";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "datetime";
-          rev = "02465ed669ed122ce3ce1682142dfca60820ae5d";
-          sha256 = "0dz65zw7zi4kjldxs3syjxnss8kaf7hx0v6a22jplcsy35iai6xn";
+          rev = "6585b2dcb0b3871a2a63656d01baa0c9a300d457";
+          sha256 = "07rb8r3j8293h0ffpwhf7mxnshqi08pb63swhmdzb34hn57cx4jg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
@@ -11603,12 +11625,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20161003.1408";
+        version = "20161005.453";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "c06ead712c4c0f44c809552014ba6f12f36102fb";
-          sha256 = "1ixg1871v9k755yflh4c92bp00ylip5aax5zgsqhbxj7mpi535pd";
+          rev = "d0d80ff47a2d39969c7091aa594fd51f21953b07";
+          sha256 = "0mwfbd99kv4cb6ba50swll944vcrdsbs4hy2kkcsff8n84pbap17";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -12083,12 +12105,12 @@
     diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "diff-hl";
-        version = "20160827.1922";
+        version = "20161005.1535";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "diff-hl";
-          rev = "f8ce39d157144ee4b22d386dd40673ea7f87ecd7";
-          sha256 = "0cnhmcdkmbjikbv2hca54xw258f7wys0srxk07wp02jaryvj1298";
+          rev = "0c8bf49c6f351d70ab5f32ff9f26b74ee1df3948";
+          sha256 = "1nx3ixbc0vi8gvnrw25cb40hphh9ii85hhf9l6blspb0jzi4qx91";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8fc25abd2fb91ec6a6ba951d89a19ca4f5571f/recipes/diff-hl";
@@ -12208,12 +12230,12 @@
     dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dim-autoload";
-        version = "20160521.728";
+        version = "20161008.1332";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "dim-autoload";
-          rev = "ac04fade74a50fd2aac48fc298e4d21d8427f737";
-          sha256 = "0jn3hwnqg455fz85m79mbwsiv93ps4sfr1fcfjfwj3qhhbhq7d82";
+          rev = "3a9b7f6c5a2b71149c4cdda7e4b4ea3bd729baa5";
+          sha256 = "0jp3rps3ps8mh7zsn1y9367l1gh26hhmbz61l1dcv3sk4jrw46mw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload";
@@ -12313,12 +12335,12 @@
     dired-avfs = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-avfs";
-        version = "20160526.1336";
+        version = "20161012.404";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
-          sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -12476,12 +12498,12 @@
     dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-filter";
-        version = "20160526.1336";
+        version = "20161009.530";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
-          sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -12501,8 +12523,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
-          sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -12543,8 +12565,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-dired-k";
-          rev = "57f263b42ea83c6a1cf391fcccffd0f36d213f35";
-          sha256 = "1w2grc91m71k9mr4n423vbnakkqg6vc10bham869xs3yr8fs7nay";
+          rev = "26aa877bed6246feeb448c659a5b676d7796197e";
+          sha256 = "062zylfm18200d987m0vphaqph6syzah28ll8zz79fhqajgv6ndz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k";
@@ -12585,8 +12607,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
-          sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -12606,8 +12628,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
-          sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -12622,10 +12644,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20160920.1522";
+        version = "20161012.1400";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "1f6gigw8lzw30qjgl3z13kivwhbgp81fkg3n1b5a8jdg04lkgldp";
+          sha256 = "1h0sqmiwfiw0xlczvblz1vq04adh0x7zwyp86sal0dm1h3lbvbij";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -12666,8 +12688,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
-          sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -12687,8 +12709,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
-          sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -12784,8 +12806,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "d53877ccfd6955c2037d0c214638b6945c8e4511";
-          sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx";
+          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -13236,12 +13258,12 @@
     dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dix";
-        version = "20160919.638";
+        version = "20161004.450";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "8b0a4f62b040a0b6b0b81bd052d8b2ea1e8822fa";
-          sha256 = "1pb6y8rrbfg0hnnlhn1akgx79hgyazk0rqjd748iyi5dggc2dhq6";
+          rev = "9e6facb25e1137ef4e1329151a7902dc2d168507";
+          sha256 = "1raz281dyq3dgxbmwrcpdy1g8i5kwlv0i42ixpsdhhj1dcmzhqza";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix";
@@ -13261,8 +13283,8 @@
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "8b0a4f62b040a0b6b0b81bd052d8b2ea1e8822fa";
-          sha256 = "1pb6y8rrbfg0hnnlhn1akgx79hgyazk0rqjd748iyi5dggc2dhq6";
+          rev = "9e6facb25e1137ef4e1329151a7902dc2d168507";
+          sha256 = "1raz281dyq3dgxbmwrcpdy1g8i5kwlv0i42ixpsdhhj1dcmzhqza";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil";
@@ -13404,12 +13426,12 @@
     dkl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dkl";
-        version = "20161001.1825";
+        version = "20161004.1707";
         src = fetchFromGitHub {
           owner = "flexibeast";
           repo = "dkl";
-          rev = "0a6b1ef7dbbf3fcf43ea386d1aab8bd7ae039d8c";
-          sha256 = "1vjs9zjcyyk728x80b53v16cvlwswxgvhn2dwncajkcfva0pjjwj";
+          rev = "6b4584f86037bda3383960c678d51f340229fb91";
+          sha256 = "1xpidgj5xk0g4ajpglhbhi02s5il8qqcvh2ccf4ac9daa1r34kxp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8bd9cf21473f676aa54e142b6f0bf0427f40d29/recipes/dkl";
@@ -13551,12 +13573,12 @@
     docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
     melpaBuild {
         pname = "docker";
-        version = "20160911.1215";
+        version = "20161011.303";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "7d9b72ed0e7afa992a6f15066bfd974d5f2e1696";
-          sha256 = "05pll1a7j9clgjn00llhra59svkwqhynyyjvsih0p3rhp3vg7297";
+          rev = "9d9a1d4f1536f149f587e0757e7f89cdd72b6863";
+          sha256 = "153sp9zkmy2kbkyd5vq0iq23dil73zsyffdx4f2hc6garwgrq2ph";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -13706,12 +13728,12 @@
     doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20160926.844";
+        version = "20161009.1630";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "1b257a7dcb21193b4af0722262c79bc53a4ab866";
-          sha256 = "1ccm4lpgmkzg0fhqak4xl25vp2is1dcid0hahd8f1ly7fzn7xwmq";
+          rev = "af85fb024a5d18852cc86ad791f966e77aa7e4ad";
+          sha256 = "02rpcziiqaqfzj36aldcpx9z5r8bz1ngp6fqwdya8jxpzydvcz9a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -13816,19 +13838,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    dot-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "dot-mode";
-        version = "20151029.655";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/dot-mode.el";
-          sha256 = "0xhbzq3yvfvvvl6mfihrzkd3pn5p5yxvbcyf2jhsppk7lscifsgk";
+        version = "20161005.1443";
+        src = fetchFromGitHub {
+          owner = "wyrickre";
+          repo = "dot-mode";
+          rev = "783ccf5b1de591e9926c0b7133ad64a26db62315";
+          sha256 = "1zsbr6cyyynczik7wdd7p6ii5nw7zn44ir7lvm2kkslwjswx34qc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fa20f7845ebf84c09ba34dbffe58dee5438d7c49/recipes/dot-mode";
-          sha256 = "1fik32635caq3r5f9k62qbj2dkwczz2z1v28mc7bcj7jv2p93nvh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b3082fb1c8a5e0439b3ae5e968845aecd99d28e2/recipes/dot-mode";
+          sha256 = "18dj3bvnm28j7mllv4f575ahnhzziinycg48wbr73qi70vq059z8";
           name = "dot-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/dot-mode";
           license = lib.licenses.free;
@@ -14109,7 +14134,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1763224";
+          rev = "1765273";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -14210,12 +14235,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20160928.1442";
+        version = "20161015.1230";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "77e27004289981d0ae3d9425dfefc725ef1829f9";
-          sha256 = "1ngvffh4lfd1nasnpqw8vvd4pyl286m4fn82xx4fhfz50m797pcy";
+          rev = "a6d6e78eb346542d0ef88ade9ade2f583caceab2";
+          sha256 = "1wkzizs50k2ahdqhcr9qgnhwgy0mkxmyysfd61k5iinwjz1z1xxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@@ -14294,11 +14319,11 @@
     dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
-        version = "20160926.1456";
+        version = "20161015.530";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "2664661b55eb";
-          sha256 = "1yawkav0hdsn41lx9q33lxsfpjy7fiwk0f5xlly5vswsn2va9zlv";
+          rev = "6ff00cc2f12b";
+          sha256 = "1sjpwgjimrmh8s8lzbjrhhqvhrfcvs36l8ls75qmrrz5rvp386l3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -14734,12 +14759,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
     melpaBuild {
         pname = "ebib";
-        version = "20160923.210";
+        version = "20161016.1143";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "212b6a594d13ffcc5683f9bcfd274682abff2b05";
-          sha256 = "1d19qw9980iq4idmcdr8ri42pdmyig6c1nwpxijqvdnd0zxfbnph";
+          rev = "007c001d8a200ed27c0bf6f32e09f6ed38a1fb37";
+          sha256 = "1374r0j8i5zmxdnd23h7svpbcwghb2wskn0fgpvnk06859xjhpgl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -14776,16 +14801,16 @@
     ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ecb";
-        version = "20140215.114";
+        version = "20160101.933";
         src = fetchFromGitHub {
-          owner = "alexott";
+          owner = "ecb-home";
           repo = "ecb";
-          rev = "071706b22efcfeb65da8381e317220d7f9d8cb54";
-          sha256 = "1hs069m4m6vhb37ac2x6hzbp9mfmpd3zhp4m631lx8dlmx11rydz";
+          rev = "7df501f5e9bc38f8fdd0d0ecc1e60d2b32914afa";
+          sha256 = "0h50amhz0yzp9zz9nviaimmh9i0rgrr10pdf5fjxc8nc669b35z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c0a4c225c05166572de4538f7ee9e4e0d088a409/recipes/ecb";
-          sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4db5183f35bedbc459843ad9f442f9cb6608c5fc/recipes/ecb";
+          sha256 = "0z61p9zgv7gcx04m4jv16a3mn9kjvnw0rdd65kpvbmzkgls0nk8d";
           name = "ecb";
         };
         packageRequires = [];
@@ -15004,12 +15029,12 @@
     ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ede-php-autoload";
-        version = "20160924.152";
+        version = "20161015.421";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "73bdbfa4dc9dda7ff735db8a8b25c18b66c9f256";
-          sha256 = "1dqxi3w6pp3mkd8jgy5ylx7bqmzf58g4qgkvrpvg0j3c2j9arfpq";
+          rev = "253638c84454021179bbebd4db37310a48ac3035";
+          sha256 = "1b4kkdals8a5fv4wk0y5ykszy2xwz69mm0dnwr2yp25cy6kqm373";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -15332,8 +15357,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "d4f408a78a1b60f78053fbdeaab99b8b350c13af";
-          sha256 = "1l2631q3n2wla2pqlfg8r1ppqzl0np62270v6mwg8zlr17yi59fi";
+          rev = "ab084ff93d8e981800707074c42cb49ab466784c";
+          sha256 = "1bf4rczgc1a19kn3m6b6ib5kgjjm7z109gxqncqzb68h6ks0pr9y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -15353,8 +15378,8 @@
         src = fetchFromGitHub {
           owner = "emacs-china";
           repo = "EGO";
-          rev = "ec36eacb1455b551a2084f8b7cc79981723dbd38";
-          sha256 = "0pv0a8d0czk3kyliynbwmcqmr3adaw0pis2wgbdy9qz07m2k64s3";
+          rev = "2a1f197f24b2231ac31f4776b6f33993ac5d5722";
+          sha256 = "0916jn6cipqjffw2spk5hagbp7d610s481zklsqblgl4ysvk0zzv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego";
@@ -15410,12 +15435,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20160923.837";
+        version = "20161016.1753";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "71d8994ebb7636fc13b305d009c537d8f0b357ef";
-          sha256 = "1cayckl1r8mhfz8sz6w4b6vrydd677mxjxm9lpnfk2yr6iwxvnbi";
+          rev = "eff24be9fb8dc81d9242fa5d6cade5677cc5f6e6";
+          sha256 = "0bq3b1dqjjgrq14cq605z9m94c7yvpr8izqx6zvc73kcivf462sf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein";
@@ -15470,22 +15495,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20160916.33";
+        version = "20161017.550";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "52c5845d25416405c19362125598ac2447f2333f";
-          sha256 = "0j1vyjx060bsmkkczvhvpzhamx6nr5qgqk8ld86aaxyd8kb3x4q4";
+          rev = "775905aaabe1f2e9aceb8432656414d58a7c5d00";
+          sha256 = "0fzhng4wn6aa9d8pwmppmsl07bjv063y0nnbxjbqdmdn2dccwm67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
           sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx";
           name = "ejc-sql";
         };
-        packageRequires = [ auto-complete clomacs dash emacs ];
+        packageRequires = [ auto-complete clomacs dash emacs spinner ];
         meta = {
           homepage = "https://melpa.org/#/ejc-sql";
           license = lib.licenses.free;
@@ -15515,12 +15540,12 @@
     el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-get";
-        version = "20160929.613";
+        version = "20161008.1525";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "0c3c33e604830e9e4dabc35a1b4bd0bc5ae0f3a6";
-          sha256 = "1dpbw9pj44lda7fnm17ap8cgw28h0cydx2sxhf49az0s7h2czdip";
+          rev = "6f39b2628d42ba9b3ca5d0230faf30bcf3ca8211";
+          sha256 = "0yb7l2001p3bmjacp9gc9bxvl1la3qxgvmcg4jrn94g21wml6nbz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -15908,12 +15933,12 @@
     elf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elf-mode";
-        version = "20160901.435";
+        version = "20161009.48";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "elf-mode";
-          rev = "284dc09309360c69efa19979113b2245c551b259";
-          sha256 = "1rv0ri5hhj3d5f1l4034sd9rd4g8z8zi2vpcd3vhdprlpgnqvn0z";
+          rev = "cd280d683cd3341d8bb31af6db7e3b74a133e6ab";
+          sha256 = "0cbvjbk2893ag1iy8ggixpirfiyhssm7fii96hb9jqdz874cdl0k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/368d1ff91f310e5ffe68f872ab0a91584a41a66e/recipes/elf-mode";
@@ -15929,12 +15954,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20160911.1353";
+        version = "20161012.1149";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "f45deed1694340df010e5c60776bfef3784a2c7f";
-          sha256 = "01my4vsjxrgnvybayshikagmw801g5dispi7mlrc7w20lab26lk5";
+          rev = "323cfe4a3a482183f46d73b404ba1f30175424dc";
+          sha256 = "1w4kzkavls63db52pkabfxf8dc3vk7yjjj1qhp2msgamw28jal2b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16003,8 +16028,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "f45deed1694340df010e5c60776bfef3784a2c7f";
-          sha256 = "01my4vsjxrgnvybayshikagmw801g5dispi7mlrc7w20lab26lk5";
+          rev = "323cfe4a3a482183f46d73b404ba1f30175424dc";
+          sha256 = "1w4kzkavls63db52pkabfxf8dc3vk7yjjj1qhp2msgamw28jal2b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -16108,8 +16133,8 @@
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refs.el";
-          rev = "0f6746fd0ee911244f116061574ece4496be776e";
-          sha256 = "0fncp8hhyrzlp53w20la0i2jcf25s4xhgz4ql0r2krshf2dvdyz4";
+          rev = "f4c04cbf533bbea93ac2fb6b6a41ba50c4dd2456";
+          sha256 = "07x2hkhjm7nazi10h5sfkvcnpzyg86q383qyqclp78f5n6l4axif";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -16167,12 +16192,12 @@
     elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "elixir-mode";
-        version = "20160922.857";
+        version = "20161015.1200";
         src = fetchFromGitHub {
           owner = "elixir-lang";
           repo = "emacs-elixir";
-          rev = "765828706971050b4bd78d22203ebe22ed2d2dab";
-          sha256 = "1r1wzw1sk3320qv72yk8d6l2r1knlnbvfaa0cnn4vlk5ww7bh1yh";
+          rev = "b71145e1f23f1222220549bd28bce3557711717e";
+          sha256 = "06m937mkd4hiqi28drqnkk8pr089ijkbcacgbxf86d5iy8qwyhw4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode";
@@ -16209,12 +16234,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20161002.103";
+        version = "20161006.11";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "2f7f0c3e42d137aaefd12bc28383807d35a2a290";
-          sha256 = "137189r1rba5l9m82qj3zba8x0gkm0c3xc9df1vri4wsbz4df7nm";
+          rev = "750bb9ced539db9dfdbd143bb2624aea54eb1e16";
+          sha256 = "12s8pphf6wigaaarapp78srisqdkk2wk7myhxkidrna38pq1ad5b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -16251,12 +16276,12 @@
     elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elmacro";
-        version = "20161003.1228";
+        version = "20161004.5";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "elmacro";
-          rev = "1014e515c9714613921622cdb3f36ed4ef27233e";
-          sha256 = "14rjlxskxhjlidj4v50g0xsm0xhqm6gxl0bi9lwm699dlw9h5z4r";
+          rev = "d9703c73ca37fa07f6cea003efcb0974db1f7776";
+          sha256 = "0rc97dpdb2y418msw1z1nry6swffqdi4q806f4klfv1qr6rn2vwd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro";
@@ -16440,12 +16465,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20160903.841";
+        version = "20161008.910";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "4137f5aa88fc219f84effc6a6f79def8249bff6e";
-          sha256 = "1jfn3pb0hh5sybgcfmgba7xairpwpcx56xg9gbrn0sviwbcmyjwp";
+          rev = "22bfc60a8017e7cab18b442818210263ffc6d24a";
+          sha256 = "1q7wbjz3y3xd31fprf9dpv6ifjijw31kwsgayg7dl0bxkhqigrfn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy";
@@ -17380,12 +17405,12 @@
     engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "engine-mode";
-        version = "20150902.1035";
+        version = "20161009.1718";
         src = fetchFromGitHub {
           owner = "hrs";
           repo = "engine-mode";
-          rev = "244610231f48af10e9cd0931827543e1fcdb3f32";
-          sha256 = "066pxfv4rpxgi7jxdyc0a3g5z9m1j66sbi5gh2l7m4rwhzkqchn9";
+          rev = "5d6c6495b31a8029b5122cfe9790c1c2609dd731";
+          sha256 = "1y23yj749i14r373cfymqw6bakqvrsdgyjn91i0rp51y1rzdpp3p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode";
@@ -17485,11 +17510,11 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20160921.1725";
+        version = "20161015.1025";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "3dcff1facb075149158175c76326900eb01c99da";
+          rev = "e7e9510cbcae5832643212e7fa42e2662337c383";
           sha256 = "08m7g0h9iap2sma7mhni6pg6rbgibf9gkhicx7i2z7r3sbgaal43";
         };
         recipeFile = fetchurl {
@@ -18077,22 +18102,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ergoemacs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20160926.919";
+        version = "20161012.2127";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "7e08fda94454bfe6be92f35bc2be3aceb32e90ad";
-          sha256 = "0ic29n4x0m3cii03bcgbs2mn5b0ng5knzal4b10q10n33zazwcvi";
+          rev = "ac70b2563fb6e3d69ea382fddc87b5721c20c292";
+          sha256 = "0ydxyylijdd6da4n9by441352shphrpfyk2631ld5aq3gz27z9gi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs undo-tree ];
         meta = {
           homepage = "https://melpa.org/#/ergoemacs-mode";
           license = lib.licenses.free;
@@ -18122,16 +18147,16 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20160831.740";
+        version = "20161007.57";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "a0abdb8631d7bd7a154023950ccdcbf09c85b92d";
-          sha256 = "19yy1sci2fdqp5iwzfm1rpw4b97vpbplfc7hwhv036afzkg9kj7m";
+          rev = "df8c6690a86d087d8de324276b2266bc5918c779";
+          sha256 = "1jgw4mwb74861mfcl3iqjsgvcf3jnyqmbk845qn1q76wvgsqm1n3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang";
-          sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
+          sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq";
           name = "erlang";
         };
         packageRequires = [];
@@ -18493,6 +18518,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eshell-up";
+        version = "20161016.946";
+        src = fetchFromGitHub {
+          owner = "peterwvj";
+          repo = "eshell-up";
+          rev = "7d1ad8faf46020f6ed9a1dd45aae807feabeced1";
+          sha256 = "09kbklns7zv14avccnj4prx1rpz3rm8lq8ffhhyd33yll3clvxdy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up";
+          sha256 = "0v26dqaszdg57brg8sls9ddmfwxzf98wkp471q1cqw75ss4999jd";
+          name = "eshell-up";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/eshell-up";
+          license = lib.licenses.free;
+        };
+      }) {};
     eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-z";
@@ -18622,12 +18668,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20161003.124";
+        version = "20161016.1144";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "c37aaa8b672c25686cd4dd92f4b230116a1897b8";
-          sha256 = "19xghzyabl0i5kg4b73jdik3npkq4bs5xsnn1kx3zrvr2szf89js";
+          rev = "58b95d39643d27d9f00cbfaa7bdaaa34f982b8ee";
+          sha256 = "04l8i75lksfk56zdvnx9x7dq3zq45p0labvbqrn1aqshysc0d4ck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -19018,8 +19064,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-evil-anzu";
-          rev = "a041db15bd6e2eb353b24f6f984f6c5ee618d460";
-          sha256 = "0cnj91lwpmk4c8nf3xi80yvv6anvkg8h1kbzbp16glkgmy6jpmy8";
+          rev = "183e42a7e4a47b1aa4dcc69e1cca87b48ffc6c5c";
+          sha256 = "0fqz1545hyz6p76vgjlg09mqhfwhi8swrlkwx8q8i5vl2r14s9px";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06b0609b56016d938b28d56d9eeb6305116b38af/recipes/evil-anzu";
@@ -19140,12 +19186,12 @@
     evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-commentary";
-        version = "20160221.1230";
+        version = "20161015.1251";
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-commentary";
-          rev = "6d9079894da0bdda8a317c03c90481b8754635c7";
-          sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni";
+          rev = "52da2aa4f4beef64b25fa13f1e085aab239d445f";
+          sha256 = "1c03h5g4jjq0d5k4m8npk0qif9xavqrwa4x5h8vxl4kj53lr9cqg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
@@ -19602,12 +19648,12 @@
     evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-multiedit";
-        version = "20160602.1213";
+        version = "20161010.1703";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-multiedit";
-          rev = "04a7633ce4cd77617ea54cc5465293d013cc3c2b";
-          sha256 = "171bq84dg86s33p73l6lji155c4as2dnjs7q3jyl8jhqsqf2cmyg";
+          rev = "5f263a9388dd3593b5acefe9f523c819bd3b338f";
+          sha256 = "0bsdyy5jw8adj26p85831n4f34d0sv4rrv9xlhjqkzx9gsr4h7d1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -19662,6 +19708,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }:
+    melpaBuild {
+        pname = "evil-opener";
+        version = "20161017.235";
+        src = fetchFromGitHub {
+          owner = "0robustus1";
+          repo = "opener.el";
+          rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
+          sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener";
+          sha256 = "08vcf9i0rplw2p6gjl7zzrc7kxdl5yv2rggj2ihgdnnfpc4sl33h";
+          name = "evil-opener";
+        };
+        packageRequires = [ evil opener ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-opener";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-org = callPackage ({ evil, evil-leader, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "evil-org";
@@ -19791,12 +19858,12 @@
     evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
     melpaBuild {
         pname = "evil-smartparens";
-        version = "20160502.155";
+        version = "20161010.322";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "evil-smartparens";
-          rev = "a415c03783cc44a9aaf30adbfed37d76c7cf9397";
-          sha256 = "1jvyj2qc340vzw379ij9vkzfw5qningkv0n1mwzhzhb1dg8i1ciq";
+          rev = "3bbb96c1064accee0715b039d09955ed5ca9851f";
+          sha256 = "0c3zb0s6snsb0a312pgha760njvb6gpl25g8ywm5dzp03r99490d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
@@ -20788,12 +20855,12 @@
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "20160608.1119";
+        version = "20161013.1040";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "77f1e187b9cecb6975bedcfe91c8c81f1b133686";
-          sha256 = "0n0v9jwswcc16cigyffvy3m9y7qqrs8qzjs11sq3d420zrv16b39";
+          rev = "433176166c561a2de8d511a1cf6fec751bcb0c57";
+          sha256 = "1nvr4jh3f0qs4lpsb1sw3ih4mi5pcgn8ryxlbnax11rdcdkm625r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -21639,8 +21706,8 @@
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "flimenu";
-          rev = "66a063612daad59ef8035aeacc1a1ed244ba22d0";
-          sha256 = "0krs5qjkis01qh21xvxqxd1jn6yw9276si36hacgwv0q92mk8x0b";
+          rev = "ecbd47c857781b9c38035048d69415b617a75422";
+          sha256 = "0a37kjpcpkm172icd2dbb5ndi6s164rbrpvy0c7kr0gl30n1gb8c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ffc67a266de3d58553b27325b7fc6937df425be/recipes/flimenu";
@@ -21758,12 +21825,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20160930.944";
+        version = "20161017.604";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "c6fc7237f55cc61cced7a400f331491333b1f2a9";
-          sha256 = "1b38rr6ad2qg17v0vdmxfp1859m1aavns7zw9d7jgbb5cv63rx14";
+          rev = "047d1008e8fab0a8487535c6e2db97ced3056c3b";
+          sha256 = "0ipna6wszxnf9ydf3ajzskdw9zwz7zj25vcsjj9yar4dzwmj4mgg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -22448,22 +22515,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }:
     melpaBuild {
         pname = "flycheck-package";
-        version = "20160921.1826";
+        version = "20161015.1803";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flycheck-package";
-          rev = "f6efe48411b695bf1db62d00b3697818dbd60b65";
-          sha256 = "1qq2vbks6c42114s1saq9g185b1r9z1k4gih4acxsdjw2vid4pj6";
+          rev = "cf561bf9896d3e7b6bdcdb7801de6cb9f548b573";
+          sha256 = "124ahlxpkcb5mcndmg8k8rdxx0piis6372zllxk6ywmgxz9mlgy1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
           name = "flycheck-package";
         };
-        packageRequires = [ cl-lib emacs flycheck ];
+        packageRequires = [ flycheck package-lint ];
         meta = {
           homepage = "https://melpa.org/#/flycheck-package";
           license = lib.licenses.free;
@@ -22619,12 +22686,12 @@
     flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-rust";
-        version = "20161002.543";
+        version = "20161017.453";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-rust";
-          rev = "737ca5faa159d1a7788f4bf52cb33ee79b1e4225";
-          sha256 = "0235dj863cdh1pysrgj10dkc4fhvpgbpxj6gj97lfb0fchbavypc";
+          rev = "d019e7acb36f1bdb4e7d0635455af137e7238d63";
+          sha256 = "07160my2rwxvrbg2ywlawhb0q9wkcrywfzim4xgzmg7dkw797h8v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust";
@@ -22728,8 +22795,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "a8ca68b508c448f6ac5ed6fa35ee3fe0a4771098";
-          sha256 = "0v8by6y25sl7528vvrb1xsmm184xbqivqvllykx3kmaxpdh5hvih";
+          rev = "066506314805ea863d4a46a9dc7e66febbf45263";
+          sha256 = "11rka7xwbvkzj455v0ijx4pb4w91vnf1lyawlybwmla9wilsr5n4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -23396,12 +23463,12 @@
     flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flyspell-correct";
-        version = "20160731.329";
+        version = "20161014.216";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
-          sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+          rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
+          sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct";
@@ -23421,8 +23488,8 @@
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
-          sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+          rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
+          sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm";
@@ -23442,8 +23509,8 @@
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
-          sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+          rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
+          sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy";
@@ -23463,8 +23530,8 @@
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "d50f3661ad545b30acac4c8819eda2238ff375fc";
-          sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig";
+          rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
+          sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup";
@@ -23564,12 +23631,12 @@
     focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "focus";
-        version = "20160131.1418";
+        version = "20161013.401";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "Focus";
-          rev = "abad47f1c40e595779c376a1e936c1609be1cdf4";
-          sha256 = "0vqjyc00ba9wy2rn454hhy9rnnghljc1i8f3zrpkdmkqn5cg3336";
+          rev = "741a94586651d8f07bbfa939de25e3c2d76444a7";
+          sha256 = "15fns0wpvj0lgq3ax14zhqkpfbkss68zib542cppnnl3q88jvbf6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus";
@@ -23918,12 +23985,12 @@
     forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forth-mode";
-        version = "20161003.541";
+        version = "20161013.110";
         src = fetchFromGitHub {
           owner = "larsbrinkhoff";
           repo = "forth-mode";
-          rev = "039bf122ee7412a29b1283bb23d8687aa07c22cd";
-          sha256 = "1f1c37d5vlpj3ach1qpc43ay399vvcv52dn1nm2mz8l0q1916sz2";
+          rev = "b8024ac331d926a74ad938c508ed38db8f050da7";
+          sha256 = "1cn904rz8iixj406n70qw1bisyk39yzmkhpislbazszgdx8qp3wh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1c8b5b9fe8f17905de801f5d7dea28ca73daa4e/recipes/forth-mode";
@@ -23981,12 +24048,12 @@
     fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "20160930.642";
+        version = "20161011.2319";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "57567cfa879acef36e396138795a48c4405023ed";
-          sha256 = "0g0br07v1lxw8sdsprsgn2hc9gmskqgjb74pin4riwja1wvgdpc7";
+          rev = "bba892a595efa1e376637dab6b31473faffdf754";
+          sha256 = "0c77dkc5rqzybym2n7mqi5jhkr1g0r77yrfmbpakbc2l0550bg8r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -24275,11 +24342,11 @@
     fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fuel";
-        version = "20160825.254";
+        version = "20161007.2213";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "78d9065db0ad87041b519b888f729f820ea49f9f";
-          sha256 = "05c6z9bwmyn110940wbglf74rcgs7v1vgf3ixfhm0xk2nvzrplf7";
+          rev = "0fe633848b54840d0b9786c9dcec13e0c44878f0";
+          sha256 = "0214gk87i94wsk56i2i64drw98l9k8idrf0kj2pggva4s8jf44f3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -24686,12 +24753,12 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20161001.1854";
+        version = "20161010.1358";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "e6535d461bc33ee0d7353b722f2fd5f8ee2bb2e5";
-          sha256 = "17p3qwj5qyx5sql09slf9pwghiljlfx3ndkh1izbbqhc5m410r2f";
+          rev = "594dac485fe15d6414f1fe4dc71e21be7de7ee33";
+          sha256 = "1h85qd45la0cm31k2nisfdidgqlc8yrq5x88jdkirz7m3ysxm5q8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -24770,12 +24837,12 @@
     german-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "german-holidays";
-        version = "20151102.743";
+        version = "20161011.13";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
           repo = "german-holidays";
-          rev = "8388b3bf5b5c38f9b9fcc9216ca26ef0640c6edc";
-          sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
+          rev = "d7d540c229c1a8be68ee09fbda08fe3ea31b7d29";
+          sha256 = "1rfka83jwd68k93vn3f7llxd6z0ma5k98gws0081y8i9fc21fnsd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5b3807ff989b13f95e8d6fad2f26a42ff0643c/recipes/german-holidays";
@@ -24900,8 +24967,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "b7cda9e9b9515ac2cbf8a0cf0ffe7cd4ba52844b";
-          sha256 = "183ssyryfqzz4dacirkfn6ycigsm6mfvr6mx4hivav9jzyrd9n7x";
+          rev = "a4f5e1adbb8fc633c8de23fee57a9e247e6b0bd1";
+          sha256 = "0b3242kbj2qagl15hng6f6hx0k81khidkgzmy5pf89myp8p3xiaq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -25190,12 +25257,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20160929.801";
+        version = "20161011.1738";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "a49dfe13916ea0062f3970b787b1b6fa80eb4d83";
-          sha256 = "0flxkv0qiic8bhr319cy1sc81sx396ighqygg13x7g9zaf97qvz2";
+          rev = "8e6434898b31f8b5d9b228d481929e04272388a0";
+          sha256 = "0fgbd7gi6fbkywrlb77g60h1pb60jia7jdkl0mxdwq6xa8zq859v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -25257,8 +25324,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter";
-          rev = "a786465bd527c13e32c73c02b95086560c1be878";
-          sha256 = "1abagq0psip7cgsqbfjv72qy60ywsny0ibsfcn74ldj6a9v17mz5";
+          rev = "338172b896bcc758a7e635cb5f79e19addf167e6";
+          sha256 = "19a535y7k5s0kw12qrvxd74mb5ikszh0alsjivqpc8ydzvpqb9r7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter";
@@ -25278,8 +25345,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter-fringe";
-          rev = "dbcaaba83a5fc3e23a735e871e8f31068b92228a";
-          sha256 = "1wklzf8vdsjpzs26xg8d97zq6fddw9hbrkd5npi3qwjmjl1xccws";
+          rev = "b52080a72042d60939db2281c234a6b9c5a56492";
+          sha256 = "08p0nrdwz37yagaaln9xcvyvd9zmj9j6f2hy43nhjhv4bxcapbg6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe";
@@ -25383,8 +25450,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-messenger";
-          rev = "9412a975f4723e9bc9c9feb4ec064b2e8c0c659d";
-          sha256 = "1hh99ippc1bpqpnchvhbh7yzcsjx9v7bbpy5r9hx82kx0xqih0sc";
+          rev = "199601fe9a71473e9c015fb2ae13f6e1ca1764e0";
+          sha256 = "1k66j0fi7101icn5a0v0km0jdckhwagmi5p6rf1fv9r90pkln1k0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger";
@@ -25673,12 +25740,12 @@
     gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
     melpaBuild {
         pname = "gitlab";
-        version = "20160909.56";
+        version = "20161013.604";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "2ed2e36dd023c12545f00b41d01bca326048656e";
-          sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz";
+          rev = "2efdc9bc2f572fceb11199cecdd04aae03df3cb0";
+          sha256 = "0pxmmgsrn5d2jmak3plwb6h15h2d4sbwk49q6gdniglcf9nagckq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab";
@@ -26111,12 +26178,12 @@
     go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "go-add-tags";
-        version = "20161003.1549";
+        version = "20161005.948";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-add-tags";
-          rev = "14865351e15a4a6d3bfbcae7a17c84435d308b00";
-          sha256 = "18phz9ysyspcpb3h4lc079wy5sarxzfkg4ycz1wg0yx21r107vjh";
+          rev = "c77bd5788347009d1dc14c0d5cbedd73d4544745";
+          sha256 = "0ppps79749fprcbrwd1grlqaj36yi5a8vlvk040rqyhi9g3phr3c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags";
@@ -26136,8 +26203,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "7a0b9e99156df54d06a720e3a2a9f55618e5a25a";
-          sha256 = "0hlbga620b2mr03vnrgmz8yd0n3sviyz03idz2jwbrrlk50qsbkl";
+          rev = "478b96fe0e77b4451b866559e2adb407fbce7120";
+          sha256 = "1ymhpiklyqxi79h65yarmh1hgyswsdx5jahg9pmhg4jww34778y3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -26216,12 +26283,12 @@
     go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-eldoc";
-        version = "20160307.616";
+        version = "20161012.616";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-eldoc";
-          rev = "6b28222429158f11988358f143da3eac7d0d48fb";
-          sha256 = "13r0m5ghqvpgkq6yxsqdx4g64s29qv9hn2cfcxk7wza7bxz1p9nk";
+          rev = "ecf71a75ccfac7f9bc6fac64ef536f2ffb56b3bf";
+          sha256 = "1q3l8x7qlcblxy0h4j48hzqjx90c14qh7nzbk8gds3ff2yrxy2kl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc";
@@ -26276,26 +26343,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-guru = callPackage ({ cl-lib ? null, fetchgit, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
-        pname = "go-guru";
-        version = "20160715.854";
-        src = fetchgit {
-          url = "https://go.googlesource.com/tools";
-          rev = "fc2b74b64ef08c618146ebc92062f6499db5314c";
-          sha256 = "0f5nx76iqr86x0bi4v06yr7x7p74n3azhhp68441w0c7cq7wsdra";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/816a2511c54e451313c7ac9433d0860f95e68da6/recipes/go-guru";
-          sha256 = "0c62rvsfqcx2g02iwaga2zp1266w0zhkc73ihpi0iq7cd6nr4wn0";
-          name = "go-guru";
-        };
-        packageRequires = [ cl-lib go-mode ];
-        meta = {
-          homepage = "https://melpa.org/#/go-guru";
-          license = lib.licenses.free;
-        };
-      }) {};
     go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-impl";
@@ -26303,8 +26350,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-impl";
-          rev = "55c6215c009458c8bc36e344c2b3ae48536e8de4";
-          sha256 = "168kcz1f0m6dxi0hj2jwl1299469zy7mrri5i5ym2hzc85rhgazp";
+          rev = "f1a8088bca73acf254b605cf421b4661b45ff2ba";
+          sha256 = "0figyrv859i48s4pzm580hr0cgyzhyi26v0gzp6ws2686i20algf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl";
@@ -26320,12 +26367,12 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20160913.944";
+        version = "20161013.1055";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "004575eb128ab01a11b4a4d278c544f91cf752fd";
-          sha256 = "0il6hbk1lvmqb6c45zima372g7my14bm13c9mlcsxghpp0hs1fj4";
+          rev = "04a2946ac3c550b1943c20b74503908def6abdd5";
+          sha256 = "0892pmx9lnbc96srwx8j05gj5zinm8kvzrvwpnj88x9ap2ig0yap";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a9d94efc1a0cedaaa0a1acd1227b2530efefca2/recipes/go-mode";
@@ -26407,8 +26454,8 @@
         version = "20160307.744";
         src = fetchgit {
           url = "https://go.googlesource.com/tools";
-          rev = "fc2b74b64ef08c618146ebc92062f6499db5314c";
-          sha256 = "0f5nx76iqr86x0bi4v06yr7x7p74n3azhhp68441w0c7cq7wsdra";
+          rev = "69f6f5b782e1f090edb33f68be67d96673a8059e";
+          sha256 = "1797hrbpa7li6mg8yi5mk683ql6qkzqzn8c61frjzrf4xcjmsk1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/421911dd75eec0f857295b76d310b8282053b57f/recipes/go-rename";
@@ -26526,6 +26573,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "godoctor";
+        version = "20161014.2042";
+        src = fetchFromGitHub {
+          owner = "microamp";
+          repo = "godoctor.el";
+          rev = "7447129ca7eb0120911d6dc96da8d5a5d4ac4276";
+          sha256 = "07d251vi3rwcggjv643w6dz61jsl6sx3vvis6p750qh87rvh3kj4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor";
+          sha256 = "0k734hry9npsr6zhsplcvmcjqw6jdf79pv4k9dw0xvd598hkpazz";
+          name = "godoctor";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/godoctor";
+          license = lib.licenses.free;
+        };
+      }) {};
     gold-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
     melpaBuild {
         pname = "gold-mode";
@@ -26596,8 +26664,8 @@
         src = fetchFromGitHub {
           owner = "golang";
           repo = "lint";
-          rev = "64229b89515c2a585c623c79a7ccdea71e8589ff";
-          sha256 = "05wjfps01hc5y8pc26lf4iq887jjvdqdkr1w2h6q8783dl0608n5";
+          rev = "3390df4df2787994aea98de825b964ac7944b817";
+          sha256 = "00kjfvbi29agwsilfapgccx4ynqrbj04whk6iflxky14zrmz044q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -26802,12 +26870,12 @@
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "20160627.21";
+        version = "20161017.204";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "74128f5c759318b5a25792a72924ea130db27e72";
-          sha256 = "0kasaiz3wi7gnl91byhfg2hczhv0r6i59cyh32m4abrmwagbk3xj";
+          rev = "2ae187078beb5d9672ca14cb636b6b4021de4230";
+          sha256 = "1pq9zjfs7gp7bz3jq11fx75m4zcx9p772lja5jicz535khpgxw7f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -26908,8 +26976,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "b932baf416e9101c762b7075f12af5a6fb364627";
-          sha256 = "18xmhdlm94p1b1jnj2mvj2dhjcgdm9cklksgp3qifwwph9xlyrh8";
+          rev = "bfd199315e792619b69e8dc330b7a81836ef73ea";
+          sha256 = "1v63j9ry4fphv8ayfbw4mm9c1yawwhlrnfxk658lndgsi5kfpzk7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -27034,8 +27102,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "9d42f284b3163215484e16bef1785456d2e7b68d";
-          sha256 = "1dwj53z4422ks30cqr5rj6x91qf63sjzbmb06sz4ac5pdr1d66q6";
+          rev = "5dc1e6a43727b8170f828b48fbbc52aad152de46";
+          sha256 = "0lp54fnz1v1pppbs9zjv9q292jri3padphriqz313hslyvb0mv09";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -27093,12 +27161,12 @@
     graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
     melpaBuild {
         pname = "graphene";
-        version = "20151108.2340";
+        version = "20161009.38";
         src = fetchFromGitHub {
           owner = "rdallasgray";
           repo = "graphene";
-          rev = "dcc0e34c6c4632d5d5445ec023f5b1ca04c7d1b7";
-          sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
+          rev = "47c5a194f81796eface2e2f062144c17ee3cfdb7";
+          sha256 = "0xx3cnwbbil6d7y15d61wkp777w4j5rsdm7gwd5gpcr8910405n2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -27144,6 +27212,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "graphql-mode";
+        version = "20161016.635";
+        src = fetchFromGitHub {
+          owner = "davazp";
+          repo = "graphql-mode";
+          rev = "7798aef2a8d369d0cf6a3cbf1f85d2495969c253";
+          sha256 = "1phmpj77hv2f5cq6685r6nngp2c5ssml55w7mdh4x4yji5mndn42";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode";
+          sha256 = "074dc8fgbrikb5inv837n9bpmz1ami7aaxsqcci1f94x3iw8i74i";
+          name = "graphql-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/graphql-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     graphviz-dot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "graphviz-dot-mode";
@@ -27372,12 +27461,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20160504.211";
+        version = "20161015.114";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "9d42f284b3163215484e16bef1785456d2e7b68d";
-          sha256 = "1dwj53z4422ks30cqr5rj6x91qf63sjzbmb06sz4ac5pdr1d66q6";
+          rev = "5dc1e6a43727b8170f828b48fbbc52aad152de46";
+          sha256 = "0lp54fnz1v1pppbs9zjv9q292jri3padphriqz313hslyvb0mv09";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -27477,12 +27566,12 @@
     gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gscholar-bibtex";
-        version = "20160929.1218";
+        version = "20161006.1944";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "gscholar-bibtex";
-          rev = "0b083af54385d292c1f6b12876f509be15269020";
-          sha256 = "12s6zhp3fy37vj53d347rhp3k1kw7hdb37p7wbnr6d1wh7vi0kpx";
+          rev = "734696423b8f807e6c1f0e871a8577a5f3a731f3";
+          sha256 = "1vva58pcrh1rbvl1yyiy0fw2vmnfzlkpinjkr9yv19zmh0jphjzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
@@ -27519,12 +27608,12 @@
     guide-key-tip = callPackage ({ fetchFromGitHub, fetchurl, guide-key, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "guide-key-tip";
-        version = "20140406.1820";
+        version = "20161011.123";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "guide-key-tip";
-          rev = "d1773156b62566e1245f39936abd151844bd471c";
-          sha256 = "1s6p4ysdbqx5fk68s317ckj5rjmpkwwb0324sbqqa6byhw3j0xyj";
+          rev = "02c5d4b0b65f3e91be5a47f0ff1ae5e86e00c64e";
+          sha256 = "1xkrfjmhprnj8i39a85wfcs5whm93fw8l57c606wdhiwqj719ciz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f23db7563654ab58632d56e3b01d2f78276fc3e/recipes/guide-key-tip";
@@ -27960,12 +28049,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20160925.103";
+        version = "20161010.118";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "f755c369d1ce22225b7dd7896fcc2620e2235ea4";
-          sha256 = "1zjmkq8sxg3vfb9hy85x39anarl8yf1z6p0hl0gg6y10xmvjv7s6";
+          rev = "2a6ea20834be76199e8820f791a284febf3eb0cf";
+          sha256 = "11v7d2jrkm2290hiq7x70vkxd0xv0qwqhhqv0jkzkldy4ikhydjp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -28168,12 +28257,12 @@
     hcl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hcl-mode";
-        version = "20160502.1700";
+        version = "20161006.950";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-hcl-mode";
-          rev = "2e3fa6fbc793a3bcf260fc269c5218cb09ca45aa";
-          sha256 = "1qlrkd10vszzqps86pzr6mv9ykffyhhpcp65y9nq3ds4aviv6jay";
+          rev = "4ce807c57c755b1eb15e17e35f2680c86595c171";
+          sha256 = "0mb0knl84wzgyizxf2p82wwslla7s13bvxb7yd05xlnskr0yrnk8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode";
@@ -28228,12 +28317,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20160929.1313";
+        version = "20161017.259";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "2b91583c4f183b505d4870b4e6d3441d57637eae";
-          sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md";
+          rev = "bb8ac7b757174c413fa3a51c75a621553686cb21";
+          sha256 = "0kilvb59ihh9vx0a2qdgnqsdb2klaa40lb93cbir3li9ndnyp2ga";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -28312,12 +28401,12 @@
     helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "20160923.2128";
+        version = "20161010.713";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "7839e04d072e2c86c339f5bb4da61b391e7ad93b";
-          sha256 = "0ssallh4rva31sw03088fvv0vm5n0ykrrm1a44jqpi4fx25az11i";
+          rev = "49e1f66fa80674513ca898e32d62d6dad875cb90";
+          sha256 = "0vzgiix2c8jwpk2hhxvz9gqb78glmd4dk1myrgvxs9fhsj54dkk3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -28417,12 +28506,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20160928.2345";
+        version = "20161016.1319";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "5d8f8488537f3c8ced5803d73dc38bcd30a31ebc";
-          sha256 = "1lnmwvhfsmv8yx5v7i5dfcfhiy1grphbmphv9ii2pzzmdj4psk8z";
+          rev = "035435d72821520bebf7bf21939a63ed0bd19a66";
+          sha256 = "0fpy8ilwakswg1piyaqid7jygl0xa93m16m9kid7hzxr0v9m38wp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -28753,12 +28842,12 @@
     helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-company";
-        version = "20160516.2258";
+        version = "20161010.59";
         src = fetchFromGitHub {
           owner = "manuel-uberti";
           repo = "helm-company";
-          rev = "d796bfc43489656c87b269c4c893d84745effb31";
-          sha256 = "0kbm8w1hxff0nb8pyjnq2l43ra1m0ywzjvvqs0lncji5zqirvp8l";
+          rev = "5202ddde359d8b3b8db242e998d0766d06db2be6";
+          sha256 = "03hdnnqigg3q73mb9zbqav2d91iamkxgsbc5857jxxr04bq23ak9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78ff0a6cf493ff148406140f3e4902bfafd83e4a/recipes/helm-company";
@@ -28774,12 +28863,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20160929.1313";
+        version = "20161017.306";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "2b91583c4f183b505d4870b4e6d3441d57637eae";
-          sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md";
+          rev = "bb8ac7b757174c413fa3a51c75a621553686cb21";
+          sha256 = "0kilvb59ihh9vx0a2qdgnqsdb2klaa40lb93cbir3li9ndnyp2ga";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -29236,12 +29325,12 @@
     helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ghq";
-        version = "20160203.727";
+        version = "20161015.117";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-ghq";
-          rev = "db37bfe290b234ed3f39dcce24667072172ded41";
-          sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
+          rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56";
+          sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq";
@@ -29296,22 +29385,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-git-grep";
-        version = "20160820.635";
+        version = "20161016.407";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-git-grep";
-          rev = "dc66d07ecfb70b0b3c57b0849c74cf80b2bb1312";
-          sha256 = "1zjimp0rww90xffzwf9yrhd0xg7jiv5r79v2hw84mxqmbqq70icj";
+          rev = "21ae7521a6ea0268b88a95c15c5ceb46851a44d3";
+          sha256 = "1vx94f1vx0rj9by74q8gmxf06kjska06l3il4qzpsn2wasky2pr3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
           sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
           name = "helm-git-grep";
         };
-        packageRequires = [ helm ];
+        packageRequires = [ helm-core ];
         meta = {
           homepage = "https://melpa.org/#/helm-git-grep";
           license = lib.licenses.free;
@@ -29366,8 +29455,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "2ed2e36dd023c12545f00b41d01bca326048656e";
-          sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz";
+          rev = "2efdc9bc2f572fceb11199cecdd04aae03df3cb0";
+          sha256 = "0pxmmgsrn5d2jmak3plwb6h15h2d4sbwk49q6gdniglcf9nagckq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab";
@@ -29806,7 +29895,7 @@
         version = "20150717.39";
         src = fetchsvn {
           url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
-          rev = "153526";
+          rev = "153985";
           sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
         };
         recipeFile = fetchurl {
@@ -29907,12 +29996,12 @@
     helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-mu";
-        version = "20160819.1132";
+        version = "20161010.102";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-mu";
-          rev = "3d53161fdd15a229c9afe96004118167ba0593b1";
-          sha256 = "0ja4vka6wxyy5vg8cdg0znkisvmrn158mhkrph7l0p4b59qdxal6";
+          rev = "1f9a6b0f8217c0c6359f53b724d9da4c3c3f896c";
+          sha256 = "0ch0zip9ldsza3vq66hs8kyczlhdywr2i9sqkza4inm8b938y1dv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu";
@@ -29991,12 +30080,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20160926.1239";
+        version = "20161008.1645";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "604e473dc2b3e107cc6fb35d10b3326c4591a0dd";
-          sha256 = "1rqm28xgp8drwk92n3vfxbm3q2rhl3ziy95l2pps1n240qj7is82";
+          rev = "671827a2b72ab6ee1f2736ea33a68b4bf5f93324";
+          sha256 = "1z7jr7v67g9vxf7bv18vvmrdi09rvhjp8aw3malynp9iddz8hab6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -30138,12 +30227,12 @@
     helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-proc";
-        version = "20160917.138";
+        version = "20161005.2005";
         src = fetchFromGitHub {
           owner = "markus1189";
           repo = "helm-proc";
-          rev = "a096066d352174cdc71f3107b089913d6b0b588d";
-          sha256 = "02rzbjzfvpszgh6gdnklsgmcxyzl1w4j88fkh7jkk3jdrrapysdm";
+          rev = "576d31c2d74ba3897d56e2acd2b0993f52c2547c";
+          sha256 = "11xahzybwh02ds19y6h5hbpqdj278kcb4239vyykdl3wx8p048a7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d7905061141721ce9f2f8ccea8fc4cf53519481/recipes/helm-proc";
@@ -30180,12 +30269,12 @@
     helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-projectile";
-        version = "20160922.4";
+        version = "20161008.45";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "29836e0a062d715fe6072f1a2af9229ac9a55d38";
-          sha256 = "0hddp85zh1ddzycvfijy9kdr55g38f36ingcpacbx9b4qb84ipik";
+          rev = "bc14d326fe892c902c55d093cccefb0fefde29b9";
+          sha256 = "1gkyk8cj55n5dxhhvflqvf14gcbg5i6pj329j04nnmk5kdn0crni";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -30667,8 +30756,8 @@
         src = fetchFromGitHub {
           owner = "bomgar";
           repo = "helm-unicode";
-          rev = "2193512aa1a46939a38a35189e307b9add68b58a";
-          sha256 = "1cxhwcbbnsdi00pmjzy0f8rrgfnzyl0ar4kwqmnbsl6r8hmf29ly";
+          rev = "e331c38e651287981e5d34c27e5d7dc4ff24b0d4";
+          sha256 = "05pvswisi44bl35anjbimd0q8i3c7kkjfksvaj69gcr788lhb8iv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f720b9f9b667bf9ff3080938beab36aa0036dc92/recipes/helm-unicode";
@@ -31300,12 +31389,12 @@
     highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-indentation";
-        version = "20150307.208";
+        version = "20161012.209";
         src = fetchFromGitHub {
           owner = "antonj";
           repo = "Highlight-Indentation-for-Emacs";
-          rev = "cd6d8168ccb04c6c0394f42e9512c58f23c01689";
-          sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
+          rev = "731fe2058b68b2eee8c6bc99d914d30f3de233c5";
+          sha256 = "093cvm4sabpchay49xm40mr65q6fk4df2i8kmlqiy2c5dvs5vsgf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation";
@@ -31552,8 +31641,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "bdee6d4138aca96bfd8f39f4e5d5e3fd3d17523d";
-          sha256 = "0h8rbvcci2virps05s958781jxkp0wk2dm8glmb7ghd5bp09p4rw";
+          rev = "0629e688dab3db7e7dd7dd094e04717cd8fe16bf";
+          sha256 = "0rfs3bg2swxxsrc69a6r2ncnk2qf67riv9kc162ck4hwqyszhksh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -31629,27 +31718,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    hipster-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "hipster-theme";
-        version = "20141205.2005";
-        src = fetchFromGitHub {
-          owner = "xzerocode";
-          repo = "hipster-theme";
-          rev = "0583bcef489c0bbe2393f813c17f634a9487e04f";
-          sha256 = "17dcpwx2y464g8qi3ixlsf3la8dn0bkxax296bhfg4vh73dxccl3";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c18f56647858f8ae1811a3f0964728d222b6d2e1/recipes/hipster-theme";
-          sha256 = "1xrgpqlzp4lhh5h3sv7pg1nqzc9wcv1hs6ybv2h4x6jangicwfl2";
-          name = "hipster-theme";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/hipster-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "history";
@@ -31875,12 +31943,12 @@
     hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hl-todo";
-        version = "20160807.523";
+        version = "20161008.1357";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "215ff60d7a4097b5104edaf2784f9a3257db4403";
-          sha256 = "1f7dz1r42qy3dwsqx7x802m7v4jfnmfp2q4678gs8d0scgxxfqb4";
+          rev = "3ef6c978011ffd01d3de060cfbde8c91d4b269f2";
+          sha256 = "0lssxnxg0dknmmrp0fri2d4wbpshnkk5zfnfbc2c9jii6bvg4982";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo";
@@ -32125,12 +32193,12 @@
     ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ht";
-        version = "20160911.1900";
+        version = "20161015.1945";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ht.el";
-          rev = "addf09885e019a7c279ecd3693c35eda1c642e25";
-          sha256 = "1kjlppsrddgvljd3qqfa198h1dlpkvqh97b7g0z2cqfjlsn6sxk9";
+          rev = "8b9281611c49335e97f2b644e34aa07a47dc4b2a";
+          sha256 = "1pnsrirbh901qzqals6p2bbf28g2xn2zminwzj2x02cj49vfyqsz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht";
@@ -32378,8 +32446,8 @@
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "hyai";
-          rev = "1ad6876a090dc54a5be1feab1c7f83b9a679e43a";
-          sha256 = "0k7r5zddlfipnf6za467lmjx8s6h68dflj7gk05vqr4n4xniwgja";
+          rev = "85df4feb527ee65f0b0228832ecfcc452fe572fd";
+          sha256 = "05fhbs4ifa40s8fp6bhccm0kdd5laq1g8r8rvyjbq9f7mj0s9g87";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd9bd1cfd2f3b760b664a4677b0e4e617cbdfa6/recipes/hyai";
@@ -32604,7 +32672,7 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20160831.954";
+        version = "20161012.1345";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el";
           sha256 = "0x082kilmzq26f9pwwbq2bid98s9mjyfwljcwz2qlj8fbihwjn6l";
@@ -33187,12 +33255,12 @@
     idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
     melpaBuild {
         pname = "idris-mode";
-        version = "20160302.635";
+        version = "20161010.710";
         src = fetchFromGitHub {
           owner = "idris-hackers";
           repo = "idris-mode";
-          rev = "dc122c178c2a0ddda36fccdd0d3976fc7cd27245";
-          sha256 = "0ngqsh0ncwcr377ifvnx5j352bf1f7lhcq7qc8avcn5pwlshri4w";
+          rev = "7965a00a33155588c55c597db84d89e5eb266acf";
+          sha256 = "161sncq7x3flnbqd0ag4fg8yb299qkj5ri5hj451p1nz5s7hibfi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -33434,12 +33502,12 @@
     imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imapfilter";
-        version = "20160419.246";
+        version = "20161008.1357";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "imapfilter";
-          rev = "f3aca4c07178c56080e4c85875f78321e94a9649";
-          sha256 = "15lflvpapm5749qq7jzdwbd0isb89i6df3np4wn9y9gjl7y92wk7";
+          rev = "a879ddc36fedc30311693f308f414c520fdfc370";
+          sha256 = "0rx4r6822iwl4gb9j0fii0sqinqvp3lzrc768rasgicgpklaqkjs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter";
@@ -33745,12 +33813,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20160404.2138";
+        version = "20161015.2329";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "aa81e316c2a0fcb2026ac036a7c1e5ab01a3d377";
-          sha256 = "1632q7zbqqs5nvvxly3b2fj9b9q9mgxwh5sspamj7442s7i0j645";
+          rev = "98b530af7c3098a2c30b9c38751c3e80c37acac4";
+          sha256 = "006cmqqykr09krlhwhb2wbv0f466w4wdmc6xxvn39qiqmprwv9a2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -33847,22 +33915,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    inflections = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inflections";
-        version = "20121016.157";
+        version = "20161017.157";
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "jump.el";
-          rev = "56cec33dd98231a95faa26dd4c0612885d923f78";
-          sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
+          rev = "23984a363dcb1a5faad2e5d0a731b7d593d97efc";
+          sha256 = "1s0cw1vcagx1rxpk00nnca8bnqphvblyi7p5rjj6fiq5rb5adqqj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/inflections";
           license = lib.licenses.free;
@@ -33910,12 +33978,12 @@
     inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inherit-local";
-        version = "20160909.755";
+        version = "20161007.724";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "inherit-local";
-          rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063";
-          sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i";
+          rev = "426f7997af0906013846d20729a499f0ce6db634";
+          sha256 = "1n97636c3zi7cq93m5fxvgqkqg5aryn742q7pb1s1w47smdpclgl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local";
@@ -34140,12 +34208,12 @@
     intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "intellij-theme";
-        version = "20160915.1707";
+        version = "20161004.2215";
         src = fetchFromGitLab {
           owner = "fommil";
           repo = "emacs-intellij-theme";
-          rev = "8e86c414aebb37543656f672e6afab0d54aa40ba";
-          sha256 = "1iqzcjyawj02ayzff3h19abc7fxwi074yjd17yj4rzfqcy67kbd1";
+          rev = "c4b4a7ecdad6ed57545c114b40da9f76371f566e";
+          sha256 = "1wz6j7szb271g1baf6jj4k4kw1dfiz8l677vrazx4wyqdpmzlk0c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
@@ -34203,12 +34271,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20160927.127";
+        version = "20161017.609";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "293acc9de8b47e0ef3faabfef810115f7dcc3ab2";
-          sha256 = "1g13lw5dj83673j5a67cngv3s7ffnzqck636dkw2llrz7a3cpsq4";
+          rev = "f836fb23cb1212f4894824d1975d82141720528c";
+          sha256 = "0jfbzy6pyi80y0m3c59hsybbvagqjbk620k00rb7hbbmy36w9p7m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -34266,12 +34334,12 @@
     io-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "io-mode";
-        version = "20140814.321";
+        version = "20161004.56";
         src = fetchFromGitHub {
           owner = "superbobry";
           repo = "io-mode";
-          rev = "79f2de13d8a448892266da26642525747d048aa8";
-          sha256 = "10xpxmbzhmi0lmby2rpmxrbr3qf1vlbif2inmfsvkj85wyh8a7rp";
+          rev = "fd65ae769093defcf554d6d637eba6e6dfc29f56";
+          sha256 = "1x3j4asbczfr9vrqd7bms57ngqzaik73sm2njcgjshf9c3js3aa9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/29ac993c86f992a452784c75c1511d15c4718c91/recipes/io-mode";
@@ -34761,12 +34829,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20160926.221";
+        version = "20161014.1228";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5";
-          sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4";
+          rev = "9f5f6e02e4b33f36652588903a8bab8ae3e28667";
+          sha256 = "162imzajrvws0980l6acr5l1mh3bbm4avajhsn1p1qic4ps8zajk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -34782,12 +34850,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20160928.2352";
+        version = "20161016.1319";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "5d8f8488537f3c8ced5803d73dc38bcd30a31ebc";
-          sha256 = "1lnmwvhfsmv8yx5v7i5dfcfhiy1grphbmphv9ii2pzzmdj4psk8z";
+          rev = "035435d72821520bebf7bf21939a63ed0bd19a66";
+          sha256 = "0fpy8ilwakswg1piyaqid7jygl0xa93m16m9kid7hzxr0v9m38wp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -34803,12 +34871,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, dash, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20160927.108";
+        version = "20161012.1018";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "aaca516a0e3d817dcbfdadfccaed548a60083651";
-          sha256 = "1lhrg7kkld9kr557fc9plsm1hmn5rlys4zmd5k036wbda3cl58n2";
+          rev = "42497875316d4ea10fc41d8afc9bcafad5cd4219";
+          sha256 = "03dcrhlpsrl1ip8iljrh7ph2q06rmf30k086bkh225rdhda20d7j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -34828,8 +34896,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "2ed2e36dd023c12545f00b41d01bca326048656e";
-          sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz";
+          rev = "2efdc9bc2f572fceb11199cecdd04aae03df3cb0";
+          sha256 = "0pxmmgsrn5d2jmak3plwb6h15h2d4sbwk49q6gdniglcf9nagckq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab";
@@ -34849,8 +34917,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5";
-          sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4";
+          rev = "9f5f6e02e4b33f36652588903a8bab8ae3e28667";
+          sha256 = "162imzajrvws0980l6acr5l1mh3bbm4avajhsn1p1qic4ps8zajk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -35053,12 +35121,12 @@
     jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "jade";
-        version = "20160916.1606";
+        version = "20161014.103";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "jade";
-          rev = "8b654ed00d4854c82c97a3c331709bb34f83c97e";
-          sha256 = "1fdr0hnq4fjmc74flsypf0jwmcwb0i6mk9v06qv11p4jma1aaqdv";
+          rev = "67174f42c38eeeda73cfed62197abf59f19b3b9c";
+          sha256 = "080dvzxymbrnaazx64lbvigd982z237a8427myi4mg5wnk68q1wg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -35827,12 +35895,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20160926.1243";
+        version = "20161016.156";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "64ec0a26673215e36f89e31d7935f99b731fd03d";
-          sha256 = "1mcrnibbpnwykhp928f2fjpyapjnv87zrr067vg29h5fmkgn5xli";
+          rev = "91e722a798fc8c30cfa4fad119acc83892d41e9c";
+          sha256 = "1pg9cdl8i10qlbsr756dsrsjvbp6fym04a97q54mfgjsv25kvrg7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -36119,12 +36187,12 @@
     julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "julia-mode";
-        version = "20160803.1643";
+        version = "20161017.613";
         src = fetchFromGitHub {
           owner = "JuliaLang";
           repo = "julia-emacs";
-          rev = "7b1d3fb053c32d9affe82fbf20cc0f8795f45026";
-          sha256 = "0fz4165rzkh2nqv99ai25y3k26y1j2igakv3gg43ffhmxxkfil5l";
+          rev = "483805b938a3fe543e075cbb60eefd4af805ad23";
+          sha256 = "0diyvgm5y8iw0zsg4vjzv74kgzib0mspw4b4di06rg1gs7ivfl8r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
@@ -36182,12 +36250,12 @@
     jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
     melpaBuild {
         pname = "jump";
-        version = "20151009.129";
+        version = "20161016.2313";
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "jump.el";
-          rev = "56cec33dd98231a95faa26dd4c0612885d923f78";
-          sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
+          rev = "23984a363dcb1a5faad2e5d0a731b7d593d97efc";
+          sha256 = "1s0cw1vcagx1rxpk00nnca8bnqphvblyi7p5rjj6fiq5rb5adqqj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump";
@@ -36874,8 +36942,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "97eaba281b9a52ca2d4749005d4c5341383ac410";
-          sha256 = "11qdcr5cl52gflvd9spyvl7x0rz5gvx584a7izgwiqmmkkav6vj5";
+          rev = "04680ff9fc8989a746189f16488d350efdd78c03";
+          sha256 = "0fb35znjvdkf4xpzdk7ad297g5n0hs997a31qdsnmmgwa3kk60qs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -36937,8 +37005,8 @@
         src = fetchFromGitHub {
           owner = "for-GET";
           repo = "know-your-http-well";
-          rev = "6479e44f8578828655f1a42ef9db8d8c67b7e238";
-          sha256 = "0dfq0f60d1fcrd2023r25rpcvwjnknz595imaj38bjpimlbw0xcq";
+          rev = "3cc5ab6d2764ab7aacb1b6e026abaccbeb6c37f2";
+          sha256 = "0hni9xvv0759nqwhngijiqkvpiz7alyd4ydf0mvi2vkmbxkci8n1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ab50ae6278022281b2b7297c086089e5e669c7a/recipes/know-your-http-well";
@@ -36954,12 +37022,12 @@
     kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "kodi-remote";
-        version = "20160712.1652";
+        version = "20161007.1409";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "cb0c81e2907529ca8db7387588869a14044a3822";
-          sha256 = "14vi1l7nmcy4i5490fvh2crv9ngbd1gf68nibzq6rc396d98f4aa";
+          rev = "5d767f98a65101cd32ea2dcc897967649b964a8f";
+          sha256 = "0v3lh67a2z0hl7qzcnp5cihgfl7421dircrsi7n0csbzla02wxqq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -37122,12 +37190,12 @@
     kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "kurecolor";
-        version = "20150423.2122";
+        version = "20161016.1827";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "kurecolor";
-          rev = "c8c72cea04e51f57701d2dd9be7dba5f3412e2f3";
-          sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
+          rev = "2b2c6778d75ef90f42fdffbe3ba7e58fa661946a";
+          sha256 = "0zcqjphz2vad6jccw9z7fds8xmvv0vmgp7fi0d8i0i5fbhpwpfz7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor";
@@ -37727,12 +37795,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20160925.1403";
+        version = "20161012.118";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "689d9309a0551daf053bfa49e6aed6455489079c";
-          sha256 = "0x8ig2c9ikz4pj5s17m20pv0fgy8k91dyip4vbpdm5ia626qypjy";
+          rev = "7a8d730ae0328e0af7cf33b33ab4210b1017b8ef";
+          sha256 = "02vqigln31vcgvz6cr0c89di7lkr3mwdbjcamn2dp5226yi7g5ah";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -37791,8 +37859,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "bad3c20bdf6f707e0eff1173beee1ff632f62501";
-          sha256 = "0v2w5n961fgvv3gq21pq1nw867jpbancg7q82zv6bni9bjrl5azq";
+          rev = "9b88b03ff9a4ede6e5bdbad0a700ad4f78d5782c";
+          sha256 = "12lsp83nmqxskrzhjrmvk8ipwm1q63pgixk7l0fv981jmf1wa1bn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -38104,12 +38172,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20161003.838";
+        version = "20161014.802";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "c4b91d70befbc40ec08e55ed6d0b4df611b5a70b";
-          sha256 = "0zf77l1cq09x5q3m62mjgxdw2g46d1adqv10d5x80azamq62dbdb";
+          rev = "ae5293765932dfa6b8c0cad77e8254c3d68d01b7";
+          sha256 = "1y6qczdxkqc3qv07pvjd3my496ca3hcfq6nhn5z97zjzbrl1z8if";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -38504,8 +38572,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "dc1ddc021dd688b1efda20e804f2d6f5133ba4ab";
-          sha256 = "1f64871k5vsdzs6fg3iyc97n0gfls9g27jm7z9j0v6vjrd376wc3";
+          rev = "94b3ee41bc4995a9e8cda4e198d06379823544aa";
+          sha256 = "0wh5w58zc8lfd6zxg15naspnhpc7z7hlxqps38i5s9l8mmaqyl5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -38730,12 +38798,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "20160720.1501";
+        version = "20161007.1145";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "2a949309b6397ea88cc1560bddb0ef3634a1af1e";
-          sha256 = "1bpnglr7k9wsx95g9h5hsvxdm9fk9l04mmsbh8fngybdsawy64q6";
+          rev = "9b2f610a32557937e704b32e97f4b61abdec6845";
+          sha256 = "0w1csjcgvl1jfhjpfj19hzrd6f055iaiq0qafpgjlyn6dd4sf9gj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -39123,12 +39191,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20161001.1454";
+        version = "20161017.405";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "a49dfe13916ea0062f3970b787b1b6fa80eb4d83";
-          sha256 = "0flxkv0qiic8bhr319cy1sc81sx396ighqygg13x7g9zaf97qvz2";
+          rev = "8e6434898b31f8b5d9b228d481929e04272388a0";
+          sha256 = "0fgbd7gi6fbkywrlb77g60h1pb60jia7jdkl0mxdwq6xa8zq859v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -39235,12 +39303,12 @@
     magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }:
     melpaBuild {
         pname = "magit-gh-pulls";
-        version = "20160513.310";
+        version = "20161010.2345";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "magit-gh-pulls";
-          rev = "afc0333296ba8185705f84ef34f628ce0e74caa8";
-          sha256 = "1cnvfvf8c2f1jvxxl4qggzwhk082q0hfljhfm1znhc5qxh1vyc4x";
+          rev = "f815f94a254aaf673eca6cfc2276510e9a86f704";
+          sha256 = "064aqrv0gspjvxmy9fzisjbk9bj91jss9a8pwb09k2vmfj2za0k5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls";
@@ -39281,8 +39349,8 @@
         src = fetchFromGitHub {
           owner = "qoocku";
           repo = "magit-p4";
-          rev = "01a42ac54606e272c29818f10320175b09b07cd6";
-          sha256 = "12finsicwzpa5bchcw5ymm2mp8ca4lmic9rrbqy22bf8907yw7q8";
+          rev = "eb88123f184a20e6727c9829a4a08f2eae850599";
+          sha256 = "10y702vj5p7pbgny2b8w1kkm69bfy1angna8fgz7336bqwcpmf8a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440d47ca465845eaa601ca8a6e4b15fc197e522b/recipes/magit-p4";
@@ -39298,12 +39366,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20160821.1338";
+        version = "20161009.1506";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "a49dfe13916ea0062f3970b787b1b6fa80eb4d83";
-          sha256 = "0flxkv0qiic8bhr319cy1sc81sx396ighqygg13x7g9zaf97qvz2";
+          rev = "8e6434898b31f8b5d9b228d481929e04272388a0";
+          sha256 = "0fgbd7gi6fbkywrlb77g60h1pb60jia7jdkl0mxdwq6xa8zq859v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -39319,12 +39387,12 @@
     magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-rockstar";
-        version = "20160517.651";
+        version = "20161013.544";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "magit-rockstar";
-          rev = "47780d27141ba50f225f0bd8109f92ba6d1db8d5";
-          sha256 = "075gxm4shbh5zfr17zpfn35w8ndgz9aqz6y3wws23wa4ff2n8kdc";
+          rev = "bccce1ac8e012f52e29470c1c7d815f9bb1a192b";
+          sha256 = "0z411x2w6ldy3b8qbavfvfgvkbjd1rl0m1plr44ynp55awrhj0k2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar";
@@ -39400,22 +39468,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    magithub = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
+    magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
     melpaBuild {
         pname = "magithub";
-        version = "20160930.1523";
+        version = "20161013.2332";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "7be8c823c51149f339a9ea2b2f2224b6c9402e8f";
-          sha256 = "0dxz3vcypfhac43iczi96y7nz2pnlj8kda962pyxij804xa8agzw";
+          rev = "78b1046f5c98e0286f1c48bd816eafd16e70d35c";
+          sha256 = "0jwqs508aipxb05y9qljpfqkk2m69iavg716h93qn4lm6mvnl668";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
           sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw";
           name = "magithub";
         };
-        packageRequires = [ cl-lib emacs git-commit magit s with-editor ];
+        packageRequires = [ emacs git-commit magit s with-editor ];
         meta = {
           homepage = "https://melpa.org/#/magithub";
           license = lib.licenses.free;
@@ -39529,12 +39597,12 @@
     make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "make-it-so";
-        version = "20160818.58";
+        version = "20161009.43";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "make-it-so";
-          rev = "5417491b28ec6300823d8e20089b10a56a4b4dcd";
-          sha256 = "0dqayvgjjac4kp1i8m0pp71y4g7mxa1vwm3cgwz00d1qxj9s3cxy";
+          rev = "9e10518a2fed8a4a5961b6abad50ef92b4747600";
+          sha256 = "0ilqa7jdfzyhjjnxn69cx93nj3py429jwyg8rgzas87kjk9qiv7m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
@@ -39907,12 +39975,12 @@
     markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }:
     melpaBuild {
         pname = "markdown-preview-mode";
-        version = "20160830.219";
+        version = "20161004.513";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "markdown-preview-mode";
-          rev = "25f1de28390a0b7be493e8f168749d851784ce12";
-          sha256 = "116jms95wfdhlbcyn10nqq452jkplvhqwsl7al8f1zx4rn22snra";
+          rev = "a5de48c4dc2cb2c8703b3ca139863f59d91086c9";
+          sha256 = "1x0rv26sq7x5pd1zyc8j3xwhmg8cbm8q4aibhrnrzf9gmc54jn0l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode";
@@ -40179,11 +40247,11 @@
     matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "matrix-client";
-        version = "20160929.756";
+        version = "20161004.1933";
         src = fetchgit {
           url = "http://fort.kickass.systems/git/rrix/matrix-client.git";
-          rev = "ab62f99be9d90fb261194d5b48a27379c9ebc920";
-          sha256 = "1g8aa2i7kb5hb9i7aq2l2kfzdw3a346i78a2vagkn00hm613gj4i";
+          rev = "5bf61e088fba83754a9e9bbef8459c82bea3be1d";
+          sha256 = "1p8wfxf8pxy9ic5sd6ci1197v3j0r6564k4sw5agqplyzap5g9v5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/152969c540b57c0a9532e698c24eac0de5e0269c/recipes/matrix-client";
@@ -40427,12 +40495,12 @@
     meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20160929.127";
+        version = "20161005.747";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "f80811e4f1efa712eabfa42fd995990d02fc1e5a";
-          sha256 = "0w2ij8zh30qs19vwnqifg3p5cvk94akig03cv2f6mx14clvrwckn";
+          rev = "2a68211d355edd8fca092a57c1a3d5e42c9193e3";
+          sha256 = "1s7m6p1i5wvfd0k136bcd59abm6aspmmjlcjhsnl36w8k82piaay";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -40613,12 +40681,12 @@
     merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "merlin";
-        version = "20160627.1923";
+        version = "20160830.242";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "b2926cf6235827c0242797775188b8f0420386c5";
-          sha256 = "0xfmvicagqccscxf45n04c25c7fqsnfk8mp8s90rnzlyr66gdck1";
+          rev = "45ee84b5b0bb01784736df536760a6f8e4ea98a7";
+          sha256 = "13x6np4cqzjf1jmiyhglsh2533nj5p2whj6gbcc3690p4chk32dy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -40757,12 +40825,12 @@
     mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mew";
-        version = "20160904.1829";
+        version = "20161011.1859";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "Mew";
-          rev = "2f9efcd93a8ea6b89d87800c8f9611899610c936";
-          sha256 = "177yp566lpc45xkzm6ahw97l358lnzpjsn90shvgfc4lhfsr6c2p";
+          rev = "eb3cb8f25f20a0a241f88ec48953cf49ff43a116";
+          sha256 = "1bnkbd448apnh244napsv28zvfcqczgsc0ly3fjh1qc2kfihx978";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -41194,12 +41262,12 @@
     mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mips-mode";
-        version = "20160923.209";
+        version = "20161008.212";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-mips-mode";
-          rev = "e63064c926312d5b90d9da869db3b86de8fecee8";
-          sha256 = "1cxpqbbdl431kxgn54008zi55hxzf6kjb1xamv73cv2gxh9aczy4";
+          rev = "00b9c0d92cca89a1313e203c33ec420a833c929b";
+          sha256 = "1bza70z7kfbv0yi4f3zvr1qid9wypqypngw3kcx9majx7mim54gq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode";
@@ -41664,12 +41732,12 @@
     monitor = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monitor";
-        version = "20160925.605";
+        version = "20161016.225";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
           repo = "monitor";
-          rev = "4b781279fd6bce744b7f553482fe6096b58b1ebb";
-          sha256 = "0kqxjysbkv8dmjzb43h9lrcdvzfxwi8q1gq8bi32wmbwakaccy5b";
+          rev = "0940c26ccfab01bbf2bd6cf7f2878ae727ea930b";
+          sha256 = "0bdprpzwq1vdd7xps37b7i9jijndypz13kbkvzr3xw1a4rc2nsvm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9df614e8e7b9dfdbd7eec552a2b13e0f5acfc22/recipes/monitor";
@@ -41790,12 +41858,12 @@
     morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "morlock";
-        version = "20160521.730";
+        version = "20161008.1358";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "morlock";
-          rev = "185e3679ebeef3dc58555301e0958e864de775e5";
-          sha256 = "0kjqdm6kzhgjmfdj4n95ivffw1wqf4r3gk62fvhfi4w29g7wd16j";
+          rev = "5845b60c705e8db88ce790b0b12cd8b917e1e5a5";
+          sha256 = "1a6kwpanwcnipsq0dc99r4iiz9xa2k883syj0kbk544dxgf338xj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock";
@@ -41808,6 +41876,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mosey = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mosey";
+        version = "20161015.319";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "mosey.el";
+          rev = "eb0ae6ec10f1d9828a2665476f6d6811df9b0bfa";
+          sha256 = "1cpa38ay4y7cffi9h34s8lw308qggpf342hzqzgbsqy7rl9wr10k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/76a9a43eea68db9f82c07677235c481a6f243aa2/recipes/mosey";
+          sha256 = "0zprzr5aqv77kmg1ki9w6fw1nc2ap6yqjl4ak05a1i9cq8g6nf3m";
+          name = "mosey";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mosey";
+          license = lib.licenses.free;
+        };
+      }) {};
     mote-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "mote-mode";
@@ -42012,27 +42101,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    mozc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "mozc";
-        version = "20160102.1506";
-        src = fetchFromGitHub {
-          owner = "google";
-          repo = "mozc";
-          rev = "d87954bf3791fb871c6e16621077fb0b97cc10a5";
-          sha256 = "01rx4ll6qdlf3qf0f3srmid24zsifqbvm43nqy7k6glnidv8fcnn";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc";
-          sha256 = "0nslh4xyqpvzdxcgrd1bzaqcdz77bghizh6n2w6wk46cflir8xba";
-          name = "mozc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/mozc";
-          license = lib.licenses.free;
-        };
-      }) {};
     mozc-im = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
     melpaBuild {
         pname = "mozc-im";
@@ -42183,12 +42251,12 @@
     mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mtg-deck-mode";
-        version = "20161001.1557";
+        version = "20161004.1742";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "mtg-deck-mode";
-          rev = "72c80dc970271f3f4f5bc3295b4f3e6227440d8c";
-          sha256 = "0qlvj2g9hg18jy9axdx28iwcygyfa82nljip5py3n5vh3zd4b87m";
+          rev = "362fcac725b31570d01df6e9bad545ab636a7dc5";
+          sha256 = "0fzh2sq9gki87yqar48jxa34zqqmyfjiifcmv3br97im25sjfq3p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -42327,12 +42395,12 @@
     multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "multi-line";
-        version = "20160908.1139";
+        version = "20161013.156";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "multi-line";
-          rev = "7c03bfb2fc1c682ad78689325eac9cf302970ea0";
-          sha256 = "1lb3kal8747z61l55dfpfzcn8m5114vrwgm8ar126rqp7hxa97xa";
+          rev = "778c7510b7f066f53cf1f96a6ad1079fda5dc1f7";
+          sha256 = "0lr1i2a4fw40iz8qz2zqch63ci9pwvrri219phv22kn76jqn39mh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
@@ -42635,12 +42703,12 @@
     mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mwim";
-        version = "20161002.57";
+        version = "20161004.647";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "mwim.el";
-          rev = "a8c6f679d39c62cf16889aed23978ba8b08bf93b";
-          sha256 = "0lpfsz6g8zvf44kg36lnviap6g3z914ldpadnwkvd810k185kinf";
+          rev = "e53da113b88a7e0693fd8f91862ce5948ad80a5b";
+          sha256 = "0vm6iynkx328zc4ww6zjibj7impiz53g2cqzxfa8bjfs2src2sw3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim";
@@ -42926,12 +42994,12 @@
     nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nameless";
-        version = "20160916.728";
+        version = "20161012.1214";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "Nameless";
-          rev = "e5e2f0a23c56cba750f93e74442104222f7f30c5";
-          sha256 = "06xvh0r4589kxb6pr8a4xxr4msxl4jfp3dh3f9xxvp1icwlf4j9b";
+          rev = "ab1a5c589378334eafca105af1a17f73b9065423";
+          sha256 = "107q1rximjnag9r9vgwh0iv687i3rsscbdnjc46f8l16j6vi4n7d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless";
@@ -42986,43 +43054,43 @@
           license = lib.licenses.free;
         };
       }) {};
-    nand2tetris = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nand2tetris";
-        version = "20151027.1451";
+        version = "20161011.1748";
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "0297cd8d76cad072cb64318ffacdc65d8a1ad948";
-          sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
+          rev = "9c5161c840f30f01647c188699dacba5e51b3b44";
+          sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris";
           sha256 = "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd";
           name = "nand2tetris";
         };
-        packageRequires = [ names ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/nand2tetris";
           license = lib.licenses.free;
         };
       }) {};
-    nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names, nand2tetris }:
+    nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }:
     melpaBuild {
         pname = "nand2tetris-assembler";
-        version = "20151027.1436";
+        version = "20161011.1748";
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "0297cd8d76cad072cb64318ffacdc65d8a1ad948";
-          sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
+          rev = "9c5161c840f30f01647c188699dacba5e51b3b44";
+          sha256 = "05ngqw29gzjs0zzs8nyldfcqkbnh9n7jkaxrsc40dfqikjhaj5xc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler";
           sha256 = "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy";
           name = "nand2tetris-assembler";
         };
-        packageRequires = [ names nand2tetris ];
+        packageRequires = [ nand2tetris ];
         meta = {
           homepage = "https://melpa.org/#/nand2tetris-assembler";
           license = lib.licenses.free;
@@ -43363,12 +43431,12 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20160921.1817";
+        version = "20161013.808";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "ed8de7fbb60b3e1d580c20a4e16cb5005a195cab";
-          sha256 = "1s1snaa76f9zgrlbkkhpnsk5arch5mi4gpc644hrrn0slc61hx8k";
+          rev = "7ae38b71faf7878eac01cbb82c9819c903e5cd6d";
+          sha256 = "0bzmv6ds74f1y4w81v59wikraqzjjsd2minzjk7xqp6iiv2i7rgh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -43636,12 +43704,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "20160906.251";
+        version = "20160908.523";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "57ac482d998db58813e8d6f3b90887635f83d44e";
-          sha256 = "1y5x49mqippngp7ya6y7p8z81anrc644n84wpd7y62yqv8qhz0fp";
+          rev = "2e2324c7f3a3ef27c9cb9cc3945cd82bec6b7755";
+          sha256 = "18ys3ddla3z733r4jf2nnfkllclrq496i08pfiyvkj6l3jnghzx0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -43661,8 +43729,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "4bd51d74af34cc0014cd1b2dd0dd105e379e9770";
-          sha256 = "0gmyrmqd75bcmh2xa2i1ykyryb38k42vspcbkr2nmrp2r87qfkrs";
+          rev = "ae8884b94975673e6a3338d2c5173c006b4c8d4b";
+          sha256 = "1svjgrldgpbaxymqf14d3pfhl4g65xilnb888a30m05vg8y7ijvn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -43783,12 +43851,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20160828.458";
+        version = "20161008.1358";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "537e584d115fb056a23a0b055e0a28f543182c45";
-          sha256 = "1cma5047c3486bjfshb612iq6j3yml0c02gqy8d0ms9507r60igq";
+          rev = "c176eae5d97f627c946ad43c980a1300e3cbeb50";
+          sha256 = "1fs50qll79w0kiyh4jr9kj08ara4s8mhfybx2x1s01xnd6yzjhk8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -43927,11 +43995,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20160930.313";
+        version = "20161017.507";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "c2e74662bbbbf9be1fde0ae416dc2664ba3da3cd";
-          sha256 = "1f68jin42nybygla41h84dp50hg4sdmn5y22a4iiapm6h6nnzmd0";
+          rev = "2f643ac763e4e2f2b1951f0f1197af951c8b2575";
+          sha256 = "0211kl3a5bif7saba7j2lpwc3ic1f46xidjfv9kjndps4p3169ld";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -44969,6 +45037,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    oceanic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "oceanic-theme";
+        version = "20161015.119";
+        src = fetchFromGitHub {
+          owner = "terry3";
+          repo = "oceanic-theme";
+          rev = "a92ee9b470843c923e6cdcafdd65106ff994d04d";
+          sha256 = "1bj4l88546gmlfmwyg1zsqfz9g2l87hsa9jlrf8s4c907di736ir";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d85588df4e2057ef1c822ff177572054ed979b/recipes/oceanic-theme";
+          sha256 = "1i69dy9hfqwfyiykvnqzkqim0lv1p5z5fjsdk84068si4b029gzv";
+          name = "oceanic-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/oceanic-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }:
     melpaBuild {
         pname = "ocodo-svg-modelines";
@@ -45018,8 +45107,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-octicons";
-          rev = "229286a6166dba8ddabc8c4d338798c6cd3cf67d";
-          sha256 = "0dp7dhmgrq078rjhpm1cr993qjqz7qgy2z4sn73qw6j55va7d9kw";
+          rev = "b993e666977e92432eab197c02728f18e81eaa72";
+          sha256 = "13v7nivp2rdqg6ndp553mlkkxh9cz8fn8n62qwl5sib7svcr2jwc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62867eae1a254eb5fe820d4387dd4e8a0ff9be2/recipes/octicons";
@@ -45032,15 +45121,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    octo-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "octo-mode";
+        version = "20161008.529";
+        src = fetchFromGitHub {
+          owner = "cryon";
+          repo = "octo-mode";
+          rev = "bd4db7e5e3275b24c74e6a23c11d04f54e9feca5";
+          sha256 = "1blr664h8bq8bs1wr82nhhb9y7ggrlxp6x203i5bv542zm4a5rba";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/899ec190515d33f706e5279c8e3628514f733a12/recipes/octo-mode";
+          sha256 = "1xvpykdrkmxlk302kbqycasrq89f72xvhqlm14qrcd2lqnwhbi07";
+          name = "octo-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/octo-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "octopress";
-        version = "20160925.1656";
+        version = "20161009.1232";
         src = fetchFromGitHub {
           owner = "aaronbieber";
           repo = "octopress.el";
-          rev = "a38e9fe336f558fbda2a142318349f5617511728";
-          sha256 = "1x1yrpn6z0vzlp9rfq0iczsbda389bcsg003nn6lcplnpchq69n8";
+          rev = "0e06723eb725e775bd4e3d506695f5b902b94b0d";
+          sha256 = "0hj96wcd1dpvm3y4h0chfb4539s1pvaiiyxqy95a6dsl57y38l1j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress";
@@ -45423,8 +45533,8 @@
         src = fetchFromGitHub {
           owner = "evgeny-panasyuk";
           repo = "open-in-msvs.el";
-          rev = "caa335b0cf83b0f529fdaa54fe039308d4de91ef";
-          sha256 = "130469gqjidz7zvzncfm9dg83vmja49vsav03j6qvdxww5z7a74w";
+          rev = "488c4adb3ad89676472507dae89b1687e43a07df";
+          sha256 = "0s6qc7hn6q89nqyra633hvpx4gfas5dwrcjg7ykc306xh72ywnm3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09a462fac31a7ceda4ee84a8550ff1db6d11140f/recipes/open-in-msvs";
@@ -45479,6 +45589,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "opener";
+        version = "20161017.236";
+        src = fetchFromGitHub {
+          owner = "0robustus1";
+          repo = "opener.el";
+          rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
+          sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener";
+          sha256 = "0fhny4m7x19wnlnr19s4rkl04dkx95yppd51jzrkr96xiznw97s7";
+          name = "opener";
+        };
+        packageRequires = [ cl-lib emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/opener";
+          license = lib.licenses.free;
+        };
+      }) {};
     opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
     melpaBuild {
         pname = "opensource";
@@ -45690,12 +45821,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20161003.510";
+        version = "20161014.1258";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "3cc35b17d69bc41eff396a1b4a97f8e34c21397e";
-          sha256 = "1rcl8zk563d64a1vsbpl49bsk4awajdffc4sb277rd50jmv6a045";
+          rev = "4b956768718c04dab4e440835babedbfe57e9743";
+          sha256 = "0q7mq3xxhak20w9gzybi20kbkx5wgfrzwlg4c3cs48n0k6ddbbrd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -45876,6 +46007,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-clock-today = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-clock-today";
+        version = "20161014.220";
+        src = fetchFromGitHub {
+          owner = "mallt";
+          repo = "org-clock-today-mode";
+          rev = "02b8fd541a01040405a9a1400c46dcb68b7c2a3a";
+          sha256 = "1gbkrgbpsrwkjd199giffim8jvx1n4dqrsyk53sz1swj9dlhxgp9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ddf5992be3677ef94ceac1ec6d3f90f520c7be9/recipes/org-clock-today";
+          sha256 = "0vnpkxlag5h793vw74l1ys6i2v87f5khvjrqbm3wzwmyc08vdz1q";
+          name = "org-clock-today";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-clock-today";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-commentary";
@@ -46152,12 +46304,12 @@
     org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }:
     melpaBuild {
         pname = "org-evil";
-        version = "20160925.620";
+        version = "20161016.237";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
           repo = "org-evil";
-          rev = "aa94ee5f41cf170ec4a9c07bf3d25147d36e20db";
-          sha256 = "0lbi9r551vs3rcagpiranrgxanwcsr69ibsss4qfghc4da638fsm";
+          rev = "3b416ea40922125675b5604987df5c7eb4b3bbc7";
+          sha256 = "0mknj4dy6yb713hi8ry6qqb2jfr70haravmarnd2cmjk64wcjjbh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil";
@@ -46340,12 +46492,12 @@
     org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-journal";
-        version = "20160907.621";
+        version = "20161017.508";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "5f1445e9bafa252c8708b3bc223f30032f5ae82b";
-          sha256 = "0aip4krrl5cyaa2agmmzipqw139zar3j6594vba93axalfdx9i9z";
+          rev = "eba1dd9e05aa5c18845c5411b7550f684ad0b824";
+          sha256 = "1953n70990ksrna0gcxrfr0y7l53ag39g4k4dzcjkh9jn9dqbxw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -46406,8 +46558,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "17e73cf9496b9972e21c4024cd9719740c2b3e62";
-          sha256 = "1hb7c7ab1jg445kdm0dp0w9f2ny9wa5f361jca7qck8jncq5gcjm";
+          rev = "8dbee9185867963b13d064e43a569c31d6fc918c";
+          sha256 = "14wm1lwnizqdjh0aw0cjdgxwf9w3f9ycix9mcjbqn73qcnhzp6zz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -46426,8 +46578,8 @@
         version = "20160808.220";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "17e73cf9496b9972e21c4024cd9719740c2b3e62";
-          sha256 = "1hb7c7ab1jg445kdm0dp0w9f2ny9wa5f361jca7qck8jncq5gcjm";
+          rev = "8dbee9185867963b13d064e43a569c31d6fc918c";
+          sha256 = "14wm1lwnizqdjh0aw0cjdgxwf9w3f9ycix9mcjbqn73qcnhzp6zz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -46598,12 +46750,12 @@
     org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
     melpaBuild {
         pname = "org-pdfview";
-        version = "20160125.1254";
+        version = "20161011.106";
         src = fetchFromGitHub {
           owner = "markus1189";
           repo = "org-pdfview";
-          rev = "569b22197f2a5a08e7be7198c4d871f29559811f";
-          sha256 = "16z44kdsg8w1p27fsi72k8wqr35xbb0777rq7h7swv6j2jn1b6hc";
+          rev = "5ed6b514351132c07d65054cdfc9b3da747a26d2";
+          sha256 = "0707y3kw9snmj4ba2v5dqwgr9fyd50xnpdxabak1jy89ckcgahxv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview";
@@ -46686,8 +46838,8 @@
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "a3c95858fc4bbc7b38f4e7253979942118f0a2ed";
-          sha256 = "0k3r78nx0gd8azcam1lzrjkxlsv0a6dzbscij8prdj1l7j9r2mxm";
+          rev = "21956fa2276761c1ea8f70f4e731bed10a8e560d";
+          sha256 = "1viviyklv1cipa2n37n85kfmm3s2jlwgyh983afmj3b8jkz8xfw2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile";
@@ -46793,12 +46945,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20161001.719";
+        version = "20161017.619";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "341108cdc4830e604ba0145688bc99149efc051b";
-          sha256 = "19jwj6m5nzjkv9p992amnwhvhwx0dz0cfhaa1radsiq17hj9mn5d";
+          rev = "f09ad5bda1d0dcb4721cd4e64b9360652795a886";
+          sha256 = "1gfq0a0vv4pdammj2dbca6y867f65fbs5xbziylsxc8kzhsm00c8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -47209,12 +47361,12 @@
     org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org2elcomment";
-        version = "20160712.2026";
+        version = "20161014.2125";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "org2elcomment";
-          rev = "0e2733f2eede71abc4586909aaf49e4deaf2df1e";
-          sha256 = "0jjqj34k1q37mrqn9l34zdy5xchc3q3lid24xsj754bs7an6s3fg";
+          rev = "be67394b675f226b50a1ede46ef9d621d9534c6b";
+          sha256 = "1n3fa06nbk7f50cy1c65zfyix46067wxllin16ryi649rx5qklwl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8af13650de8b4a814832638d4182bf8ce576244c/recipes/org2elcomment";
@@ -47335,12 +47487,12 @@
     orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "orglink";
-        version = "20160606.407";
+        version = "20161008.1359";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "orglink";
-          rev = "4e3e6d920a74fd32a57d5722f81293428e9d8a46";
-          sha256 = "0yjnnrrcvbsq41dpw8cz8gv6q3jd626y1k4fgzsimyciz9l23w11";
+          rev = "3b617ba7290ee550caab1aa055a6bedabe33d6fd";
+          sha256 = "0d1i30jbfbv0hm77sf278ism28ds5lz7675ji8f1gf01rfkchjbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink";
@@ -47881,12 +48033,12 @@
     ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-clip";
-        version = "20160816.507";
+        version = "20161012.1107";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "db84d90c9bedc7581129323fb3448b1e771de815";
-          sha256 = "0b12n6wr6yn33f1ybbzf2pivhzdx5947ja91xclba5rl8n9d9r6y";
+          rev = "23d45ecead7154b11554e40f539123f8485f1120";
+          sha256 = "196r85cw61l344vnld4irz70z6fkpncf6vcz6a8jypnvzy7xjrc3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -47965,12 +48117,12 @@
     ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, makey, melpaBuild, org }:
     melpaBuild {
         pname = "ox-ioslide";
-        version = "20160120.805";
+        version = "20161015.638";
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "org-ioslide";
-          rev = "746bce18ec534a470ec265a14c1d982ffc3f5d3c";
-          sha256 = "0p03xzldz5v8lx3ip2pgll0da00ldfxmhr6r3jahwp6692kxpr6j";
+          rev = "6555680be5364c8ddd2bf446865cb1a82adb6b9e";
+          sha256 = "05d1bykgj454g0vq2k2sd36pd9hmcwr9a8033dagkqc625h7wj4h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b960abca4d642c47e640300876eefee1851e6b86/recipes/ox-ioslide";
@@ -48154,12 +48306,12 @@
     ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-rst";
-        version = "20160607.1017";
+        version = "20161006.821";
         src = fetchFromGitHub {
           owner = "masayuko";
           repo = "ox-rst";
-          rev = "958ce46c0eacb6c0dbb6e0f006487af4e01c2298";
-          sha256 = "0zwaliskikf2098a3wsqkjk40w9q2afmx33wygwaz7saxgs08jwl";
+          rev = "b4aceca6babd5f59a14225df1e3e99a3e313bae7";
+          sha256 = "13kk5cb2v1pv0zjrqvhprqpxxh96xv7jv920jgznbvgypvwbs9p0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst";
@@ -48343,12 +48495,12 @@
     package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-build";
-        version = "20160903.1832";
+        version = "20161014.2251";
         src = fetchFromGitHub {
           owner = "melpa";
           repo = "package-build";
-          rev = "680eeb78201d7c94d24bb920386486942ce0d465";
-          sha256 = "0xzf8byg76lbhx0bypqr2k48scx86985g0998b5wsqw820q1qiw4";
+          rev = "9a6824cda477d1bd77d0507b62dcc09ed436b32e";
+          sha256 = "1yswi3yqpfm8sjlhcv4phd069vl9rc2ngi5ma6acpah532k4gi1f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -48382,6 +48534,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "package-lint";
+        version = "20161017.658";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "package-lint";
+          rev = "e5f76496d399ded29c4c94907edadca03c178491";
+          sha256 = "0hjli5c9ky5ndsj2kb5r9yp0wci8b5mlc1qzdsnmszwwa4d9hqff";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
+          sha256 = "0w7nkj4yz5yqmhr3mr7kxa6aqqfs75m3l2578s39940a5sdzirwy";
+          name = "package-lint";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/package-lint";
+          license = lib.licenses.free;
+        };
+      }) {};
     package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-plus";
@@ -48511,12 +48684,12 @@
     page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "page-break-lines";
-        version = "20160617.2100";
+        version = "20161015.1709";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "page-break-lines";
-          rev = "9229260e88fe84b53d384677fe5eda4a6652f015";
-          sha256 = "11gg3bc41cn1fa04b6gf6r6bf5di1ffwbagmh2bb0n0i42idlcw8";
+          rev = "65fc27e4c89eb0b37dd3a8e87c32ceba78f37f42";
+          sha256 = "0lxfjryq13zg0ikbn1ydqghs57z6yxqwb5wvzkn98mf98iq6nlsp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines";
@@ -48821,12 +48994,12 @@
     paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "paren-face";
-        version = "20160521.755";
+        version = "20161008.1400";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "paren-face";
-          rev = "7b115519d668301633f31a9f3d03b5e36d0541d7";
-          sha256 = "0f128gqn170s6hl62n44i9asais75ns1mpvb4l8vzy1sc0v16c0k";
+          rev = "fd8b9a863f0e15e8feeab862d0f67ab35ef18be3";
+          sha256 = "08j4kgvbx7fr3f0243508chbgd3bh9i6dhbqkndqj93zmbxxdhcw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face";
@@ -48860,22 +49033,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    parinfer = callPackage ({ aggressive-indent, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "20161003.1729";
+        version = "20161017.706";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "4d7fc1cdcf0d0e1674996e72a9f4feccec0d6c7f";
-          sha256 = "120qvffimvw01d1dchgrs85h5lw8x8wp78vpfz6g1iny1nspsajg";
+          rev = "b7cfd62fc139fc35f1c9b14c4edd0b5d54234e1c";
+          sha256 = "0jpna416rplr5r4l0g86him3g5w200v0y989jxny10s6jswzy1jp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
           sha256 = "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i";
           name = "parinfer";
         };
-        packageRequires = [ aggressive-indent cl-lib dash ];
+        packageRequires = [ cl-lib dash ];
         meta = {
           homepage = "https://melpa.org/#/parinfer";
           license = lib.licenses.free;
@@ -48926,12 +49099,12 @@
     parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parsec";
-        version = "20160714.1524";
+        version = "20161016.1358";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "parsec.el";
-          rev = "7e65db0d4f21cd64434adc2a19d250589604531d";
-          sha256 = "093gwb8ppgwvaz3jxp48mwj577xkcqckvzgq8cgl1l04si1lkcdc";
+          rev = "89dd2ac64e403ab3fc04b4a75db445a6ae4f4a71";
+          sha256 = "0qxwqpz1fr8x7d0iqavn953wxamhfjb458zcvvaaaz3qvlq3gjv9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
@@ -48947,12 +49120,12 @@
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
-        version = "20160821.1136";
+        version = "20161014.255";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "pass";
-          rev = "6093fb0a07a4afdd428c13178e6aef086c24da36";
-          sha256 = "114dvh1grsx0xrw2x0l9hiki2vmc8d8grbz1p4cwcq230rcm6q2z";
+          rev = "2b1a6c176bc81acf20ddebbab7e9c69bf33fdc48";
+          sha256 = "1c2r0r3rhp2b28bg73qvfl13n6i3y1qp49j4jlphsaqxd2abfl33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -49260,12 +49433,12 @@
     pcap-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pcap-mode";
-        version = "20160923.819";
+        version = "20161011.638";
         src = fetchFromGitHub {
           owner = "orgcandman";
           repo = "pcap-mode";
-          rev = "38169363f8e1da3837b049762e537a9c9bb516ca";
-          sha256 = "13cf00pj238hmcmspvhwp6wrp2a2s0s5h2fzafpk1dn251yfybhc";
+          rev = "f681f074a335f40cf355171ecd05ebc8877642b0";
+          sha256 = "10cj12bv2m9x1fmwi6s0awgsq9bqmrjnrgxmyp203c6yp9gbhv74";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44f4cb526556a4b58b7e67314002e73413a59a76/recipes/pcap-mode";
@@ -49700,12 +49873,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20161001.533";
+        version = "20161017.147";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "8d66aa2f9f16d64ab6808e80c25dd9baf7c9e754";
-          sha256 = "0ax2yap12jicgdfvgzvn0vzrdn3k1xn06g3qj4rparkw4wl890zn";
+          rev = "6fd464a3f5038b34751ec3d07913575906f38ab1";
+          sha256 = "0v6abr2x4xnv6qi8az3ki330z7v5vc4b0ibxqzwlq9mzqlqhnpsl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -50621,22 +50794,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plantuml-mode";
-        version = "20160928.900";
+        version = "20161016.757";
         src = fetchFromGitHub {
-          owner = "zwz";
+          owner = "skuro";
           repo = "plantuml-mode";
-          rev = "fa3e2e96e1a96516ad9b8ae7a55548556e4ed603";
-          sha256 = "0rkfdbw5mhlb41y879nnkqf3j5063nha56klgn8bcidjfg4qq8hs";
+          rev = "9001192acf5741b761dbde58eea50211094d41d0";
+          sha256 = "1g3sp2ljdx7ybps2fv2na0vw6mp4swpjj7z5z2f5vk06ldkyrfjp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cad28f1bb83685ca355e230b46f1e0eebe2f7bb1/recipes/plantuml-mode";
-          sha256 = "14imiqfgc2j9kjr3aqwzlw8xr1w5hb8i7d4ch709qky036i3lsci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
+          sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
           name = "plantuml-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/plantuml-mode";
           license = lib.licenses.free;
@@ -50670,8 +50843,8 @@
         src = fetchFromGitHub {
           owner = "brocode";
           repo = "play-routes-mode";
-          rev = "2fa89d0796772714447a93552936f4cb861e8754";
-          sha256 = "1yl6hmb4y156lxh809z0h26ybzykdhsc3y0w42jqfpxsnawd6nv6";
+          rev = "325ce59b0b3cb27ddbbde9949a16f6a749ffbd3f";
+          sha256 = "0jn4mcwaws92lsj5hp67zlx03qwcxbqacy3rigy1b183ksqqf26i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode";
@@ -50869,12 +51042,12 @@
     podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "podcaster";
-        version = "20160930.433";
+        version = "20161008.524";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "podcaster";
-          rev = "d216120ee920715ae783245dc54e823f6a2cf7f4";
-          sha256 = "0wflg2r7l1701vm7hn5iarbf1aw7d9h643l9ln24b42g8fwfpml1";
+          rev = "b0a6a5b351a2e16dd177d5f8f8ed18d46f5270b9";
+          sha256 = "0sbmxglha5nq4akssp8984wl7qmwhj3pqkpmnkhx1smjqv33id1j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2649dc294f40d00f3bf1b1cf09879c2ef0d3e43b/recipes/podcaster";
@@ -51055,12 +51228,12 @@
     ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ponylang-mode";
-        version = "20160527.541";
+        version = "20161008.1423";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
           repo = "ponylang-mode";
-          rev = "ed7ccf6d62a06e07eeec7020a931c0af62d8ae4d";
-          sha256 = "0ks1g381sx8if93hg6ndsc1lnv1msrd8f7zf8ykk1jrsfy9mn48h";
+          rev = "1f4ce183e11f4908173cea16685020f2acb818ae";
+          sha256 = "1lxzl5ks4lydn8zzvkc0jz6p1zjz7hfm4fs9dlyjxi6fn2bvj5kw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
@@ -51883,12 +52056,12 @@
     projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20160926.1133";
+        version = "20161008.47";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "5ad4275672beff1404ebead240836e0697cea4b2";
-          sha256 = "0v8pbnrs9bi5nv4mg51968s8lsm161rk164x84dv9lwh4hsk1sms";
+          rev = "44f75e3ceceeebac7111954e6f33cda50d4793d5";
+          sha256 = "1av32m99fczdmilxci8r8ni73f3x4kmvm99jjjjx4dnpg4siv35d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -52013,8 +52186,8 @@
         src = fetchFromGitHub {
           owner = "anshulverma";
           repo = "projectile-speedbar";
-          rev = "2b9758fbf0b9c314a939630438822fbe2b538524";
-          sha256 = "0383rg1zh03r8jbrm898lf0fxs74rgsivlvclr3lidf9h7har2yg";
+          rev = "93561bbe264b23958b72f951d2f0701450ad01e9";
+          sha256 = "1cn5wvagbgn4snrv8f6y6sgq7l51bd0l5z0ns3vs4753wx2y5dxw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar";
@@ -52223,8 +52396,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "4d8752780715582aec3011e40a45778959acbe24";
-          sha256 = "1bcnim7lj1r57a04h3j1pwzkx16nbrd89cvdl75n07iz47pkzpiz";
+          rev = "008b5a228b37c054f46ba478ccafa5e855cb16db";
+          sha256 = "0nixfffd0ysjalphglyqx3k7yplpb8ndkgwl7hgksdl7yscr0flq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -52240,12 +52413,12 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20160926.619";
+        version = "20161012.143";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "49d021de7fcba3717904f15d164524c754297726";
-          sha256 = "1v4jj5qgiz74skg40q9wwsgqfawzf06q2pplaa2gbnl0ghsx9473";
+          rev = "756bead9d5153a6ed47e4f86f42be0c49c95cace";
+          sha256 = "0mkvnhyl5lxbzjks8769pgzzafhi9z1sr768c67zmgbzz6fl0rmi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -52384,27 +52557,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    puml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "puml-mode";
-        version = "20160719.36";
-        src = fetchFromGitHub {
-          owner = "skuro";
-          repo = "puml-mode";
-          rev = "ae1cd8eb21d3af33bc60d4bfa39a90b8f49b7011";
-          sha256 = "12csnmas5n0r356hwrqgx4lb72ns4mdbfkh5dw5jss377akv12gr";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c0c28ccef208035fd0bdd648771825c1d10f42ff/recipes/puml-mode";
-          sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
-          name = "puml-mode";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/puml-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "punctuality-logger";
@@ -52471,12 +52623,12 @@
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20160416.936";
+        version = "20161014.952";
         src = fetchFromGitHub {
           owner = "lunaryorn";
           repo = "puppet-mode";
-          rev = "3321cd25f742bcb4466f4a736d936e9da773a83c";
-          sha256 = "1ly7gkxlkfgx3nzw35f7rwx7x9w6jrhql15jgsrh9slcw3q2rksl";
+          rev = "3cd6cdddd69e576b2f2a645742e7e18420ad8f05";
+          sha256 = "1x4j0kak65r1f9bcbjbbpkrkbfymfpqlrianrq5z23z72hsr4x03";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca67e3241b3fe5037b8d6a8e4f1104d9a46a01b1/recipes/puppet-mode";
@@ -52492,12 +52644,12 @@
     purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "purescript-mode";
-        version = "20150316.1828";
+        version = "20161013.911";
         src = fetchFromGitHub {
           owner = "dysinger";
           repo = "purescript-mode";
-          rev = "1390bf6a2ddd0764a5ee7f5cac4e88980cf44eaf";
-          sha256 = "0k2plyvd6842yryzrfadbf4h7a9hrjvkcvixclbca2bkvfik3864";
+          rev = "96c5ce0b22023ff6e2944d43ffeb34a34dd57db6";
+          sha256 = "0znwimxdh0jc3z0y1b9lrv680wi0ixlnmhm5i5xypkxis65n2yrb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode";
@@ -52957,8 +53109,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "05cc9a7dc82afeb32a315f5cbe2a132a2dac513e";
-          sha256 = "1lhfsy29fxr1r9c5qygiwmj9a48l5vnrmm5cl3pdd1hdcmsdphnz";
+          rev = "ad717acd4fb594b57aa893ecb30304604f650955";
+          sha256 = "0766sqqinb7ywp842yhi69d5gjq1xflgwqipr8ys1w78sddxknns";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -52974,12 +53126,12 @@
     pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pytest";
-        version = "20160330.647";
+        version = "20161014.815";
         src = fetchFromGitHub {
           owner = "ionrock";
           repo = "pytest-el";
-          rev = "b3574f81c372ebf84a1f9092187c6611d374410c";
-          sha256 = "0bg8pqqia9l39ac3s9xrnlyrg1pj2w00vc742qpjdk5349lazdl6";
+          rev = "91d8b7fe568527f51c172d6caadaad4f49e53bdd";
+          sha256 = "1s2s8bf0r1nidypmqiawj8i6jwb3y3wslgrhr8nzbz8c7lf626s3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/33a854a27adbaf57d344340199f90d52747b8450/recipes/pytest";
@@ -53100,12 +53252,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20160911.1032";
+        version = "20161009.2250";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "a9cf4f5183228a6c6a31f676e3f5a47d7322a213";
-          sha256 = "1yisakjmzd75mbdq2wrwdq06dkvyfzxkqg02llwv9wg8s2pbbn30";
+          rev = "a4295abe5e9bc115ffbdcb332266abbc51456ba8";
+          sha256 = "1jwg3180ixkhbqv5zf4g9557mcxxsh2ls6kx2vs5m2w95pd9mhdj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -53121,12 +53273,12 @@
     python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-test";
-        version = "20160924.1013";
+        version = "20161015.652";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "python-test.el";
-          rev = "38fd3d63b810d3f82624224354ea3f0d5a3327f1";
-          sha256 = "1w8xl3h34b34q8ar1rrp5jmssqzj5dnz11dzg0cj9iwszw1kgpcy";
+          rev = "8d64fb3d5154a18ecf3ef2ca6e8e2739a0d93559";
+          sha256 = "09x9shynh3ppq0lkb7krhv3cjr2246r3apdlbry2gp4h3ssyn3c4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test";
@@ -53226,12 +53378,12 @@
     qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "qml-mode";
-        version = "20160108.704";
+        version = "20161015.1731";
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "qml-mode";
-          rev = "efb465917f260b4b18c30bd45c58bc291c8246f0";
-          sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
+          rev = "6c5f33ba88ae010bf201a80ee8095e20a724558c";
+          sha256 = "1sncsvzjfgmhp4m8w5jd4y51k24n2jfpgvrkd64wlhhzbj3wb947";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3abc88ddbb6b8ecafa45e75ceba9a1294ad88d4/recipes/qml-mode";
@@ -53457,12 +53609,12 @@
     racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
     melpaBuild {
         pname = "racer";
-        version = "20161003.1655";
+        version = "20161004.1950";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "47a29c4420f9b80b2b0dda87c34b4300df50a59e";
-          sha256 = "0gc3ji639h93yawbbyj0w7cb9rnapyhgif33gpl3dqpgwv12bk28";
+          rev = "f77c9072866b9a961f7f1038ced6953950e515ef";
+          sha256 = "0rmzl9628a3jxavx2b276y89jszcp6a92q4g8lndadhsnh4zwdxs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -53478,12 +53630,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20160923.851";
+        version = "20161013.1744";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "2dbceb055495e95a2a2a9d2abdc7f2a5eed47187";
-          sha256 = "1mbbmcaqpli83za1d5imy9mw50wv5p0wsinhvmi1i4q9gk3fkg1k";
+          rev = "57b3af62adcdc48730ab631b36ff3dcb80b7cf13";
+          sha256 = "05hbqd47n4s9g21sxylfgwl2nk0c4b661dc89rf9kib191vzbazx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -54448,8 +54600,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "80e9ce1f30594b342a04e06abad0065604a5e5fc";
-          sha256 = "0ja7cs0byziwzqdrpwcx02jpzrqjqk6xik46yjwa47zfcpwsaxcw";
+          rev = "67a76ce4fc01db1ca642e49826c8106a5678e6b1";
+          sha256 = "1gxhxy1g5ch1mx0ny6f81chgw35x1yyr9lyzsb6lrcznhj51bna2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -54901,12 +55053,12 @@
     req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
     melpaBuild {
         pname = "req-package";
-        version = "20160603.401";
+        version = "20161012.427";
         src = fetchFromGitHub {
           owner = "edvorg";
           repo = "req-package";
-          rev = "fea6f96c3b98939c1273ece962b8af5c4bd6f752";
-          sha256 = "03yvgb2iiqp90jncrh5ji5l3v5q86rcqb757x1n2x4xkpjjsxa19";
+          rev = "f0a81e86ede9896b4653839d5b3ca23f784d3678";
+          sha256 = "1mk9wl63yhk0pjnbpsk0awvgxh31r6k98jik1b96adid77jxqj76";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
@@ -55378,12 +55530,12 @@
     ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ripgrep";
-        version = "20160928.9";
+        version = "20161008.51";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "77e8aa61b5b893c037d87117943a164514c6145f";
-          sha256 = "1xs8h2g02jdb05c07bk9qfvxvfchgzhccj5yhkxbnpxqmxpcskdc";
+          rev = "47f4451c497588de4a198f271f4121572e7db1af";
+          sha256 = "0nrn60nr30a0dqvd1aiwm9mwlkcn21qz62ziq25n5ixjy1hv8p5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -55403,8 +55555,8 @@
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "riscv-mode";
-          rev = "bfd7b91d25748158923c2194242e344df2f708a8";
-          sha256 = "1kcl64klksvxjk0zrgn6w4647r7xwa3xinl5jlvi46wync54hivj";
+          rev = "e8425b71443a2decbe70cc5892e72ce2ceb17570";
+          sha256 = "035hv8dpc6rk4b22mw4ch9yzf4wq14h8bba765fxg87grpi0mwg4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0853b4b678be7d1906a2f7946bfa1072590faf72/recipes/riscv-mode";
@@ -55630,12 +55782,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20160926.1010";
+        version = "20161012.2348";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "7b7a39429eca2a48c5c6e08aeed5623ce0198ba1";
-          sha256 = "03qzg5mymr73x1aaxsm6xiqmn7l9s05bph2ahlrn77x8llrlcvfj";
+          rev = "45e6fdacc3fe8cd1426418ffcdad317d9486f0ba";
+          sha256 = "1wlg8i9nv0n334gr97vkrf01608cgc3bnvj9q70g2800ji09s6ia";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -55672,12 +55824,12 @@
     rubocop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rubocop";
-        version = "20151123.2137";
+        version = "20161015.1200";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "rubocop-emacs";
-          rev = "c54905256410ce2aed6725d5b5f7ed61d4ddc956";
-          sha256 = "1y5z0kr4qwd4fyvhk0rhpbbp6dw2jpzrawx62jid5539wrdjcabk";
+          rev = "42198901d3bc0a3170b403dc194203f7c07bdb13";
+          sha256 = "0vwnn087h0fgr5wr2c4qa3lwzprd2hyip5vkix7hr79linp2qnzl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop";
@@ -55696,7 +55848,7 @@
         version = "20160911.333";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "56336";
+          rev = "56436";
           sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8";
         };
         recipeFile = fetchurl {
@@ -55776,7 +55928,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "56336";
+          rev = "56436";
           sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8";
         };
         recipeFile = fetchurl {
@@ -56063,6 +56215,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ryo-modal";
+        version = "20161007.1633";
+        src = fetchFromGitHub {
+          owner = "Kungsgeten";
+          repo = "ryo-modal";
+          rev = "83de15288751ca985a668a9f57a113cb107a6229";
+          sha256 = "1631lsqwvgy7zbgdrfyfbhsa0n7qp28m8h5ima7siy5f9clfdvlz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a4d9f86140b0ee95742c3a66dfbc063b5f87fb3a/recipes/ryo-modal";
+          sha256 = "019r1k14mhdv1x06fd5q4l0l4jnjy330b078qvpxrqv1fnwh1q51";
+          name = "ryo-modal";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ryo-modal";
+          license = lib.licenses.free;
+        };
+      }) {};
     s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "s";
@@ -56126,22 +56299,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20161002.122";
+        version = "20161012.854";
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "7f7bafe83ddeac11e30c9c10524f176b6d70200b";
-          sha256 = "10zr6fq9skqyw8mj9862b94s4k9yc40iq8dzk15sa43nsblmripi";
+          rev = "a1d0a371e6c5a8c1a3a8a37a84894dafcdaaa159";
+          sha256 = "1al73qfwbdmz1v6byxsl6bxs3f0r28hlywg0frkb2x46ja964y6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
           sha256 = "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv";
           name = "sage-shell-mode";
         };
-        packageRequires = [ cl-lib deferred emacs ];
+        packageRequires = [ cl-lib deferred emacs let-alist ];
         meta = {
           homepage = "https://melpa.org/#/sage-shell-mode";
           license = lib.licenses.free;
@@ -56192,12 +56365,12 @@
     sass-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "sass-mode";
-        version = "20160506.2045";
+        version = "20161006.2326";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "sass-mode";
-          rev = "7f0df85fd1b90e40e019a0f2e4ea6661169ceb65";
-          sha256 = "1zvsv2j3hqrj9vlm4mspfnm9nwah0lhizamyx43xykd7xk0z8hkw";
+          rev = "37105f46f6ea3592039f2ea7d0463ae7f042616e";
+          sha256 = "0gd0n5mh2f1gr2aq65d94zmvc2d04z2yb1baw24m0c11fai4y710";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/sass-mode";
@@ -56315,22 +56488,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20160914.818";
+        version = "20161006.622";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "420044bc305bd4fe38d2f3af1f76b29172b06ff9";
-          sha256 = "02h71mh0w8g9gz1pslgqmk40b5fb5q3g6jl5150cq608m4apyk75";
+          rev = "4e21f0673d39231fec070abfb24ab0c18948eb5c";
+          sha256 = "1ymkph8ikcsall9waq3vxac8jkji2bl9676pchydqr4ajc3aw8xm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
           name = "sbt-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/sbt-mode";
           license = lib.licenses.free;
@@ -56343,8 +56516,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "7e0935d02c285a588152d373aed89b49d029c70d";
-          sha256 = "0hj4brm8lfhlyp7p2qcncschbckr9inc59v3znazchz7clhpl2by";
+          rev = "5cb40a2aee82545ae65e9276dd0ea623c82ed9ad";
+          sha256 = "0wmn98nsgi639c2pmx7qivsz8ajss27nsjrq70ab48ck4zc5ngqf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -56855,6 +57028,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
+    melpaBuild {
+        pname = "secretaria";
+        version = "20161016.1423";
+        src = fetchgit {
+          url = "https://bitbucket.org/shackra/secretaria.el";
+          rev = "7cbbbd5da3493b5fe7cd643e72c8cb4666453671";
+          sha256 = "004cqj5ivmm0syyvncgadwmz9qaighih7nd7zn28xfc6v27m4jcg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
+          sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv";
+          name = "secretaria";
+        };
+        packageRequires = [ alert emacs f org s ];
+        meta = {
+          homepage = "https://melpa.org/#/secretaria";
+          license = lib.licenses.free;
+        };
+      }) {};
     seeing-is-believing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "seeing-is-believing";
@@ -57187,6 +57380,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "session";
+        version = "20120510.1700";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "session";
+          rev = "19ea0806873daac3539a4b956e15655e99e3dd6c";
+          sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/session";
+          sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
+          name = "session";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/session";
+          license = lib.licenses.free;
+        };
+      }) {};
     seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "seti-theme";
@@ -57976,12 +58190,12 @@
     simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simple-call-tree";
-        version = "20160609.1108";
+        version = "20161007.1913";
         src = fetchFromGitHub {
           owner = "vapniks";
           repo = "simple-call-tree";
-          rev = "3f6c2f8052d0c1609ee2452587dce3f0777df96e";
-          sha256 = "1d29c2wrm0mmx2airr18b330h2c66rfk6a3ydx3z2xzcw2k888pb";
+          rev = "431206e9c2b88cbab9cfe9ebf3f6cb73f5e6740f";
+          sha256 = "1qwswf5i060j396gfsr60zid0lqwf5xkrq3q0c1s6nz9wxlhayjw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/316a5ffcb3080abd623bbe3065077809e6cbfb74/recipes/simple-call-tree";
@@ -58022,8 +58236,8 @@
         src = fetchFromGitHub {
           owner = "jorenvo";
           repo = "simple-mpc";
-          rev = "c920da63cc2c5cbc56fb8eb87f260dfffba163f9";
-          sha256 = "1kaihrr2i2pcdyjh7qhz0x3clggf85ay5c4m5ld3r7dm3vv1yvmf";
+          rev = "b48bbcfe9a59941cfcc7e4a31200aada18ab9e05";
+          sha256 = "0gp39ay1viixk6x5hnaa09c73vbz8xx453rnkw79pqchhsnyh6va";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc";
@@ -58394,12 +58608,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20160907.602";
+        version = "20161012.1531";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "bad2acf672c33b913aabc1a7facb9c3c16a4afe9";
-          sha256 = "0d0p03d368jmyz5kjwbrcvs5glq7b6k1yyang3ai8f08sjvkmh6h";
+          rev = "f54b0c445065ba42f8abb8519a44ba2dadd9a68c";
+          sha256 = "1s015n4z7mxbw1dv317v7w3mdl0z6p0xwcd20a5prz6yk78yw0gk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -59062,12 +59276,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20161001.704";
+        version = "20161015.1227";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "9ae8d4f5ce471d4cf53231e085c52d46ece4aa14";
-          sha256 = "0pnyyrc0fdnjrf87qcb8k1hy8ac5j3xcj5wq3isr1zwyxxhsfw4l";
+          rev = "40f6f53a11ad458cd3d8abb4c932b414688b4a23";
+          sha256 = "0caa2cn6z2b9a9rw3yilsq4bm518n3fyigfcr38n4wlvqcvml0gh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -59415,27 +59629,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    snapshot-timemachine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    snapshot-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "snapshot-timemachine";
-        version = "20160222.132";
+        version = "20161004.122";
         src = fetchFromGitHub {
           owner = "mrBliss";
           repo = "snapshot-timemachine";
-          rev = "7a1ebd73e9da146f1a9f258c5d2a7b54660f87a4";
-          sha256 = "0m5j1v9br7vp9m2km8xccy5vv8gis0mcgwjxfc6qhnv7kbx0sx2k";
+          rev = "ceeb0e559d0f25974493c35b580381959633c219";
+          sha256 = "19w4shkhxwx9k5x6abcanh9xln779axwvg8i7363lgixkqdyx05f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69376b802f0687227a78838877d89163b2893c5b/recipes/snapshot-timemachine";
           sha256 = "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p";
           name = "snapshot-timemachine";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/snapshot-timemachine";
           license = lib.licenses.free;
         };
       }) {};
+    snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }:
+    melpaBuild {
+        pname = "snapshot-timemachine-rsnapshot";
+        version = "20161008.305";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "snapshot-timemachine-rsnapshot";
+          rev = "49e252a917cbb80837a225e372af0898166b1140";
+          sha256 = "1viafnx8yh7hfkps0qraqycsk1ppp2q3pvzkdybf57flywly8gk1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot";
+          sha256 = "0fxijd94p961ab0p4ddmhja4bfrif2d87v32g4c41amc1klyf25r";
+          name = "snapshot-timemachine-rsnapshot";
+        };
+        packageRequires = [ seq snapshot-timemachine ];
+        meta = {
+          homepage = "https://melpa.org/#/snapshot-timemachine-rsnapshot";
+          license = lib.licenses.free;
+        };
+      }) {};
     snippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "snippet";
@@ -59523,12 +59758,12 @@
     solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
-        version = "20160901.334";
+        version = "20161009.838";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "1fe6b5e8486a8f346198c70804a62c9e0885659b";
-          sha256 = "1i6zv1yy1b25qjvjhv968nav4zw94jdccgq5a34z0h5n9dgfv2hh";
+          rev = "43d25005f8c06cd145b9fe55c7f9c4b626293b1b";
+          sha256 = "19hl3pfr04l3pli0dnall9gbymh0k17m9r5dzm36dx3a7m5v3j4l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -59544,12 +59779,12 @@
     solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solidity-mode";
-        version = "20160926.409";
+        version = "20161015.522";
         src = fetchFromGitHub {
           owner = "ethereum";
           repo = "emacs-solidity";
-          rev = "f62b7ff83420b0459c4f26b2e4c050ac94421f50";
-          sha256 = "1cmxj6hd454lz82z17kxh1sabh6v7xh3bwy1zav9pg13sdxwr9qz";
+          rev = "e8bc634a2ea53198ff1fab8a1e52edbaa92e40ca";
+          sha256 = "00k7c9kn9pqznrj9fi7rjmbdmnlmahry1kdfvdp28cgzflim8q6n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
@@ -59562,22 +59797,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }:
+    sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }:
     melpaBuild {
         pname = "sonic-pi";
-        version = "20150919.330";
+        version = "20161013.1248";
         src = fetchFromGitHub {
           owner = "repl-electric";
           repo = "sonic-pi.el";
-          rev = "3d88a784bf7883ec56fbef5923c4e1b50d2b9b09";
-          sha256 = "1ga35d3rhdf6ffd36q58ay6380gjvkmaiid4vscga3v7ca0dkhl1";
+          rev = "6e7ae8fc0d9b4b457a6cc92871873628f2c40e79";
+          sha256 = "05kzlmf8vbx556fsgzj82kyyxjdr61hpysw5ska6933dnhlyn6ly";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0536c7e32ef145546e4014a1d418cbac8673eb5/recipes/sonic-pi";
           sha256 = "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp";
           name = "sonic-pi";
         };
-        packageRequires = [ cl-lib dash emacs osc ];
+        packageRequires = [ cl-lib dash emacs highlight osc ];
         meta = {
           homepage = "https://melpa.org/#/sonic-pi";
           license = lib.licenses.free;
@@ -59670,12 +59905,12 @@
     sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sotlisp";
-        version = "20160509.1504";
+        version = "20161012.1217";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "speed-of-thought-lisp";
-          rev = "325c21e0718aebf0d6929f67da2476dd53ab95bb";
-          sha256 = "01n943kycazsw9znk7cj17qjlar91i5r25p3cmxcxh75wnh4h1vj";
+          rev = "fffe8d0b42b143a2e7df0470d9049fa57b6ecac5";
+          sha256 = "0j5zwb1ypqps30126w2684lmjh8ia4qxg8inlajcbv8i3pbai7k6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/sotlisp";
@@ -59800,6 +60035,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sourcerer-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sourcerer-theme";
+        version = "20161014.925";
+        src = fetchFromGitHub {
+          owner = "gilbertw1";
+          repo = "sourcerer-emacs";
+          rev = "c7f8e665d53bb48fb72f95f706710d53d24bd407";
+          sha256 = "06bxsbjyrn4grp9i17p90cs4x50cmw62k6a2c6gapkw8f1xbv7xv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8532e062b1830d8cf4e7f72518131a1f32762b37/recipes/sourcerer-theme";
+          sha256 = "0xikcln8sz3cic5a77cdvq2aazy1csf1qfxgmcavpqz54ps14j1z";
+          name = "sourcerer-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sourcerer-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     sourcetalk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "sourcetalk";
@@ -59845,12 +60101,12 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "20160914.711";
+        version = "20161017.50";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "679bdaa22b4155d515c9cc1bc42f793cf53adcc8";
-          sha256 = "0xdkk1ig70ys4hs68fg5wa4pqjr2nf07jc0ckdlfvs3r1fafs7a3";
+          rev = "6d7651ce1e2b1170378b8660f6dc6a553a83b893";
+          sha256 = "0x6anr0jqqkg4h0k066gjgfd2dx1qkkd0vs3m6al2vrj6kg3mfdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -59950,12 +60206,12 @@
     sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20160728.1000";
+        version = "20161015.1256";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "22d1f80176e4ac57ec489d4aa3d243212060843d";
-          sha256 = "1v1wcbvbymg0vlwpis706ps5w9bscypqp8zpbk52lcny2lshqmik";
+          rev = "6f1bcf7a6a03e53de24d3d1c49d4186525764f0f";
+          sha256 = "15xq91qyj5nw03zr343s0r5x60p4a702bdv9k0pgm85787jrfr86";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -60507,12 +60763,12 @@
     srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "srefactor";
-        version = "20160420.33";
+        version = "20161008.238";
         src = fetchFromGitHub {
           owner = "tuhdo";
           repo = "semantic-refactor";
-          rev = "a12eecfab02c10a6b8090df6fa376c1d98a1b9dc";
-          sha256 = "02jr9cgar2r71rrrx13rj83nd19bxajmzzgj4awzn0d93i4l5qkc";
+          rev = "88e8ad5af2b9da89947aa75c9252163dbc917b35";
+          sha256 = "0sqy1w1sda2n116xrfnblysjykg914ax9yqsj5vh40q9wdmyqjaw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor";
@@ -60654,12 +60910,12 @@
     stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "stan-mode";
-        version = "20160626.1518";
+        version = "20161016.1619";
         src = fetchFromGitHub {
           owner = "stan-dev";
           repo = "stan-mode";
-          rev = "62109483b39c6dc20e1b55bd833c9f8ea38e7118";
-          sha256 = "0jnfhb49hi6fydffhdj1kkhrsc45zjsnm43djbsgzdnd6abbfhnr";
+          rev = "4f39ddf6ccbf26cefa08be83916a3cc398b421fb";
+          sha256 = "05zzf8ablddh3i09qkl094rkjal4yp7y16g1d5gxvd7lprmhjby3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode";
@@ -60675,12 +60931,12 @@
     stan-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stan-mode, yasnippet }:
     melpaBuild {
         pname = "stan-snippets";
-        version = "20160626.1518";
+        version = "20161016.1619";
         src = fetchFromGitHub {
           owner = "stan-dev";
           repo = "stan-mode";
-          rev = "62109483b39c6dc20e1b55bd833c9f8ea38e7118";
-          sha256 = "0jnfhb49hi6fydffhdj1kkhrsc45zjsnm43djbsgzdnd6abbfhnr";
+          rev = "4f39ddf6ccbf26cefa08be83916a3cc398b421fb";
+          sha256 = "05zzf8ablddh3i09qkl094rkjal4yp7y16g1d5gxvd7lprmhjby3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets";
@@ -60700,8 +60956,8 @@
         src = fetchFromGitHub {
           owner = "lueck";
           repo = "standoff-mode";
-          rev = "c55e80ff0e939f3d2cd6bda50b1121a54c08231c";
-          sha256 = "0cjqd0cgn0n5mlf8iva70y228day58inly7929p2hw28fndy51gy";
+          rev = "a1ad5b3823bf43242dfc54cfd8cd1b09bee286d8";
+          sha256 = "1bakh0rwq0kxy6k6yjrywbcvj0hszq44z9v1gny2cf824shqa3r9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode";
@@ -60759,12 +61015,12 @@
     state = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "state";
-        version = "20160422.550";
+        version = "20161008.535";
         src = fetchFromGitHub {
           owner = "thisirs";
           repo = "state";
-          rev = "4a5fa2e37186408df3e98d936514387ceef80bd5";
-          sha256 = "1rjp1zsbh476njjznbsxr47x4lqs4i887yi9xvwvpcb2wcwfly81";
+          rev = "ff38227310347ed088fe34ff781037774cc7456b";
+          sha256 = "0hanisrni8i0bbq7f2flvfla990nyv8238nb9dfjpvimkw7rjbsg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82e955112089569c775e11888d9811119f84a4f8/recipes/state";
@@ -61355,12 +61611,12 @@
     suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
     melpaBuild {
         pname = "suggest";
-        version = "20160928.1741";
+        version = "20161015.1943";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "c0c43412f21db464a542f5cab6de7e9ca66547aa";
-          sha256 = "1bnf6s6bam6j6inhscy1zlq7rnvlwh8wcbpiliwzl3gxg3mnn1c6";
+          rev = "0060b4016c25d2052bf47e1e56e3b83ad1e97c55";
+          sha256 = "063jq4gn0zfmj3n6l1g00r6xcrgna9ns92nj5rlz55m77q9d7anm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -61685,12 +61941,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "20161002.506";
+        version = "20161016.709";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "ea77cf9157ed2a2bbf6874b6fbd15c2ca776f775";
-          sha256 = "0x0v57a6f3lxbafb3slcl782vga7vrq2rci66hhabzrgs2k3lh7j";
+          rev = "58f31cc50ee8fac236f5aa3936152e6e70ee3ce5";
+          sha256 = "0ncz4bcnbh64p3iqbr65g6b1p8lfpqviszpz80909izi8awjgbgf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -61727,12 +61983,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20160921.138";
+        version = "20161011.747";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5";
-          sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4";
+          rev = "9f5f6e02e4b33f36652588903a8bab8ae3e28667";
+          sha256 = "162imzajrvws0980l6acr5l1mh3bbm4avajhsn1p1qic4ps8zajk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -62394,12 +62650,12 @@
     tango-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tango-plus-theme";
-        version = "20140425.1511";
+        version = "20161016.322";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "tango-plus-theme";
-          rev = "99c3484eeb4e6f7f62a6dacfd665a4d46f4cbdaf";
-          sha256 = "1gfn1yyyb9p2fi17wra1yf2j96cfjw0sifgk3c0vl63h3vmiyvjf";
+          rev = "ef8510d75c60459a7c3bce8aaf686280faf71663";
+          sha256 = "0k7mmffr73i14brh7zf0bdzw0m8g3ljff8q4vi5fnxzrr4k99z8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b069fa60d3bbf41168b938f71f4903e313b2c6ac/recipes/tango-plus-theme";
@@ -62475,6 +62731,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    tblui = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, tablist }:
+    melpaBuild {
+        pname = "tblui";
+        version = "20161007.1212";
+        src = fetchFromGitHub {
+          owner = "Yuki-Inoue";
+          repo = "tblui.el";
+          rev = "bb29323bb3e27093d50cb42db3a9329a096b6e4d";
+          sha256 = "1pja9v4h3abqc2iydm7wwjxrg7ni1pn94yb4azrgjq5qc0fsgn7a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f4dd6e9dcc73c57f93371ba16b15f2d98d805dae/recipes/tblui";
+          sha256 = "1m0zhk5zyialklnil5az974yz6g1zksw02453cxc0xpn5pf0a3xa";
+          name = "tblui";
+        };
+        packageRequires = [ cl-lib dash magit-popup tablist ];
+        meta = {
+          homepage = "https://melpa.org/#/tblui";
+          license = lib.licenses.free;
+        };
+      }) {};
     tbx2org = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "tbx2org";
@@ -62688,12 +62965,12 @@
     term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "term-manager";
-        version = "20160922.1302";
+        version = "20161013.127";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "term-manager";
-          rev = "c6d2810a3c9fc3e6d7f018127a12846607e6ed6e";
-          sha256 = "17aw0jnihncf3scjynii7idpbczrf24cf0pq8r0bfqs4hw0k0qn8";
+          rev = "f023c857459d6b7436907f626aa59929336f7b61";
+          sha256 = "024yqz3g9m3vpw9r9p58sz4gakkv59q2hs208v6rlbfsd5y75zpi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager";
@@ -62776,8 +63053,8 @@
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "term-manager";
-          rev = "c6d2810a3c9fc3e6d7f018127a12846607e6ed6e";
-          sha256 = "17aw0jnihncf3scjynii7idpbczrf24cf0pq8r0bfqs4hw0k0qn8";
+          rev = "f023c857459d6b7436907f626aa59929336f7b61";
+          sha256 = "024yqz3g9m3vpw9r9p58sz4gakkv59q2hs208v6rlbfsd5y75zpi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile";
@@ -62839,8 +63116,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "a36a20c36265430c36235371957f07c8c89fee44";
-          sha256 = "1q25ln12b25al2vfwbsxrv5bg4a9qpyj8p1as9hkcmaszj2z7d41";
+          rev = "4a5fe8f95323410ac3d57b3ee9971df7c792326e";
+          sha256 = "09k1x56z8q48a9h4yvgrq58m26hss71lhdysq1q65p1lijvmxrvq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -62860,8 +63137,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "a36a20c36265430c36235371957f07c8c89fee44";
-          sha256 = "1q25ln12b25al2vfwbsxrv5bg4a9qpyj8p1as9hkcmaszj2z7d41";
+          rev = "4a5fe8f95323410ac3d57b3ee9971df7c792326e";
+          sha256 = "09k1x56z8q48a9h4yvgrq58m26hss71lhdysq1q65p1lijvmxrvq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -63183,10 +63460,10 @@
       }) {};
     thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "thingatpt-plus";
-        version = "20160906.1018";
+        version = "20161004.640";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thingatpt+.el";
-          sha256 = "0k7nw25bs7a5zrgfw3anfv0ls5pq1lhrwg81x0j749djjhw3xk5p";
+          sha256 = "0p0sb5w646vlc623nk7qajfmywn281kabwaa8ha3la39a6sdd1xh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+";
@@ -63269,8 +63546,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "b0dadbde6aad1f5a09d47e3d1f2c713c76cd915f";
-          sha256 = "0yv0nssydryipa43w5vfpdaqg4h2z5n8hxln6fhp4gdcbk9p65v0";
+          rev = "af81cf0c6180cda4791e023a37ad134247fa7794";
+          sha256 = "1ahwzg44bd2pmh92q4qkl7h17h8xvpcamwkn8ydd8k6hl6nm0rri";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -63326,12 +63603,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20160929.357";
+        version = "20161004.2019";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "de8937514494cb6b849be24a7b935e9c6bd08bfb";
-          sha256 = "1lw5q3crhiyf6p5fm9ssxs4c4vm1ma8ibkpwhbb67jw8z8lnir0m";
+          rev = "a8fc3e8223a40243616347e875cfa1151be9a794";
+          sha256 = "0nvdz0v11baxsnhhi6hmv9ikrxgi0a4351r787plrdb2qz7zpmrl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -63617,12 +63894,12 @@
     toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "toc-org";
-        version = "20160711.25";
+        version = "20161004.320";
         src = fetchFromGitHub {
           owner = "snosov1";
           repo = "toc-org";
-          rev = "08ed3f0883b0937bb17b7373c84ac7b8744aa8ae";
-          sha256 = "0zr5j0n3xr6310zwd3wss34g77k0dfmmq7mm1a5pa8b7llvm1qbq";
+          rev = "a0e8ca05e806e5074b8603985da7f18b92c15856";
+          sha256 = "1sv9y5dln4ai9w3mgg8p4a3s05hflfqh0k7k8isjqikydbv85m2k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -64003,15 +64280,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, python-environment, request, request-deferred }:
+    traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
     melpaBuild {
         pname = "traad";
-        version = "20151225.2334";
+        version = "20161010.152";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-traad";
-          rev = "bcf9260fb8b9216ec1c455f673270049be7ccb38";
-          sha256 = "1yh9dxf986dl74sgn71qxwxsg67lr0yg1z7b9h2254lmxq0mgni6";
+          rev = "d96da54c87cba247306b4519295cc4d4df7cc33c";
+          sha256 = "1hx6d4r20irs8zdimsfw17kwpwrdcjhkvf1zf7k4cr9bmkj4bvz5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -64021,9 +64298,9 @@
         packageRequires = [
           deferred
           popup
-          python-environment
           request
           request-deferred
+          virtualenvwrapper
         ];
         meta = {
           homepage = "https://melpa.org/#/traad";
@@ -64339,6 +64616,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ts-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ts-comint";
+        version = "20161006.1034";
+        src = fetchFromGitHub {
+          owner = "josteink";
+          repo = "ts-comint";
+          rev = "2e71708dcd6f3af62501912904c85075d70edc7c";
+          sha256 = "1m8rcz6yj8j49jxyjg330bgw3d6mqmzf3f1ja1ngjsfhpkl27v99";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/84e7004395083b66fce7ff4676af818bc798058a/recipes/ts-comint";
+          sha256 = "18swvzkzcwn0wks58flsjpn9dddzcznij67xifyz6009l4fgdrzd";
+          name = "ts-comint";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ts-comint";
+          license = lib.licenses.free;
+        };
+      }) {};
     tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }:
     melpaBuild {
         pname = "tss";
@@ -64961,12 +65259,12 @@
     undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
     melpaBuild {
         pname = "undercover";
-        version = "20160329.737";
+        version = "20161016.2358";
         src = fetchFromGitHub {
           owner = "sviridov";
           repo = "undercover.el";
-          rev = "f96c6033db6ff316fb6ba31db9c0d60736d35e5f";
-          sha256 = "1860hnsbvndaahqs233adk8piz7nyj8v3b0gziv1lrnq864hrq5i";
+          rev = "6026118ea2030fa69688dfff294843a865ddf3a3";
+          sha256 = "0slml92b2i3cphjmqm738rbwk0brsxg22a8wpz6cdgm62hhxr1zd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover";
@@ -65003,11 +65301,11 @@
     undo-tree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "undo-tree";
-        version = "20160922.853";
+        version = "20161012.701";
         src = fetchgit {
           url = "http://www.dr-qubit.org/git/undo-tree.git";
-          rev = "8afead161b5bfd167eab39f06f16a86c2dd36e29";
-          sha256 = "1hnh2mnmw179gr094r561w6cw1haid0lpvpqvkc24wpj82vphzpa";
+          rev = "4cba00bb049cfaa2ee6821a9e347209a88a740b5";
+          sha256 = "0qawh5cr0ahdg1rks96g9fbva2nfkz8mbl82jnps6axqdf57gm38";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/undo-tree";
@@ -65476,8 +65774,8 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "d8905336751ab1a3065d128fb4e13bbcf54d0e2e";
-          sha256 = "0hyfk565cy2h1rhs4azx2g6bwpjhh6yz59qlnlrirjpsnjya6f9k";
+          rev = "a7e716dd7e9778268337f2f9142f7d658f985511";
+          sha256 = "0x2ag7amkqq8bgiz5ma31fpcwfpzx0qqs7cr6ia8rxzwiwnyb06k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -65829,12 +66127,12 @@
     vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }:
     melpaBuild {
         pname = "vdirel";
-        version = "20151215.2255";
+        version = "20161009.224";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "vdirel";
-          rev = "6154343b8265d7e8cc6629f28aa4c3d28d3708cf";
-          sha256 = "1lh8nv0ayl9ipl2aqc8npzz84g5q7w6v60l14v61mmk34fc23lnc";
+          rev = "4232676e93ca5ace8e51f6605bec223c3205beea";
+          sha256 = "0jdjg50f6my9952frl6asi8zk0i8b4hva26wm7pi8zk423pydr30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel";
@@ -65955,12 +66253,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "20160916.1421";
+        version = "20161010.239";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "c93d080df2e47702a7952420101cf2d1d3b38bfd";
-          sha256 = "12rbhgx350x46lj7777rgjv8akfjs59x86bfm95dwsq4mva7q2cl";
+          rev = "a3a7fa4a84c6117e618ed771c7327f413e1a021b";
+          sha256 = "114jyzx6asxr0r3xqi11wz10aij3h2rpyk9ga5xwzw47f7sayw64";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -66183,27 +66481,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    visible-mark = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "visible-mark";
-        version = "20150623.2150";
-        src = fetchFromGitLab {
-          owner = "iankelling";
-          repo = "visible-mark";
-          rev = "c1852e13b6b61982738b56977a452ec9026faf1b";
-          sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/visible-mark";
-          sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80";
-          name = "visible-mark";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/visible-mark";
-          license = lib.licenses.free;
-        };
-      }) {};
     visual-ascii-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "visual-ascii-mode";
@@ -66249,12 +66526,12 @@
     visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "visual-regexp";
-        version = "20160806.610";
+        version = "20161008.520";
         src = fetchFromGitHub {
           owner = "benma";
           repo = "visual-regexp.el";
-          rev = "96dea5e40a2f904da8efb7cff968d770550b9fb8";
-          sha256 = "1482pk12fb23dv97lvp9wkmsa5pybsvc3d2yn5223kwxdy6yg922";
+          rev = "df7812007fb9836b290c4528ebddfc9d146b2fb6";
+          sha256 = "1iysfgn8j36mdqnbvvyy25l1sxivj5yw6ligag9z0g0km6z0f6r1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp";
@@ -66435,12 +66712,12 @@
     vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
     melpaBuild {
         pname = "vue-mode";
-        version = "20160411.2054";
+        version = "20161009.1916";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "28e2cc06f8ba8e0ac7027b33300b999493e73505";
-          sha256 = "1d9rwgyvizn1zas8v98v86g5kck0m567cprpcakdawwamn155k49";
+          rev = "3847c3132dc743932507b622dadb83bed935b6f9";
+          sha256 = "0m541ib25fcva8kzbpxi3bwyimdqzzx3w6m9m4yz90cxc3hzvl9i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -66535,12 +66812,12 @@
     wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wakatime-mode";
-        version = "20161003.729";
+        version = "20161011.101";
         src = fetchFromGitHub {
           owner = "wakatime";
           repo = "wakatime-mode";
-          rev = "75fff3baaa405d0a19998bdfd76c2d8e06eb5169";
-          sha256 = "0q1lfs9lm773lfq11zdv21z7kkrnfzp2wq5508wnh9q3swgwp1vq";
+          rev = "e264e4d4ec02187688b5bb9f96187fe7d5497b72";
+          sha256 = "0ghhfvck1hlxa2amxp4ipr9rip6vqb9s4r372mdp3i83700p8k46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a46036a0e53afbebacafd3bc9545c99af79ccfcc/recipes/wakatime-mode";
@@ -66829,12 +67106,12 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20161003.1327";
+        version = "20161008.22";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "f7ecb126c1ecd43815fdaef7878678562360fa13";
-          sha256 = "0wnspvmq8shfscf2a0ddp7sby9pq3q1r65yq137vz9n2rbaqmh5j";
+          rev = "e0decc759a3858a0e6f70bc604202d387bf1ff9f";
+          sha256 = "0pkmbadb8z7dcbv2920lfgya527v8rqbacm3wdwcpfm2qqaf5rhq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -66888,6 +67165,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "webpaste";
+        version = "20161010.1100";
+        src = fetchFromGitHub {
+          owner = "etu";
+          repo = "webpaste.el";
+          rev = "c57cd53b6036e8f9d128ffb1d80cdd898d52c2e8";
+          sha256 = "1sjczh4z4fd6mlpqvd8qbkyc1pphkx1s7d953msqqfy1lvwd2v6j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
+          sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm";
+          name = "webpaste";
+        };
+        packageRequires = [ cl-lib emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/webpaste";
+          license = lib.licenses.free;
+        };
+      }) {};
     websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "websocket";
@@ -67122,12 +67420,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20160911.1302";
+        version = "20161005.1154";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "c493e0b4bb53c524d99c6ad071ba0a22259f8f38";
-          sha256 = "0gngmryqhkhsd6wjvg24fcxdmag3sp6mvp3r6swz1hg2j905lrf7";
+          rev = "5b3614643e3e8a5815505e24fb34ee57a360442b";
+          sha256 = "1hwai59fg6s93ryiixhm2y2wjpp5qhxmvcmwhmjffy4j68cicwwc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -67312,8 +67610,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "3cc7e8c4f4781db4f838531a7ba225865f74977f";
-          sha256 = "0i97z8czrfva60i4iikcnkr45fc3bgmsk5i8x2bb63pbla9q4l6i";
+          rev = "dfe7872a9914cf13c542e661aa294afbd729d7a1";
+          sha256 = "1c86bppn8ivjqqfrhpfwc590m2xai9rh0h2a4cil1crzr61wbsrh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -67410,12 +67708,12 @@
     win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "win-switch";
-        version = "20150208.1911";
+        version = "20161009.927";
         src = fetchFromGitHub {
           owner = "genovese";
           repo = "win-switch";
-          rev = "a0da96c23e8775a2dfdbe55ed3ec5b57f1ebb26a";
-          sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
+          rev = "954eb5e4c5737f0c06368c42a7f1c3dd374d782f";
+          sha256 = "1xpx4sc1g1w8w0yc39k2dys83m8skrpvi745bfrzdl47jngrf54h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/win-switch";
@@ -67572,12 +67870,12 @@
     window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "window-purpose";
-        version = "20160927.744";
+        version = "20161017.433";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "38d8dd513d5de18572d4c2b58a5e6feceb6bcb4b";
-          sha256 = "1iar8f0qgjha4kr8gnjf7p3cbxbb6avlm8wk8nkx0x1vm5wzab87";
+          rev = "3ccfb8dfbd5970d6b0d64142e586459f38f21d79";
+          sha256 = "0waf5imivhgzqp38rwhjqhy2y13dar7gqm52kbh71bvfwakgnkfd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
@@ -67659,8 +67957,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "a55b6dd96558";
-          sha256 = "1n0a99v2gwr12dhgg0yw42lm7ggcq9b85qn1c29k66l7jz637mfp";
+          rev = "b9e861ccb52d";
+          sha256 = "0gk1nclvkwdx20m2cnhfyb4l9jfxkvya8fifvfgry8swzbmab9h2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -67697,12 +67995,12 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20160930.1603";
+        version = "20161009.917";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "19201be2c59a7762da97835f7efc11f86191b676";
-          sha256 = "0xqvk56dpafqqnglkyy9y95g3gik6jwyq6cqynmyg0wbqz48biza";
+          rev = "1a6c49bfdef5aacce14b76f06adda3b66d1f3847";
+          sha256 = "1ignivq4df5a716p7n4cm6jbv9zly9b1ssn39a49wzvy9ch5m76q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -67757,6 +68055,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    wolfram = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wolfram";
+        version = "20161017.127";
+        src = fetchFromGitHub {
+          owner = "hsjunnesson";
+          repo = "wolfram.el";
+          rev = "c66e9daa644856e02990f6a775e7b54f4e969e18";
+          sha256 = "1iswap3aqj0ykd2d62xfb4fgp5r1arkgln6fzl2b4dji399b2xyy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/785b5b1ec73e6376f2f2bb405707a1078398fa3a/recipes/wolfram";
+          sha256 = "02xp1916v9rydh0586jkx71v256qdg63f87s3m0agc2znnrni9h4";
+          name = "wolfram";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/wolfram";
+          license = lib.licenses.free;
+        };
+      }) {};
     wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wolfram-mode";
@@ -68016,8 +68335,8 @@
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "wsd-mode";
-          rev = "d1ee33397f9914834b9dd7208198b69ba46d3a11";
-          sha256 = "0maxswk4pih27znq276q0aw0z5b9cj51m95ml5ap3qy7fsq9czdv";
+          rev = "cdbdf48f60900cedca2805a8b0875327a3a81f19";
+          sha256 = "1ms30d1vz4nd90q6nypz5vixw1s3x6c68lm3l9zgq2ls6bw3kz93";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode";
@@ -68180,12 +68499,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20160924.753";
+        version = "20161013.442";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "9e3c379e6fddaee086b0bba62066839aca9f02b9";
-          sha256 = "07r5y1fpkpxg7pwcqbj23lps6nid2589hr1gja7r49mp2qrna006";
+          rev = "1aa3834aa64759a628d05b8177c54323f455c689";
+          sha256 = "0lzn3zdpx4qbshba1s2xyxcl7z2a81iyvhx3kny5zy5b9ab8rw4s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -68222,12 +68541,12 @@
     xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20161003.1702";
+        version = "20161016.459";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "db0821ee98f98b169b5c9e26f5db715a6bba0d20";
-          sha256 = "1v3a53w8wpynm406j0nf247b2ncly5zpb7rq2ci8x9w3l8vqg664";
+          rev = "f9849ddd3b128628e4e9632e1e21edb8c904cb38";
+          sha256 = "14dc0lwmh4zf8whj3m65nsxvadqqmhr6kiymrx6vykwbsj4lzfiq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -68282,36 +68601,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    xah-math-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "xah-math-input";
-        version = "20160711.1326";
-        src = fetchFromGitHub {
-          owner = "xahlee";
-          repo = "xah-math-input";
-          rev = "188b3195344e8204a6d0e3f30c6b439d27b7c024";
-          sha256 = "02k95lkmwid1mr2g1vd4wppwpjfik76zm5x9zd5gmj0dzdgihi8g";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input";
-          sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
-          name = "xah-math-input";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/xah-math-input";
-          license = lib.licenses.free;
-        };
-      }) {};
     xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20160913.1512";
+        version = "20161005.1847";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "d26e73bdefd6e0a53559c433b576aa663008308c";
-          sha256 = "1gvdx1nvmxxvbbkr4hz4ar7k52cyyc77vcbm1yqw4r167i468knf";
+          rev = "9b518378fe204737301a8c206d915ce19f2b9b5d";
+          sha256 = "1289ylz3dmyjv4z6yssb9c84a3wa794kd10xf5gwqlpmdlp7x1yc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
@@ -68642,12 +68940,12 @@
     xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xterm-color";
-        version = "20160802.1752";
+        version = "20161013.1627";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "xterm-color";
-          rev = "f7c197f64e3aded540faefc6b7686cc959cdd948";
-          sha256 = "0d4njs7bk3kh8qjqc7mhj245ca1ckd7yq8vhdwl4njx587ikldvy";
+          rev = "9c850434b398f5e758b0e6ff6d9ce8f7351521f0";
+          sha256 = "14h46z8hqyx4135adj3lqbfpkaxlnvky7x4sfsnxbx82zqlcqnac";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
@@ -69080,16 +69378,16 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20160801.1142";
+        version = "20160924.2001";
         src = fetchFromGitHub {
-          owner = "capitaomorte";
+          owner = "joaotavora";
           repo = "yasnippet";
-          rev = "9cf92085e53f579af997f43540a26b4377f07678";
-          sha256 = "0v7xzjhp87v1ahgzlvpf44b5qk5xfby80nbryla4d5afhahn8s0n";
+          rev = "ff6f31ee2cd22deb6593564bb9076d505d5841ab";
+          sha256 = "04nssa913j0v8ji5azwrhh603r4ig4n98biikgr75zn86hy0vnlv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/489687c6c41399a3bca8148a62d25581726a847d/recipes/yasnippet";
-          sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
+          sha256 = "1r37vz5b8nj6hr6c2ki9fdbrs3kkb4zwimh8r4ixm10kdkk5jqds";
           name = "yasnippet";
         };
         packageRequires = [ cl-lib ];
@@ -69164,12 +69462,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20160922.525";
+        version = "20161016.2330";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "a8ca68b508c448f6ac5ed6fa35ee3fe0a4771098";
-          sha256 = "0v8by6y25sl7528vvrb1xsmm184xbqivqvllykx3kmaxpdh5hvih";
+          rev = "066506314805ea863d4a46a9dc7e66febbf45263";
+          sha256 = "11rka7xwbvkzj455v0ijx4pb4w91vnf1lyawlybwmla9wilsr5n4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -69215,12 +69513,12 @@
     yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yoshi-theme";
-        version = "20160608.1423";
+        version = "20161006.1632";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "yoshi-theme";
-          rev = "660b9368f448372330722985d1c869966c034652";
-          sha256 = "13p1rzi9l4k6gjvdsls0kg0c8rdkwinfrl2ns9y5fn4pbr2lwba5";
+          rev = "09ce91530896f6443b5b45409bd67b5a449651c9";
+          sha256 = "19kfjaqd1p1v777zgr76zpyc33i8rn7v7f5wq59cnnnswi01m8m9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
@@ -69340,12 +69638,12 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20160914.135";
+        version = "20161014.2316";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "e20756e1b78de58d3f82ba4a9d7c0772cb37482d";
-          sha256 = "0mm4qx9c6v9r708p6yq6spzznbjy43qpn5k2479plnxixp8dh664";
+          rev = "22fbaab1a198fbb6115fea2e45112b670eee8e46";
+          sha256 = "1w4mpflmigzn4lsnrgxkazl3s6lcsdg20fjlcw2bly8g19686mq8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -69402,12 +69700,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20161003.855";
+        version = "20161008.434";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "cfd030d61347681566a06c119ac294d26cd17f91";
-          sha256 = "08q64b7brdqi53vkb56dbz0agpjnyp0815qfkzd5m2qk6p4bsx7l";
+          rev = "8b67b97fa02d3b19d15ff1d4638e7702189bfabc";
+          sha256 = "1p6pdll9bwvlm6zhpc57sn7ka59wj91pnbdx5zcam48vyiyvlhgn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -69507,12 +69805,12 @@
     zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zone-nyan";
-        version = "20160928.2303";
+        version = "20161014.154";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "zone-nyan";
-          rev = "52f7e0a374fb7b4c1a69ad8b215fa8126063ba06";
-          sha256 = "05yyin9y376zhha084zvfxj565s1qhy22yycc3wg3gs41xm0hrk1";
+          rev = "0ec6328ee58d7d140c8c7be84822c07741f3ad2b";
+          sha256 = "106sppnp1jd5qcp2ydb180fbhfld90jvfimy8316qvrgk5xc2q57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38262704e1045c21ee73ca9dc87656936382004a/recipes/zone-nyan";
@@ -69653,8 +69951,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-zoom-window";
-          rev = "95cd0c74bd63c9163148914fe1faecce7716be3c";
-          sha256 = "1gddjvvl5pnh3q9x8q3q92d9l0rg9kksxqq84gi2hcyhvix5ghmz";
+          rev = "1c39773c69b9833382c26101c6ff60bfa218cc09";
+          sha256 = "08yw2ibn5zc40f8l3bnpp87w3nf5zzlzhi0f61a6px4ix2mqlsv4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 67198297485..393b409f827 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -884,12 +884,12 @@
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "1.8.1";
+        version = "1.8.3";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "8438ff5e71ca040e7a1e325d608a3f5ea050503f";
-          sha256 = "03mpg4ksvcc5zs540rgnf3gssyx97aiiv60lwdn3934al4125vnq";
+          rev = "998407f56009f441a7cb83d678118d4d8e68f661";
+          sha256 = "0brggqlij0nacx0yjk10rkn045nk0z03r8llmnqkangjm47ffksr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1028,22 +1028,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "2.0.0";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "21b2e084a8779a6eb2e800add37671e21e5fc5d8";
-          sha256 = "1zw6mkayf9dqxkk6pfb6niarkxk1jcwdln45jp7q7n8vq3cqg6rp";
+          rev = "9266eeb6ab2eef04389850422d7da059c707380e";
+          sha256 = "169g2dk3m0f7z64pjxcs918r6j5g2pzphrylr2vm40kppigy8gmw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
           sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
           name = "all-the-icons";
         };
-        packageRequires = [ dash emacs ];
+        packageRequires = [ dash emacs font-lock-plus ];
         meta = {
           homepage = "https://melpa.org/#/all-the-icons";
           license = lib.licenses.free;
@@ -1082,12 +1082,12 @@
     anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "anaconda-mode";
-        version = "0.1.5";
+        version = "0.1.6";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "359c9d62649ad3f2cb007c4d8871e5b051d695f6";
-          sha256 = "1kwn5lln7l754x5l3glij7ci3r2g6p9sapc43bm2gmwbgxa9fgis";
+          rev = "3f473150009f86dac68edb02e2f22850788289a5";
+          sha256 = "16c2q6c44qc3bdaxq835rrbyq49z6rd3h6cgss50p4gqwfwxfxn7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1187,12 +1187,12 @@
     annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "annotate";
-        version = "0.4.6";
+        version = "0.4.7";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "annotate.el";
-          rev = "9616c55812c4b6f11365e0f4e90f9357c95280ff";
-          sha256 = "0wkdvmszabx1rcwqbm6rw07niwd7n4bdb9h2iav2miljwy68s40x";
+          rev = "e6af7f8ef7d241fdc9f866d57dce24beb4bb6b87";
+          sha256 = "19a419rnqqsmvrcl2vwy3gl7mvbfg669vyin2h2xpm56rxsinvy1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate";
@@ -1292,12 +1292,12 @@
     ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ansible-vault";
-        version = "0.3.1";
+        version = "0.3.2";
         src = fetchFromGitHub {
           owner = "zellio";
           repo = "ansible-vault-mode";
-          rev = "8b4cdebb817c979b13eab625e3bbeebb08ddf026";
-          sha256 = "1gqga59qinmkjalk1jkbh8w70sqvb3p033sbx69qljc2mivs8rh8";
+          rev = "57fd8017ab93cc6a1f9bbc795d494a069557a1cb";
+          sha256 = "04sdgg98z9gydgx8sf4nfmkwazm799gyvywssfa0mkcvza2z7s21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
@@ -3439,12 +3439,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "0.13.0";
+        version = "0.14.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "b8932a37b936a34b923ce4e356379ea76108ec6d";
-          sha256 = "07xb09csppk2rbffbyiy22mx4s7cd5h48nx428dag7q13fvarc31";
+          rev = "f3c396ff8cf4baf331b0e19e18e33b795b66ee3e";
+          sha256 = "1np4bh7fxv6xkvdg1nyd596p2yjkrh5msw2wsfyidl0xb1jdnj9c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -3807,12 +3807,12 @@
     clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "clojure-snippets";
-        version = "1.0.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "mpenet";
           repo = "clojure-snippets";
-          rev = "30cd52379b856cf80eab2b541c32b1bcdcff3db2";
-          sha256 = "1p0w83m9j4a6va4g68a4gcfbdkp8nic0q8cm28l8nr7czd5s0yl6";
+          rev = "83785faa607884308a42b81f160854f2cecfd098";
+          sha256 = "1sdgf1avfw7w3m3i7nqb9m9nhqk8lr0bri686lrkq23ds2b44454";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
@@ -3891,12 +3891,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.6.2";
+        version = "3.7.0pre1";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "c5dcd31e92c0a09009a340e3fe23ced4f6190b64";
-          sha256 = "0k40czfgxwdn4yavkl10ab5ls57mdr7smxjjld20mfrjnfbmv0fc";
+          rev = "1dc252ecf4d0946196133734540ebe8e90f312d3";
+          sha256 = "1bp5ann5a6k3xyb3s71y7crsy88bxscvzn6pp0zmjmdyk8igkj8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4479,12 +4479,12 @@
     company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-ngram";
-        version = "0.7.7";
+        version = "0.7.8";
         src = fetchFromGitHub {
           owner = "kshramt";
           repo = "company-ngram";
-          rev = "11323ca12ddd5f706d5a855a3a7824013cf3cca6";
-          sha256 = "1gq2q6bjnaji53gdaqy4gadiydrvl0ddg0l8xhxj0v1w3sk81b08";
+          rev = "1d43d7df4c5d7a58e1176c7c57a8dce60dba2e8a";
+          sha256 = "1isfyzjik8a5fr8sfy7462hpv5zh5bgbm8zc7d0lk50ggrazz7l5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
@@ -4611,12 +4611,12 @@
     company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
     melpaBuild {
         pname = "company-tern";
-        version = "0.2.0";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-tern";
-          rev = "9a2cb8427a1a93c9c5021c01df1b47c69d79e176";
-          sha256 = "11cinjsyf24d4a682ikniprxd1vkwn6mynsp5dzab6yzq09np78i";
+          rev = "b20b3e490bf277c8480712210e3c92ea489859ef";
+          sha256 = "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern";
@@ -5302,12 +5302,12 @@
     darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darcula-theme";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitLab {
           owner = "fommil";
           repo = "emacs-darcula-theme";
-          rev = "202a5affe59a5e1ac1d33a7e518d1df772bf2100";
-          sha256 = "1gdh4izwhyly6dyrmh7lfpd12gnb8hpnafj8br51ksijsssrf21f";
+          rev = "834202004507221c3bdf49457219a56760b13d22";
+          sha256 = "1j2g94cz9b3ivv0w88gw1hcf236kc0c7hnrf13yyspxjm5jfdmd5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -5323,12 +5323,12 @@
     darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "0.1.49";
+        version = "0.1.57";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "825a61d8d65dbbe9fca44f865dc0a57dbd6bf3db";
-          sha256 = "1b2i5fvg3q4fwg5inp08ivznv97cvz2x073i21pv82rk1p8f39q7";
+          rev = "eb398c9b0500384f9e6d512f4be38f8bc6ff47ed";
+          sha256 = "05a6bz0pmdy8wzggifwzcx31lqlknwhihd6yccjqgbplys8snxmd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -5449,12 +5449,12 @@
     datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "datetime";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "datetime";
-          rev = "dd38546d80a8aa30b9e259490ab82c337e851f54";
-          sha256 = "1w8qzj8qrgkygprb3ibyx28j951lv7k1frbpdwz69cg23whi3s30";
+          rev = "6585b2dcb0b3871a2a63656d01baa0c9a300d457";
+          sha256 = "07rb8r3j8293h0ffpwhf7mxnshqi08pb63swhmdzb34hn57cx4jg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
@@ -5783,12 +5783,12 @@
     dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dim-autoload";
-        version = "1.2.0";
+        version = "1.2.1";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "dim-autoload";
-          rev = "ac04fade74a50fd2aac48fc298e4d21d8427f737";
-          sha256 = "0jn3hwnqg455fz85m79mbwsiv93ps4sfr1fcfjfwj3qhhbhq7d82";
+          rev = "3a9b7f6c5a2b71149c4cdda7e4b4ea3bd729baa5";
+          sha256 = "0jp3rps3ps8mh7zsn1y9367l1gh26hhmbz61l1dcv3sk4jrw46mw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload";
@@ -6286,12 +6286,12 @@
     doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "1.1.0";
+        version = "1.1.2";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "cf58400f74e88ed2ec519428a16b5668aaa60842";
-          sha256 = "01dmy7723wss3cvxi127ki75v7ssxb4cs09d34akcmynrgh4x92s";
+          rev = "dbe6ed4b4cf27ab676843505cb7c5edba50b455b";
+          sha256 = "0npzshc9mv1zy8dmghz34nwdjlpgxxd4iiv2zp3l6qa0m78j52ri";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -6499,8 +6499,8 @@
         version = "0.3";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "2664661b55eb";
-          sha256 = "1yawkav0hdsn41lx9q33lxsfpjy7fiwk0f5xlly5vswsn2va9zlv";
+          rev = "6ff00cc2f12b";
+          sha256 = "1sjpwgjimrmh8s8lzbjrhhqvhrfcvs36l8ls75qmrrz5rvp386l3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -6807,27 +6807,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "ecb";
-        version = "2.24";
-        src = fetchFromGitHub {
-          owner = "alexott";
-          repo = "ecb";
-          rev = "1e9ddf472d7b6006dc92684b82de22e6148f38b4";
-          sha256 = "1s9r1qj7cjsjvvphdpyjff6y598xpbrm9qjv5ncq15w6ac7yxzvc";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c0a4c225c05166572de4538f7ee9e4e0d088a409/recipes/ecb";
-          sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
-          name = "ecb";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/ecb";
-          license = lib.licenses.free;
-        };
-      }) {};
     eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eclim";
@@ -6915,12 +6894,12 @@
     ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ede-php-autoload";
-        version = "0.4.1";
+        version = "0.4.2";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "682cf38c3ba7c0da21171826a655003c0f1d8349";
-          sha256 = "0gi8095rib20bggrjz8a52y0v3wh6jidjjab1yfr21gyl6i885w7";
+          rev = "c748354c6398aa7e5d3f00ee4c5422f4eca09a91";
+          sha256 = "1imr45s2a1lilqfgfccgxasqlmh1nkc1ivf5iq01w31wik2hii0z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -7393,6 +7372,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    elf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elf-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "elf-mode";
+          rev = "cd280d683cd3341d8bb31af6db7e3b74a133e6ab";
+          sha256 = "0cbvjbk2893ag1iy8ggixpirfiyhssm7fii96hb9jqdz874cdl0k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/368d1ff91f310e5ffe68f872ab0a91584a41a66e/recipes/elf-mode";
+          sha256 = "0xwpaqg4mc0a0d8a4dxbd1sqzvi01gfhwr75f7i3sjzx0fj8vcwd";
+          name = "elf-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/elf-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
@@ -7501,12 +7501,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "0.19.5";
+        version = "0.19.6";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "2f7f0c3e42d137aaefd12bc28383807d35a2a290";
-          sha256 = "137189r1rba5l9m82qj3zba8x0gkm0c3xc9df1vri4wsbz4df7nm";
+          rev = "750bb9ced539db9dfdbd143bb2624aea54eb1e16";
+          sha256 = "12s8pphf6wigaaarapp78srisqdkk2wk7myhxkidrna38pq1ad5b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -7522,12 +7522,12 @@
     elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elmacro";
-        version = "1.0.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "elmacro";
-          rev = "10eb7d70188ed1d49763920ecbc584b71864e8ba";
-          sha256 = "0f0k9ais7bmjidv2mqr1whrv6rhq4jkig5h2y4h9npxyyb2nrz3q";
+          rev = "d712c8efc01646117097e061e1b14933b822b9c7";
+          sha256 = "00fry1gjsrx4dv9d9rjf5pd8w3709mn0052al0l948vhwz4wys9z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro";
@@ -8187,12 +8187,12 @@
     engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "engine-mode";
-        version = "1.0.0";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "hrs";
           repo = "engine-mode";
-          rev = "9e8b10b029f63bc0399f8975a28247eaa78dfcbc";
-          sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw";
+          rev = "243d04691475b47a4453ad7106d8268ca14d9f28";
+          sha256 = "02xas46nl28mascqsyr1zcd4hn15bh0fjv2xlxv1kmrj0pis94ml";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode";
@@ -8548,22 +8548,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ergoemacs-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
+    ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "5.14.7.3.1";
+        version = "5.16.10.12";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "295ce7a4a5341d9e144a06e91befeebfac1239d9";
-          sha256 = "19m6chwc2awbsk5z03q1yhq84m481pff2609a8bxymcvm6yaamvf";
+          rev = "ac70b2563fb6e3d69ea382fddc87b5721c20c292";
+          sha256 = "0ydxyylijdd6da4n9by441352shphrpfyk2631ld5aq3gz27z9gi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
-        packageRequires = [ emacs undo-tree ];
+        packageRequires = [ cl-lib emacs undo-tree ];
         meta = {
           homepage = "https://melpa.org/#/ergoemacs-mode";
           license = lib.licenses.free;
@@ -8572,16 +8572,16 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "19.1.1";
+        version = "19.1.4";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "310b00b7fc18b5883f5f2cb1b992deb1dd6c9a65";
-          sha256 = "0vgnv517ljhkgmrljvxinm3x72c2mf4y83vpyhlb0cwl2q0gmc4d";
+          rev = "c1c2149818396bdefe9eff995184f8864f18fca3";
+          sha256 = "0zcq88x0r49cd6gm7kni04srr2sb0jn57syb513w3srn79pr5qmg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang";
-          sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
+          sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq";
           name = "erlang";
         };
         packageRequires = [];
@@ -9305,12 +9305,12 @@
     evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-multiedit";
-        version = "1.3.0";
+        version = "1.3.3";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-multiedit";
-          rev = "a14dbfdd41d2baa789fbfbbf3b8148056c11b969";
-          sha256 = "118a9bkj2i95xi4axa39mwm3nh519jzznzahbvlncf2279v8mrzr";
+          rev = "5f263a9388dd3593b5acefe9f523c819bd3b338f";
+          sha256 = "0bsdyy5jw8adj26p85831n4f34d0sv4rrv9xlhjqkzx9gsr4h7d1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -9365,6 +9365,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }:
+    melpaBuild {
+        pname = "evil-opener";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "0robustus1";
+          repo = "opener.el";
+          rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
+          sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener";
+          sha256 = "08vcf9i0rplw2p6gjl7zzrc7kxdl5yv2rggj2ihgdnnfpc4sl33h";
+          name = "evil-opener";
+        };
+        packageRequires = [ evil opener ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-opener";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-org = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "evil-org";
@@ -10320,12 +10341,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "29";
+        version = "30";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "38f88da0b6531bde5a7fcb6ebad9c502503ebd51";
-          sha256 = "0vxhj5lqaj0fmwr6i55gcap44b3x37kbsaz9qg48wjk6gxz91006";
+          rev = "9c063965e893f0cc7c97fabb810ac41ec22f82fb";
+          sha256 = "1vyncqicafmy9av2nsawywn56ay50zdyjba9r55vv11baklabg8w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -10614,12 +10635,12 @@
     flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-package";
-        version = "0.9";
+        version = "0.10";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flycheck-package";
-          rev = "d2366c27a342e2040903b9c7a016c7309b299611";
-          sha256 = "1gblp39k20qkwybpwlb1xl72281hjz4ymcynqc7dg2nv1gh89dv3";
+          rev = "3d890612de15c98d37ae37255d79d45e0102b25c";
+          sha256 = "1ay8qgshfhlrhjcvvr2qfw0lzwcdnksh75abfx0wgpqjd07iws2v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
@@ -11475,12 +11496,12 @@
     fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "2.2.1";
+        version = "2.2.2";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "a31c19e88f403a8ebb2e6a5d27eef39fca595ba4";
-          sha256 = "1sxr79gcj2xkh8qfp0h4r6iqmhm27qkibsk8l78gi2n3790sbnxk";
+          rev = "4e88b7525c2f39c3d25f689b394b0ece7c6eed6d";
+          sha256 = "1vcc8sdm0b3kss3g47wggc6mv28pr474559d3786fhncp5mxl1qq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -11851,12 +11872,12 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "0.8.1";
+        version = "0.9";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "c6f17b25200e36f80d812684a2127b451fc11817";
-          sha256 = "1667zln7bav0bdhrc4b5z36n8rn36xvwh4y9ffgns67zfgwi64kk";
+          rev = "8ef6a9321d81ff478cfd376023eb84b8a819a991";
+          sha256 = "08aha9lxdxix1jq0vc3am9wsyivj6vjpfs8frm797aca3bwaam0j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -12754,12 +12775,12 @@
     go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "go-add-tags";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-add-tags";
-          rev = "a6a879889729d579297935598d26b985f900ef29";
-          sha256 = "1s4jwpwxlqxi9h5qqjcvxz3i8rgfrs874rpadp6lhizdhpjjp82y";
+          rev = "facff8dbb65fb56874d63a63edfd072eceed7904";
+          sha256 = "14bflgc9s9hslwisf4id0pc3asr5qvppwn1w14vvij3plal4mfhi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags";
@@ -12919,6 +12940,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "godoctor";
+        version = "0.0.5";
+        src = fetchFromGitHub {
+          owner = "microamp";
+          repo = "godoctor.el";
+          rev = "de7f838af320c87f10cba17619492e072000c47e";
+          sha256 = "1f9xfpyza23763pamknnpcvcxm7dcwk8dpj5a1mm7brg764yis2z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor";
+          sha256 = "0k734hry9npsr6zhsplcvmcjqw6jdf79pv4k9dw0xvd598hkpazz";
+          name = "godoctor";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/godoctor";
+          license = lib.licenses.free;
+        };
+      }) {};
     golden-ratio = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "golden-ratio";
@@ -13006,12 +13048,12 @@
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "0.12.0";
+        version = "0.13.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "c7ead398b69ab25db695f5dab73ceaa0aba572fa";
-          sha256 = "1idhnsl8vkq3v3nbvhkmxmvgqp97aycxvmkj7894mj9hvhib68l9";
+          rev = "2ae187078beb5d9672ca14cb636b6b4021de4230";
+          sha256 = "1pq9zjfs7gp7bz3jq11fx75m4zcx9p772lja5jicz535khpgxw7f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -13237,12 +13279,12 @@
     graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
     melpaBuild {
         pname = "graphene";
-        version = "0.9.5";
+        version = "0.9.6";
         src = fetchFromGitHub {
           owner = "rdallasgray";
           repo = "graphene";
-          rev = "dcc0e34c6c4632d5d5445ec023f5b1ca04c7d1b7";
-          sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
+          rev = "47c5a194f81796eface2e2f062144c17ee3cfdb7";
+          sha256 = "0xx3cnwbbil6d7y15d61wkp777w4j5rsdm7gwd5gpcr8910405n2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -13917,12 +13959,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.2.0";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "2b91583c4f183b505d4870b4e6d3441d57637eae";
-          sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md";
+          rev = "378ceb9b8b8c63cd550d57248e07631de354439f";
+          sha256 = "0s2cf9ax28rkr05bzqy70q9mmpwxd3xwcbdslmlmasq9y57i61k4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -13959,12 +14001,12 @@
     helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "0.56";
+        version = "0.57";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "8e652e426f1cb285b35920cfba6a586da624c060";
-          sha256 = "0hyrladvqf4vn7wliajh33jippfih3rj5jbpx73kcpwqpcg15s0a";
+          rev = "49e1f66fa80674513ca898e32d62d6dad875cb90";
+          sha256 = "0vzgiix2c8jwpk2hhxvz9gqb78glmd4dk1myrgvxs9fhsj54dkk3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -14148,12 +14190,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.2.0";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "2b91583c4f183b505d4870b4e6d3441d57637eae";
-          sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md";
+          rev = "378ceb9b8b8c63cd550d57248e07631de354439f";
+          sha256 = "0s2cf9ax28rkr05bzqy70q9mmpwxd3xwcbdslmlmasq9y57i61k4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -14229,6 +14271,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-dired-history";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "jixiuf";
+          repo = "helm-dired-history";
+          rev = "dd324f383a66a5306ccd0fc3cf7a2c4815f45e8f";
+          sha256 = "1xjnblqmk2247c0brbi6byiq3k7d9lz9bb94w9n6j1qyls0flinm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history";
+          sha256 = "1k0021wn6x7in4wi9lri2c9wl06pvprv950hgdwgra8m155qjfp1";
+          name = "helm-dired-history";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-dired-history";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-firefox";
@@ -14295,12 +14358,12 @@
     helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ghq";
-        version = "1.6.0";
+        version = "1.7.0";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-ghq";
-          rev = "db37bfe290b234ed3f39dcce24667072172ded41";
-          sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
+          rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56";
+          sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq";
@@ -14313,22 +14376,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-git-grep";
-        version = "0.8.0";
+        version = "0.9.0";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-git-grep";
-          rev = "456ea8324eb811f099dad993ae94c8837368b23a";
-          sha256 = "13p8dbfln8kcvi6iwj9mlb7vy6bda4285gagsng01j3nfrw0ck9x";
+          rev = "6ca2fcd44510305cf019815d61bf65eca200c238";
+          sha256 = "0qmxccwpv7l5lbhv9n7ylikzcggdr99qzci868ghf33p4zhqyrj5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
           sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
           name = "helm-git-grep";
         };
-        packageRequires = [ helm ];
+        packageRequires = [ helm-core ];
         meta = {
           homepage = "https://melpa.org/#/helm-git-grep";
           license = lib.licenses.free;
@@ -15492,12 +15555,12 @@
     hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hl-todo";
-        version = "1.7.1";
+        version = "1.7.2";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "215ff60d7a4097b5104edaf2784f9a3257db4403";
-          sha256 = "1f7dz1r42qy3dwsqx7x802m7v4jfnmfp2q4678gs8d0scgxxfqb4";
+          rev = "3ef6c978011ffd01d3de060cfbde8c91d4b269f2";
+          sha256 = "0lssxnxg0dknmmrp0fri2d4wbpshnkk5zfnfbc2c9jii6bvg4982";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo";
@@ -16455,22 +16518,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    inflections = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inflections";
-        version = "2.3";
+        version = "2.4";
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "jump.el";
-          rev = "fb7355615276f00397b15182076bf472336448a9";
-          sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
+          rev = "fb3dd59f21f77016742de40028aee92176c0917a";
+          sha256 = "1alncmx4q2szvlzg57332zmqm6rsgzf12kfg9l1vb5s9vgd1ki5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/inflections";
           license = lib.licenses.free;
@@ -16643,6 +16706,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "intellij-theme";
+        version = "1.0";
+        src = fetchFromGitLab {
+          owner = "fommil";
+          repo = "emacs-intellij-theme";
+          rev = "c4b4a7ecdad6ed57545c114b40da9f76371f566e";
+          sha256 = "1wz6j7szb271g1baf6jj4k4kw1dfiz8l677vrazx4wyqdpmzlk0c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
+          sha256 = "1g8cninmq840sl8fmhq2hcsmz7nccbjmprzcl8w1zdavfp86b97g";
+          name = "intellij-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/intellij-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "interleave";
@@ -16980,12 +17064,12 @@
     jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "jade";
-        version = "0.20";
+        version = "0.22";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "jade";
-          rev = "856846322ea8077ffe6215b54f2f3676db5ccf61";
-          sha256 = "03ckvamv61hpk1lcw6z66wsyg471qy979vm3wf8brq9zwapfknia";
+          rev = "23444b1939e06f5caebff734c1d01a8a3d6265ef";
+          sha256 = "0sx94lps673b0dhbi26kgyjm4cnysdv2vgszpdmsbakdgd6zkdbf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -17442,12 +17526,12 @@
     jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
     melpaBuild {
         pname = "jump";
-        version = "2.3";
+        version = "2.4";
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "jump.el";
-          rev = "fb7355615276f00397b15182076bf472336448a9";
-          sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
+          rev = "fb3dd59f21f77016742de40028aee92176c0917a";
+          sha256 = "1alncmx4q2szvlzg57332zmqm6rsgzf12kfg9l1vb5s9vgd1ki5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump";
@@ -17925,12 +18009,12 @@
     kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "kurecolor";
-        version = "1.2.2";
+        version = "1.2.4";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "kurecolor";
-          rev = "c8c72cea04e51f57701d2dd9be7dba5f3412e2f3";
-          sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
+          rev = "eb894bcb0769ce73404734f14f7582661abe02c8";
+          sha256 = "118csp4pi1dxm9grmd006d9wmdplnx8gnk02hbfrl639k7hnnd8z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor";
@@ -18114,12 +18198,12 @@
     less-css-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "less-css-mode";
-        version = "0.20";
+        version = "0.21";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "less-css-mode";
-          rev = "d59a3ff4031ae75fbbe77b6cfce7843205394c28";
-          sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
+          rev = "59bf174c4e9f053ec2a7ef8c8a8198490390f6fb";
+          sha256 = "1rkjamdy2a80w439vb2hhr7vqjj47wi2azlr7yq2xdz9851xsx9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/less-css-mode";
@@ -18583,12 +18667,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "0.5";
+        version = "0.5.2";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "cd63640f3ab15e9a50f4cf250f6828e428fbb345";
-          sha256 = "0a3cx96nv64xxsvvxca966kmwd3hacvday936kd1yfdf2bmgiw6z";
+          rev = "9b2f610a32557937e704b32e97f4b61abdec6845";
+          sha256 = "0w1csjcgvl1jfhjpfj19hzrd6f055iaiq0qafpgjlyn6dd4sf9gj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -18926,12 +19010,12 @@
     magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-rockstar";
-        version = "1.0.4";
+        version = "1.0.5";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "magit-rockstar";
-          rev = "47780d27141ba50f225f0bd8109f92ba6d1db8d5";
-          sha256 = "075gxm4shbh5zfr17zpfn35w8ndgz9aqz6y3wws23wa4ff2n8kdc";
+          rev = "bccce1ac8e012f52e29470c1c7d815f9bb1a192b";
+          sha256 = "0z411x2w6ldy3b8qbavfvfgvkbjd1rl0m1plr44ynp55awrhj0k2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar";
@@ -19535,12 +19619,12 @@
     meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.2.2";
+        version = "0.2.3";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "f80811e4f1efa712eabfa42fd995990d02fc1e5a";
-          sha256 = "0w2ij8zh30qs19vwnqifg3p5cvk94akig03cv2f6mx14clvrwckn";
+          rev = "2a68211d355edd8fca092a57c1a3d5e42c9193e3";
+          sha256 = "1s7m6p1i5wvfd0k136bcd59abm6aspmmjlcjhsnl36w8k82piaay";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -19602,8 +19686,8 @@
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "b2926cf6235827c0242797775188b8f0420386c5";
-          sha256 = "0xfmvicagqccscxf45n04c25c7fqsnfk8mp8s90rnzlyr66gdck1";
+          rev = "45ee84b5b0bb01784736df536760a6f8e4ea98a7";
+          sha256 = "13x6np4cqzjf1jmiyhglsh2533nj5p2whj6gbcc3690p4chk32dy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -20143,12 +20227,12 @@
     morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "morlock";
-        version = "1.0.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "morlock";
-          rev = "185e3679ebeef3dc58555301e0958e864de775e5";
-          sha256 = "0kjqdm6kzhgjmfdj4n95ivffw1wqf4r3gk62fvhfi4w29g7wd16j";
+          rev = "5845b60c705e8db88ce790b0b12cd8b917e1e5a5";
+          sha256 = "1a6kwpanwcnipsq0dc99r4iiz9xa2k883syj0kbk544dxgf338xj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock";
@@ -20161,6 +20245,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mosey = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mosey";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "mosey.el";
+          rev = "4d28bf359242477a45994336c2ce37243965c65e";
+          sha256 = "1xakw1q5m3iahvj7xapyi008pr2nrl3msgdfdfsk561ci7bc2008";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/76a9a43eea68db9f82c07677235c481a6f243aa2/recipes/mosey";
+          sha256 = "0zprzr5aqv77kmg1ki9w6fw1nc2ap6yqjl4ak05a1i9cq8g6nf3m";
+          name = "mosey";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mosey";
+          license = lib.licenses.free;
+        };
+      }) {};
     move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "move-dup";
@@ -20395,12 +20500,12 @@
     multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "multi-line";
-        version = "0.1.4";
+        version = "0.1.5";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "multi-line";
-          rev = "329551143764c4106e717bce77a493bd20b72cb8";
-          sha256 = "1bvz3h394mmnc3r4k121nnks5ha15wlz53708hda993cs6r8dqvb";
+          rev = "778c7510b7f066f53cf1f96a6ad1079fda5dc1f7";
+          sha256 = "0lr1i2a4fw40iz8qz2zqch63ci9pwvrri219phv22kn76jqn39mh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
@@ -20539,6 +20644,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nameless";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "Nameless";
+          rev = "ab1a5c589378334eafca105af1a17f73b9065423";
+          sha256 = "107q1rximjnag9r9vgwh0iv687i3rsscbdnjc46f8l16j6vi4n7d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless";
+          sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq";
+          name = "nameless";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nameless";
+          license = lib.licenses.free;
+        };
+      }) {};
     names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "names";
@@ -20752,12 +20878,12 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "0.2.1";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "c4f32b489fb1f5f00897a7dbb58a27ee704f5493";
-          sha256 = "1gmi0xxwkh33w5gxc8488m1vv6ycizqhlw1kpn81zhqdzzq3s06n";
+          rev = "ba1f4bacd97c99d55ad37e5940bd7567d2ae50d4";
+          sha256 = "1a8riwz37sws2g2992zj6y8q4ypr76gxfwril6vnfig367anv4js";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -20836,12 +20962,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "1.2.2";
+        version = "1.2.3";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "eb28bf99c3562cfda07f312ca49e0b594f0ff81b";
-          sha256 = "148iyy8ma1n5a3biyal5rafxpp0zzn81nyy06jlzrkzjy44iyzwi";
+          rev = "2e2324c7f3a3ef27c9cb9cc3945cd82bec6b7755";
+          sha256 = "18ys3ddla3z733r4jf2nnfkllclrq496i08pfiyvkj6l3jnghzx0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -21573,24 +21699,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
+    opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
-        pname = "opensource";
-        version = "0.2.0";
+        pname = "opener";
+        version = "0.2.1";
         src = fetchFromGitHub {
-          owner = "OpenSourceOrg";
-          repo = "el-opensourceorg";
-          rev = "27d06be45c852e84e47c33cbd0f4c344fd9a0370";
-          sha256 = "1rjf78vki4xp8y856v95877093p3zgfc9mx92npscsi1g93dxn80";
+          owner = "0robustus1";
+          repo = "opener.el";
+          rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
+          sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec4255a403e912a14a7013ea96f554d3588dfc30/recipes/opensource";
-          sha256 = "17gi20s2vi7m75qqaff907x1g8ja5ny90klldpqmj258m2j6a6my";
-          name = "opensource";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener";
+          sha256 = "0fhny4m7x19wnlnr19s4rkl04dkx95yppd51jzrkr96xiznw97s7";
+          name = "opener";
         };
-        packageRequires = [ dash pkg-info request s ];
+        packageRequires = [ cl-lib emacs request ];
         meta = {
-          homepage = "https://melpa.org/#/opensource";
+          homepage = "https://melpa.org/#/opener";
           license = lib.licenses.free;
         };
       }) {};
@@ -22537,12 +22663,12 @@
     orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "orglink";
-        version = "1.1.0";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "orglink";
-          rev = "4e3e6d920a74fd32a57d5722f81293428e9d8a46";
-          sha256 = "0yjnnrrcvbsq41dpw8cz8gv6q3jd626y1k4fgzsimyciz9l23w11";
+          rev = "3b617ba7290ee550caab1aa055a6bedabe33d6fd";
+          sha256 = "0d1i30jbfbv0hm77sf278ism28ds5lz7675ji8f1gf01rfkchjbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink";
@@ -22912,6 +23038,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "package-lint";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "package-lint";
+          rev = "2f7bce95d26d06e5674b731c028dee820cbfe92e";
+          sha256 = "0wm107vriz1qvyaf82069dyscs5j6sccixik0bkh926i0whhysm1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
+          sha256 = "0w7nkj4yz5yqmhr3mr7kxa6aqqfs75m3l2578s39940a5sdzirwy";
+          name = "package-lint";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/package-lint";
+          license = lib.licenses.free;
+        };
+      }) {};
     package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-plus";
@@ -23186,12 +23333,12 @@
     paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "paren-face";
-        version = "1.0.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "paren-face";
-          rev = "7b115519d668301633f31a9f3d03b5e36d0541d7";
-          sha256 = "0f128gqn170s6hl62n44i9asais75ns1mpvb4l8vzy1sc0v16c0k";
+          rev = "fd8b9a863f0e15e8feeab862d0f67ab35ef18be3";
+          sha256 = "08j4kgvbx7fr3f0243508chbgd3bh9i6dhbqkndqj93zmbxxdhcw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face";
@@ -23225,22 +23372,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    parinfer = callPackage ({ aggressive-indent, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "0.3.1";
+        version = "0.4.3";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "710f203c3103016815c8d21369fe77e34103b0f9";
-          sha256 = "1b92ksjpi3pzn97jgwx78vz10p3a6459j2mgcwb249zgzvb0lprx";
+          rev = "f29efd86a13423055e47579f176db7fe0fd08bbd";
+          sha256 = "0algcf5izfiyc154579fb3r7rbnv8dn7hy8iqy78ri1w8yb3xs2h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
           sha256 = "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i";
           name = "parinfer";
         };
-        packageRequires = [ aggressive-indent cl-lib dash ];
+        packageRequires = [ cl-lib dash ];
         meta = {
           homepage = "https://melpa.org/#/parinfer";
           license = lib.licenses.free;
@@ -23267,15 +23414,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "parsec";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "parsec.el";
+          rev = "34521c605fe525cc9b8f7b0e4ca991ca1eb25218";
+          sha256 = "1fylcg7m95naz377ia2g9iyysaj64zd2x0warqdzs8isbpwj3cmc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
+          sha256 = "1p3364sv5r868xjj1411xqj4acxqmbzcdl900sd03585ql5wbypj";
+          name = "parsec";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/parsec";
+          license = lib.licenses.free;
+        };
+      }) {};
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
-        version = "1.4";
+        version = "1.5";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "pass";
-          rev = "6e5f557f3430934fdf78d99d93d2456c474e4bde";
-          sha256 = "0crf97jjmhvnxc9d089qfi9m5qdbpxiv7ncacp7m3xasxy9sd7cb";
+          rev = "d89a0f82b9c606d59d6f3440825c1c0bb14b1455";
+          sha256 = "15mk90dbwq5qbb7yv1gliq156lhc3ha576nkly4n7jl44v2f3c23";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -23604,12 +23772,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "2.9";
+        version = "2.9.2";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "56bc86c345be1a9fcea8acdf340cf87fa1869400";
-          sha256 = "1hcz5ld259vsfcx6mfqm8raksi0nrndh21bn712ij0bx6gmy7vq1";
+          rev = "6fd464a3f5038b34751ec3d07913575906f38ab1";
+          sha256 = "0v6abr2x4xnv6qi8az3ki330z7v5vc4b0ibxqzwlq9mzqlqhnpsl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -23979,6 +24147,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "plantuml-mode";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "skuro";
+          repo = "plantuml-mode";
+          rev = "d7067729fa557e509784e50106eca802b81113e6";
+          sha256 = "0sgfy671vrqz8rny287vyd6cwvxgrbb2in5iq0fb3pbbp6fkp4d8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
+          sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
+          name = "plantuml-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/plantuml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "platformio-mode";
@@ -24148,12 +24337,12 @@
     ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ponylang-mode";
-        version = "0.0.7";
+        version = "0.0.8";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
           repo = "ponylang-mode";
-          rev = "cab4db97aacb9b5e05d6f0175154039a6b068cff";
-          sha256 = "0by7klp7imy7zgc37wsiil86y6i2h1wfwfyifc2cf0jn5dsvfikw";
+          rev = "bdc549e2658f4662f462e0c233b4825c761288cd";
+          sha256 = "0v55bdj3vhf260addgsim6q4rwfzyvhqswxan4qqcq6acgi1liw4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
@@ -24795,27 +24984,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    puml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "puml-mode";
-        version = "0.6.6";
-        src = fetchFromGitHub {
-          owner = "skuro";
-          repo = "puml-mode";
-          rev = "ae1cd8eb21d3af33bc60d4bfa39a90b8f49b7011";
-          sha256 = "12csnmas5n0r356hwrqgx4lb72ns4mdbfkh5dw5jss377akv12gr";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c0c28ccef208035fd0bdd648771825c1d10f42ff/recipes/puml-mode";
-          sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
-          name = "puml-mode";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/puml-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "punctuality-logger";
@@ -26622,6 +26790,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
+    melpaBuild {
+        pname = "secretaria";
+        version = "0.2.3";
+        src = fetchgit {
+          url = "https://bitbucket.org/shackra/secretaria.el";
+          rev = "7cbbbd5da3493b5fe7cd643e72c8cb4666453671";
+          sha256 = "004cqj5ivmm0syyvncgadwmz9qaighih7nd7zn28xfc6v27m4jcg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
+          sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv";
+          name = "secretaria";
+        };
+        packageRequires = [ alert emacs f org s ];
+        meta = {
+          homepage = "https://melpa.org/#/secretaria";
+          license = lib.licenses.free;
+        };
+      }) {};
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
@@ -27756,6 +27944,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rsnapshot-timemachine, seq }:
+    melpaBuild {
+        pname = "snapshot-timemachine-rsnapshot";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "snapshot-timemachine-rsnapshot";
+          rev = "2c76bb73d157bc273c6ff13b76c57fa79dec2218";
+          sha256 = "008064vg1586kjmdwi0hfps342dnfswah3nzz388gyl5lx7c356s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot";
+          sha256 = "0fxijd94p961ab0p4ddmhja4bfrif2d87v32g4c41amc1klyf25r";
+          name = "snapshot-timemachine-rsnapshot";
+        };
+        packageRequires = [ rsnapshot-timemachine seq ];
+        meta = {
+          homepage = "https://melpa.org/#/snapshot-timemachine-rsnapshot";
+          license = lib.licenses.free;
+        };
+      }) {};
     solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
@@ -27822,12 +28031,12 @@
     sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sotlisp";
-        version = "1.5.2";
+        version = "1.6.2";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "speed-of-thought-lisp";
-          rev = "b67364d4825a9bf0a22261809ee9e9060b268198";
-          sha256 = "0xykm4yayb8gw83arv5p205cx18j14q9407rqw3sbcj9cj5nbk34";
+          rev = "fffe8d0b42b143a2e7df0470d9049fa57b6ecac5";
+          sha256 = "0j5zwb1ypqps30126w2684lmjh8ia4qxg8inlajcbv8i3pbai7k6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/sotlisp";
@@ -28680,12 +28889,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "2.1.2";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "92119801203e2991543cbf943cc101673bd190bd";
-          sha256 = "182lzswrkrzihcd5vmcwq94aqn2aj1j38ra0j3vcgk114rayy6dk";
+          rev = "a07be7a34d4f677a28878f4b72a2095addc628fd";
+          sha256 = "14l8cm82fx0p1xcbf48a303llx2p9p0i17ly1vx8y5ff3a0i0l0h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -30406,12 +30615,12 @@
     vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }:
     melpaBuild {
         pname = "vdirel";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "vdirel";
-          rev = "aab19692e2c2084a0d5b554a96a64a2e3e2a3d09";
-          sha256 = "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v";
+          rev = "4232676e93ca5ace8e51f6605bec223c3205beea";
+          sha256 = "0jdjg50f6my9952frl6asi8zk0i8b4hva26wm7pi8zk423pydr30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel";
@@ -30906,6 +31115,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "webpaste";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "etu";
+          repo = "webpaste.el";
+          rev = "58f66efcb8f061d25bf474b14f3867ae856f6b1d";
+          sha256 = "0qczw7pdkjgqmjibwyw8psxhqy1bx183qzni832qx59sds15j13q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
+          sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm";
+          name = "webpaste";
+        };
+        packageRequires = [ cl-lib emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/webpaste";
+          license = lib.licenses.free;
+        };
+      }) {};
     weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
     melpaBuild {
         pname = "weechat";
@@ -31182,12 +31412,12 @@
     win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "win-switch";
-        version = "1.1";
+        version = "1.1.4";
         src = fetchFromGitHub {
           owner = "genovese";
           repo = "win-switch";
-          rev = "a0da96c23e8775a2dfdbe55ed3ec5b57f1ebb26a";
-          sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
+          rev = "954eb5e4c5737f0c06368c42a7f1c3dd374d782f";
+          sha256 = "1xpx4sc1g1w8w0yc39k2dys83m8skrpvi745bfrzdl47jngrf54h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/win-switch";
@@ -31311,8 +31541,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "a55b6dd96558";
-          sha256 = "1n0a99v2gwr12dhgg0yw42lm7ggcq9b85qn1c29k66l7jz637mfp";
+          rev = "b9e861ccb52d";
+          sha256 = "0gk1nclvkwdx20m2cnhfyb4l9jfxkvya8fifvfgry8swzbmab9h2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -31349,12 +31579,12 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "2.5.5";
+        version = "2.5.7";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "c05420c75edaca71b15326d1fba629be9054749f";
-          sha256 = "1nblk82yxmfxqnjz87xyjcak9jg9rk68657bxajh0l8rlf918yd4";
+          rev = "1a6c49bfdef5aacce14b76f06adda3b66d1f3847";
+          sha256 = "1ignivq4df5a716p7n4cm6jbv9zly9b1ssn39a49wzvy9ch5m76q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -31727,12 +31957,12 @@
     xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "xref-js2";
-        version = "1.3";
+        version = "1.5";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "xref-js2";
-          rev = "b4bd3b992220a9f8c38b313e4fbf4eeddc07176a";
-          sha256 = "1kmlya0bwgm2krwc6j4gp80579sf5azz08l8d7pydw69rckv6ji0";
+          rev = "7e2bc6a8dad08a493d11d3554f6374584846b9e6";
+          sha256 = "1mmd27miv32sl8cj7qhy09yfh7v1zgw7rv4fdwk96msvd4qfdkqd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2";
@@ -31876,14 +32106,14 @@
         pname = "yasnippet";
         version = "0.10.0";
         src = fetchFromGitHub {
-          owner = "capitaomorte";
+          owner = "joaotavora";
           repo = "yasnippet";
           rev = "dc3e4ca3454e8ffcd9a9eae312dba5b3657f9b11";
           sha256 = "16akdsqb74b4lriywidszmyyc8irq5dws8ya3mcja87kvih76148";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/489687c6c41399a3bca8148a62d25581726a847d/recipes/yasnippet";
-          sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
+          sha256 = "1r37vz5b8nj6hr6c2ki9fdbrs3kkb4zwimh8r4ixm10kdkk5jqds";
           name = "yasnippet";
         };
         packageRequires = [ cl-lib ];
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index d7ca335214f..802aaa35d57 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 = "20161003";
+        version = "20161017";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20161003.tar";
-          sha256 = "1q59s9ir9x8ig4nfx6vbq3dj3ah01sjwvqax2x2dqxn2mk2igr4x";
+          url = "http://orgmode.org/elpa/org-20161017.tar";
+          sha256 = "0hpvi68pzja6qna4x6bvj7hzfnfkgmmix7ramvr1q3m2nqxv2pvx";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20161003";
+        version = "20161017";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20161003.tar";
-          sha256 = "0phi7jdkv7m4y7q7ilkz0dfw9g11d52dd34pv41dvawf032wvwn7";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20161017.tar";
+          sha256 = "1qahvhkfgf5wh96j1v1c03yspjfqacyinix97is93c3nm94279f4";
         };
         packageRequires = [];
         meta = {
diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix
new file mode 100644
index 00000000000..8aea8508aef
--- /dev/null
+++ b/pkgs/applications/editors/hecate/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  version = "0.0.1";
+  name = "hecate-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "evanmiller";
+    repo   = "hecate";
+    rev    = "v${version}";
+    sha256 = "0ymirsd06z3qa9wi59k696mg8f4mhscw8gc5c5zkd0n3n8s0k0z8";
+  };
+
+  goPackagePath = "hecate";
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "terminal hex editor";
+    longDescription = "The Hex Editor From Hell!";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ ramkromberg ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/editors/hecate/deps.nix b/pkgs/applications/editors/hecate/deps.nix
new file mode 100644
index 00000000000..c9d94934a44
--- /dev/null
+++ b/pkgs/applications/editors/hecate/deps.nix
@@ -0,0 +1,29 @@
+[
+  {
+    goPackagePath = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev = "b6acae516ace002cb8105a89024544a1480655a5";
+      sha256 = "0zf95qdd5bif9rw03hqk87x7d905p373bvsj0bl4gi16spqjbdil";
+    };
+  }
+  {
+    goPackagePath = "github.com/edsrzf/mmap-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/edsrzf/mmap-go";
+      rev = "935e0e8a636ca4ba70b713f3e38a19e1b77739e8";
+      sha256 = "11a63wrjwfnchjhwqjp6yd5j0370ysppjgv31l5bmvvwps7whq9d";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "737072b4e32b7a5018b4a7125da8d12de90e8045";
+      sha256 = "09ni8bmj6p2b774bdh6mfcxl03bh5sqk860z03xpb6hv6yfxqkjm";
+    };
+  }
+]
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index a28890e2466..f6760895b57 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem
 , ncurses, libtermkey, lpeg, lua
 , acl ? null, libselinux ? null
-, version ? "2016-08-24"
-, rev ? "010dcd60ffda37027908f2a0b20c751b83ca975e"
-, sha256 ? "0bpbyi5yq50zw0hkh326pmdcnm91paf1yz4853dcq63y0ddv89jp"
+, version ? "2016-10-09"
+, rev ? "b0c9b0063d0b9ed9a7f93c69779749130b353ff1"
+, sha256 ? "0g3242g3r2w38ld3w71f79qp7zzy3zhanff2nhwkwmyq89js8s90"
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/graphics/kipi-plugins/5.x.nix b/pkgs/applications/graphics/kipi-plugins/5.x.nix
new file mode 100644
index 00000000000..2f6cc8e4ece
--- /dev/null
+++ b/pkgs/applications/graphics/kipi-plugins/5.x.nix
@@ -0,0 +1,34 @@
+{
+  stdenv, fetchurl,
+  ecm,
+  karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
+  libkipi, qtbase, qtsvg, qtxmlpatterns
+}:
+
+stdenv.mkDerivation rec {
+  name    = "kipi-plugins-${version}";
+  version = "5.2.0";
+
+  src = fetchurl {
+    url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz";
+    sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g";
+  };
+
+  prePatch = ''
+    cd extra/kipi-plugins
+  '';
+
+  nativeBuildInputs = [ ecm ];
+  buildInputs = [
+    karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
+    qtbase qtsvg qtxmlpatterns
+  ];
+
+  meta = {
+    description = "Plugins for KDE-based image applications";
+    license = stdenv.lib.licenses.gpl2;
+    homepage = http://www.digikam.org;
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 8fb4af6d53e..85d3c4e49f9 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,21 +1,22 @@
 { stdenv, pythonPackages, fetchFromGitHub,
 }:
 
-pythonPackages.buildPythonApplication rec {
-  version = "2.4";
+with pythonPackages; buildPythonApplication rec {
+  version = "2.5";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
     rev = "v${version}";
-    sha256 = "0rmvlpp1pzzgn1hf87ksigj9kp60gfwkvxymb4wiz7dqa57b1q0n";
+    sha256 = "0m6km37zylinsblwm2p8pm760xlsf9m82xyws3762xs8zxbnfmsd";
   };
 
   buildInputs = [
-    pythonPackages.cryptography
-    pythonPackages.beautifulsoup4
+    cryptography
+    beautifulsoup4
   ];
+  propagatedBuildInputs = [ beautifulsoup4 ];
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 61e1f31a8c8..7b47b9fb3cb 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.68.0";
+  version = "2.70.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0mn6wdws1xxc4yvhp5vdzb5i5c9dsmamyms1njdzs5fv754rszpm";
+    sha256 = "18iv1c2nx93gkfqa3k2m42dk4p59b9zp08fggb6imc1xqh2icfch";
   };
 
   inherit python;
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index e8336eac45f..18f55698b08 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "2.7.8";
+  version = "2.7.9";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "0p4dx5fks68avzxkknawv094xxf7322hgm068js4v56qirvxm563";
+    sha256 = "0a3bdfcyrq5g3ihck80fqxxyzpj5k9sfax2nsmmwafmzmfqw819h";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/misc/keepassx/2.0-http.nix b/pkgs/applications/misc/keepassx/reboot.nix
index b3a84d36b1e..f6ed251601a 100644
--- a/pkgs/applications/misc/keepassx/2.0-http.nix
+++ b/pkgs/applications/misc/keepassx/reboot.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }:
 
 stdenv.mkDerivation rec {
-  name = "keepassx2-http-unstable-${version}";
-  version = "2016-05-27";
+  name = "keepassx-reboot-${version}";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
-    owner = "droidmonkey";
-    repo = "keepassx_http";
-    rev = "bb2e1ee8da3a3245c3ca58978a979dd6b5c2472a";
-    sha256 = "1rlbjs0i1kbrkksliisnykhki8f15g09xm3fwqlgcfc2czwbv5sv";
+    owner = "keepassxreboot";
+    repo = "keepassx";
+    rev = "${version}-http";
+    sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv";
   };
 
   buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ];
 
   meta = {
     description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
-    homepage = http://www.keepassx.org/;
+    homepage = https://github.com/keepassxreboot/keepassx;
     license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ s1lvester ];
+    maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 9fa112375c5..9da087d4969 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     harfbuzz fribidi m17n_lib openssl libssh2
   ];
 
+  patches = [ ./x_shortcut.c.patch ]; #fixes numlock in 3.7.2. should be safe to remove by 3.7.3 since it's already in the trunk: https://bitbucket.org/arakiken/mlterm/commits/4820d42c7abfe1760a5ea35492c83be469c642b3
+
   #bad configure.ac and Makefile.in everywhere
   preConfigure = ''
     sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \
@@ -91,7 +93,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://sourceforge.net/projects/mlterm/;
+    homepage = http://mlterm.sourceforge.net/;
     license = licenses.bsd2;
     maintainers = with maintainers; [ vrthra ramkromberg ];
     platforms = with platforms; linux;
diff --git a/pkgs/applications/misc/mlterm/x_shortcut.c.patch b/pkgs/applications/misc/mlterm/x_shortcut.c.patch
new file mode 100644
index 00000000000..f0f929b7965
--- /dev/null
+++ b/pkgs/applications/misc/mlterm/x_shortcut.c.patch
@@ -0,0 +1,26 @@
+--- mlterm-3.7.2/xwindow/x_shortcut.c
++++ mlterm-3.7.2/xwindow/x_shortcut.c
+@@ -292,6 +292,11 @@
+ 	/* ingoring except these masks */
+ 	state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
+ 
++	if( state & button_mask)
++	{
++		state &= ~Mod2Mask ;	/* XXX NumLock */
++	}
++
+ 	if( shortcut->map[func].ksym == ksym &&
+ 	    shortcut->map[func].state ==
+ 	      ( state |
+@@ -318,6 +323,11 @@
+ 	/* ingoring except these masks */
+ 	state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
+ 
++	if( state & button_mask)
++	{
++		state &= ~Mod2Mask ;	/* XXX NumLock */
++	}
++
+ 	for( count = 0 ; count < shortcut->str_map_size ; count ++)
+ 	{
+                 if( shortcut->str_map[count].ksym == ksym &&
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 738e8deb094..d07863df0e0 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -58,5 +58,6 @@ in stdenv.mkDerivation rec {
     '';
     maintainers = with maintainers; [ cdepillabout ];
     platforms = platforms.linux;
+    broken = true; # https://github.com/NixOS/nixpkgs/issues/19579
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 057468d7fd6..9d895a383e1 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,189 +4,189 @@
 # ruby generate_sources.rb 46.0.1 > sources.nix
 
 {
-  version = "49.0";
+  version = "49.0.2";
   sources = [
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ach/firefox-49.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "b082245bf287224c9487d650305cbc8cc8a602c36b526fc0174f56489bbe211dfff78ec40ad2dcf8df5eb4d951c352fdba5fe4b7a3181b54b54d1304ce9cfdfe"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ach/firefox-49.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "0c724d60357c817d78a4430103a50188db56f9e6b915cffc1d5177675727e1f253bdec37244651bfe1d055974a202306424f59e43c97c41c31954fa931c73f7c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/af/firefox-49.0.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "0cde959ebafc32dd5bb34af6bd7eb30a556ab6092459766a52e60621f545051300b41c3212786afb5a2e01cd3dc744fda72fd1461f4d2770e734537df930c7fb"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/af/firefox-49.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "59d8b7ae0db4720811e9d85f00055eb2f702a24cd9a1e0b6fc6cc1b07d55559d02976a6cc176063c777f391f5c1206c647cbdfaa8c880c4d97b3764e42ce3fb9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/an/firefox-49.0.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "e0a5d4993fc3088b517330278228d87d27871c2c6b07b1c771c3af274bdb7968de36cd16d78d1056dfd32773a3e813d38728bea3f5177d83c7ad87645f339aa4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/an/firefox-49.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "d10c9bda25fdf945c11dc83abb088ef5758c7cefc6c1eab2db246d680c8bf97517bf7839710481684f03c6339089fdc1c01f6eedd88e1c675320e4f7898ed2ab"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ar/firefox-49.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "6f9d6f15dfd5af271d4e0a7944d2a37c17c755278ac9c951bb8c2e6602f71bacd0aa63297e041f1422364f0125310af8179975d023bd7cf0e01556695b720981"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ar/firefox-49.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "374ab7e28f5ef960b6d0ba6ffa2bef136d697916dbbcfb8d87186c9bc25aff188063d81bd250a6581c0e1870f222526ac7bf179f6960ffb34c08974b0f6a4be7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/as/firefox-49.0.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "ea216d3def6e83a8dd6db481d3477747ba87049f668b41906c40abcce9913758aebe478c3ccd258b5267d6c9ad013bac3652fc6496811fb96e4639ad8adc829e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/as/firefox-49.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "f25cd18e71f331c906edfafa229f93336c92f792d023f7ad87f77d7ff59a80bdeb9a9d77fec585d623dc13c9694d3c256262c1bc9396e996fb713decf7c5991a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ast/firefox-49.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "2bcd3c9d217389ad200896d3e8f79b3708c0df0f255e1e3241156ce6bcf61123b839eda1e7700313b0fdd77cc4857f5ce321df228fc4133d7be475427d41550a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ast/firefox-49.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "a408ab3ac9ebb6b0f2ad6fc67577617597ddae3ef944d72648246c538da7d7dea6af260323ec061c43a1e84c3946cc879ea9ac85e19f780459021832186a66b2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/az/firefox-49.0.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "ef7def291ac82d2675b9bd65907451a1ae1cc7e6f9ba33a99801230a945aa801b9e31b74fc66038644cd9b2d77eba4cbaf4de5af2be14351dbe06b6cd46ebb60"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/az/firefox-49.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "7b9df427933588e40fcdd99486b28a3a1df4bb2c7de54aa9feca2c4a3b0aafcbc86005962af228e5a57a5c48d84cc1104d95505dfae6d70f0d58297d22425849"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/be/firefox-49.0.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "4605f9e2b679ee41bb0b2ef915d7eafebc2018ad6291d4732468b264917691561c49b7497e2bcb4bd9b121dab239c1c35a837e622538410b1c3fb2056cb0b401"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/be/firefox-49.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "e0864d2534562c794ecb790dc1859d37ba400bf79e06fbcef571e2dff36458d515fe42e50bcc5ec172d2643225d146ea38065b1b595061252001a75d595ec82e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bg/firefox-49.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "4da00516d997ecaaf9ccd27b54e2d52916246f24ce28b62ac62451cf77f37611eccbea6b494b36c56d352327ebaa25a1de3fad4ebd8f076a113d204126591ed9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bg/firefox-49.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "973290680cf923eaeab4a0ca2fc6950bc7445b5579c6d4c73845a3881b545ad1aaf9fbafa5d37fa45f271f4a3fd38eefc2d7a756d7dedaa08a52f55955473929"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bn-BD/firefox-49.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "5fb2558b29c80b45208ba36874442e31d406c0a1b4c46ac8accc930b1ab98f1a24ea51d4172a2b2942af5475d21cc19db798b0db2032599f02eca60f7ee5cd30"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bn-BD/firefox-49.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "db253c316e328385431d89ee373ac782b42ecc89c7aa6305253e85ba331b15513bf6295bd7f867ee298e2067afd4cec4c6a00e8645b94a31be14f4a1b89e64fb"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bn-IN/firefox-49.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "574c3f178d81f2a2cf5aac98577b3f6e384a5adbbd4b2645111a3829cd0a7962a8304bf42d7dd29ca5e37311bf1b1e8b62634cac823d1bbfd832a71a2fb5cc3d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bn-IN/firefox-49.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "2b5e63643bc6a39f7493ee2e3744ca6b0c5a0c6251f4b1af32ab911f71cb5219d5506910bccc8f0168353c3fd0ab7d1eedf487ee7406f5a1852e010f6261cc02"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/br/firefox-49.0.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "efd72e7824440c1220ee34f578176d1b1652f2ca31cb4f28f7343bfa4d7cd91f40ead137b879fef39840d790e76b4261724f68175e8eaadc7a55f0b9ecce5538"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/br/firefox-49.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "17abd7de76cbc9b1871886d09a0c35df49d7acb3736b3a6c616a200932565170864ebbf1dc6b320ace2a0c95de1b892aae170fd3be794e9c27025f0c19c435f5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bs/firefox-49.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "8ef4c39bcf10068156bdce5bb3df64753914476f92ce565b7fd681a674d6a45a5005efd2a7c4969bddb8eadbe11ddee7fa8ea206868b8505024b6688cd11c47d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bs/firefox-49.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "3e25aa90f2348725517858299ac6ec3b1febad9dc2080f17484113c23e43862a1abf06d473c623bb0764a589ab68e3295c48b997ba3e76f21d5e04e0ecfdedaf"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ca/firefox-49.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "4120e2c2cfd3183c294be353243f32631f34f8e3ddd0767b5772a355058c3148557e606d1971e1a89da349fbcab56072366342f8a7f03d2b702a0ee55d1a6268"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ca/firefox-49.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "e3d8e3d060ad6cf28cbe06d51b21c26285f89cdc32695eede992d6953f9d62068f6951506f02e32e1ada37034abf095b1d6dd7a57076ae0eeac9ff939e2e84c5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/cak/firefox-49.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "5b27d128df2101f08a59dcd46f66ba7c07434b29e9729ece3c4681d7a5b6a4330023bfddda42ad5f1765c1ea3c1401f2664c019b0f84c182f709e91520813f7d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/cak/firefox-49.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "ea241cee1ef1ddc3545f4af9b0ad4e93a7879e04fc0c11e2288b3ea59d1ba2a5db36a048d5eebe0f69319b40ed6654866c498879ab50970124dbfa904f5929a2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/cs/firefox-49.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "93080871362ee9f8d07993fc2e509beb6e6abe496ab1b9cf8451979e65c25b7a6e4eda0759ec6d6631a1dd04874cea08e4e0e777bd0429ec6525563777040b02"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/cs/firefox-49.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "9aaec753784c6e5db6fd48a2fe134cf4a9c008ff3f5ca09a17c5982b7389f2949c6551a004e0bac723c91ec5e20dab46221b35aa3f94974b5fc14629cb375096"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/cy/firefox-49.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "843b18d25d94808737283b2b572902d999bf34ea17fe620319b3b15bf004d0b5526c89416d6f09ab84a6087353212e0e1a72fc3ef8df50acb7336da2819d4830"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/cy/firefox-49.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "caa53c6ab2c4f8127fa637d8b8df9727e31b0c0ec9da8e016447cf8e1333cd82e0e41b93917821ceb8db59c558761ca52f4dd34fc4916e1b70499f491a9b3ecb"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/da/firefox-49.0.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "c4a441053cb6c116cb35817e03774690ad540b6f9c6865c6a64d4751137c3935c5c2422cafc60f10f4b9d393a6418c2862c8e05f8ce814abd1e028f867114901"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/da/firefox-49.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "8cb552f986e49d590659901f438e6f10d494445758d09798285285629f2cd11e7da39e828f56793673d70f5616b3ae9bea10d18c859f89190fb4998f5d75cab5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/de/firefox-49.0.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "50f7a3e44c19e56d4845423065a47b6ccd12d353b10ff2ed21798a668e77fd37da86824a9da2b740f95d6f83af9a33eb3c50d8539db7d27a421606139212a71d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/de/firefox-49.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "2678fdbd4a9ee6281eee6a04b3586d2e577110fdf98e8a589d934dddbbc4be565ef50d4b457709758a732506b56084938144d5d2e0b95a9fcba5afc3c826ad02"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/dsb/firefox-49.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "6fd71b3130ea4571ff4456876219f5720f99e190b92ea0615c6fdb519fed1dbc4432ecc65205a92023bfcf6c1ac49a622dca3dc0e3f362dd4a82253baffbd220"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/dsb/firefox-49.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "a23f6f93bb47ab231ee670817a28187e78ebbd459d4151444fd39b68b2c44990f06f8c90c850628ff8e88ab262c0aef48d990d4c235aeceb4d252249326bb16d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/el/firefox-49.0.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "12406ba82fc63d94245188dc5e3a1afe8e97f00ced23d19b0f463806b1fe98fd49daaf9e7caea0f1b0a6f6bfd05237a1231bca5b6a49298c8e9a1ceabf5f3a94"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/el/firefox-49.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "dd4f50c2201652a912dbd5ee7b6e3053c2519d0fcc13ea683ff7c6f6b1ff80ed5ff27215980def1de5254c658dbcb59df13f5be09ca9acc7f41e5711c9819d6f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/en-GB/firefox-49.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "4ce5cbeefef030ba020f1f4ca674587734729d1451c072efc8bf7486b3f0929b9720ff399bb7acb80afbbd39997e218c47ad2a9c6b248c97695248e9b3448c65"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/en-GB/firefox-49.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "ff7b4aaf59af5524d015ad680cd684e705cc9bd97b9afd459d829261d2b9f43a39a9a6cf56374b69e5e23674f97ac08e6ea4babc1732efb013e289c6c7835b8e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/en-US/firefox-49.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "d3815b311f7798c4c2dae7682c93ec32fa374fbddf5bc696cf13f048a2a6b1b35ba6b5700a30f0c0727ba346905e846da38402b8bdbb6b15549cbc2aa0d9446c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/en-US/firefox-49.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "eecb07437e814ddb9c9331fde306b1531dd225866d91a7b15412aef905e89d753332940f2da7b6bc53e7d73c348091ef58b8304f95775378c4bff1a740c18162"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/en-ZA/firefox-49.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "c1e47313c2a07b5d33ab09d00148cf62e09ae566e0601518e0d3f65805e258c65fffbb240197f46e52d21c93b171d7cff64a74a3d7d9ac4ad8849a7648718165"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/en-ZA/firefox-49.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "50a5a6df373af7620b6fb3166a3c7ea06a73ed6d14d9dab46c1f7fb885f6a7da6a4fd7b1fa7e44b91f3dcf2e2b432e140f9ace19f51e35c7e7fb5994e024b5f1"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/eo/firefox-49.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "9424ac023e76cf2c41e9bf50d941ae59a73ca716050c98401ebc6a7f2c891e22fe399bfab105454206dec7e503c05c16afd9605e44bbf9f3827b429a3372e416"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/eo/firefox-49.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "bf8338a6ebc3c9c3f21249367e6d288b06fa31988ab110d11fd136a7575501531d5e7cb687d15cc883468d3f852ceb015c0570e42b355ddea5f384eb1dab53c0"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-AR/firefox-49.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "6b5e1014d1c5379c6a461c8835459dc6bb030ec0b898aee547f122b1b92ae284d4fa2a2bd93893f43faeee5c30e3ddcef1bbd06abb655178fdf2d080af5bb137"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-AR/firefox-49.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "d9625988b3754c2c0bd89aedf78bff52c53404ea8d47f642726767e6a11d18059c4e9e261bc5f5eee02dcf820a184020aa504570b32d3ced6d15beb82bc6916c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-CL/firefox-49.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "3cb9ff0f823aa1b8f2f33d2ad39763df9992ff84be75c1c4685ee34a3f3d1e614869f4d31a95f16c86e540318736845814c143a6bf26a5e6324df466e1ea02aa"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-CL/firefox-49.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "1010add5bb4418960b77cdef8f1267ef9ba98fe9d7d82bbe7d125ed23589ad9b2f934af82e35e477bedeae324e9fa862354e268ca829346061bbe4308cf2b107"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-ES/firefox-49.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "d64fcf43f71de119c4e5916943ff17b5e47e4c51c7482b4ebd9e90ae411cd1a302c6e246dde3a90ae5bd29d33f3915529633a3b87120ae571a90e6bf3e676c87"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-ES/firefox-49.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "ce0d7b320514c975dfe74b9d6cf63a51162c68e40d4addbfddc378377a0788b501b6e6b80787137987196cff286fd62021cf99d9ef128bdaf2a9a271e6e83ed7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-MX/firefox-49.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "097d9e98cbb024042325188fa4744acc28035fa89788c613a579a74ae8619d02a16a49e7b73a8b4cce95102d9388bb3a857036c17b825be1b12acf7a8ab7568c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-MX/firefox-49.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "3cc5950e78621a31b11a3b1cc0946d41d4cf1eade23dd92c818df6f5f2bf60db228d278999610f80b2383feb5b8e1e78b90532135d8111c5ebc3b628d4804845"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/et/firefox-49.0.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "5be378c889cf86aa71e2c234ec090db8d8a67a778fe2fb8b271e141e931082e93c086aace526026ef57888accc8cc52d37827dfaa6e975d0a3b1710f27a02902"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/et/firefox-49.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "1754850a8415771904ae90b8096d3d04a3fe75df3aa87c1ea967bcfcb747483f2171ded2c8f3f091eaacfab3a2587b3be4a0009384fac74627c53135173a3508"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/eu/firefox-49.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "e6356d13de9445e11e6b0a1908d2ab10ffb559c907a8e6d06cff090afbfcd4a557e1bc16ff13caeee61818d2044fbacc65ace65a7d27428aaa071cc52b453404"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/eu/firefox-49.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "15d3cbb376dfa269eace5b2910172256b79787e16f1eaaaa7dd002e92d73f50540398f0097146e6d494e173e2f1c2f0dd7bbc4c7d52f3dbfc98ad6e376fc5bc5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fa/firefox-49.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "151f18d14cd3be6360c36fa63c4cb605078fdc9146c3e28605d626fd85886561159275cc1dad44bb130f8b530da09aa897e3a23e061fc044c61ed74c930ce81e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fa/firefox-49.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "5810155928327671fac79d99b114c16f96120f3ca6c26c286c37d23d7fe71dfba2e8b9f0236a16a2cc6d1fc9fe2bd84278b6e5ddf25aa7876d672c6c157d2065"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ff/firefox-49.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "5716afa43a8efa70b2261906b990b376aa1505c206446273156f75c0fe8ce9cf0713e40a72125b4f0999cfa6d7d7d55872221a3effedde2f31abd4bad15085a1"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ff/firefox-49.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "bb85b1f71568d117d27d891978ea14b65340027803fdf0693a0a2c42b9429c7a57462c5e3b0acfa133a6a133ac4faf31ba83faa417587c1a35c3ae752d0be5a8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fi/firefox-49.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "ed3a084f08985d9f4021327fc9b597bf184ef37e067ed6f96573337f63aae35f96f887594d9620d57c840ac6b2259add0e2a029b0a7f86d25bd3217cee609daf"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fi/firefox-49.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "f4d137824175b1231b662d800270bd59f1d1eb8a5d3c975f15a1f9a1efa4c9def03af0d82c0243e05e4113d1b23a7e08da35019f66c3e0f257d5f26cf0259bb1"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fr/firefox-49.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "0583f12e50318ae7eba691251e94a9828a227d1ca462ac1ef0dadc6371aab88838cc3cfe9c6ddcb9899b81111cfdc851d7a9dd9e82cbd89eeab29c02d3e2bd23"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fr/firefox-49.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "b12009c61cd54c7ad8d60a8d358b3f8fed9fd09172ae928d477844437c276fbf04021a2c367565923e204a6e3170857bc910a20364d66232bd4c3142dd7afc47"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fy-NL/firefox-49.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "8e35ee5c5b323daf54624cf2dffe306a2a59b490d28c516c6537fd2cc6430e52e6134729dc98f03fef945c06d888cff690939f6c2fd418b2d99991bd8f4acc35"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fy-NL/firefox-49.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "5b070c19834d6ecff8f607ed2cfb149dcd487d128620f79e1ecbd9fc874e594f5af43fa34f1543263f244f51b8d748af99c8a1cd8b10207e4014658e3f18ff36"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ga-IE/firefox-49.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "482d840f25a6d734d530f81aabd30e516cf8070e0f43e0dea13af1745463a478c3f84f61eb305beb2440cdd3c1e219336c7dce8edf0197d21e87b3adde0eee17"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ga-IE/firefox-49.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "fcf48da92e7b86d5a7bd59f09a919cab41bb72c33a73768fafbb93a970a254546df3b090b7aa3414ec25bc9b97b0c16b66ad57fca4a04218c07d8865e1bcbbcc"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gd/firefox-49.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "e6c244ea5ba25ed59695e961deffac3f99b9bfa03c1416c7c52d25d8be26c438813f3531c7dad243dc0ab36e6aab0c6485ffeebdec16e5ad47d4f6b5b3718edf"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gd/firefox-49.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "6cc1052e440888ca0114c6c7fb7ffc3c08cf9fc5ae5f38be0fd94dbda8e2230936f3046761983840a9b909b472852474641418b80eb5e268686b0f94ec2da39a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gl/firefox-49.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "69d928c79b5cefce463f4831363395954787690a0d0b6dadc9f9e89ddeba9f210c71a1a6b7504a35722b0f36cc871dacc82bf40b2b9bee454f871c045919ca10"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gl/firefox-49.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "190a8504b7ae9e72e06f0848a6c0746164fc208c7a7554caccd8e81f65f0ab914796f9e811095b8ecf50c6ec9b213856e3969bb8631f1734bd74255908eb2a42"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gn/firefox-49.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "801acc36c2821035af178d6ba779897041d2a7dfa760eb0e5dbfe578877fb62e40547fb5c26d0f6442ae0eba5b333616ede8d746565325fbb2d8e5b1d870e699"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gn/firefox-49.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "79db4de1e92e21264f2ec1bc8b9bf334adec8a48cc207b2d691ffc570bfff4d48da0a51accbab1b64395dc7679d1650fb158d8f4516de48004be7e3cf4b1932c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gu-IN/firefox-49.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "2520fb3d79e8a37b954a83cd4195ba79547fd12fde3c2a91f13a8d0ae9dd165f07cda6e7ffa9f9c3edc0e81998ff6e9343fac49bffd8d707010083adddf553a7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gu-IN/firefox-49.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "0864172462c8ca9bd162c8227e59f4684f6a90106c864a36224d58fd749b2d19d1496c6b877e432a1b8a6c680f9cde63d50352223def13ce8da4d5806de56a93"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/he/firefox-49.0.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "f1a595f504376d70531e5eb04efa86797705d869d462c7505909b416840040f2f7fc2a27718de6a743a9b2d37e5abd443674ba2f389882d9ecda86707adf8b8a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/he/firefox-49.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "4a4a7ed80a016812dcae29079c0f0badbdd39c020418dfbe07e05dca97b7632c9bc689bc084f7e957da6046cb2cdc74a7e0d9f06d358701c80f73e702cffb2fa"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hi-IN/firefox-49.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "608477ed47c0d4cf9cbe33a240775dc10009546c4834012257839dee6d516b527051118c92ca8bc289a9f868cdaf432c1c44247efdf8d53e9cca87db02837bfa"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hi-IN/firefox-49.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "9d2e91b8df386a3263b82cf88a945b5cc7de1a9fa3515b52c48f27ed1c8dd9b4edf471b588ba9c5a9d1eabebd7dc0fca89b33c0fff7ef6a0030a4474a158dbda"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hr/firefox-49.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "354d3cb33707ceb6a9d4d3f20304ad252e8f2efa36882f512c4382663b05ea70428f2978d2f9fd8871006cfba8a74d46f66b288bc0f2093218b0383d6248790a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hr/firefox-49.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "d5ee0aad4e91596503309d0028dc636550ac9f9fc5d36b1352026dda8de2c5a931175d96fb98192d93e52236b6c89c42fb9b56f2a69c484108281d2fae4dcbba"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hsb/firefox-49.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "d18f984de95199e074d7d115f2a685f3d99d890cefd216e6d6fced2f5a8f71f0275729c5d35107f0810538373bf46e1ed04f541e1933cf0d4feac89e9bf44931"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hsb/firefox-49.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "91e39217abcc24eb11fba06d95da8ff61355efc4c60be213197eca86359d6ce386ec890534ded720ec40814a7c347c6e2ff100fcf8a75697c40a06da496b078c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hu/firefox-49.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "e6f1ee393c56d6f156b2f6c263460df19e7e52d6aeeee668702911fe0f016cabd8900db8a774b89ec74d43c5963c39cd8db75862a350565a13d9382964c9adc9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hu/firefox-49.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "8f404fa390e70b54903267def0a458046ec6bf68bf8515352a61849a7ff72ac26c849c6bf69b992d3212268316ac8b954535aef9979b8edd4493481be6c8f9ae"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hy-AM/firefox-49.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "e2adbeb30ac0b272e4e62dcf1876579dd3bfe0ab1d5f5385edc07c6a04d62d38cecbc584bbab12c1ba27377f7680d5a2a740e621c5a89d6fc616bca13e988661"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hy-AM/firefox-49.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "7ce1778d1facd77af248f20f7b63ba5d20c13407dfa3ac25307777691d7f4f4844e421c1a6011867b8c7e18f2172f1905f81cf833268610042823525d1179932"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/id/firefox-49.0.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "6d98e771905f729de5890bbd75dc1131bfccc901638aaf362ce139c9341c417c8292e2f362adbd46ab8c8675c8f59f9a523a41b760a2f3dbadc96debeadc3a2a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/id/firefox-49.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "7feab0aadd4aaaa30d4a9a528ad1ce4737ee14c32df5d7c672708ec02b5f9567bf9f985d64c3064b86917de9c25fe10ce3b361c81bc5be1fba54439f287143c9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/is/firefox-49.0.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "6fa9e14841a790ecb83969ab803fc90c73da1fc974af17cb0814abfc22d3d334538feb2b121b0bc976ea247f12242c7a9e0eca1a544492ae6c51376dd4f41677"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/is/firefox-49.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "18924e3085893b1182e60e490dee1332278bcd030ddf4ed0a05f1dc2cdd9ccafa5885b7eba6361d647e562cddfa3675d16708338073e88ad010b2cee4f8fa0c2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/it/firefox-49.0.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "c67b8d3836c388c8433a779e55c23790ca906ca812b28c7d0d97261627e5c57534b8d0311ba50ae1876055745a8ad20911b482b53ab0eedf0d9767578082cbc6"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/it/firefox-49.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "705518c053e6af3a3b23e66b019c3ee1e51d73a75755663ccc671335f1ac3fb5b8c941a4f09dbe21abb279474d0cfb822beb115b51cd3edaf32f72154c661f21"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ja/firefox-49.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "585800058eb00b56bb6509886cd4f51ab9d9fb80de5c4b63f60a1b9bf5779a1b9f5310a99d746fcd8931c7eb2bb078ddd444518b624a73cbdfb535bbe38f759b"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ja/firefox-49.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "4dd92b0d0261649ffe51d20898cd633fd35efba7c8a55585a8fad9fb5b49ee6be53dea58deb0fc84ed13355406f0a663a78ad2a41cd6f1cd52b63e1c1ab8724a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/kk/firefox-49.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "a199ed24401d183745166d82929305c742a2a1cbed24ef09c91259515564bd5e5b86e30125285766f820755e65bd8e62eddb3079092243b88a4a91e5d5ca47b4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/kk/firefox-49.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "413078071b8ca1c9ff8c971e1fc8ae7b23e93414c8eee70820fb8662a4197f4f7ac7f8db11e7aacb2a914c3846be43a2aff9ed13f18c065bf7fd467807c51a50"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/km/firefox-49.0.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "c0ab421db1c33783e201762a3790d807e54f789ed16c2bdd372223cf10207995d91e45f600ee9df778fa4548fa0e09ae1f432b11cf4fbb1e50b4c46c5a805bfc"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/km/firefox-49.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "5e50bcf2b9a70efe7ddfad9d05d4eef954c7da7d8ebad7ad6ff15b7464b46f636db49612f5d42294fff4e8225e8919934253f6acf4ffe4ad5967c75a6ba33be9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/kn/firefox-49.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "123bffa9583f8e5db3e94668baafb581aa5af023b3ca646e052360761b46be086b128a5a3c7b518f38bb9c57dc49df82ad9e88caf289655609708735421a4490"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/kn/firefox-49.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "06b7bc1716f64c84f580e62051e437129624c02d6c5def9a4fa8b3489f6302e263e977743731ccf123a1eecc70d1cb4ab6a83cf0ec80fdaf82d4d11421ec3b31"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ko/firefox-49.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "bf8ceaaa462c253fbdfff2d57feba1fb649d74e7ade09f9e6120597ecd7e7bbabcae6d32da09764ed660d173f8f28eef993366876928145947a1befaeb564597"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ko/firefox-49.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "e3dd9441bc01aca97ab96763ce086c1c52b33781fdb90083431c15a5a057a5e51092cd79adbc10793d6159dec30d72704577e1dfebc68bb02f7182645a38528d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/lij/firefox-49.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "e47d12ed8959ab76c670e98fdee111e9a1897ca58a82730239ce1544c24d0149a40066666da74fd941b6653d19d65f75b7064391fd45a47d4926d6f4d3a6a771"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/lij/firefox-49.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "81521acf4cc49a3e4dc7c4af58b7f048a949d170b95789001bf5cc02cade557042cce3b5243927e28c4c2bfebccaf1e4667bf0ce42871a51475baec2dc116fd4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/lt/firefox-49.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "2c9b2df1e811ecb5488ddc012c7c408b067901ad6329bfd6fa0838e7cccdb63eaf3c7bbf9ea5be5ff2f03aae8acf6b62612a90126209bbfece59a00b41a73598"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/lt/firefox-49.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "587ae06c7639043ea347ef68bc1b143baf0d507d1e98ab0b5bcf5d3f6ae364c3d77d2855550ebf6f63f972fecebc9d7bd05eebe4227bde512f9b2a4c72f4d0a4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/lv/firefox-49.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "833a69b97e5f74ef1829ae80a91dd6219b20918b5a8e0faa272bb1defdda1704a4e17e21892f15d606d74d644a4506196b83b33000f8ef8697aeef85c4f5315e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/lv/firefox-49.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "059d16aa412e31eb6453002b46a26384b125aaa1d212a22747ad465f6ccdc2cabfaef88a63479a04878f6c662ef45da0caed62b8e0c5a4cb8bf5037a820b34c5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/mai/firefox-49.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "df520edb25360d686cef1d8eb3c3566581a2f71e2b6a6119e2d6eed7c2004d3193d1e2784d3ae575ee5f750956f8eb83558d5793786abcf075ca991e78a610ea"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/mai/firefox-49.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "6562f84949698c920b220982a32e04a6686a4a3690e97db835e0a648952035217f49e0f7d4c8441cf31130e80a952bdda986b7d943f4b5cdbead9ab6c316a0e6"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/mk/firefox-49.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "3db4b5257edbf0f03585f7fe7ac0d2ddf269d2fc2c4ccb6cb17f62b61e4c152c02b54a5ae32cfdeb1f6eafba82a3db44ec1c8f82de5187226ded7ee2f6a0e442"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/mk/firefox-49.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "4a09dd37f58904b1b5790dc23d7a81caa34e69bb663b7946ae9a7bba9d139696ce14b662ecdadc453a0021f33df90503110685b59f4bde528b53d8fa4ce68fd8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ml/firefox-49.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "39d7b2342c9a2dfe07a643e0f15b6f0368c331d1576f075d6e864122f91bba8ad8af43619fdfd1cc880337267a7bf0e885879e60cee22dc3d4e4cd8c23713bd1"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ml/firefox-49.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "2a0d77e1e542b6a6a32c4cb122400b1b1023111cf234bbaf8e0d7c23e572283e163142b7de7c35108a2098e88352a31b118ed6914d07a832b8d155297cc317b0"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/mr/firefox-49.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "ccdbdeefd26a0a6e005028976d0549a22fde6ce5c054806c15aba6447595785789eec0365d3a48712f2077e834b68e46ae6ea085ca776a9cb6b5bf326929b0d5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/mr/firefox-49.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "a5053f31dc8ea124756933ecc79870887d89fde3c6bfe0aee4d930a778edac865d3a929d2afbb714629ec77717aa1bba19d7647ddd3784951dd4510d76dc95d4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ms/firefox-49.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "83b325c1c175dd01b3a04f35533e6adb0b82a5629a1be4e560a2eb65bc705c3d4e762db9fe8faa59aeb02cd55eeb95f1f587fca555ea1c5f5e353a6fb8edd550"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ms/firefox-49.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "674ac356543ffe310e0adae210ca8f01f287130eab80a610428ba854bce781c3fb281f6a2d2ce540acf66a650de3b9f960f1a7a0606c93576f0f02f5a1179865"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/nb-NO/firefox-49.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "8efba2a1704c6c37fd91776d40f702aa9fc1951dae23aa164d8dc50cc14e22e047ac88f93a5090f15782fab37be1c0d1448ccf641e1426313bfd013488585da7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/nb-NO/firefox-49.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "799179660bc918c5fb0c9781581ed0dac0ec7932dbf897fbb632a1fc8e7b310161b6d0d13d34d6259380e51be726e4afc1875abf3ae4a2a3bbc3454711f503cb"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/nl/firefox-49.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "d5ae51a144176a1748c3d7060d6e81e71975faf8ce02daefc53f087524e6afbc101c16e32fca2568f38d438cb748cd7194d64a6e89c6ceaab00d3adfff154ea8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/nl/firefox-49.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "ee514f354a05630ac3135afdc668d59780626ab58e01f88d4d60effad71b8772f5bbced8fd2616e53236d75a32bb9ab7c187c399942f1d3c58fe7cdc7449f715"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/nn-NO/firefox-49.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "6f4c1959d9fd6d793908ca790b74c96f609167211aeb814ce630c0a57842c5d1a22e67697e71871cc9e04a2bb1b4c72603ede8cbcbade3702a07e24831b9bfbd"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/nn-NO/firefox-49.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "5159f3b060724bbdbc7f7575955d1143eda0d7e38eb4ed7efa29e82908311a351a4597f3ac374023574ec8021a1ea26a439379357eee5710aab6ff9b6e59cf39"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/or/firefox-49.0.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "a2057b3d615c61075a1667ac3b55fde78f8e037f6b67496faf7590067b0b4192065af8818b189f0eedf4c0a22e9cc6a0e35095cfc2f832168dadd174fa0b0cfa"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/or/firefox-49.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "e109c47b21d7dd4f18fb728f2f20322cfaa26574e43be5bc8b100fbc6272a8117ea00575bda525fe2876415e4127393882c41a252786f9857346b732255981c0"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pa-IN/firefox-49.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "54dfeaf8cf5ae829f802e985ec4b4ccf12bdc967df9ce5e35bd19b4cbb932fffb425127519703d576ba58ede507f97d609caf2168be1159acec9aadaf393f24f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pa-IN/firefox-49.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "4abd39707f2fc415b12a9041e1763978d90ddfbb167fd7ac901002a155e5b82f7c9299e446aa4de222e35f894b29a51b25b0ce0803ec54480788a52b9740679d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pl/firefox-49.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "df54680a948595d2a889c5d92e321f64161081a0618bf9227593ba22db57b9dd639e245637d5a2473da7dec46a81487720ce8651963223ac368f1cd52504fe06"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pl/firefox-49.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "2230bc383cdad5d6ecdbab7f2890d511420d89bd4de3b52f987c1d62c81153b8ce47ecf25f74c210572c50f8ac90f289f235d95df14c69bbb16dc5a817c146b8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pt-BR/firefox-49.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "c5155061326efd963a43d44add6644c42ef1b84fb07e0ffaa8e9f2d8b5f213d614ccea04d8251435aac6c88523e759449e7b91c49317fd19380c33d39572ab4c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pt-BR/firefox-49.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "b2757aaba8b0078b23a9e8c12c26ee2699a93e19029deeef37809086e57d23ac4c58338268d814774a6c8aa2c727efbb12205256795c5e19ca9ebe5b1cfb59cc"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pt-PT/firefox-49.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "e3c6728add0ed5a320da8abfec1dd2bf63952e38a01f71601bc882789be771423fdf5625c35c9b4c0d278c0c3ea646e0409b09596f74f16a6397568524815b8d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pt-PT/firefox-49.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "8763f5917f2945536524af90916301e94ec60ec7cf1e5d3d128e9c72f01f25924d34f65e48708cd2a9aafe9f3a4d4beac26d83e8803b7e2bb3c6eaf630dfeda5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/rm/firefox-49.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "ed1285152ef25a0471846f1aef7785a7958246d078cf78617e543de851d0b1722964b0428a3216d7d4feb40a8c2b76faf9802ed7c278a95592f252897415f4f7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/rm/firefox-49.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "f7d042a502a7c7cbe4af94e3649170cbcc52d3d925ff6158245aa60935fd09ebd743a29edee2b78908232e0e98cc1a1c40a50c6e19b6ca037c0b2f6249f39e60"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ro/firefox-49.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "2dc4658d7b9aad11ee14a036db8e6171c5a912f93ed24e94b951c188f418eb7180e4621ad0d540eb9878ae8664f202287e09aa3636eaa1afc2cbdcf7606e6232"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ro/firefox-49.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "b5643df75ab40c4830afdc88d010e50c0c2fb7b9560caf985c80d84a0744b47fcc08f5d3dfa3a45bfc55f4ec22adf49e9cfe9513fa3d645887b813a0ae8bea4e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ru/firefox-49.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "b74c8e4e82e113b07f901d66108e505010087f8a44664b172af8625bd622dedd178a94a9391d29af22347f309cc8d455cfc4392d1bdf7fefb2dfd7bc35ccc3fc"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ru/firefox-49.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "eae3cf9a4588f99ff93d6ab08943872bdc4b215f1442aa1dd5d2ba9f1866264b767753a84de033e0979f24518876b536f8476840523920a7a1e1a94779080e29"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/si/firefox-49.0.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "69b3282ddd9b4cc57775cf1b13bfae3dcb7efe6c04f5279bb2d055ddeac0a008b05bbc82e12768521c075b83a8a7c37b8ec8d9ae01b022cea309b7155642495c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/si/firefox-49.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "fee048d1f5a743f5c9ec01241b87ed3c1c5c725423348b29bc76eb2ff9b23ab39b9fc5374e82b43412efe6e3b5a10cbe8b559b1c2b3289ae763901032c877496"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sk/firefox-49.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "ebad91e8633219cd7a5fe14712c83b8ad5e8931d201f42c67d61d955293de1adc836eff993450acd6df02211b7219cd2f4e274ecc515d6e422f77cbff4245118"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sk/firefox-49.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "b02a2ff848f6da677ae77d873e3d2ad77b6c650efbf44b967a1e2b704bb813875ffb39be9f7fbc1a39ac31060a6214266c4649c6e665b24a53c23c3e6b126258"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sl/firefox-49.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "de23536009e3d11816304f3bfc49d7ba77c4427907ae91a337e41ddb301cd188ff9802bbb42d6505e0b559d7107a2f150675e7c5ec53e9f3c689daee6a100c3c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sl/firefox-49.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "ee47a01e1673eca4101c69f67e639ad6dba6272502affa1c5af3081cf4bc8ee9cd3156006c14f8eccb687139913c61ef582aa567e6d35ff8630a075072e9b6fb"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/son/firefox-49.0.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "de572494fd7ec09ab71d6b65e51fa2bf16934ed26fc7a21e74d55f3b6309075d830b6c41bd37887ebcdf9eed46a0e2093a853d8b4733bf112b4d06582afc239f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/son/firefox-49.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "bae6e78ca201f0ba6f3c882cee89fcb5c5a46149d54d114196d689bb5b26e785fe3a3ff0a659a10d140e5530de847ea4d775cfc919d8e36be1ff21f0452f585f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sq/firefox-49.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "c1a3828372703a06ff71752de271a5e6e999be5be2cc7bbf3ae7b1c23737035a3cb0685113806d98f96e62873818ee2d8a113822966499c1f54578e0570105a9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sq/firefox-49.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "491fea89f4d662061d1ff4b7a91756aceaa1bf336733d68f2ec775eff0505a98397ac7eabc9e411d38e3b96298a7c7f948b389b4574a277e490d364416dce010"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sr/firefox-49.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "e7ef9c19f485a50b46a2944283e3d2e46c82c68e350786e3bf31720367a682464e096ec7b3045f740c8af981be76be94d1c8965a1f10cf5271be4328edfb5a9a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sr/firefox-49.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "7fbf31358db27264452544742c5589e8cc57d0b2998748545d63ad8f88d6e6d43f358cc72fbde6004edf9370a32b7d5e53d7b6aa831c86271742ad007e9e3304"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sv-SE/firefox-49.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "cde0b52a9b03c2673a13cc330c8d47308d84e43d7e70183cacd53252572b25c97d932fabed06dddfc395a8a192717a28f5b8fa175f857d90209971462ab45a09"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sv-SE/firefox-49.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "c2a4297b7f096b187fbfd59166e10182090eed5a9063d90ddad591fd0b235ae145f22829a7d36176f8c18d760c177882131749eb29d76ddeda062f17da07f9af"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ta/firefox-49.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "d8e7dc079889db15438a8e59ee42b78ff818014cc03136efa9a69a238f36a3c0db3fec073ba156280e427c8d67ac54f606eac390854337edcf6ecc751cbb8695"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ta/firefox-49.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "881280f9799000fbfe664c7b67ced2bea2d9c99400ae7aa5a5e8274472306f5d6ca030d7eb7ce060c98c308d887af1bc00558c48cc1915ada7b43940d955c224"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/te/firefox-49.0.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "f628a62da53b356b0543b59ecb8ac3eab72956de499761fbec7e93c1c415929f0c0571c274c16a5412c69c709ef1c82b6f35bbee2d48286c092ad6b7fccf4e8c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/te/firefox-49.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "a3f2bc14ac0e3961ed75ad5c221374a91373a637cea05e023c87c2b06bc2beb63ab7470c1bf6da95304b5afe615ef05c0843cc508ff491b549e73a9e65d17d59"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/th/firefox-49.0.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "cf5196484a6408a3ba27f440909492c542305fb47dc463e5e54801f264efb274916484bb7b5850c34eb6fd3937a484fe3800d807e40c0d1a3bc902040fabf1b1"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/th/firefox-49.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "8f70f70faaeeba6cff2326dba2b43f4e80924e7f11666ede7474e896dbba42cfba650b0e9328d2b432474b06fc0ec738edaacf2b17e8acf549d5d7b590f75f3c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/tr/firefox-49.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "1af9ff1d8376ec7eba385ac88d17bea0cdf02885b88d501f77b40d5402f9d918ed42cb8e4ce2e33610eb3f57ca5a26850acf6cfe83954bec205ee33a6d74fc31"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/tr/firefox-49.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "9a8ead1fdd4cf3cd49c8e3d626cc721ed79d949b91a9646157360c4d74381ccc6e32118adbae46ee060d8e0b7e5eaccdfad9af42beea216c1bdcb081a14e91a6"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/uk/firefox-49.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "c105b652cafd9baf5b8d3f8ebcd64ad1ace6da89d9746ee65fbee00891b2a4ad821c9a181cf1d6ddeb3b75dca08cace3b7e74f1e357aac5a6f08960499efdd4d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/uk/firefox-49.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "01eeb3f62f2ee7377811aa38ec69426fbbb0fccac23e91d0202a7c35ede59eeab1d534fce6dfa7c51fb083626fbc9b3cfba48793c7d0fe625e1163d14fccf36a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/uz/firefox-49.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "38259f998ff94528b1f466cfdc332f0fcd10b3ec4da3e0f88a5b3966eb7fc703763f2b9e4fabfc71ec286e9349d47c8c929b036f539dfef833411c6bae32d6e3"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/uz/firefox-49.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "dfdaa4540b742911226034fa75127c5de88ee3e97e10e7c29514df1331e5d8e3d1b8798f7050083c18a71838c6210343d6e63343ce6964ace885ac8172438314"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/vi/firefox-49.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "634f54f7d54f1b47a401b319eb8053ab08e43711650117a0155757280b6824eafa9d9f9ab6887cddce1d9c8190f949194d93cd9741d76bdf3df5d82a27b767d9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/vi/firefox-49.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "b9cfd74289669d4d2ee49e216ae0eed15aa2377d54c632ec0d15f9799867a0bf24ad2efe17047fe63e3fdf2d9e486c33c1d96926872106053a36968e5f546714"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/xh/firefox-49.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "26c6bf5c9d2d1007d93d95351e3f9bd7ea246cee6b40ea77f7e26087d8612f709a01829a7e5bcfff8bdee4f7874c36966ae229b86a31f74c724deda875221de5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/xh/firefox-49.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "153e6a2c1644e00bdc950f092f99c515aa079dbafdbd618287639f00481af22a4acaca7e8d4aeb0e78e004eaf17a11911425ce8296b67298b4b6bfafd2d4dc23"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/zh-CN/firefox-49.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "a24bc352a98315fab4a64cb1078b35b1531b559b3f044cb349a2d4f52e4ee54b27510e8b0c9e3aa2d891dcb17036e1ab057bf3b6395cd73147314e413894d90e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/zh-CN/firefox-49.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "a9b26841eceda1c9cea02f3b0b4707d8c79ad78c26fecbd5d6a69fdcdbbf087d487252934b2e6f02f89c29644f241beba1a555b67d22a396e60db8c5e21b9512"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/zh-TW/firefox-49.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "a81cfb6d197d99476dd9d4386df40a7b507d9fdbf6c8966aa20bed2537c7689c3ae0e09f5053f66b9e3d5f4a462157d4d09de371c31cecc5c64a8c6e1501ffd5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/zh-TW/firefox-49.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "2c98d22cfe74847143601acc36adceba62d93ca90adc8c2b8044bbeb101ef39f7ddc19210cd0905542cc8205cd2dfaf9709fdd3d6596113b9ca1eca522ebd7eb"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "34e58b3394e51a48e168513e73d916e76ff8cbb733cb85483c3f71076b31fb2d2fd72cc19994339cc23ec84989caf23514e84a393946ecbd2765ac388672ae27"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "fb640df0aa14ddf92db3f8cf94598b7321b2b9f6a0360de20a2c8a70e697e3a0e6f13b13704ce766766c8a7a428e4601e8cdc3044d64558976c81e34cb5b1a2d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "8772744f9ef9ad3a0f37fcdddb90b08a105d65f347e6e1fdf66955a95a3e12e5e18dae2b1f75895fa73914744c0a9d98556e84c6a1813f4dc9d22d7633749688"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "475ad078d26386336954a747ca32722422122638632c75d8f8302875b5d3ae9c6271352e700ebfbf7bd226fa5d740c6eb4aeda83e6df712aa03583d54e7cfedc"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "782e1a0d98506a66413f4420609e51ef8b49ff711b89345b806f243414fdbb1d179b1ad3e74f25e0aeeac0103ca75fb497cb2a6a94e1b138f98c593350a34c85"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "2130aefd45506e9dfa56183955dae528edca747bbd186b108a5fc31cd0271017ec9d8d2f88ac061e2de94b3c235876d6c20f65c11c4a6ae95625db3633553d74"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "aa3d9ac9cb446b63d1275a4bc2172a127a002f07a2c98771fe09e5585e2617a9bf8bd3171dfec839a47ffae10b47a65c9c76403449207b745e8b587d5356ba10"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "4e1649a2feeafedd73f3b7a137105dc6fde8cd83e49b1ca58c65367e262e9abbe3b2be73e0b778503b33458dccc99a9ca8bb3f9a6a01a7989c20ac8a262f7bf8"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "db178c3bdcff6f2c8166d28a380bf47c457c53bebb5d0bdd811af96d41b2233c7e487ac17a61a479979f494dca78800c289ce4e1f00a371bbd4e1478ecafedbe"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "bc37a83dcfc488a32421a784559f6c236230c3ce189888c695ee2f476024f5d60dbf83782eac5f41824a63cf6d9c7e2f775717dd664ab311b1c4337c0a9489c6"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "7699c57014e5a8545fafe2a11c8dfb066d5f0c9fa3257264df78d2926b86cdf5dd44846ff3ce755eb13f9e34b60a78777b9ae5d0799890ad93bd390109ca055a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "a2f0af3df56a3a99afa9f8144760545724f48ea454f84d51988773003d3550340402736a592cea1bfc3b4b728f8d38eee53fd22aadb6fc032902b14a5692b153"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "20f5911c186a9e11ac9f1913bbb4a5c4d6cdf99e4225c8025df0967420b18452cc10f8bc1d6508607b27ba067b2e9dfbeb68bf3ed08469d87997121363990705"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "85fa4add0e7dfcb5209c36a56438aa1480462bbaef29340fc76f710de81a419a3d6a58ccfc28592ffecc0464bae51b75cf0e658d078d7a18251849d5333a98e9"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "b93544226bca7eac5220878f34b23e1a9a740dc2bfeef4bec90057bd0197d77e6eec142e04f072f227d379a085660f3d19e112e3f55233dd82ad59e9e91f6635"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "fe752476db9babd70882ba947b860a810f76dfb9f2dde8ccdefe72ce960a7676440fbefc261c3b70a6d6ded6874166b81c34ad62c159b1e55101b804e93b02e0"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "b0436dc79fd6064e5d455d6ecd5f835b6b1cd855aa147675502468c9a332698b4d91e505eb92a45bf2aaa8479074eeda745c7340852a071a4ebe4b19a6e9ded4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "892af8626ee894bdf6408ebeae6c5239b5531a52b0f107cf7f207f4f87225a0f3d690aab233e0e6db9628b29cc572d65fbb4ed3f3ba0c15b54c54fca195929fe"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "371dcf9a6cffa6fa5a505d390e082d6703a4ca906be8870a07d28d47a00f94808ee456409e24d50d1ac75affffcb2b1f341aed638a0c6d54407f7d7bf1484e07"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "866629e3b07bfc6884c6974d411b553f48edb18ab3b01d2d8b74e72b2d0c1bec4d8ccf451c00dc3567f939d78f7b16837c8b9c54e875a987294f7c9e88d85395"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "a87004782631b26012dbac62f6a3c2dd5303a65e1c3a23113e9a20419f280450a4bbc7008d3e78448db65f6bcd670011e27a76dc5f930d96e480e1fc6e8a3e3b"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "4195e49bd40edf6aa3767be6c706d66e5d2a22c6e8effb57d101684934f5497d01abdc7f897c296e9129710365d0b34cb3f6f595a244d03bf0b25cd725433c11"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "a2977e3e4d926cc21e2dea941f34a7b75f0d99d454ae9de6a97f95e31277402420fb3efbf606098feac0832355b7ab36e2da90ca7b85cfcc3a9065bcbcc90c55"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "7c26ed2e7b9e37c97e4186fa02610205e4b4b4540a29efe0ecaa0851e65ffbbeca3b26b47ae99b8f87baf2212a8c5b6ab69cbc51ee4d3ef6805cd37cb8a936bb"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "08f93fb2c29e2f090702570a9390088954328f22a69d50a2eabccc3893e1f28ecde95011b3c0ee1f2082a447d61f86d4417b5e54b39858b666c69b6ea546257e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "1b4d4e9f74532974f7cf0382c2e4ca6cbee1dda11037df203f5a643305876e9bb33965ecbf68935b9ad626e77f86886b3deeebfd9326251f3dfe2b11a70c24fd"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "e9b270bd2b2b2e48dace759ea61d0c78e4b0eaa4f9e44d418e37c55fb8ca96ca16304649b1d57b30a31575c2dc3abc4b4e40d89ac32fcf8beedba055bd38049d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "d44b1c0b434f92bff6edc4c514d5263f2d48e31a741ab10f8ca3a29c831b24058c1952ec09d4f2e2318d0b851281b0d228ee7941fd07e4828939b7652d86f08e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "6b687dd14de728612de1ac96534a57ee1a82bb5e069cb1a5715ca688d19f33fe00079339a7fd93e13674c3fecd645ffebb36ba84bc597ed047ff4f3e51d9aa68"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "35a68ed2b047a70253af24112554e733274bd531b5cf85bd82893d8abae19f56eb9e712b564ea44a3c72fcd9887338a314a02f9dfec747d5eb51fcc5b91e8e7f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "c206bd2c38e38ceb7722aeaa607f29ecefde9c9a7dce67f3685948e2bd347e18807398b050d65a0a0f7aa75af28eb360733a2b55a1004845d24ca00276f8894e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "7b0a0236d16b6443cd701b6b87347839d218e458a99b62cb8a85e47fad46d7dbcc778042906db189532e37f4392fcdc08c150e81baf838e47af1894a9a3f03b7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "0d1a025f349ab6a87d82fdcedb2b5d5227fadde3b071d54347e66e4cfb9200b9a3e689898b286d5d9e92d05989e817c75e8ee633026a81e2c36fbfd89bd63ebb"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "e52b74c7ed70df4d9d182ddf43d3aa385f8d9d3020a51553b2abf03ba1e1002c56571b199f8e96155eef25bcd296add90c59eb389e5f96b9b671a67819532a42"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "9760bc438dbf5d318d34767898e4c585435694ba051fc3e88b9c21fe64d2513ae306d30655c021af6feb43de62576630dabbdf84dc379978ad7f27293206863c"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "cbaa47308c0718da93615fff7fddd026d9396dba581b9a095bb86025a63e0eafa900aef6ef306888cb6c8371d9c5d5fca7f8facfc3f603746d17b3acfabbdd54"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5bbfafea2170467dd84a297dc3308d73b01b41c89bac3fccde203205bd8a2ef6b699d239df22938d4edc71e6074b4d797f4ecebe6140ecf28e75e07a35bd86c0"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "2b86397fa086b15afb255f733ae12e821ab57b5045e3cb5e47bda703bfa170ef879c966049c2bca5c15f76136af250489c49e313674e878e1d0815d02e5e5d84"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "e761e49fe6d38ff37688b6b700c943ef5461e99990ddddb6b642403b9ed99cd815286860907245d27c3561f1e26d16b757a631ebc13de05df61b86bcba272f1a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "ce65e525200dc1b6890c1ee5c847e2c720680b28221c700367d373f0eb262f10aee1831348c27b03af9218cfc14b40106130d62005107c674b5e4e89bd8183f0"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "559e97300b603e1159beefc3d58715b437a9741cfef77f8c36955825e103d3510a88617601e95ab230b7dc27185b6ac091aa7659b7fb059a6c4780ed5efd3977"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "ddfdce0ad9215c2a41e659c8bcb0aa7f04bd4906e5420ea47c64158a15ab111f8cb4bb410fcbaa2a747e74621dc8fd13fcb63861f5bce06bb045c4170501bad4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "cc32b9418874f1fb60d2103a03a99bf56d2565be31e530e19ffdc4fa3f855d6baf8ee6e03363b1ad3beef624c9865774abae8563c7744e995ab13a3c4b50ca3d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "85b3f54f69de86a3461e977934a21ce1226af04c3df07635e592b1531c06084a31d5fe50687990d982994cea747c1a32e4f6ee65c90954752c05494c5a144583"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "fc7309f05662a2bed24566076047a7ab328bd098c3764c7b8ac8f58388be7225a26d9e917542b712338b29cfc06a603569750d607818946e2880f66aee8a892c"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "cad0ee863c3362e3e2798ad9c3026d5ea5ed8f46ad9409922fcd8e4a9fff9fa7d383bd32d7e0e13aed98116f85463060a99044398a7673fd2015a97eea06ed1f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "1f5411b427384132e5a4922249d1cc5596942840ddb3225864e888651dc50dcc601de59d52caae242e3c09733113955162a061446181ab85a582047baef019dd"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "7846e2db723636407eaff1f7d8327f683ed2e76600e0b2ff4cdbf4a2f5ffbb54bc7f8004a4604abe128fe15809f7ac257cb4c895c5a8d434e20fa896f73881c2"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "71544335b093db847bbb75d95d85ce79fca7ef628172fae7a4aaa42f1860ec700472e75cb42b5cd7ecaddd62e86cf99cd105b2afb03f6a523cf8ab430398101b"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "1712059dd0583535706f91819aa664732120b9771a2db9c19374b82dd99c3b08c5f96747936c4e004182e5a4c7226e38aa567385a91810b2d6569080881defb4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "7641053300343cae1ba6167cec8f35f02f7536b1d711dbe3522a52c3de841d4a1ad8798295ebf01805a7897118797c641cef380fcb00b59ccc6c609023df242c"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "1c25707e13c94039cbd2f05c72c8cff35c26f31566a89f238d27c5277362a4c9b26f57c85b35ca9740b14a8771c9dfd54346b1db8d843827d61184d9ad7063d2"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "d9a10289461272833bdc1423b0e943633edb352ec3db52511f64c35b9f36c8a9b807432799ad140d6086a839992bdacfd864f0110756d5991f288abf1e9060f8"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "e96dbfeb2c5d17f0e174d7975e57ec964c8dc6c4322b510a1819eabc081f371f43b63bc85085c8ff0bb0380afc9c2583ae4bc0aa4224dad99e0134746b96019f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "db99c4ccdb514ee68291fc41f38a0c0fca22bd235831b4c079a649e6e5b5a6b87dbd7512ba44c72dec31a173d128907298866b4855ab7259168402e3709e4114"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "0f2497e1dd719905494e2290f2dd09ac51b51058fbc27b65a23eac3e2d5e49adbb88a845e51393154ba69e2d5e67d7cd1911753efaf43838587ad417f39da251"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "d612e453d1f952c65a5352f54f52189cb8b92ccbb7bf8a191efaa7f919748dc8538f07152b3182839ccb3f66171d7e1d48a1927a3a346e51dd23018d144b0453"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "f1c47ebab9dc88932ccb93b24b7411080dde9ebb335b1d8f56041d1841f8425d104d0c1cb765f01222325ca5be10208f8b3326ad5aaae474ccee3c828648b4a4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "683ec0c1eb4716b9b8ae897052a1208492a24ca6803ce890d5ad4044fbca57a6d8c58581c54faff5753134b6144d157202d047e0b80cda1125df0d9e495e7457"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "a3da302a585a4cad943a71a8f6fa9376821e4ab4953acd56ffd3f3993fd9e8971bc0ac1b2e5c37a8ade28a0fdaa0b47b277abed18f38246cb1885de532186afa"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "988a8c2411dc43e4599c9db2a94e220738049e2cca4fc59ca073e2c215a71598809d5102356fa36132b5ab0e5a552183252ecc17688ad83a76eefe726f62e7c7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "873ace38cbcdcd022f932c1753eb9b4c9124a41b2589e89a84f050f90383483b6fa8d793a830d79860fe6f20295b5a8971775136e70877256f9b23900c7b236f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "0a1119a749db6cc2b277f4c1037d8163b6f35a0bd76ac0c121941502a821ea9c698822096037c242f29ffe85aa58fe97da821eed0b8995ef8f94f373567cef95"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "68aba1cc55f22c39af1c68e4e77e5f8eed5005a1f7c4903b03a3cd711a9583a99042cf82d2dbdeb74b897ea1d840888ef7a417d9f6142b626d8c2f3654e01794"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "9cbef7bc67fe071cf40734eeaa64be8ee0b7f3c5428cfeaf5b81eb4eef5c4fb38e36af6de389164b2b0a65f2cfa0d14b2e933883d343cef1212f03f6da9c1801"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "d8b5362bea1305546da3681c98452594c5b15ccb57945efdb7b6971cfd07b7b940c9952a8db8143ab9bc8ef55f034ef9c8a162ea9b8dd4a82af033f99c34d9cf"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "4f07573325b6def42bbe66e7dac08396520b66eea71230fcb432724cd6187c11d21325ae6084ed6c8c416b31f2a582fbb0efdf98905c566cebfdfae002875714"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "f5dd198d264426ca8e759eef8801e31d90f628788451ea4802397a525938790a7b83a68fdba6839ff669239c79915f9596cc7f0ed48454fa528833041d9b7e85"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "135da7e143fda33c6821002a0153cee11dff432bb75036731af68296142558f371d595f448dcb74b848b5e7a9318e80f2d0627c1554d9fb47de6143b5d2fd046"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "b57bcc4602433cd703ec660b57b3b7d72c5e859b69d8b12c77a8250a09c6148fcbbfbc3bba59a984d8dc3ab284c11dab9cec1ea67e9d1f56e5f0b177e11358bf"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "901833140bdb0eaa7375fb9f83a395fb62de11df2b094b65e4fdf9c1c1b55e1fbc61330fab861214c843bdca5722f1f0f5c25765b15c883434fbc571d86768e5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "3aadc1c35a8d498b336fc9f6300a467efc1d51161dc15099fe8d588deb4eb6f4255d2730ac21c9cbb98b136ac5f31993458368892969d0bd00423e778fcc09ea"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "42f85212a3826f2a80c957ab717e918b0f3ca622cd057ef091f5ad749bc6b3173db3e8d0029ad1cd79d33b1d0b88eaa2b8e3de22ff76895cf1abe3f166610c83"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "e2103c5af60b6d318f8f009418811f0f7c27933ccf1b72ca998b8e66dcd61c3e833a8b3a9f078f0ec212202cafdba25f8054cb13f999a8aae88310ca6439b797"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "b00d74f2f954395027d48a1c91325ac21c0bbfc2d20a44242f5bd8f74780d6e2fa46e4344113592b5b4f6c8d106406eb62d2373f3b8adb042cc8fcebc3237f98"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "fd1c042d586a59ba35d77095cc8f9a72a74a68c3e90318050854433f74b79a62019535f0baa63e33c7687cef401ab1668694ad1fa54a6dd731c77ccad66f599e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e339859eaf9b2bdd8b4c09e2b3c22f35a8b72bf9a5c3fe4756576c34318cd1219c663190596196801acc09652e8710c8133e91e9abf30a1fd9e4c2721a9270db"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "3beb1c6cdd6372615283af42074c4356009addc9ad41d98b01d008896182831c6275dc2398dbd477b9befacfd88a84415d2a45ef2f03d4748de8c5837fa4e7c8"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "dbf599e7eb564146977cc59587b40bcf02c0e6b0e853ab71715635884d883e0427fd53df6950e7da9bcecd979bcf5f9c5a08cde9894e8b68d6faf42467baa020"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "0e6f7818fa7c22483ef976684730b93e5793cbbcf79ff96645f9527b41d1bdbec8b0c25aba7ef5a3c4895888a9374dbb259ffa7ee95a1c3eb3633d46848711a5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "c439babad0a48b8eb495b65510f33879038b950ff11820f7cf9fc7363092e761a95c9e9b7b9b51b7621efd4b39ae4ba45bdbd0ecf9fa14aa2bcba656a38a1106"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "48d9c9233115365bbdd5fcc4d5a59f5e254394b030387f4338086552734376bd77a7d4405ba75807e78b332d49fc04dbe4f2ce9c4d4fc625eeaf5ccf2cf29a14"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "a74cf826abb5ad09b4ad76e5292eed081c904560fa7579c8ea2663bace3e23f630f7410782e47b44bb123693b5a053513e07e3377b36770d3deee4bbf8334b4e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "0266dbce27dbd09262b892d4bb6f8179cc5f710ad27618c6f3fc2f4a4850d715c12162729d17b87b60327b057fcf5e8ce0e8d64c7fdfcd56f41f0396e34ff5f2"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "ffe0bfc30861ffbbc50fac77fff688bc716e4485c11134757c6ea1096ab6a76311d69480f47bbb6ee9d67b6c00061436d8d402b31e3c97b86283cf0a027d1b49"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "9ade7154bd38c9fac3291574d0ba956ef39c47d49d24c4a0006ff28b6065ee020074287e093742bc073b3d5f9e32ca517f84054ae5df72e513a7c4dd1da05903"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "0d1d75e61fd2e70e09168e1cfef9a936868d49c31a0df036b15a98f5eec353c122748369eca9ccbf696621702ec3e2521b76ce92a6c9ee0cc4ac7e20ab6beae5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "da7ba8fbb68ea0028408ceadb328fdd59b2df2514948cabf14da56ae548441b697598eb199772e65fd6fa001ce5e116fe8bdff9818c54110dd4a9574a021400e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "f3bb00b3725fb8c5817923a2a40af5e21abe9b85304be2787987132822af9318cb7b1c7f1f9657543e1b8e07f09870411e00c061ddcf293c5ea0634784197390"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "7119d7730d4231d2e1a9c3da810fa1f030afd4fcfdd19df2e7879ce294bc114468324bec41126aa3a234604d30d4fa7517028ceb9c4258b470b4c45b6e796131"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "41f68050eab542a96482f63769b3cd760b5a61ef06c5e11af78be7428d287d06e61bc5367b9cbf30a96cd33e785c21f939639e64071ed1828e0a2e9bd834b584"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "295f9f02994d40c658f70819d42ed9e5066b55675acf4f639ffa88b5b922d586b9bede8a20608a4c6e7533b206dfbd5b4c78d933d05c0d45e6d248c7e8ede611"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "80a2f18d1f2a306005761c7df5a7eac3d5c1a0ddf8a556e9ad641ae1d0f099c359d9950a1e29f9444c191d27659242935b8ce760d80118096c4334047ef4c3a3"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "318767607dff10d4ddc5b18e77756eef267a49c5a8d866c88f971cd126577632c9385c7f9981282f2720af82a7c050db098312e07c5d8e7f442d6610fa93f935"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "33355c4b3a5bfc0737bf8d473bfa0b91eab12ebf1f7960f2c06e2b70940e928712398147eafed5e3e72ebd1cae3ed0df262bdd3fbd9b8314f52afeae1540ccb9"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "dcf596d4013b5d370802b0f717e327d2cd2c6fad377e77e3230d2d1f9b9cb081bcd6af514a56aa06bec625c5fc55213022eec4ed6fc45289dcd459205deffead"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "4e8bc5fcf1dd6e059bb1aa79955040f3a59c814b3bd3812c59df83a9ae7e07d0b9bec64c14ae33ee9f6688ad027e3545d54a435fda8a340f11f4bdb96200b5f0"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "5368d47f4676eb165b91bed0d9e53f0f0e9bfb4b0edd821e17b689267b90d7932c84b8668c1e5f06f7ee3dc6a66fffa2516446f1ad40faaa87d7fd521053085c"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "23d8b1e901f213a84123192796cc314ef6bcf664f31c15aecbf1112911a4df76aad41b93806067437cbd40c0722b54ee1139911b32057efa2f783819d39fa2e7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "378e7765f081bb2abd25bff5bb3a89046a9f2bf09390c2830f916f8c7e811d32359cbaea832d433062fdd31b9251242361483851e91a15070b0420cc7a5d6344"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "f20fb6d3bc76c5ae40b11547ee1f4542460f781bc19a88fdd70dd95e5fb74de2adc3e642283d2baa7ef26cc49e5574addadbb5b18a804dd77b9c83900c15809a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "aec4ba1d3c33bd586649b219a1fcd7beae8e51bdab1b44c311414cf141f452550a41e6a5044fb2ed9a184938f49e2196f97bda93e0cf5c7400463222da1e920e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "b7e72ef90953825ef50d98acdb0040b9a452e5e7f3661dd1e574eb045cf8679375afdf6695e866a9e70eb2d46c38d3eea5918b8373bddd6956ea42fcc3c50a3a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "c2c03344eb5cbfdc3555221fd66b245c38ee9fb5df40806ca475b1b5a94ac7c488816d18946c7cea0b8a556519d4d40d39224ee327ec59fd399c3c8e761fe575"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "1f79fd7893de0c5c773912ce5c96ccd81f29fa5ff879ff882d96dfd778b12c05f9476fa8e01a2f84d35dafbb53aeaeeb53f9a06a7abeb0b93482dd8c430891b6"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "ccd6987dc3bcb13f483c12015933801b6e4e85d0de1f9179e7e959ee7f6d75bee79de67551bde5ade7c5d0afdd58aa9367fef13f9caf0f31c9626742e20f03ba"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "c63724966e962bd383ae8ba0dca744c547c9a794f0f96f1a51bb2bad04a786ae3f00a09a39d679c28db254c37a99795f474042fb8dee46754ddfb0a7c50297bb"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "8916c80f522578152783af409b5df23ea554f4d711a1d85de1445678372eb856a2798263b2e638d72a5dedf3870fbde5c23ebefe7d051bc5c781f0363447a112"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "da33a16e3f8b414cc32b9dd3b4993d8c3645fae0066e92f50d659dda50de664ce6a15c0959f0b3883c7ddb23e14620e5d045fc0961da4c6c57bf638ef238e871"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "fba1f0fd69974d679c52246b9977f4d03d70c32ef4c77831d3305eaa30c4e19cca36692bee92aaa5195a4db34b162b909dd4b56370a4391aed33897b7f36463c"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "28879f30f4db7f26f5bccf9219dcefcbf79437dcbe84d2ba7a27406d4ea4e6b4f3941bf2944400952c37df861f65db98ba60581df33a49a3b513c260ec33afca"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "d0eea75c2bcf8f1040025807ff496c7e48b0949b633d475367b9721cf6c3447d2a30137afcdd54217f1d226cd67e3e5413d348eab9b63f95f3bb96b43e5fa5b4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "0991e328fc606eea0c7b67dca5a19c2c94a925d20e998994bee262a90fd69ba592936f29fe88ace97607c1bc3207f5f30ffafb5044a6e088967dbc2880bab154"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "eaa6aeabf0f1c00cbd08d69e2a03d332ac9b022711aca0b09794ead8989fcc714313e8157de1884cdd3364b1fbeeaf62d31d61aab9baf34bfe97b5f56a55682b"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "113b76cc2e5f0467b7cf02091857dc60bdb1fcb965089ad8a7196dbb15494642d161836d79035c26c09aade1ea1eb5cd734dc23ff80402b5b1b45efae9770892"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "531f667d61dbf8b6cd90c918464e8456f907c964899b5819ac91fa6493b446ced18ada61c5a2227cc7bc044851142e03388e1b924cfc135cf5d61d1642369104"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "42ba06b3c89c9702574f89f225663dc438bf4d2c8cdc698e80e46bcbb292814fec2487b540a3b4e4cfb484c146a34bedfe3cde0af504b9453ee7f7dea6688c29"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "6dd7fac8a46343a0abf3958a044e534e0669894f30611aeb753a77cbb0da607f240672d1912490a3d05f312179d02ca96339e92f104298b9ccad45ab076bdd3e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "fbe110a9ba35be23b38511d5caffd2d1d0d365d881403b287980727987fe2b40ada8d6fa656faabc4eea4bd798f13ccc00de90091bf14cdc3dd4cacb28349f6d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "831d7f10a08bb9e6bb5ca163c8e172f9a4855b2062fca66c4832192eda45b20d64585f88ddb08268328e00f2d678b943e5d961f630cbd9730fd788997101ce8a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "5b7e6f3c8ae0dccff269c97b8efc3a77e0468f0689a90afa61cddf8e88c3f3f4c3d9bf5ca0100376dc7d23f4d676739a2582235edee8bea836366cd38a4f4fc4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "0a6ed3141038fdbd9c4a68dbac0178a3735d6777b60cbab679d6115e4c3b382bb59c6fe964924695a23975b44c064ad997d3f2f053b76dd8a0f241f157a86a54"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "ab8d8f2984e94a37116a49453e0662a56fb83b981ef15627f5e328dc7d2bb595f09d6efa51d8840ea351be48aef311c177ddb24238bee6a5b7bc3996f7f888ba"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "7bb1f611b4304f514183cb445b2bdd8d74140a4758b4c3a9664d7f62137540db191eecedb52287e45c269198f3d952c3e617d3bdbce2606dcce3f12efa59f5de"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "c6ff426bd09681209a36776e2a4b4282f3c4d50b3c9509b1e964da536527e03ece806b6d615e035a8f7425752d4796f11bbeb51cf8ce10b7c4b2770096366d94"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "dc7ab98a4d65df6a7e3496bc4ed37db622c8c26f790a2072f869cae8e4232ca2a3a7e299af25e7bfd855516e2de41745ef2cfdf2452e4d98bd60881c0845f44e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "e4a2cb87bdd925faf6518e38fc7ccfed781e679df22c5456239cc5aec0afb5aa48f774225ee6fdaf82c6de56ef53c8738f8396c76a133c5eeefbac6a9ab96af7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "5f0e719b40e67832968a1e8c9df8c3ddf7890b3e82ed555a3a2369637202e5f4c9f2a0b8faf7a2f6aa6719b033e3ad4f27dae3d6b5b0f0333615a8bb636320d4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "cfc57c748e0f940ba164b13c64d1129263d890e489ec0753900696947f869ecb1793f69a1f8b2cd986eecdd857ff7e94c28985248950f6a15f6ab15acd9046ca"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "e7bdfd3976ae41a5f9fbfbd6b177f5f6815e68d9069e8916123574afdacfd28e0032211e7b1760275bded18bd3602ebf5697702edf89990c3ebac3efac381861"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "85fd914b626e27727461dc269c125539793e1a1c6001ea035c636bfee62d42ade799fb89bfba0bd4a915c5b33f6dd4569845cce3f189df1cb31ed2052fb90c30"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "6a478dd27c868c5e5ec0cda838044ca132eb89d93dee8556591c5651ad9ef8a6d89522498dd5d004e8e84d7ae40c09c69faac63591270b211a60b37667196a6a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "335e08ee71febcca07e7d11310ed407a888aeb840c2cfc960a13706ce7ef1ecffcf6f8a21f65e1ae1606e88a3b383f9f3bb8d3110a8f3ae768c0c4277d3cf5fa"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "e4c4708c363346af1e7e58664baff9003e890aa934ccbdebaf682ec4b140bed7ab9b93cf657440401672ef1cfb79916d63f164066cc8ead18546de4718aed9ad"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "67a60e43ef5670dc2d669efc62101b87a1caa97c8bf8052c66396efa75c11dd90717b78b7dbac17cb8207549d26ea41d8bdb2965ea249618258de5892c4a40b3"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "c77dbfb443da63d0503a9c3586d01517b463071bfa8b739397b070ce80b8fde2a6ae86ba4552a2efe995eb7eb47cef7f6e2688526c7455c9d308dfdbd229ae6f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "85f6e5525f0e1b6d691613903f1646c84bcb7758092101c5b64e2190221e5d041e66938845c97877dc79c72aacaf9da6d6009bfaf9745d7138b58bf957591880"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "0dfccd89d0c8a58a37b66e3034491139ad5fb16102f229c45f5ffcfabe77fc2f6a3a5d01f38c2471a770a1c8c8cf884e3a65cc793efe298366098280eab9da71"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "8b4ac20ae1fc5a7370199c6dd1e56f2bdb8f394b84e61410d4d33916de3aaab13d1c36d9944f8d6676895838aaf5e8a8beb0d5eadc82429a827214f528968aab"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "2c34abddecd5a2b83d8abef842b165ebcf601b7b90ffb8dc80a265b5297ab33da193ba450210be025d9ac8f826b7b4227063d66c9624bbcee06f01c787406a91"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "e5a1618114152348b19bc88f7e584d8bad09fedc893ccda0b38b55a1c449ec7f53f74dbae5901414edf74e4f3946e997e79da1ee597db29ff2f884460c2596a2"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "6cce28d554977a263c4d38675f88bfaccd4272c75ab82543b023f57ab503dcc806cb4f824681aef47dc788ed9fe85d54b0b1026cb0dcc4031267715929269fa7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "f06f72078658dc8f28fe376af8459980b1ef0470c7fd9557afb3cb4052a14e4e57d6e6131b5f158859ff53efa76ddccb10b95a5731a3c42654907bb8e776db85"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "73b537df635d7278f8251ee0de6ddaceb1f9f843187d7b5ec5f0a7ccb8670cf97020a4ad9d22a4479b12dd0e81c36b94f557fc99f45dc70e6efe1914395d788e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "8ce0260f462af9e2035987af36d90bf3b410d450cc69baada0326962b8a682c5b0e905c7d8a4d30875e4a6f09ca21a04c38db21955d3834c7edd3b5b72758e8b"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "d195066b01b39292121e4016a93d5e2ca02e0f8c3941f371a8033bcfaa4bef2966244ab0def982b1d8814b8d4af95be14b3e4ca3b900401f142aba9376e9387a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "5860019163bd0bbb2f2a45396f74618358f294bc0a18cfdef148c28dde288050432bd4e1f68cab46b1d08e822f8850f5d940e6ab153a929052e5569199cfc2db"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "67c6e5e5fa32458db4fb4849796dc042a3f8f8a681c7cea52160f21841776dde9b746a068b090dd21d8db790b37d2306d344fcfc173a92291f73dd0b5d28b293"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "b218ca70de786cc046146d237283b808f54896c5efb8ca3a9ed2f5b6bc3201abba3ce0d01e3af453b097035b5a19ede69e8ce2543a84efd836d72cbdd3f60070"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "531f00041cb3eadf78b21f4bfef4429462b4bb3c497209724af5cfd75b879e2dfcf0f64135c79f6be1fa4c9b61a8735f18d6b74d4d6ffab0c252c2e02eb88ab9"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "cefc02bb41d10e463af03b086da872e1cb191c5c44da2b69d0b3005c04d994cfd7c9a05205c2a74b46cf4fd920e12c3fd439da85b6ea8301a04ba07f0387b80a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "8334ff7e81e83e2a478705e1306fa8d1fe30edace143b5e84ddfafbb8d1b21fcb6875fcab4b36fc7f264fd738dac2821d21c0abffe71899691092ec67403ffe5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "2bb22102e3597987f81d02f0f162b94505d191c580016af1ad425d7722ec3913ed17d86292eef094d3631d4e0bb8adfcafc5372dbf6c17ce4fd73f4ce8695742"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "97c9d25d58f0fa546237e9f10ecf9faf52e98242aa233e105233fb36ef97de76719588032d1fcd6b85cf2bb2f096e158a3c02774eac7cb026788d6e336cb5015"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "8ceeced6f4800f66499a30a2ec2275f70006ab875a7f1c14c095da0400cc7b9e93251da2156df07f2c861f5ce30adf5cbd3c263b6173ba71cb201d0dcfb28aba"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "8808edd0aced9810f191ea4e160aa316db12dfa663e6e085d848cbe2379d664a7c9005d5f9ee024d441398f47a87978d5182dc1b4b69bb9fc5a3b8be83f44457"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "cf278fecf4a9c7a2590ca4484643c0e430e2f696479d3c50f06068b8191d2353b93c254385c59bed7b077aa83718561c0b387890093f2f026133362a5f2c45d2"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5b89d98d4bd5f618472bf0531839a5faed960fcb4ecbfd03f894f1aada0f73126a6f9351e1096379e606c6e7ed1665457da9eec05132b5838340be254c091873"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "3a9549e949628d170e04e696db4f8b436ca240ecff99aff8cf7431391b73124b3278a04f5d758a1b3359de6fe264ba2552072582a8b385c797fc01049fbbd3c5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "45e4d83ebc97cd5da01e97a6bb083b3464d4b423dadc255ae49c927143be92843dc054357aafb6857f95fe004659833720453b049660f6dd6a75b4d433cde3f7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "a203c9c80b4c64fec9ebef68279f70b23e1ddfe6a43ce5f6bcad48c9ccb3fbd1835b7a5783c1b4aec3e389301240007bd1fd402db692d2d9000dd5f28384feaf"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "8bdb4da9149743ec4e66f37e0346c46bd011105d09a6517ba8ec35eda4d47d06ea8763114f736cf98aa79b0dafec42e8c8f8285ae87ced63f51f60e2c7088cf6"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b6d1fa74bcb003f2c5a3dd57c226ecf1a7a99d2874ccf89a525ca23ec5809f12f2d1fee20ebbe9096d9fdd13714d93a46b8ce83544c582a94cb9e39f80fe3ddc"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "0ed976141674b93154cd0f48cbeb70d5349a3642066bed36b53f9c9e8e78fd2c0409e4bff7de038d07480e0fed87fc96485296f4cda9a2a3b460c7dcab622ab7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "60c4e8c2a1d61ec87a6ce0e0a77a61412d3f9e28dd3310666da0c8ca58ccd93765f20315e8c4866138ede58465626fd16fba5196808fd716dff9ed9ccecd0e95"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "85fedf1de1c5ceaef81765031e8d5e24145bf1851331d82a319ac54ab0b3abf7f896d69262c82615015e8854649321a9352037c59baf0827c2d3d2d7f40fdfba"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "cacc9b4ccee14f1bfb8c9828c69903933d92fcc73c8fe7b83eb5057e6636b4cc35d231746ecea4e319e7537f7af645fa0c0f8dc5bbc70a333f83ab06780a4ac5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "88070db1c08bc68231fd32c4ee812ab4c225a3b53a09773bc55ad82381813b822d12fefccbb4dce6b41bb89cc57ab423caf8051b9ecdbb9b9f8e55025d90ec4a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "effa5261281a2c45549943d2ea757bd0f2a6100921566114bf6186695f906ee6a19a84992643f4ba5e434b397d4da976ef137cc3992965d269d3f8398def88e4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "759cdbed5de7367fb04a412122423b863095743f15e310ec4b4416f89aa8b76cb74fbdbd05524ab0d6ca8f420057d9fe937c7f44e44d5079d35afcf8835e11c7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "57937cd67abd7aca0e5ebfed3e890237dd305a45499dea46d31d8e4994195af0365e27981ba624068781df5b0f64437148564604dacf83f96ceb32448503ed41"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "94ffa3c69613db6124278edeed6df2d11880a47941c8761eefd86b30eaa6f6b60e83d5fb5df25156613ab74f9f0491e58794042dc1df74909c14089b8cb3b232"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "b5280fe0b3d5afcb37afc1c0d18d583f698eca1cd01abbe22ed9c3726db9327e9f758079856fedf23b533a9d64fd47ae9da733a1138ac715b4c0ff043618b89e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "d6c658a6c76606ee2861b89f109e1de707e32d1b3136bc92de9f60f2257286b271a0594517d53bcc727a86cb457d33a27bc9574de60c4059b2a203fdd5601a2d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "cbe65faa2d20a3740cf1ce97efa29f3e9e1697feef0f63f26d9f7577dc626114834f8435c3b7c7d3989bf3f985d5ac518ab59f6ba9eea4fa86b8f5a20dcf7cc2"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "919f2fdbf20f39698264a7760ce8df4c7d979bbc91a44ac6a2a258c2ceafa62bcc945dd07a3fb4a4535f47c4e90dc34e06ac0d58165d6ea8edd451bf147aa818"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "f8c3c5424bf6bb41ac9143b20a57bb1e78688ad9ba9ba35a5fe00c524354ca9e65db3e0d4dd2b3447c76a80332b9f4adc16fc5daeab61e35ecf868ea935228cc"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "1d331b1b1c1bf3f84c7378189faa17ca112869b0fcaed57184d5f40d05c9d336a06fecd84bac2a2cbfff5494f0eab472fb4678a82af4541172b240f5baff68e7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "0f59002f5d5ae044a07d3c6136a5db19d4c3d067da8617614b8e8b68f266475fdccc32e1bc59bfd3195dff3e475a4e3f1cc6d505b560b8322744277b5d88885d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "1a18d792941b4a0d49c1321cd53d397a9c667de62cac58c75229c0b10327cb4e39b7c5df294be378aec581647de1f52c17a309724689f010d37141aa5691cd2a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "d58697f7898bf018958d5fc9389b4aa65c81c61fc104e51d758b0a15e19febf22c882b740f12536dfda3ba776019859637b66aa4e302735b31abcff098762175"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "4a53044f7e44e5239587256d24f8149ce0d4606bd53ac6a3f1ec48ca6950a67c1892036730ed7743ae53905ef3c33aa4e192805c8a279ced68c3202342439a77"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 828c3c9d2dd..650f4a3006a 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -141,8 +141,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "49.0.1";
-    sha512 = "0b1lmsxazd32xxlbbzg01xam7qc9m7abv6fnl1ixv4dz0xpfc88l1zikskghhdk9snzglyl3lidgnbkli9039g3gf9m06yv77gasmkg";
+    version = "49.0.2";
+    sha512 = "e9daa62c8e645ec034f1435afb579ddb5c503db313ea0cc3e48b7508f8368028979de07ca1426cc4c0f3ae82756f39dcb3b349712d520b8503a34afbd443fb1e";
   };
 
   firefox-esr-unwrapped = common {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 6f8e327a6c3..c33bff60e01 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -17,11 +17,11 @@ in
 stdenv.mkDerivation rec {
   name = "bluejeans-${version}";
 
-  version = "2.160.66.8";
+  version = "2.180.71.8";
 
   src = fetchurl {
     url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb";
-    sha256 = "1wf9jgd2717gfzm2wb0hxj4i76kczhgnwfhhpiy15zkqdcsmczsr";
+    sha256 = "1fgjgzss0ghk734xpfidazyknfdn11pmyw77pc3wigl83dvx4nb2";
   };
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index 3f1b5dad727..826452016e7 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "drive-${version}";
-  version = "20151025-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "6dc2f1e83032ea3911fa6147b846ee93f18dc544";
+  version = "0.3.8.1";
 
   goPackagePath = "github.com/odeke-em/drive";
   subPackages = [ "cmd/drive" ];
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/odeke-em/drive";
-    sha256 = "07s4nhfcr6vznf1amvl3a4wq2hn9zq871rcppfi4i6zs7iw2ay1v";
+  src = fetchFromGitHub {
+    owner = "odeke-em";
+    repo = "drive";
+    rev = "v${version}";
+    sha256 = "1b9cgc148rg5irg4jas10zv9i2km75x1zin25hld340dmpjcpi82";
   };
 
   goDeps = ./deps.nix;
+
+  meta = with lib; {
+    homepage = https://github.com/odeke-em/drive;
+    description = "Google Drive client for the commandline";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/applications/networking/drive/deps.nix b/pkgs/applications/networking/drive/deps.nix
index ad5a8f7c4e6..ca132288bd6 100644
--- a/pkgs/applications/networking/drive/deps.nix
+++ b/pkgs/applications/networking/drive/deps.nix
@@ -1,38 +1,30 @@
+# This file was generated by go2nix.
 [
   {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
-      sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
-    };
-  }
-  {
-    goPackagePath = "google.golang.org/api";
+    goPackagePath = "cloud.google.com/go";
     fetch = {
       type = "git";
-      url = "https://code.googlesource.com/google-api-go-client";
-      rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80";
-      sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8";
+      url = "https://code.googlesource.com/gocloud";
+      rev = "7450882a75c8d2600748666d1ed16e0a5afa532d";
+      sha256 = "1hl2lsf9m1imdszf5mww4h6qrcjfdjghwh6l2kqsy85d32vbkjgd";
     };
   }
   {
-    goPackagePath = "google.golang.org/cloud";
+    goPackagePath = "github.com/boltdb/bolt";
     fetch = {
       type = "git";
-      url = "https://code.googlesource.com/gocloud";
-      rev = "6335269abf9002cf5a84613c13cda6010842b834";
-      sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf";
+      url = "https://github.com/boltdb/bolt";
+      rev = "074dffcc83e9f421e261526d297cd93f22a34080";
+      sha256 = "1kkmsby74n9czqx4mvng9x1cvnm4qgjl3dp6b4mfmg2b00fwbqnv";
     };
   }
   {
-    goPackagePath = "golang.org/x/oauth2";
+    goPackagePath = "github.com/cheggaaa/pb";
     fetch = {
       type = "git";
-      url = "https://go.googlesource.com/oauth2";
-      rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a";
-      sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8";
+      url = "https://github.com/cheggaaa/pb";
+      rev = "ad4efe000aa550bb54918c06ebbadc0ff17687b9";
+      sha256 = "0w6dl2s0vzb64q85yfy1hd5z2fq2vzwygiwl65is6hwa4vkc7hi3";
     };
   }
   {
@@ -40,26 +32,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-isatty";
-      rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449";
-      sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj";
-    };
-  }
-  {
-    goPackagePath = "github.com/boltdb/bolt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/boltdb/bolt";
-      rev = "957d850b5158a4eebf915476058e720f43459584";
-      sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf";
+      rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8";
+      sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5";
     };
   }
   {
-    goPackagePath = "github.com/cheggaaa/pb";
+    goPackagePath = "github.com/odeke-em/cache";
     fetch = {
       type = "git";
-      url = "https://github.com/cheggaaa/pb";
-      rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb";
-      sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam";
+      url = "https://github.com/odeke-em/cache";
+      rev = "baf8e436bc97557118cb0bf118ab8ac6aeeda381";
+      sha256 = "00nvrnp40w4m1ld89k3s3gwi9qcfjxwi8hnp62zggnvqqyc4fyz1";
     };
   }
   {
@@ -72,12 +55,12 @@
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/statos";
+    goPackagePath = "github.com/odeke-em/command";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/statos";
-      rev = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6";
-      sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs";
+      url = "https://github.com/odeke-em/command";
+      rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561";
+      sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62";
     };
   }
   {
@@ -99,6 +82,33 @@
     };
   }
   {
+    goPackagePath = "github.com/odeke-em/go-utils";
+    fetch = {
+      type = "git";
+      url = "https://github.com/odeke-em/go-utils";
+      rev = "d915395a7a46a9fe73d93f4daeff5953eeac5ef2";
+      sha256 = "0c1z4vmz69vxak8ldw4qjcgwia5ph969gj80az7a3824gia7zhbh";
+    };
+  }
+  {
+    goPackagePath = "github.com/odeke-em/go-uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/odeke-em/go-uuid";
+      rev = "b211d769a9aaba5b2b8bdbab5de3c227116f3c39";
+      sha256 = "086l4xmwkjl5qcylcb5iwy9ksk9k5g43xwfbkcgvmhpz5mq3wmz2";
+    };
+  }
+  {
+    goPackagePath = "github.com/odeke-em/log";
+    fetch = {
+      type = "git";
+      url = "https://github.com/odeke-em/log";
+      rev = "cad53c4565a0b0304577bd13f3862350bdc5f907";
+      sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w";
+    };
+  }
+  {
     goPackagePath = "github.com/odeke-em/meddler";
     fetch = {
       type = "git";
@@ -108,57 +118,75 @@
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/xon";
+    goPackagePath = "github.com/odeke-em/pretty-words";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/xon";
-      rev = "d580be739d723da4f6378083128f93017b8ab295";
-      sha256 = "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc";
+      url = "https://github.com/odeke-em/pretty-words";
+      rev = "9d37a7fcb4ae6f94b288d371938482994458cecb";
+      sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl";
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/cache";
+    goPackagePath = "github.com/odeke-em/semalim";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/cache";
-      rev = "b51b08cb6cf889deda6c941a5205baecfd16f3eb";
-      sha256 = "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4";
+      url = "https://github.com/odeke-em/semalim";
+      rev = "9c88bf5f9156ed06ec5110a705d41b8580fd96f7";
+      sha256 = "0nq93dcl84cmlvg31rdk281ndlc2452zlh5s7i40hasi0z0kmn1k";
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/command";
+    goPackagePath = "github.com/odeke-em/statos";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/command";
-      rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561";
-      sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62";
+      url = "https://github.com/odeke-em/statos";
+      rev = "6f7e4db337bc11fc46d9b0456a93836cbbfe5141";
+      sha256 = "1lijz3cxqxd78sl0nzfgvs675dg7q99jqwvhgisnk9n84ic4ffzj";
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/log";
+    goPackagePath = "github.com/skratchdot/open-golang";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/log";
-      rev = "cad53c4565a0b0304577bd13f3862350bdc5f907";
-      sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w";
+      url = "https://github.com/skratchdot/open-golang";
+      rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c";
+      sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga";
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/pretty-words";
+    goPackagePath = "golang.org/x/crypto";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/pretty-words";
-      rev = "9d37a7fcb4ae6f94b288d371938482994458cecb";
-      sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl";
+      url = "https://go.googlesource.com/crypto";
+      rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3";
+      sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj";
     };
   }
   {
-    goPackagePath = "github.com/skratchdot/open-golang";
+    goPackagePath = "golang.org/x/net";
     fetch = {
       type = "git";
-      url = "https://github.com/skratchdot/open-golang";
-      rev = "c8748311a7528d0ba7330d302adbc5a677ef9c9e";
-      sha256 = "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac";
+      url = "https://go.googlesource.com/net";
+      rev = "6acef71eb69611914f7a30939ea9f6e194c78172";
+      sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "1e695b1c8febf17aad3bfa7bf0a819ef94b98ad5";
+      sha256 = "1sfgrc63jwslczkld7bsfipw1jm1rn06228dx0vc5gggd52155ys";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/api";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/google-api-go-client";
+      rev = "eb84d1a029af1654777e7ba65c979085305c3e38";
+      sha256 = "0ldmzcx5lxa81lcr39djcvyhd0ls11jlswj5877rinq3505ayf5l";
     };
   }
 ]
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 90c6bce6506..9639fe9e74a 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "11.4.22";
+  version = "12.4.22";
   sha256 =
     {
-      "x86_64-linux" = "1fpwknf8as2h6d8d11nb8i0q4ap5r6fvii919b3pj5d29jgfd25l";
-      "i686-linux"   = "1dv60ijb93464js34vk3l8hm8a57zdpkzhrfkv2kp3v3172cqj8s";
+      "x86_64-linux" = "1vmaddk19w9b9lg03v2jr532qpk6miw24rrprx6x6md9ll9asv8y";
+      "i686-linux"   = "1pzxsdsi37fvk0gr69m2sa61q7afy5gcz8p78nsdr4i0gga1gxfr";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
new file mode 100644
index 00000000000..229e3497ea4
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit, python3Packages }:
+
+python3Packages.buildPythonPackage {
+  name = "scudcloud-1.35";
+  namePrefix = "";
+
+  # Version 1.35, branch 254-port-to-qt5
+  # https://github.com/raelgc/scudcloud/commit/6d924b5c23597c94d1a8e829a8a5d917806a5bc9
+  src = fetchgit {
+      url = https://github.com/raelgc/scudcloud/;
+      rev = "6d924b5c23597c94d1a8e829a8a5d917806a5bc9";
+      sha256 = "01k5am3067l3p1c91mdrh2fk3cgr20dhppa6flqi5b2ygzrc1i8q";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ];
+
+  meta = with stdenv.lib; {
+    description = "Non-official desktop client for Slack";
+    homepage = "https://github.com/raelgc/scudcloud";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ volhovm ];
+  };
+}
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index bc1d0344490..8de3bf1326c 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.12.1";
+  version = "2.12.2";
   name = "hexchat-${version}";
 
   src = fetchurl {
     url = "http://dl.hexchat.net/hexchat/${name}.tar.xz";
-    sha256 = "0svwz9ldrry1sn35jywgpacjj1cf3xl3k74ynwn8rjvxs73b00aj";
+    sha256 = "1xnclfbrgbkqndxygi5f27q00jd7yy54jbd1061jmhxa6wzpibbd";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/irc/quassel-webserver/default.nix b/pkgs/applications/networking/irc/quassel-webserver/default.nix
new file mode 100644
index 00000000000..abc43d5e33d
--- /dev/null
+++ b/pkgs/applications/networking/irc/quassel-webserver/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, lib, fetchFromGitHub, callPackage, python, utillinux}:
+
+with lib;
+
+let
+  nodePackages = callPackage <nixpkgs/pkgs/top-level/node-packages.nix> {
+    neededNatives = [ python ];
+    self = nodePackages;
+    generated = ./quassel-webserver.nix;
+  };
+
+in nodePackages.buildNodePackage rec {
+  name = "quassel-webserver-${version}";
+  version = "2.1.1";
+  src = fetchFromGitHub {
+    owner  = "magne4000";
+    repo   = "quassel-webserver";
+    rev    = "dda457f38795d15565557a8629085063fa6a7378";
+    sha256 = "0syglfdmjnssxdiak1dw8cns5f736v58zmlsh81dvxww90gx3k7h";
+  };
+  buildInputs = nodePackages.nativeDeps."quassel-webserver" or [];
+  deps = [ nodePackages.by-spec."body-parser"."^1.15.2"
+           nodePackages.by-spec."commander"."^2.9.0"
+           nodePackages.by-spec."cookie-parser"."~1.4.3"
+           nodePackages.by-spec."express"."^4.14.0"
+           nodePackages.by-spec."jade"."~1.11.0"
+           nodePackages.by-spec."less"."^2.7.1"
+           nodePackages.by-spec."less-middleware"."^2.2.0"
+           nodePackages.by-spec."libquassel"."~2.0.5"
+           nodePackages.by-spec."morgan"."^1.7.0"
+           nodePackages.by-spec."net-browserify-alt"."^1.0.0"
+           nodePackages.by-spec."serve-favicon"."~2.3.0"
+         ];
+  peerDependencies = [];
+
+  meta = {
+    description = "A web server/client for Quassel";
+    license = licenses.mit;
+    homepage = "https://github.com/magne4000/quassel-webserver";
+    maintainers = with maintainers; [ uwap ];
+    platforms = platforms.unix;
+  }; 
+}
diff --git a/pkgs/applications/networking/irc/quassel-webserver/quassel-webserver.nix b/pkgs/applications/networking/irc/quassel-webserver/quassel-webserver.nix
new file mode 100644
index 00000000000..954762dc46f
--- /dev/null
+++ b/pkgs/applications/networking/irc/quassel-webserver/quassel-webserver.nix
@@ -0,0 +1,2436 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."accepts"."~1.3.3" =
+    self.by-version."accepts"."1.3.3";
+  by-version."accepts"."1.3.3" = self.buildNodePackage {
+    name = "accepts-1.3.3";
+    version = "1.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz";
+      name = "accepts-1.3.3.tgz";
+      sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca";
+    };
+    deps = {
+      "mime-types-2.1.12" = self.by-version."mime-types"."2.1.12";
+      "negotiator-0.6.1" = self.by-version."negotiator"."0.6.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."acorn"."^1.0.1" =
+    self.by-version."acorn"."1.2.2";
+  by-version."acorn"."1.2.2" = self.buildNodePackage {
+    name = "acorn-1.2.2";
+    version = "1.2.2";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz";
+      name = "acorn-1.2.2.tgz";
+      sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."acorn"."^2.1.0" =
+    self.by-version."acorn"."2.7.0";
+  by-version."acorn"."2.7.0" = self.buildNodePackage {
+    name = "acorn-2.7.0";
+    version = "2.7.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";
+      name = "acorn-2.7.0.tgz";
+      sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."acorn-globals"."^1.0.3" =
+    self.by-version."acorn-globals"."1.0.9";
+  by-version."acorn-globals"."1.0.9" = self.buildNodePackage {
+    name = "acorn-globals-1.0.9";
+    version = "1.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz";
+      name = "acorn-globals-1.0.9.tgz";
+      sha1 = "55bb5e98691507b74579d0513413217c380c54cf";
+    };
+    deps = {
+      "acorn-2.7.0" = self.by-version."acorn"."2.7.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."align-text"."^0.1.1" =
+    self.by-version."align-text"."0.1.4";
+  by-version."align-text"."0.1.4" = self.buildNodePackage {
+    name = "align-text-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+      name = "align-text-0.1.4.tgz";
+      sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+    };
+    deps = {
+      "kind-of-3.0.4" = self.by-version."kind-of"."3.0.4";
+      "longest-1.0.1" = self.by-version."longest"."1.0.1";
+      "repeat-string-1.5.4" = self.by-version."repeat-string"."1.5.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."align-text"."^0.1.3" =
+    self.by-version."align-text"."0.1.4";
+  by-spec."amdefine".">=0.0.4" =
+    self.by-version."amdefine"."1.0.0";
+  by-version."amdefine"."1.0.0" = self.buildNodePackage {
+    name = "amdefine-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz";
+      name = "amdefine-1.0.0.tgz";
+      sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."array-flatten"."1.1.1" =
+    self.by-version."array-flatten"."1.1.1";
+  by-version."array-flatten"."1.1.1" = self.buildNodePackage {
+    name = "array-flatten-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";
+      name = "array-flatten-1.1.1.tgz";
+      sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."asap"."~1.0.0" =
+    self.by-version."asap"."1.0.0";
+  by-version."asap"."1.0.0" = self.buildNodePackage {
+    name = "asap-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz";
+      name = "asap-1.0.0.tgz";
+      sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."asap"."~2.0.3" =
+    self.by-version."asap"."2.0.5";
+  by-version."asap"."2.0.5" = self.buildNodePackage {
+    name = "asap-2.0.5";
+    version = "2.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz";
+      name = "asap-2.0.5.tgz";
+      sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."~0.2.6" =
+    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."basic-auth"."~1.0.3" =
+    self.by-version."basic-auth"."1.0.4";
+  by-version."basic-auth"."1.0.4" = self.buildNodePackage {
+    name = "basic-auth-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
+      name = "basic-auth-1.0.4.tgz";
+      sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."body-parser"."^1.15.2" =
+    self.by-version."body-parser"."1.15.2";
+  by-version."body-parser"."1.15.2" = self.buildNodePackage {
+    name = "body-parser-1.15.2";
+    version = "1.15.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz";
+      name = "body-parser-1.15.2.tgz";
+      sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67";
+    };
+    deps = {
+      "bytes-2.4.0" = self.by-version."bytes"."2.4.0";
+      "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "http-errors-1.5.0" = self.by-version."http-errors"."1.5.0";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "qs-6.2.0" = self.by-version."qs"."6.2.0";
+      "raw-body-2.1.7" = self.by-version."raw-body"."2.1.7";
+      "type-is-1.6.13" = self.by-version."type-is"."1.6.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "body-parser" = self.by-version."body-parser"."1.15.2";
+  by-spec."bytes"."2.4.0" =
+    self.by-version."bytes"."2.4.0";
+  by-version."bytes"."2.4.0" = self.buildNodePackage {
+    name = "bytes-2.4.0";
+    version = "2.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz";
+      name = "bytes-2.4.0.tgz";
+      sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."camelcase"."^1.0.2" =
+    self.by-version."camelcase"."1.2.1";
+  by-version."camelcase"."1.2.1" = self.buildNodePackage {
+    name = "camelcase-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+      name = "camelcase-1.2.1.tgz";
+      sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."center-align"."^0.1.1" =
+    self.by-version."center-align"."0.1.3";
+  by-version."center-align"."0.1.3" = self.buildNodePackage {
+    name = "center-align-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+      name = "center-align-0.1.3.tgz";
+      sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+    };
+    deps = {
+      "align-text-0.1.4" = self.by-version."align-text"."0.1.4";
+      "lazy-cache-1.0.4" = self.by-version."lazy-cache"."1.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."character-parser"."1.2.1" =
+    self.by-version."character-parser"."1.2.1";
+  by-version."character-parser"."1.2.1" = self.buildNodePackage {
+    name = "character-parser-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz";
+      name = "character-parser-1.2.1.tgz";
+      sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."clean-css"."^3.1.9" =
+    self.by-version."clean-css"."3.4.20";
+  by-version."clean-css"."3.4.20" = self.buildNodePackage {
+    name = "clean-css-3.4.20";
+    version = "3.4.20";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz";
+      name = "clean-css-3.4.20.tgz";
+      sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501";
+    };
+    deps = {
+      "commander-2.8.1" = self.by-version."commander"."2.8.1";
+      "source-map-0.4.4" = self.by-version."source-map"."0.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cliui"."^2.1.0" =
+    self.by-version."cliui"."2.1.0";
+  by-version."cliui"."2.1.0" = self.buildNodePackage {
+    name = "cliui-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+      name = "cliui-2.1.0.tgz";
+      sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+    };
+    deps = {
+      "center-align-0.1.3" = self.by-version."center-align"."0.1.3";
+      "right-align-0.1.3" = self.by-version."right-align"."0.1.3";
+      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."commander"."2.8.x" =
+    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 = "https://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."commander"."^2.9.0" =
+    self.by-version."commander"."2.9.0";
+  by-version."commander"."2.9.0" = self.buildNodePackage {
+    name = "commander-2.9.0";
+    version = "2.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+      name = "commander-2.9.0.tgz";
+      sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+    };
+    deps = {
+      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "commander" = self.by-version."commander"."2.9.0";
+  by-spec."commander"."~2.6.0" =
+    self.by-version."commander"."2.6.0";
+  by-version."commander"."2.6.0" = self.buildNodePackage {
+    name = "commander-2.6.0";
+    version = "2.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
+      name = "commander-2.6.0.tgz";
+      sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."constantinople"."~3.0.1" =
+    self.by-version."constantinople"."3.0.2";
+  by-version."constantinople"."3.0.2" = self.buildNodePackage {
+    name = "constantinople-3.0.2";
+    version = "3.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz";
+      name = "constantinople-3.0.2.tgz";
+      sha1 = "4b945d9937907bcd98ee575122c3817516544141";
+    };
+    deps = {
+      "acorn-2.7.0" = self.by-version."acorn"."2.7.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."content-disposition"."0.5.1" =
+    self.by-version."content-disposition"."0.5.1";
+  by-version."content-disposition"."0.5.1" = self.buildNodePackage {
+    name = "content-disposition-0.5.1";
+    version = "0.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz";
+      name = "content-disposition-0.5.1.tgz";
+      sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."content-type"."~1.0.2" =
+    self.by-version."content-type"."1.0.2";
+  by-version."content-type"."1.0.2" = self.buildNodePackage {
+    name = "content-type-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz";
+      name = "content-type-1.0.2.tgz";
+      sha1 = "b7d113aee7a8dd27bd21133c4dc2529df1721eed";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookie"."0.3.1" =
+    self.by-version."cookie"."0.3.1";
+  by-version."cookie"."0.3.1" = self.buildNodePackage {
+    name = "cookie-0.3.1";
+    version = "0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz";
+      name = "cookie-0.3.1.tgz";
+      sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookie-parser"."~1.4.3" =
+    self.by-version."cookie-parser"."1.4.3";
+  by-version."cookie-parser"."1.4.3" = self.buildNodePackage {
+    name = "cookie-parser-1.4.3";
+    version = "1.4.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz";
+      name = "cookie-parser-1.4.3.tgz";
+      sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
+    };
+    deps = {
+      "cookie-0.3.1" = self.by-version."cookie"."0.3.1";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "cookie-parser" = self.by-version."cookie-parser"."1.4.3";
+  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 = "https://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."css"."~1.0.8" =
+    self.by-version."css"."1.0.8";
+  by-version."css"."1.0.8" = self.buildNodePackage {
+    name = "css-1.0.8";
+    version = "1.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz";
+      name = "css-1.0.8.tgz";
+      sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7";
+    };
+    deps = {
+      "css-parse-1.0.4" = self.by-version."css-parse"."1.0.4";
+      "css-stringify-1.0.5" = self.by-version."css-stringify"."1.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."css-parse"."1.0.4" =
+    self.by-version."css-parse"."1.0.4";
+  by-version."css-parse"."1.0.4" = self.buildNodePackage {
+    name = "css-parse-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
+      name = "css-parse-1.0.4.tgz";
+      sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."css-stringify"."1.0.5" =
+    self.by-version."css-stringify"."1.0.5";
+  by-version."css-stringify"."1.0.5" = self.buildNodePackage {
+    name = "css-stringify-1.0.5";
+    version = "1.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
+      name = "css-stringify-1.0.5.tgz";
+      sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
+    };
+    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 = "https://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."decamelize"."^1.0.0" =
+    self.by-version."decamelize"."1.2.0";
+  by-version."decamelize"."1.2.0" = self.buildNodePackage {
+    name = "decamelize-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+      name = "decamelize-1.2.0.tgz";
+      sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."depd"."~1.1.0" =
+    self.by-version."depd"."1.1.0";
+  by-version."depd"."1.1.0" = self.buildNodePackage {
+    name = "depd-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz";
+      name = "depd-1.1.0.tgz";
+      sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."destroy"."~1.0.4" =
+    self.by-version."destroy"."1.0.4";
+  by-version."destroy"."1.0.4" = self.buildNodePackage {
+    name = "destroy-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";
+      name = "destroy-1.0.4.tgz";
+      sha1 = "978857442c44749e4206613e37946205826abd80";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ee-first"."1.1.1" =
+    self.by-version."ee-first"."1.1.1";
+  by-version."ee-first"."1.1.1" = self.buildNodePackage {
+    name = "ee-first-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
+      name = "ee-first-1.1.1.tgz";
+      sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."encodeurl"."~1.0.1" =
+    self.by-version."encodeurl"."1.0.1";
+  by-version."encodeurl"."1.0.1" = self.buildNodePackage {
+    name = "encodeurl-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz";
+      name = "encodeurl-1.0.1.tgz";
+      sha1 = "79e3d58655346909fe6f0f45a5de68103b294d20";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."errno"."^0.1.1" =
+    self.by-version."errno"."0.1.4";
+  by-version."errno"."0.1.4" = self.buildNodePackage {
+    name = "errno-0.1.4";
+    version = "0.1.4";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz";
+      name = "errno-0.1.4.tgz";
+      sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d";
+    };
+    deps = {
+      "prr-0.0.0" = self.by-version."prr"."0.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-html"."~1.0.3" =
+    self.by-version."escape-html"."1.0.3";
+  by-version."escape-html"."1.0.3" = self.buildNodePackage {
+    name = "escape-html-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
+      name = "escape-html-1.0.3.tgz";
+      sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."etag"."~1.7.0" =
+    self.by-version."etag"."1.7.0";
+  by-version."etag"."1.7.0" = self.buildNodePackage {
+    name = "etag-1.7.0";
+    version = "1.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz";
+      name = "etag-1.7.0.tgz";
+      sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."eventemitter2"."^2.1.3" =
+    self.by-version."eventemitter2"."2.1.3";
+  by-version."eventemitter2"."2.1.3" = self.buildNodePackage {
+    name = "eventemitter2-2.1.3";
+    version = "2.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-2.1.3.tgz";
+      name = "eventemitter2-2.1.3.tgz";
+      sha1 = "bd7201f85c59548380e1e43b3f6a7286d4da7349";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."express"."^4.14.0" =
+    self.by-version."express"."4.14.0";
+  by-version."express"."4.14.0" = self.buildNodePackage {
+    name = "express-4.14.0";
+    version = "4.14.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz";
+      name = "express-4.14.0.tgz";
+      sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66";
+    };
+    deps = {
+      "accepts-1.3.3" = self.by-version."accepts"."1.3.3";
+      "array-flatten-1.1.1" = self.by-version."array-flatten"."1.1.1";
+      "content-disposition-0.5.1" = self.by-version."content-disposition"."0.5.1";
+      "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
+      "cookie-0.3.1" = self.by-version."cookie"."0.3.1";
+      "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.1.0" = self.by-version."depd"."1.1.0";
+      "encodeurl-1.0.1" = self.by-version."encodeurl"."1.0.1";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "finalhandler-0.5.0" = self.by-version."finalhandler"."0.5.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "merge-descriptors-1.0.1" = self.by-version."merge-descriptors"."1.0.1";
+      "methods-1.1.2" = self.by-version."methods"."1.1.2";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "path-to-regexp-0.1.7" = self.by-version."path-to-regexp"."0.1.7";
+      "proxy-addr-1.1.2" = self.by-version."proxy-addr"."1.1.2";
+      "qs-6.2.0" = self.by-version."qs"."6.2.0";
+      "range-parser-1.2.0" = self.by-version."range-parser"."1.2.0";
+      "send-0.14.1" = self.by-version."send"."0.14.1";
+      "serve-static-1.11.1" = self.by-version."serve-static"."1.11.1";
+      "type-is-1.6.13" = self.by-version."type-is"."1.6.13";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+      "vary-1.1.0" = self.by-version."vary"."1.1.0";
+      "jade-1.11.0" = self.by-version."jade"."1.11.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "express" = self.by-version."express"."4.14.0";
+  by-spec."finalhandler"."0.5.0" =
+    self.by-version."finalhandler"."0.5.0";
+  by-version."finalhandler"."0.5.0" = self.buildNodePackage {
+    name = "finalhandler-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
+      name = "finalhandler-0.5.0.tgz";
+      sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "statuses-1.3.0" = self.by-version."statuses"."1.3.0";
+      "unpipe-1.0.0" = self.by-version."unpipe"."1.0.0";
+    };
+    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.3.0" =
+    self.by-version."fresh"."0.3.0";
+  by-version."fresh"."0.3.0" = self.buildNodePackage {
+    name = "fresh-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz";
+      name = "fresh-0.3.0.tgz";
+      sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."graceful-fs"."^4.1.2" =
+    self.by-version."graceful-fs"."4.1.9";
+  by-version."graceful-fs"."4.1.9" = self.buildNodePackage {
+    name = "graceful-fs-4.1.9";
+    version = "4.1.9";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz";
+      name = "graceful-fs-4.1.9.tgz";
+      sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  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 = "https://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."http-errors"."~1.5.0" =
+    self.by-version."http-errors"."1.5.0";
+  by-version."http-errors"."1.5.0" = self.buildNodePackage {
+    name = "http-errors-1.5.0";
+    version = "1.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz";
+      name = "http-errors-1.5.0.tgz";
+      sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "setprototypeof-1.0.1" = self.by-version."setprototypeof"."1.0.1";
+      "statuses-1.3.0" = self.by-version."statuses"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."iconv-lite"."0.4.13" =
+    self.by-version."iconv-lite"."0.4.13";
+  by-version."iconv-lite"."0.4.13" = self.buildNodePackage {
+    name = "iconv-lite-0.4.13";
+    version = "0.4.13";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
+      name = "iconv-lite-0.4.13.tgz";
+      sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."image-size"."~0.5.0" =
+    self.by-version."image-size"."0.5.0";
+  by-version."image-size"."0.5.0" = self.buildNodePackage {
+    name = "image-size-0.5.0";
+    version = "0.5.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/image-size/-/image-size-0.5.0.tgz";
+      name = "image-size-0.5.0.tgz";
+      sha1 = "be7aed1c37b5ac3d9ba1d66a24b4c47ff8397651";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."inherits"."2.0.1" =
+    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 = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+      name = "inherits-2.0.1.tgz";
+      sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."int64-buffer"."^0.1.4" =
+    self.by-version."int64-buffer"."0.1.9";
+  by-version."int64-buffer"."0.1.9" = self.buildNodePackage {
+    name = "int64-buffer-0.1.9";
+    version = "0.1.9";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.9.tgz";
+      name = "int64-buffer-0.1.9.tgz";
+      sha1 = "9e039da043b24f78b196b283e04653ef5e990f61";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ipaddr.js"."1.1.1" =
+    self.by-version."ipaddr.js"."1.1.1";
+  by-version."ipaddr.js"."1.1.1" = self.buildNodePackage {
+    name = "ipaddr.js-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz";
+      name = "ipaddr.js-1.1.1.tgz";
+      sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is"."^3.1.0" =
+    self.by-version."is"."3.1.0";
+  by-version."is"."3.1.0" = self.buildNodePackage {
+    name = "is-3.1.0";
+    version = "3.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is/-/is-3.1.0.tgz";
+      name = "is-3.1.0.tgz";
+      sha1 = "2945d205d691cbfe4833e3f8a11c8ae94673f2a7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-buffer"."^1.0.2" =
+    self.by-version."is-buffer"."1.1.4";
+  by-version."is-buffer"."1.1.4" = self.buildNodePackage {
+    name = "is-buffer-1.1.4";
+    version = "1.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz";
+      name = "is-buffer-1.1.4.tgz";
+      sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-promise"."^2.0.0" =
+    self.by-version."is-promise"."2.1.0";
+  by-version."is-promise"."2.1.0" = self.buildNodePackage {
+    name = "is-promise-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
+      name = "is-promise-2.1.0.tgz";
+      sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-promise"."~1" =
+    self.by-version."is-promise"."1.0.1";
+  by-version."is-promise"."1.0.1" = self.buildNodePackage {
+    name = "is-promise-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
+      name = "is-promise-1.0.1.tgz";
+      sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jade"."~1.11.0" =
+    self.by-version."jade"."1.11.0";
+  by-version."jade"."1.11.0" = self.buildNodePackage {
+    name = "jade-1.11.0";
+    version = "1.11.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz";
+      name = "jade-1.11.0.tgz";
+      sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd";
+    };
+    deps = {
+      "character-parser-1.2.1" = self.by-version."character-parser"."1.2.1";
+      "clean-css-3.4.20" = self.by-version."clean-css"."3.4.20";
+      "commander-2.6.0" = self.by-version."commander"."2.6.0";
+      "constantinople-3.0.2" = self.by-version."constantinople"."3.0.2";
+      "jstransformer-0.0.2" = self.by-version."jstransformer"."0.0.2";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "transformers-2.1.0" = self.by-version."transformers"."2.1.0";
+      "uglify-js-2.7.3" = self.by-version."uglify-js"."2.7.3";
+      "void-elements-2.0.1" = self.by-version."void-elements"."2.0.1";
+      "with-4.0.3" = self.by-version."with"."4.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "jade" = self.by-version."jade"."1.11.0";
+  by-spec."jstransformer"."0.0.2" =
+    self.by-version."jstransformer"."0.0.2";
+  by-version."jstransformer"."0.0.2" = self.buildNodePackage {
+    name = "jstransformer-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz";
+      name = "jstransformer-0.0.2.tgz";
+      sha1 = "7aae29a903d196cfa0973d885d3e47947ecd76ab";
+    };
+    deps = {
+      "is-promise-2.1.0" = self.by-version."is-promise"."2.1.0";
+      "promise-6.1.0" = self.by-version."promise"."6.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."kind-of"."^3.0.2" =
+    self.by-version."kind-of"."3.0.4";
+  by-version."kind-of"."3.0.4" = self.buildNodePackage {
+    name = "kind-of-3.0.4";
+    version = "3.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz";
+      name = "kind-of-3.0.4.tgz";
+      sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74";
+    };
+    deps = {
+      "is-buffer-1.1.4" = self.by-version."is-buffer"."1.1.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lazy-cache"."^1.0.3" =
+    self.by-version."lazy-cache"."1.0.4";
+  by-version."lazy-cache"."1.0.4" = self.buildNodePackage {
+    name = "lazy-cache-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+      name = "lazy-cache-1.0.4.tgz";
+      sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."less"."^2.7.1" =
+    self.by-version."less"."2.7.1";
+  by-version."less"."2.7.1" = self.buildNodePackage {
+    name = "less-2.7.1";
+    version = "2.7.1";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/less/-/less-2.7.1.tgz";
+      name = "less-2.7.1.tgz";
+      sha1 = "6cbfea22b3b830304e9a5fb371d54fa480c9d7cf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+      "errno-0.1.4" = self.by-version."errno"."0.1.4";
+      "graceful-fs-4.1.9" = self.by-version."graceful-fs"."4.1.9";
+      "image-size-0.5.0" = self.by-version."image-size"."0.5.0";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "promise-7.1.1" = self.by-version."promise"."7.1.1";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "less" = self.by-version."less"."2.7.1";
+  by-spec."less"."~2.7.1" =
+    self.by-version."less"."2.7.1";
+  by-spec."less-middleware"."^2.2.0" =
+    self.by-version."less-middleware"."2.2.0";
+  by-version."less-middleware"."2.2.0" = self.buildNodePackage {
+    name = "less-middleware-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/less-middleware/-/less-middleware-2.2.0.tgz";
+      name = "less-middleware-2.2.0.tgz";
+      sha1 = "c3e4d512c8403685204add7bdaad7398c535c674";
+    };
+    deps = {
+      "less-2.7.1" = self.by-version."less"."2.7.1";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "node.extend-1.1.6" = self.by-version."node.extend"."1.1.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "less-middleware" = self.by-version."less-middleware"."2.2.0";
+  by-spec."libquassel"."~2.0.5" =
+    self.by-version."libquassel"."2.0.5";
+  by-version."libquassel"."2.0.5" = self.buildNodePackage {
+    name = "libquassel-2.0.5";
+    version = "2.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/libquassel/-/libquassel-2.0.5.tgz";
+      name = "libquassel-2.0.5.tgz";
+      sha1 = "faeba62e381b37527b1d6dea2e2c2f4c7a0f220f";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "eventemitter2-2.1.3" = self.by-version."eventemitter2"."2.1.3";
+      "net-browserify-alt-1.0.0" = self.by-version."net-browserify-alt"."1.0.0";
+      "qtdatastream-0.6.6" = self.by-version."qtdatastream"."0.6.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "libquassel" = self.by-version."libquassel"."2.0.5";
+  by-spec."longest"."^1.0.1" =
+    self.by-version."longest"."1.0.1";
+  by-version."longest"."1.0.1" = self.buildNodePackage {
+    name = "longest-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+      name = "longest-1.0.1.tgz";
+      sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+    };
+    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"."1.0.1" =
+    self.by-version."merge-descriptors"."1.0.1";
+  by-version."merge-descriptors"."1.0.1" = self.buildNodePackage {
+    name = "merge-descriptors-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz";
+      name = "merge-descriptors-1.0.1.tgz";
+      sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."methods"."~1.1.2" =
+    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.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 = "https://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-db"."~1.24.0" =
+    self.by-version."mime-db"."1.24.0";
+  by-version."mime-db"."1.24.0" = self.buildNodePackage {
+    name = "mime-db-1.24.0";
+    version = "1.24.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz";
+      name = "mime-db-1.24.0.tgz";
+      sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.1.11" =
+    self.by-version."mime-types"."2.1.12";
+  by-version."mime-types"."2.1.12" = self.buildNodePackage {
+    name = "mime-types-2.1.12";
+    version = "2.1.12";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz";
+      name = "mime-types-2.1.12.tgz";
+      sha1 = "152ba256777020dd4663f54c2e7bc26381e71729";
+    };
+    deps = {
+      "mime-db-1.24.0" = self.by-version."mime-db"."1.24.0";
+    };
+    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 = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+      name = "minimist-0.0.8.tgz";
+      sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  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 = "https://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.0" =
+    self.by-version."mkdirp"."0.5.1";
+  by-spec."mkdirp"."~0.5.1" =
+    self.by-version."mkdirp"."0.5.1";
+  by-spec."morgan"."^1.7.0" =
+    self.by-version."morgan"."1.7.0";
+  by-version."morgan"."1.7.0" = self.buildNodePackage {
+    name = "morgan-1.7.0";
+    version = "1.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/morgan/-/morgan-1.7.0.tgz";
+      name = "morgan-1.7.0.tgz";
+      sha1 = "eb10ca8e50d1abe0f8d3dad5c0201d052d981c62";
+    };
+    deps = {
+      "basic-auth-1.0.4" = self.by-version."basic-auth"."1.0.4";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "morgan" = self.by-version."morgan"."1.7.0";
+  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 = "https://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.6.1" =
+    self.by-version."negotiator"."0.6.1";
+  by-version."negotiator"."0.6.1" = self.buildNodePackage {
+    name = "negotiator-0.6.1";
+    version = "0.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz";
+      name = "negotiator-0.6.1.tgz";
+      sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."net-browserify-alt"."^1.0.0" =
+    self.by-version."net-browserify-alt"."1.0.0";
+  by-version."net-browserify-alt"."1.0.0" = self.buildNodePackage {
+    name = "net-browserify-alt-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/net-browserify-alt/-/net-browserify-alt-1.0.0.tgz";
+      name = "net-browserify-alt-1.0.0.tgz";
+      sha1 = "d85326b4940ba4630db5ea7644cc07c5551a0e7e";
+    };
+    deps = {
+      "body-parser-1.15.2" = self.by-version."body-parser"."1.15.2";
+      "ws-1.1.1" = self.by-version."ws"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "net-browserify-alt" = self.by-version."net-browserify-alt"."1.0.0";
+  by-spec."node.extend"."~1.1.5" =
+    self.by-version."node.extend"."1.1.6";
+  by-version."node.extend"."1.1.6" = self.buildNodePackage {
+    name = "node.extend-1.1.6";
+    version = "1.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz";
+      name = "node.extend-1.1.6.tgz";
+      sha1 = "a7b882c82d6c93a4863a5504bd5de8ec86258b96";
+    };
+    deps = {
+      "is-3.1.0" = self.by-version."is"."3.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."on-finished"."~2.3.0" =
+    self.by-version."on-finished"."2.3.0";
+  by-version."on-finished"."2.3.0" = self.buildNodePackage {
+    name = "on-finished-2.3.0";
+    version = "2.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
+      name = "on-finished-2.3.0.tgz";
+      sha1 = "20f1336481b083cd75337992a16971aa2d906947";
+    };
+    deps = {
+      "ee-first-1.1.1" = self.by-version."ee-first"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."on-headers"."~1.0.1" =
+    self.by-version."on-headers"."1.0.1";
+  by-version."on-headers"."1.0.1" = self.buildNodePackage {
+    name = "on-headers-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz";
+      name = "on-headers-1.0.1.tgz";
+      sha1 = "928f5d0f470d49342651ea6794b0857c100693f7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."optimist"."~0.3.5" =
+    self.by-version."optimist"."0.3.7";
+  by-version."optimist"."0.3.7" = self.buildNodePackage {
+    name = "optimist-0.3.7";
+    version = "0.3.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+      name = "optimist-0.3.7.tgz";
+      sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+    };
+    deps = {
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
+    };
+    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 = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
+      name = "options-0.0.6.tgz";
+      sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
+    };
+    deps = {
+    };
+    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."parseurl"."~1.3.1" =
+    self.by-version."parseurl"."1.3.1";
+  by-spec."path-to-regexp"."0.1.7" =
+    self.by-version."path-to-regexp"."0.1.7";
+  by-version."path-to-regexp"."0.1.7" = self.buildNodePackage {
+    name = "path-to-regexp-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz";
+      name = "path-to-regexp-0.1.7.tgz";
+      sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."promise"."^6.0.1" =
+    self.by-version."promise"."6.1.0";
+  by-version."promise"."6.1.0" = self.buildNodePackage {
+    name = "promise-6.1.0";
+    version = "6.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz";
+      name = "promise-6.1.0.tgz";
+      sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6";
+    };
+    deps = {
+      "asap-1.0.0" = self.by-version."asap"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."promise"."^7.1.1" =
+    self.by-version."promise"."7.1.1";
+  by-version."promise"."7.1.1" = self.buildNodePackage {
+    name = "promise-7.1.1";
+    version = "7.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz";
+      name = "promise-7.1.1.tgz";
+      sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf";
+    };
+    deps = {
+      "asap-2.0.5" = self.by-version."asap"."2.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."promise"."~2.0" =
+    self.by-version."promise"."2.0.0";
+  by-version."promise"."2.0.0" = self.buildNodePackage {
+    name = "promise-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
+      name = "promise-2.0.0.tgz";
+      sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e";
+    };
+    deps = {
+      "is-promise-1.0.1" = self.by-version."is-promise"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."proxy-addr"."~1.1.2" =
+    self.by-version."proxy-addr"."1.1.2";
+  by-version."proxy-addr"."1.1.2" = self.buildNodePackage {
+    name = "proxy-addr-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz";
+      name = "proxy-addr-1.1.2.tgz";
+      sha1 = "b4cc5f22610d9535824c123aef9d3cf73c40ba37";
+    };
+    deps = {
+      "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
+      "ipaddr.js-1.1.1" = self.by-version."ipaddr.js"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."prr"."~0.0.0" =
+    self.by-version."prr"."0.0.0";
+  by-version."prr"."0.0.0" = self.buildNodePackage {
+    name = "prr-0.0.0";
+    version = "0.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
+      name = "prr-0.0.0.tgz";
+      sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."6.2.0" =
+    self.by-version."qs"."6.2.0";
+  by-version."qs"."6.2.0" = self.buildNodePackage {
+    name = "qs-6.2.0";
+    version = "6.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz";
+      name = "qs-6.2.0.tgz";
+      sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qtdatastream"."^0.6.6" =
+    self.by-version."qtdatastream"."0.6.6";
+  by-version."qtdatastream"."0.6.6" = self.buildNodePackage {
+    name = "qtdatastream-0.6.6";
+    version = "0.6.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/qtdatastream/-/qtdatastream-0.6.6.tgz";
+      name = "qtdatastream-0.6.6.tgz";
+      sha1 = "c572113d4a2174acb4062e58c06644723b50e1c1";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "int64-buffer-0.1.9" = self.by-version."int64-buffer"."0.1.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."range-parser"."~1.2.0" =
+    self.by-version."range-parser"."1.2.0";
+  by-version."range-parser"."1.2.0" = self.buildNodePackage {
+    name = "range-parser-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz";
+      name = "range-parser-1.2.0.tgz";
+      sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."raw-body"."~2.1.7" =
+    self.by-version."raw-body"."2.1.7";
+  by-version."raw-body"."2.1.7" = self.buildNodePackage {
+    name = "raw-body-2.1.7";
+    version = "2.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz";
+      name = "raw-body-2.1.7.tgz";
+      sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
+    };
+    deps = {
+      "bytes-2.4.0" = self.by-version."bytes"."2.4.0";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+      "unpipe-1.0.0" = self.by-version."unpipe"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."repeat-string"."^1.5.2" =
+    self.by-version."repeat-string"."1.5.4";
+  by-version."repeat-string"."1.5.4" = self.buildNodePackage {
+    name = "repeat-string-1.5.4";
+    version = "1.5.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz";
+      name = "repeat-string-1.5.4.tgz";
+      sha1 = "64ec0c91e0f4b475f90d5b643651e3e6e5b6c2d5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."right-align"."^0.1.1" =
+    self.by-version."right-align"."0.1.3";
+  by-version."right-align"."0.1.3" = self.buildNodePackage {
+    name = "right-align-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+      name = "right-align-0.1.3.tgz";
+      sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+    };
+    deps = {
+      "align-text-0.1.4" = self.by-version."align-text"."0.1.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."send"."0.14.1" =
+    self.by-version."send"."0.14.1";
+  by-version."send"."0.14.1" = self.buildNodePackage {
+    name = "send-0.14.1";
+    version = "0.14.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz";
+      name = "send-0.14.1.tgz";
+      sha1 = "a954984325392f51532a7760760e459598c89f7a";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "destroy-1.0.4" = self.by-version."destroy"."1.0.4";
+      "encodeurl-1.0.1" = self.by-version."encodeurl"."1.0.1";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "http-errors-1.5.0" = self.by-version."http-errors"."1.5.0";
+      "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.3.0" = self.by-version."on-finished"."2.3.0";
+      "range-parser-1.2.0" = self.by-version."range-parser"."1.2.0";
+      "statuses-1.3.0" = self.by-version."statuses"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."serve-favicon"."~2.3.0" =
+    self.by-version."serve-favicon"."2.3.0";
+  by-version."serve-favicon"."2.3.0" = self.buildNodePackage {
+    name = "serve-favicon-2.3.0";
+    version = "2.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz";
+      name = "serve-favicon-2.3.0.tgz";
+      sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39";
+    };
+    deps = {
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "serve-favicon" = self.by-version."serve-favicon"."2.3.0";
+  by-spec."serve-static"."~1.11.1" =
+    self.by-version."serve-static"."1.11.1";
+  by-version."serve-static"."1.11.1" = self.buildNodePackage {
+    name = "serve-static-1.11.1";
+    version = "1.11.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz";
+      name = "serve-static-1.11.1.tgz";
+      sha1 = "d6cce7693505f733c759de57befc1af76c0f0805";
+    };
+    deps = {
+      "encodeurl-1.0.1" = self.by-version."encodeurl"."1.0.1";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "send-0.14.1" = self.by-version."send"."0.14.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."setprototypeof"."1.0.1" =
+    self.by-version."setprototypeof"."1.0.1";
+  by-version."setprototypeof"."1.0.1" = self.buildNodePackage {
+    name = "setprototypeof-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz";
+      name = "setprototypeof-1.0.1.tgz";
+      sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."0.4.x" =
+    self.by-version."source-map"."0.4.4";
+  by-version."source-map"."0.4.4" = self.buildNodePackage {
+    name = "source-map-0.4.4";
+    version = "0.4.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
+      name = "source-map-0.4.4.tgz";
+      sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
+    };
+    deps = {
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."^0.5.3" =
+    self.by-version."source-map"."0.5.6";
+  by-version."source-map"."0.5.6" = self.buildNodePackage {
+    name = "source-map-0.5.6";
+    version = "0.5.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
+      name = "source-map-0.5.6.tgz";
+      sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."~0.1.7" =
+    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 = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
+      name = "source-map-0.1.43.tgz";
+      sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
+    };
+    deps = {
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."~0.5.1" =
+    self.by-version."source-map"."0.5.6";
+  by-spec."statuses".">= 1.3.0 < 2" =
+    self.by-version."statuses"."1.3.0";
+  by-version."statuses"."1.3.0" = self.buildNodePackage {
+    name = "statuses-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz";
+      name = "statuses-1.3.0.tgz";
+      sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."statuses"."~1.3.0" =
+    self.by-version."statuses"."1.3.0";
+  by-spec."transformers"."2.1.0" =
+    self.by-version."transformers"."2.1.0";
+  by-version."transformers"."2.1.0" = self.buildNodePackage {
+    name = "transformers-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
+      name = "transformers-2.1.0.tgz";
+      sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
+    };
+    deps = {
+      "promise-2.0.0" = self.by-version."promise"."2.0.0";
+      "css-1.0.8" = self.by-version."css"."1.0.8";
+      "uglify-js-2.2.5" = self.by-version."uglify-js"."2.2.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."type-is"."~1.6.13" =
+    self.by-version."type-is"."1.6.13";
+  by-version."type-is"."1.6.13" = self.buildNodePackage {
+    name = "type-is-1.6.13";
+    version = "1.6.13";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz";
+      name = "type-is-1.6.13.tgz";
+      sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08";
+    };
+    deps = {
+      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+      "mime-types-2.1.12" = self.by-version."mime-types"."2.1.12";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uglify-js"."^2.4.19" =
+    self.by-version."uglify-js"."2.7.3";
+  by-version."uglify-js"."2.7.3" = self.buildNodePackage {
+    name = "uglify-js-2.7.3";
+    version = "2.7.3";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
+      name = "uglify-js-2.7.3.tgz";
+      sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
+    };
+    deps = {
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
+      "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
+      "yargs-3.10.0" = self.by-version."yargs"."3.10.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uglify-js"."~2.2.5" =
+    self.by-version."uglify-js"."2.2.5";
+  by-version."uglify-js"."2.2.5" = self.buildNodePackage {
+    name = "uglify-js-2.2.5";
+    version = "2.2.5";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
+      name = "uglify-js-2.2.5.tgz";
+      sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7";
+    };
+    deps = {
+      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uglify-to-browserify"."~1.0.0" =
+    self.by-version."uglify-to-browserify"."1.0.2";
+  by-version."uglify-to-browserify"."1.0.2" = self.buildNodePackage {
+    name = "uglify-to-browserify-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+      name = "uglify-to-browserify-1.0.2.tgz";
+      sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+    };
+    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 = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz";
+      name = "ultron-1.0.2.tgz";
+      sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."unpipe"."1.0.0" =
+    self.by-version."unpipe"."1.0.0";
+  by-version."unpipe"."1.0.0" = self.buildNodePackage {
+    name = "unpipe-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
+      name = "unpipe-1.0.0.tgz";
+      sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."unpipe"."~1.0.0" =
+    self.by-version."unpipe"."1.0.0";
+  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.1.0" =
+    self.by-version."vary"."1.1.0";
+  by-version."vary"."1.1.0" = self.buildNodePackage {
+    name = "vary-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz";
+      name = "vary-1.1.0.tgz";
+      sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."void-elements"."~2.0.1" =
+    self.by-version."void-elements"."2.0.1";
+  by-version."void-elements"."2.0.1" = self.buildNodePackage {
+    name = "void-elements-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz";
+      name = "void-elements-2.0.1.tgz";
+      sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."window-size"."0.1.0" =
+    self.by-version."window-size"."0.1.0";
+  by-version."window-size"."0.1.0" = self.buildNodePackage {
+    name = "window-size-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+      name = "window-size-0.1.0.tgz";
+      sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."with"."~4.0.0" =
+    self.by-version."with"."4.0.3";
+  by-version."with"."4.0.3" = self.buildNodePackage {
+    name = "with-4.0.3";
+    version = "4.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/with/-/with-4.0.3.tgz";
+      name = "with-4.0.3.tgz";
+      sha1 = "eefd154e9e79d2c8d3417b647a8f14d9fecce14e";
+    };
+    deps = {
+      "acorn-1.2.2" = self.by-version."acorn"."1.2.2";
+      "acorn-globals-1.0.9" = self.by-version."acorn-globals"."1.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."wordwrap"."0.0.2" =
+    self.by-version."wordwrap"."0.0.2";
+  by-version."wordwrap"."0.0.2" = self.buildNodePackage {
+    name = "wordwrap-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+      name = "wordwrap-0.0.2.tgz";
+      sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+    };
+    deps = {
+    };
+    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 = [ ];
+  };
+  by-spec."ws"."^1.1.1" =
+    self.by-version."ws"."1.1.1";
+  by-version."ws"."1.1.1" = self.buildNodePackage {
+    name = "ws-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz";
+      name = "ws-1.1.1.tgz";
+      sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018";
+    };
+    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."yargs"."~3.10.0" =
+    self.by-version."yargs"."3.10.0";
+  by-version."yargs"."3.10.0" = self.buildNodePackage {
+    name = "yargs-3.10.0";
+    version = "3.10.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+      name = "yargs-3.10.0.tgz";
+      sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
+    };
+    deps = {
+      "camelcase-1.2.1" = self.by-version."camelcase"."1.2.1";
+      "cliui-2.1.0" = self.by-version."cliui"."2.1.0";
+      "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0";
+      "window-size-0.1.0" = self.by-version."window-size"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+}
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 17f754f6acc..911555fa6a6 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ncurses, openssl, aspell, gnutls
 , zlib, curl , pkgconfig, libgcrypt
-, cmake, makeWrapper, libobjc, libiconv
+, cmake, makeWrapper, libobjc, libresolv, libiconv
 , asciidoctor # manpages
 , guileSupport ? true, guile
 , luaSupport ? true, lua5
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
       cmake
       asciidoctor
       ]
-    ++ optionals stdenv.isDarwin [ pync libobjc ]
+    ++ optionals stdenv.isDarwin [ pync libobjc libresolv ]
     ++ optional  guileSupport    guile
     ++ optional  luaSupport      lua5
     ++ optional  perlSupport     perl
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"
     # Fix '_res_9_init: undefined symbol' error
-    + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1");
+    + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv");
 
   postInstall = with stdenv.lib; ''
     NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index ded4e66e366..e3481315416 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -113,6 +113,11 @@ stdenv.mkDerivation rec {
       EOF
     '';
 
+    postFixup =
+      ''
+        paxmark m $out/lib/thunderbird-${version}/thunderbird
+      '';
+
   meta = with stdenv.lib; {
     description = "A full-featured e-mail client";
     homepage = http://www.mozilla.org/thunderbird/;
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 90c80db0a02..2b157604f48 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook
 , glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11
 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
 , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
     sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0";
   };
 
-  buildInputs = [ cmake pkgconfig makeWrapper
+  buildInputs = [ cmake pkgconfig wrapGAppsHook
                   glib gtk3 gettext libxkbfile libgnome_keyring libX11
                   freerdp_git libssh libgcrypt gnutls
                   pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
@@ -55,10 +55,15 @@ stdenv.mkDerivation {
 
   cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2";
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
+    )
+  '';
+
   postInstall = ''
     mkdir -pv $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
-    wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 3d8733635ee..d7918b3b912 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, go }:
+{ stdenv, lib, fetchFromGitHub, go, pkgs }:
 
 stdenv.mkDerivation rec {
   version = "0.14.8";
@@ -25,11 +25,24 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
+    mkdir -p $out/bin $out/etc/systemd/{system,user}
+
     cp bin/* $out/bin
+  '' + lib.optionalString (stdenv.isLinux) ''
+    substitute etc/linux-systemd/system/syncthing-resume.service \
+               $out/etc/systemd/system/syncthing-resume.service \
+               --replace /usr/bin/pkill ${pkgs.procps}/bin/pkill
+
+    substitute etc/linux-systemd/system/syncthing@.service \
+               $out/etc/systemd/system/syncthing@.service \
+               --replace /usr/bin/syncthing $out/bin/syncthing
+
+    substitute etc/linux-systemd/user/syncthing.service \
+               $out/etc/systemd/user/syncthing.service \
+               --replace /usr/bin/syncthing $out/bin/syncthing
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.syncthing.net/;
     description = "Open Source Continuous File Synchronization";
     license = stdenv.lib.licenses.mpl20;
diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix
index ea8d73cb863..f1343d4a67e 100644
--- a/pkgs/applications/networking/syncthing/inotify.nix
+++ b/pkgs/applications/networking/syncthing/inotify.nix
@@ -15,12 +15,23 @@ buildGoPackage rec {
 
   goDeps = ./inotify-deps.nix;
 
-  meta = {
+  postInstall = ''
+    mkdir -p $bin/etc/systemd/{system,user}
+
+    substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \
+               $bin/etc/systemd/system/syncthing-inotify@.service \
+               --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
+
+    substitute $src/etc/linux-systemd/user/syncthing-inotify.service \
+               $bin/etc/systemd/user/syncthing-inotify.service \
+               --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
+  '';
+
+  meta = with stdenv.lib; {
     homepage = https://github.com/syncthing/syncthing-inotify;
     description = "File watcher intended for use with Syncthing";
-    license = stdenv.lib.licenses.mpl20;
-    maintainers = with stdenv.lib.maintainers; [ joko ];
-    platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ joko peterhoeg ];
+    platforms = platforms.unix;
   };
-
 }
diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix
index 77fcb8ce7e9..2034c832294 100644
--- a/pkgs/applications/office/beancount/default.nix
+++ b/pkgs/applications/office/beancount/default.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchhg, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "2016-04-10-b5721f1c6f01bd168a5781652e5e3167f7f8ceb3";
+  version = "2.0b12";
   name = "beancount-${version}";
   namePrefix = "";
 
-  src = fetchhg {
-    url = "https://bitbucket.org/blais/beancount";
-    rev = "b5721f1c6f01bd168a5781652e5e3167f7f8ceb3";
-    sha256 = "10nv3p9cix7yp23a9hnq5163rpl8cfs3hv75h90ld57dc24nxzn2";
+  src = pkgs.fetchurl {
+    url = "mirror://pypi/b/beancount/${name}.tar.gz";
+    sha256 = "0n0wyi2yhmf8l46l5z68psk4rrzqkgqaqn93l0wnxsmp1nmqly9z";
   };
 
   buildInputs = with pythonPackages; [ nose ];
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
new file mode 100644
index 00000000000..5ed7d25667e
--- /dev/null
+++ b/pkgs/applications/office/fava/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }:
+
+python3Packages.buildPythonApplication rec {
+  version = "1.0";
+  name = "fava-${version}";
+
+  src = fetchFromGitHub {
+    owner = "aumayr";
+    repo = "fava";
+    rev = "v${version}";
+    sha256 = "0dm4x6z80m04r9qa55psvz7f41qnh13hnj2qhvxkrk22yqmkqrka";
+  };
+
+  assets = fetchzip {
+    url = "https://github.com/aumayr/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz";
+    sha256 = "1vvidwfn5882dslz6qqkkd84m7w52kd34x10qph8yhipyjv1dimc";
+  };
+
+  buildInputs = with python3Packages; [ pytest_30 ];
+
+  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
+  '';
+
+  propagatedBuildInputs = with python3Packages;
+    [ flask dateutil pygments wheel markdown2 flaskbabel tornado
+      click beancount ];
+
+  meta = {
+    homepage = https://github.com/aumayr/fava;
+    description = "Web interface for beancount";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+  };
+}
+
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index b1eb4ddf021..20ab6ce6f60 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -1,9 +1,9 @@
 { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
-, hicolor_icon_theme}:
+, hicolor_icon_theme, libsoup}:
 
 let
    download_root = "http://homebank.free.fr/public/";
-   name = "homebank-5.0.6";
+   name = "homebank-5.1";
    lastrelease = download_root + name + ".tar.gz";
    oldrelease = download_root + "old/" + name + ".tar.gz";
 in
@@ -13,10 +13,11 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     urls = [ lastrelease oldrelease ];
-    sha256 = "1r1rn8lgnqnlwkspx230gly5f4i90ij0a3ddrvw51kdc41xfylja";
+    sha256 = "1v6za6md5sjb1r3f5lc9k03v2q68cbx6g64vcn69666c42za2aq0";
   };
 
-  buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme wrapGAppsHook ];
+  buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme
+   wrapGAppsHook libsoup ];
 
   meta = {
     description = "Free, easy, personal accounting for everyone";
diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
index 7c95bcafec5..9a59bef617b 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/pkgs/applications/office/marp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marp-${version}";
-  version = "0.0.8";
+  version = "0.0.9";
 
   src = fetchurl {
     url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz";
-    sha256 = "0d7vvz34ik2jafwl3qjkdsvcva25gyrgrfg1gz1nk8f5dkl1wjcf";
+    sha256 = "142c35d88rkgjy85f4204givgx0p1qyfpipbrsa11lp3cb6jzhn2";
   };
   sourceRoot = ".";
 
diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index c45eb7d53d0..9e02377eaa5 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -1,16 +1,16 @@
-# To use this program, copy all that is in $out/opt/mmax into a writable directory,
-# and run it from there. This is the intended usage, as far as I understand.
+{ stdenv, fetchgit, sqlite, wxGTK30, gettext }:
 
-{ fetchsvn, stdenv, wxGTK }:
 
-let version = "0.9.5.1";
+let
+  version = "1.2.7";
 in
   stdenv.mkDerivation {
     name = "money-manager-ex-${version}";
 
-    src = fetchsvn {
-      url = "https://moneymanagerex.svn.sourceforge.net/svnroot/moneymanagerex/tags/releases/${version}";
-      sha256 = "0mby1p01fyxk5pgd7h3919q91r10zbfk16rfz1kbchqxqz87x4jq";
+    src = fetchgit {
+      url = "https://github.com/moneymanagerex/moneymanagerex.git";
+      rev = "refs/tags/v${version}";
+      sha256 = "0d6jcsj3m3b9mj68vfwr7dn67dws11p0pdys3spyyiv1464vmywi";
     };
 
     preConfigure = ''
@@ -18,19 +18,13 @@ in
       export CXXFLAGS="$CFLAGS"
     '';
 
-    installPhase = ''
-      mkdir -p $out/opt/mmex
-      cp -r mmex runtime/{*.txt,*.png,*.db3,en,help,*.wav,*.ico} $out/opt/mmex
-    '';
-
-    buildInputs = [ wxGTK ];
+    buildInputs = [ sqlite wxGTK30 gettext ];
 
     meta = {
       description = "Easy-to-use personal finance software";
-      homepage = http://www.codelathe.com/mmex;
+      homepage = http://www.moneymanagerex.org/;
       license = stdenv.lib.licenses.gpl2Plus;
       maintainers = with stdenv.lib.maintainers; [viric];
       platforms = with stdenv.lib.platforms; linux;
-      broken = true;
     };
   }
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 808af776e28..45d7686b3e5 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python
+{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
 , libX11, libXpm, libXft, libXext, zlib, lzma, gsl, Cocoa }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9";
   };
 
-  buildInputs = [ cmake pcre pkgconfig python zlib lzma gsl ]
+  buildInputs = [ cmake pcre pkgconfig python2 zlib lzma gsl ]
     ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext ]
     ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa ]
     ;
@@ -69,5 +69,6 @@ stdenv.mkDerivation rec {
     homepage = "https://root.cern.ch/";
     description = "A data analysis framework";
     platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/applications/science/physics/sacrifice/compat.patch b/pkgs/applications/science/physics/sacrifice/compat.patch
new file mode 100644
index 00000000000..c66b91b7628
--- /dev/null
+++ b/pkgs/applications/science/physics/sacrifice/compat.patch
@@ -0,0 +1,12 @@
+diff --git a/src/PythiaMain.cxx b/src/PythiaMain.cxx
+index 0e5ddd2..2b626ab 100644
+--- a/src/PythiaMain.cxx
++++ b/src/PythiaMain.cxx
+@@ -96,7 +96,6 @@ int main(int argc, char **argv){
+   HepMCConverter pythiaToHepMC;
+ 
+   pythiaToHepMC.set_store_pdf(true);
+-  pythiaToHepMC.set_crash_on_problem(true);
+   
+   if(photosHandler.isEnabled()){
+     photosHandler.initialise();
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix
new file mode 100644
index 00000000000..d6aeeedc086
--- /dev/null
+++ b/pkgs/applications/science/physics/sacrifice/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia }:
+
+stdenv.mkDerivation rec {
+  name = "sacrifice-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "http://www.hepforge.org/archive/agile/Sacrifice-1.0.0.tar.gz";
+    sha256 = "10bvpq63kmszy1habydwncm0j1dgvam0fkrmvkgbkvf804dcjp6g";
+  };
+
+  buildInputs = [ boost hepmc lhapdf pythia ];
+
+  patches = [
+    ./compat.patch
+  ];
+
+  preConfigure = ''
+    substituteInPlace configure --replace HAVE_LCG=yes HAVE_LCG=no
+  ''
+  + stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace LIB_SUFFIX=\"so\" LIB_SUFFIX=\"dylib\"
+  '';
+
+  configureFlags = [
+    "--with-HepMC=${hepmc}"
+    "--with-pythia=${pythia}"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A standalone contribution to AGILe for steering Pythia 8";
+    license     = stdenv.lib.licenses.gpl2;
+    homepage    = https://agile.hepforge.org/trac/wiki/Sacrifice;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 76ba871c4a1..5e4bda1aaa0 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -3,18 +3,29 @@
 
 stdenv.mkDerivation rec {
   name = "yarp-${version}";
-  version = "2.3.65";
+  version = "2.3.66";
   src = fetchFromGitHub {
     owner = "robotology";
     repo = "yarp";
-    rev = "v${version}";
-    sha256 = "003n0z1qrd7l8maa98aa49gsfsyy7w8gb2pprlgj92r0drk8zm02";
+    rev = "v${version}.1";
+    sha256 = "0hznysxhk6pd92fymcrnbbl8ah7rcwhcvb6n92v09zjv6yl5xpiq";
   };
 
   buildInputs = [ cmake ace ];
 
   enableParallelBuilding = true;
 
+  cmakeFlags = [
+    "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON"
+    "-DCREATE_YARPC:BOOL=ON"
+    "-DCREATE_YARPCXX:BOOL=ON"
+  ];
+
+  # since we cant expand $out in cmakeFlags
+  preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_LIBDIR=$out/lib"'';
+
+  postInstall = "mv ./$out/lib/*.so $out/lib/";
+
   meta = {
     description = "Yet Another Robot Platform";
     homepage = http://yarp.it;
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 77c2f45bbd5..cf7f6b82ce2 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }:
+{ stdenv, fetchurl, pythonPackages, makeWrapper, gettext, git }:
 
-pythonPackages.buildPythonApplication rec {
+let
+  inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
+in buildPythonApplication rec {
   name = "git-cola-${version}";
-  version = "2.5";
+  version = "2.8";
 
   src = fetchurl {
     url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz";
-    sha256 = "0ybjmlwm1plnvqi20y91ci7sgldzwlwn86vyyn9a157h7lf4ngb8";
+    sha256 = "19ff7i0h5fznrkm17lp3xkxwkq27whhiil6y6bm16b1wny5hjqlr";
   };
 
-  buildInputs = [ makeWrapper gettext ];
-  propagatedBuildInputs = with pythonPackages; [ pyqt4 sip pyinotify ];
+  buildInputs = [ git makeWrapper gettext ];
+  propagatedBuildInputs = [ pyqt4 sip pyinotify ];
 
   # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but
   # "import __future__" must be placed above that. This removes the argv[0] line.
@@ -26,6 +28,8 @@ pythonPackages.buildPythonApplication rec {
     }'
   '';
 
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/git-cola/git-cola;
     description = "A sleek and powerful Git GUI";
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 d80b48a8577..e432543df45 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -7,6 +7,7 @@
 , withManual ? true
 , pythonSupport ? true
 , sendEmailSupport
+, darwin
 }:
 
 let
@@ -42,7 +43,9 @@ stdenv.mkDerivation {
   buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv perl]
     ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
          docbook_xsl docbook_xml_dtd_45 libxslt ]
-    ++ stdenv.lib.optionals guiSupport [tcl tk];
+    ++ stdenv.lib.optionals guiSupport [tcl tk]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
+
 
   # required to support pthread_cancel()
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
@@ -51,11 +54,17 @@ stdenv.mkDerivation {
   # without this, git fails when trying to check for /etc/gitconfig existence
   propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc";
 
-  makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
+  makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
       + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
       + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
-      + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else "");
+      + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ");
 
+  # build git-credential-osxkeychain if darwin
+  postBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    pushd $PWD/contrib/credential/osxkeychain/
+    make
+    popd
+  '';
 
   # FIXME: "make check" requires Sparse; the Makefile must be tweaked
   # so that `SPARSE_FLAGS' corresponds to the current architecture...
@@ -63,6 +72,11 @@ stdenv.mkDerivation {
 
   installFlags = "NO_INSTALL_HARDLINKS=1";
 
+  preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/bin
+    mv $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin
+  '';
+
   postInstall =
     ''
       notSupported() {
@@ -157,7 +171,15 @@ stdenv.mkDerivation {
        for prog in bin/gitk libexec/git-core/git-gui; do
          notSupported "$out/$prog"
        done
-     '');
+     '')
+   + stdenv.lib.optionalString stdenv.isDarwin ''
+    # enable git-credential-osxkeychain by default if darwin
+    cat > $out/etc/gitconfig << EOF
+[credential]
+	helper = osxkeychain
+EOF
+  '';
+
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 0f92bcbe0ae..2aadfd21fb5 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.43";
+  version = "0.44";
   name = "gource-${version}";
 
   src = fetchurl {
     url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
-    sha256 = "1r5x9ai86f609hf584n0xaf5hxkbilj5qihn89v7ghpmwk40m945";
+    sha256 = "0z095zsf5pz8czh7nmlkdy29rm93w83sqyqspg2zsprh892cl116";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 0d02377b714..0af19aeca95 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "9.4.2";
+  version = "9.5.0";
 
   src = fetchFromGitHub {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    sha256 = "1dyhlpik8d9z78dg47cha313r0dm9fcjg6hzkmzd2ng9yrq5pmdy";
+    sha256 = "1v6rqlb5srhwzad45b50pvfbi1c9n719ihi54hzbkzklj7h4s70h";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ];
diff --git a/pkgs/applications/virtualization/rancher-compose/default.nix b/pkgs/applications/virtualization/rancher-compose/default.nix
new file mode 100644
index 00000000000..5980141d8b9
--- /dev/null
+++ b/pkgs/applications/virtualization/rancher-compose/default.nix
@@ -0,0 +1,44 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+let
+  generic = { version, sha256 }: buildGoPackage rec {
+    name = "rancher-compose-${version}";
+
+    goPackagePath = "github.com/rancher/rancher-compose";
+
+    src = fetchFromGitHub {
+      owner = "rancher";
+      repo = "rancher-compose";
+      rev = "v${version}";
+      inherit sha256;
+    };
+
+    buildFlagsArray = ''
+      -ldflags=
+          -X github.com/rancher/rancher-compose/version.VERSION=${version}
+    '';
+
+    excludedPackages = "scripts";
+
+    meta = with lib; {
+      description = "Docker compose compatible client to deploy to Rancher";
+      homepage = "https://docs.rancher.com/rancher/rancher-compose/";
+      license = licenses.asl20;
+      platforms = platforms.unix;
+      maintainers = [maintainers.mic92];
+    };
+  };
+in {
+  # should point to a version compatible
+  # with the latest stable release of rancher
+  rancher-compose = generic {
+    version = "0.9.2";
+    sha256 = "1wlsdjaa4j2b3c034hb6zci5h900b1msimmshz5h4g5hiaqb3khq";
+  };
+
+  # for rancher v1.2.0-pre3+
+  rancher-compose_0_10 = generic {
+    version = "0.10.0";
+    sha256 = "17f3ya4qq0dzk4wvhgxp0lh9p8c87kpq7hmh3g21ashzqwmcflxl";
+  };
+}
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 483a71fecdc..7c5cc8de7ab 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
     cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/
 
     wrapProgram $out/bin/rkt \
-      --prefix LD_LIBRARY_PATH : ${systemd}/lib \
+      --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib \
       --prefix PATH : ${iptables}/bin
   '';
 
diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix
new file mode 100644
index 00000000000..7b31c63128a
--- /dev/null
+++ b/pkgs/applications/window-managers/bspwm/unstable.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }:
+
+stdenv.mkDerivation rec {
+  name = "bspwm-unstable-2016-09-30";
+
+
+  src = fetchFromGitHub {
+    owner   = "baskerville";
+    repo    = "bspwm";
+    rev     = "8664c007e44de162c1597fd7e163635b274fb747";
+    sha256  = "0clvpz32z38i8kr10hqlifa661szpfn93c63m2aq2h4dwmr44slz";
+  };
+
+  buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
+
+  buildPhase = ''
+    make PREFIX=$out
+  '';
+
+  installPhase = ''
+    make PREFIX=$out install
+  '';
+
+  meta = {
+    description = "A tiling window manager based on binary space partitioning (git version)";
+    homepage = https://github.com/baskerville/bspwm;
+    maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ];
+    license = stdenv.lib.licenses.bsd2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/sxhkd/unstable.nix b/pkgs/applications/window-managers/sxhkd/unstable.nix
new file mode 100644
index 00000000000..a3379259a8c
--- /dev/null
+++ b/pkgs/applications/window-managers/sxhkd/unstable.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }:
+
+stdenv.mkDerivation rec {
+  name = "sxhkd-unstable-2016-08-29";
+
+  src = fetchFromGitHub {
+    owner  = "baskerville";
+    repo   = "sxhkd";
+    rev    = "69b6acc7831bd333b39286c37188e5638ad0de27";
+    sha256 = "11i451hz0icsbxnvbq2bdl6r5kacxf6ps0yvi9ix3vkpxn4zcanh";
+  };
+
+  buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
+
+  makeFlags = ''PREFIX=$(out)'';
+
+  meta = with stdenv.lib; {
+    description = "Simple X hotkey daemon (git version)";
+    inherit (src.meta) homepage;
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix
index 6ae844a6246..9940e611124 100644
--- a/pkgs/build-support/kernel/modules-closure.nix
+++ b/pkgs/build-support/kernel/modules-closure.nix
@@ -3,10 +3,10 @@
 # the modules identified by `rootModules', plus their dependencies.
 # Also generate an appropriate modules.dep.
 
-{ stdenv, kernel, nukeReferences, rootModules
+{ stdenvNoCC, kernel, nukeReferences, rootModules
 , kmod, allowMissing ? false }:
 
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   name = kernel.name + "-shrunk";
   builder = ./modules-closure.sh;
   buildInputs = [ nukeReferences kmod ];
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index a4ecc24d3a6..25a99789af5 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -2,14 +2,14 @@
 , qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmakeHook }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.0";
+  version = "0.3.1";
   name = "zeal-${version}";
 
   src = fetchFromGitHub {
     owner = "zealdocs";
     repo = "zeal";
     rev = "v${version}";
-    sha256 = "1f0nsnily2lsrraj1f8j34lqhiskiyq22clkci7w4h2zfv35j1s0";
+    sha256 = "14ld7zm15677jdlasnfa6c42kiswd4d6yg1db50xbk2yflzzwqqa";
   };
 
   buildInputs = [
diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix
index 9cbf7059d92..7f81bc73d0a 100644
--- a/pkgs/data/fonts/font-awesome-ttf/default.nix
+++ b/pkgs/data/fonts/font-awesome-ttf/default.nix
@@ -1,28 +1,30 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "font-awesome-4.6.3";
+  name = "font-awesome-${version}";
+  version = "4.6.3";
 
-  src = fetchurl {
-    url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
-    sha256 = "06d6p3rydy86hg82igra4vqglyx7bii19jj5kdyhva0d2gqv7zfn";
+  src = fetchFromGitHub {
+    owner  = "FortAwesome";
+    repo   = "Font-Awesome";
+    rev    = "v${version}";
+    sha256 = "135k1xskksqzriad9zzcxa79iprldyp2bnmc22wslak0dvjz74w0";
   };
 
   buildCommand = ''
-    ${unzip}/bin/unzip $src
     mkdir -p $out/share/fonts/truetype
-    cp */fonts/*.ttf $out/share/fonts/truetype
+    cp $src/fonts/*.ttf $out/share/fonts/truetype
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Font Awesome - TTF font";
     longDescription = ''
       Font Awesome gives you scalable vector icons that can instantly be customized.
       This package includes only the TTF font. For full CSS etc. see the project website.
     '';
     homepage = "http://fortawesome.github.io/Font-Awesome/";
-    license = stdenv.lib.licenses.ofl;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.abaldeau ];
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abaldeau ];
   };
 }
diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix
index d93d2016971..e02ee967b67 100644
--- a/pkgs/data/fonts/league-of-moveable-type/default.nix
+++ b/pkgs/data/fonts/league-of-moveable-type/default.nix
@@ -21,8 +21,10 @@ stdenv.mkDerivation rec {
   sourceRoot = ".";
 
   installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp */*.otf $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/opentype
+    cp */*.otf $out/share/fonts/opentype
+    # for Raleway, where the fonts are already in /share/…
+    cp */share/fonts/opentype/*.otf $out/share/fonts/opentype
   '';
 
   meta = {
diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix
index 2bc90e83d14..e754135755a 100644
--- a/pkgs/data/fonts/raleway/default.nix
+++ b/pkgs/data/fonts/raleway/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp "$src/fonts/OTF v3.000 Fontlab"/*.otf $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/opentype
+    cp "$src/fonts/OTF v3.000 Fontlab"/*.otf $out/share/fonts/opentype
     find -type f -maxdepth 1 -exec cp "{}" $out/ \;
   '';
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       It also has a sister display family, Raleway Dots.
     '';
 
-    homepage = src.homepage;
+    homepage = src.meta.homepage;
     license = stdenv.lib.licenses.ofl;
 
     maintainers = with stdenv.lib.maintainers; [ profpatsch ];
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index d3aadbcd5a1..8df9b48a8bf 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.18.1";
+  version = "1.18.2";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "08njx6wd505as1vn0yp4mnmf6mb2v28jsipxxx4zhf78v18d2sqc";
+    sha256 = "1vbvsrrpkvvrmvjavwnp5q77kw5i7vmbaj2vq5mnmrbzamvaybr9";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix
index af74df4ad13..3cb62fef6c2 100644
--- a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix
@@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
-    gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ];
+    gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper
+    gnome3.gsettings_desktop_schemas
+  ];
 
   preFixup = ''
     wrapProgram $out/bin/anjuta \
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index 980cc9ac25c..942bd5eb977 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -53,6 +53,7 @@ let
     kio-extras = callPackage ./kio-extras.nix {};
     kompare = callPackage ./kompare.nix {};
     konsole = callPackage ./konsole.nix {};
+    kwalletmanager = callPackage ./kwalletmanager.nix {};
     libkdcraw = callPackage ./libkdcraw.nix {};
     libkexiv2 = callPackage ./libkexiv2.nix {};
     libkipi = callPackage ./libkipi.nix {};
@@ -63,6 +64,9 @@ let
     spectacle = callPackage ./spectacle.nix {};
 
     l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
+
+    # External packages
+    kipi-plugins = callPackage ../../../applications/graphics/kipi-plugins/5.x.nix {};
   };
 
 in packages
diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh
index c23d8a4d757..666acf1a8cb 100644
--- a/pkgs/desktops/kde-5/applications/fetch.sh
+++ b/pkgs/desktops/kde-5/applications/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/16.08.1/ -A '*.tar.xz' )
+WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.2/ --cut-dirs=1 -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/applications/gwenview.nix b/pkgs/desktops/kde-5/applications/gwenview.nix
index 66df17f2e44..18f5036127d 100644
--- a/pkgs/desktops/kde-5/applications/gwenview.nix
+++ b/pkgs/desktops/kde-5/applications/gwenview.nix
@@ -1,8 +1,8 @@
 {
   kdeApp, lib, kdeWrapper,
   ecm, kdoctools,
-  baloo, exiv2, kactivities, kdelibs4support, kio, lcms2, phonon,
-  qtsvg, qtx11extras
+  baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
+  libkdcraw, libkipi, phonon, qtsvg, qtx11extras
 }:
 
 let
@@ -15,9 +15,12 @@ let
       };
       nativeBuildInputs = [ ecm kdoctools ];
       propagatedBuildInputs = [
-        baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon
-        qtsvg
+        baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 libkdcraw
+        libkipi phonon qtsvg
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/gwenview" ]; }
+kdeWrapper unwrapped {
+  targets = [ "bin/gwenview" ];
+  paths = [ kipi-plugins ];
+}
diff --git a/pkgs/desktops/kde-5/applications/kwalletmanager.nix b/pkgs/desktops/kde-5/applications/kwalletmanager.nix
new file mode 100644
index 00000000000..a7a7ba47f43
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications/kwalletmanager.nix
@@ -0,0 +1,35 @@
+{ lib
+, kdeApp
+, kdeWrapper
+, ecm
+, kdoctools
+, kauth
+, kcmutils
+, kconfigwidgets
+, kcoreaddons
+, kdbusaddons
+, kdelibs4support
+, kxmlgui
+}:
+
+let
+  unwrapped = kdeApp {
+    name = "kwalletmanager";
+    meta = {
+      license = with lib.licenses; [ gpl2 ];
+      maintainers = with lib.maintainers; [ fridh ];
+    };
+    nativeBuildInputs = [ ecm kdoctools ];
+    propagatedBuildInputs = [
+      kauth
+      kcmutils
+      kconfigwidgets
+      kcoreaddons
+      kdbusaddons
+      kdelibs4support
+      kxmlgui
+    ];
+  };
+in kdeWrapper unwrapped {
+  targets = ["bin/kwalletmanager5"];
+}
diff --git a/pkgs/desktops/kde-5/applications/spectacle.nix b/pkgs/desktops/kde-5/applications/spectacle.nix
index 26faea2678a..aa618ffcde1 100644
--- a/pkgs/desktops/kde-5/applications/spectacle.nix
+++ b/pkgs/desktops/kde-5/applications/spectacle.nix
@@ -1,8 +1,9 @@
 {
   kdeApp, lib, kdeWrapper,
   ecm, kdoctools,
-  kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, knotifications,
-  kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, xcb-util-cursor
+  kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
+  knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
+  xcb-util-cursor
 }:
 
 let
@@ -17,4 +18,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/spectacle" ]; }
+kdeWrapper unwrapped {
+  targets = [ "bin/spectacle" ];
+  paths = [ kipi-plugins ];
+}
diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix
index e3ecd24b6db..a8c984ad645 100644
--- a/pkgs/desktops/kde-5/applications/srcs.nix
+++ b/pkgs/desktops/kde-5/applications/srcs.nix
@@ -3,2067 +3,2067 @@
 
 {
   akonadi = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/akonadi-16.08.1.tar.xz";
-      sha256 = "1km4qis98z19b5vy0g8r52mnd4i301ycf9l96a4vw4q56wmss2f1";
-      name = "akonadi-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/akonadi-16.08.2.tar.xz";
+      sha256 = "141da3xj9d5gwksh9lz93s4zsvpadf314345ai6lirhhi99683g6";
+      name = "akonadi-16.08.2.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/akonadi-calendar-16.08.1.tar.xz";
-      sha256 = "12bz190cww8r34j0543wavf4d9ydkwszxh1ayxkg6hlf67yv2jpf";
-      name = "akonadi-calendar-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/akonadi-calendar-16.08.2.tar.xz";
+      sha256 = "0jpmh5051mxcndaf1clldz7zzfhfyi8qxz87lj20s0d4gzrf6cpw";
+      name = "akonadi-calendar-16.08.2.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/akonadi-contacts-16.08.1.tar.xz";
-      sha256 = "09dx4vi1329fgr2gya833p3zwasz4y8vh4fwlis3669zns6nvn6w";
-      name = "akonadi-contacts-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/akonadi-contacts-16.08.2.tar.xz";
+      sha256 = "0d3cjyq4i778zvy13wm2gfpzkibsr17wgxydqm5ac5wkl30wb07l";
+      name = "akonadi-contacts-16.08.2.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/akonadi-mime-16.08.1.tar.xz";
-      sha256 = "16hyz28gjp1b0w6l33cgdrli4b777yanryfr8nn1mp4y8p2375fp";
-      name = "akonadi-mime-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/akonadi-mime-16.08.2.tar.xz";
+      sha256 = "0q1g6g1dyj82ya8dfnq87asx9qnmqypsmb873y20i8x3pkzjwzld";
+      name = "akonadi-mime-16.08.2.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/akonadi-notes-16.08.1.tar.xz";
-      sha256 = "1m95zckfr9wlcjsf3h6v2fg7rbivd28gjj2yddrrv7wx57xmky4j";
-      name = "akonadi-notes-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/akonadi-notes-16.08.2.tar.xz";
+      sha256 = "0ryw21y25iq28rn75gibfxlwgyx0fz1y37lkgnqfcl3mwj16gcb4";
+      name = "akonadi-notes-16.08.2.tar.xz";
     };
   };
   akonadi-search = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/akonadi-search-16.08.1.tar.xz";
-      sha256 = "1qdqzb9achabb3vs7dm3pi3pk3l8rmk6ymmzlxr79l98cfmw39bk";
-      name = "akonadi-search-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/akonadi-search-16.08.2.tar.xz";
+      sha256 = "063y170nfdi279pbh9zdyhrga2hf0xsb20bn2p210vhmwhi7l51r";
+      name = "akonadi-search-16.08.2.tar.xz";
     };
   };
   analitza = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/analitza-16.08.1.tar.xz";
-      sha256 = "1l08g9gzi6aabzh62cg2k4731nbw8hnfb7qy1mjb4yn2gap0c4cd";
-      name = "analitza-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/analitza-16.08.2.tar.xz";
+      sha256 = "1rh58dfpnxyahpqz49p935pa01mxci9bbqddayv1807my2i5kz2h";
+      name = "analitza-16.08.2.tar.xz";
     };
   };
   ark = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ark-16.08.1.tar.xz";
-      sha256 = "1g9qvxw26hqngvbp4i82lmhpbr4nxidv7pj0sg1ji48jzycjbd3q";
-      name = "ark-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ark-16.08.2.tar.xz";
+      sha256 = "043nl64g6374diczkrq7prid4fr8ll625df2nhqnaz79fnh1ysv8";
+      name = "ark-16.08.2.tar.xz";
     };
   };
   artikulate = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/artikulate-16.08.1.tar.xz";
-      sha256 = "1rbs6yf3pmhp9xj3lpr0h14pb4mylffhav2nb8sb42hw7c3pjycb";
-      name = "artikulate-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/artikulate-16.08.2.tar.xz";
+      sha256 = "1pcpwqpd7xk796bc5gyydqqrvqm592jhyh8swvlsdqadczlqnn9h";
+      name = "artikulate-16.08.2.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/audiocd-kio-16.08.1.tar.xz";
-      sha256 = "15x9nv014sdvc80vqldsgxrgickrrda6hrm26jcvp483qzvpjp82";
-      name = "audiocd-kio-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/audiocd-kio-16.08.2.tar.xz";
+      sha256 = "0m85j4lrdas47l501f20i44q7w7qwxvpdy754zp4nf5wzm7nvjdv";
+      name = "audiocd-kio-16.08.2.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/baloo-widgets-16.08.1.tar.xz";
-      sha256 = "0lb42ci06xka82147awcwdhw35d1spvhdkfiq3qpbbyq8ajqxq18";
-      name = "baloo-widgets-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/baloo-widgets-16.08.2.tar.xz";
+      sha256 = "1r784qd1j3y1ff6y494m8qyfdjsz626agwdj05h6igngvw1ywff2";
+      name = "baloo-widgets-16.08.2.tar.xz";
     };
   };
   blinken = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/blinken-16.08.1.tar.xz";
-      sha256 = "0xk39mcyad8s8haj2rmg2m7x46qzayl8zivc8v8h28vn80lvhk4v";
-      name = "blinken-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/blinken-16.08.2.tar.xz";
+      sha256 = "0nqkw6abnzbx80d25ba0b6bix1ngr3wfrxlfjqdk4gmb1m34dkcm";
+      name = "blinken-16.08.2.tar.xz";
     };
   };
   bomber = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/bomber-16.08.1.tar.xz";
-      sha256 = "0rsgwr8vlnfli8zb77l9vdqn60k7kpdxpsaq16nhxxwl2n3780gn";
-      name = "bomber-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/bomber-16.08.2.tar.xz";
+      sha256 = "1zcqxkfy57lw03v6fpf44asbdf8q9ivn323li9ks0kwzzc2nk7f9";
+      name = "bomber-16.08.2.tar.xz";
     };
   };
   bovo = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/bovo-16.08.1.tar.xz";
-      sha256 = "1vc4dv5gh2vif98fz4rcdb8zv20sashq4xbgfvk0xq3ls9j3qdyi";
-      name = "bovo-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/bovo-16.08.2.tar.xz";
+      sha256 = "0clbhcg6bw8nrjw3nynlhcglgxasxw2b15ski25cf9cvrq3cahn7";
+      name = "bovo-16.08.2.tar.xz";
     };
   };
   calendarsupport = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/calendarsupport-16.08.1.tar.xz";
-      sha256 = "08xvnmlpkwrsdz5fawcddcd5s7dn3zczfk5shk9a00734nc4akkb";
-      name = "calendarsupport-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/calendarsupport-16.08.2.tar.xz";
+      sha256 = "1h9w8mk2gwnfbm9520bfmqbzjjg1211lpvzbq8ba4jg3l99d69j6";
+      name = "calendarsupport-16.08.2.tar.xz";
     };
   };
   cantor = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/cantor-16.08.1.tar.xz";
-      sha256 = "1cawdhpmyfb5qgbxil38szghi8q7hslpljzgsn7ma3gy6sqv3k9s";
-      name = "cantor-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/cantor-16.08.2.tar.xz";
+      sha256 = "1zi989fklw4qs0yj2zs0rpbaq1yfd9dax6ric376s2r85mrdfvjc";
+      name = "cantor-16.08.2.tar.xz";
     };
   };
   cervisia = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/cervisia-16.08.1.tar.xz";
-      sha256 = "0apb29k4r2wsf6hn3rl2h1yvmy8npi4dmvjhr02j3gqfxic68vf1";
-      name = "cervisia-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/cervisia-16.08.2.tar.xz";
+      sha256 = "1pnjiww36689vzqg8aixn8q7jf9j295i18gr8ggck80ccxrrf7rd";
+      name = "cervisia-16.08.2.tar.xz";
     };
   };
   dolphin = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/dolphin-16.08.1.tar.xz";
-      sha256 = "022mnq1x9la8yxim3svf3vj2x43gdp5qd6fwr50lvxw4i4gc8giy";
-      name = "dolphin-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/dolphin-16.08.2.tar.xz";
+      sha256 = "1d6r7fi4cmdhxbrks8x0ar9s147zi4d6ap1pbxjmlxfa1v7jmmls";
+      name = "dolphin-16.08.2.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/dolphin-plugins-16.08.1.tar.xz";
-      sha256 = "1vi0pwvz76w13gglpbn1dwxbzr5hmwjhdpi64nmbqjgi71i9x2sa";
-      name = "dolphin-plugins-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/dolphin-plugins-16.08.2.tar.xz";
+      sha256 = "0cpcfgl77s02zi4hhsg9fnnmfrl0crk8vyacfis8j59zwcjf5n3d";
+      name = "dolphin-plugins-16.08.2.tar.xz";
     };
   };
   dragon = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/dragon-16.08.1.tar.xz";
-      sha256 = "1441jgg8bwvqghz31xnkwwlsayw134q0jiffgh1nis4rxm2rln8h";
-      name = "dragon-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/dragon-16.08.2.tar.xz";
+      sha256 = "0rv300ggjz4mclw5k406hjbg0a7jh5gkp9ycb897qaj4cfzw59x8";
+      name = "dragon-16.08.2.tar.xz";
     };
   };
   eventviews = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/eventviews-16.08.1.tar.xz";
-      sha256 = "0hp282if9fzw1xv4zdwrvar7wkchi9psl373r1594a7rjz9iby5j";
-      name = "eventviews-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/eventviews-16.08.2.tar.xz";
+      sha256 = "1mphb53nl2y8z42m47prh9nm6s42z2xcsk3c0ssk5glyq52g3z00";
+      name = "eventviews-16.08.2.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ffmpegthumbs-16.08.1.tar.xz";
-      sha256 = "08gna4lcz6ipjkm2vx862n1w61cxzkskaapsd22zxfmgfhmqyp73";
-      name = "ffmpegthumbs-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ffmpegthumbs-16.08.2.tar.xz";
+      sha256 = "1q2gkbfy57r23k7wchlnxmcy0phw41rwz5hl7mi9hliz1dlvkhc0";
+      name = "ffmpegthumbs-16.08.2.tar.xz";
     };
   };
   filelight = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/filelight-16.08.1.tar.xz";
-      sha256 = "0l059q0vh4yp2y5m0alvcz74g4amiks6yfhh45bd38vkvfay8073";
-      name = "filelight-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/filelight-16.08.2.tar.xz";
+      sha256 = "0jw6vpd6nnn9fbmfcas5g938ir7q3sk5b0x6advspci0asngnins";
+      name = "filelight-16.08.2.tar.xz";
     };
   };
   gpgmepp = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/gpgmepp-16.08.1.tar.xz";
-      sha256 = "1fqxjfn3mqkar8akpfh0i2lr30bvf99fm2ldsx34x7fq3kh29ys5";
-      name = "gpgmepp-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/gpgmepp-16.08.2.tar.xz";
+      sha256 = "0828qlhdi1i26n2xgyb01c0q77m6jlppbxv6mprryxq0ma88940a";
+      name = "gpgmepp-16.08.2.tar.xz";
     };
   };
   granatier = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/granatier-16.08.1.tar.xz";
-      sha256 = "1k270rqcyf37gl1r4086q4r49ssvawy56d32y1n02ph289m3dgl6";
-      name = "granatier-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/granatier-16.08.2.tar.xz";
+      sha256 = "0qx1rlgm9dznk387yv6ylvi2i97a652bi1nvr86syiwgydawb5ag";
+      name = "granatier-16.08.2.tar.xz";
     };
   };
   grantleetheme = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/grantleetheme-16.08.1.tar.xz";
-      sha256 = "10xajrlmkjpz6xl3jg47mdvpf478vvxx3rcwcvd2zxaza9yyakms";
-      name = "grantleetheme-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/grantleetheme-16.08.2.tar.xz";
+      sha256 = "0mviqfbzd8jb8ni4maydcdni034p52wm2ndms0r5f4az5mq1vs8i";
+      name = "grantleetheme-16.08.2.tar.xz";
     };
   };
   gwenview = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/gwenview-16.08.1.tar.xz";
-      sha256 = "1i55zd0pbgg2xinqzhxpsqx0vqp3dwn4z7bbf85m5cldbi070yv8";
-      name = "gwenview-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/gwenview-16.08.2.tar.xz";
+      sha256 = "0y2pk0a0wk2srfcyk401ymy2qmp413448r7larmgnw1yy0fbp8l2";
+      name = "gwenview-16.08.2.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/incidenceeditor-16.08.1.tar.xz";
-      sha256 = "0wl89kwbnqrafflrdphczrn3l5gjgl5fqxvz4z995ri9m98kvgin";
-      name = "incidenceeditor-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/incidenceeditor-16.08.2.tar.xz";
+      sha256 = "1z25z2pc3m6lnw3hpcjrrpj0f8jfbjav4i9kz6f97cs1rrklabym";
+      name = "incidenceeditor-16.08.2.tar.xz";
     };
   };
   jovie = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/jovie-16.08.1.tar.xz";
-      sha256 = "0nkrcvdsjcpba2awgvk0nv8ni3b5596p2jygxa906w50sjkcf5bk";
-      name = "jovie-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/jovie-16.08.2.tar.xz";
+      sha256 = "1iia5ja90ypid2mm59njr2jg4hlsqz727fipa1v88c5nx31fqn9s";
+      name = "jovie-16.08.2.tar.xz";
     };
   };
   juk = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/juk-16.08.1.tar.xz";
-      sha256 = "1kj5iw3hfgqwz08imcfjicgm5m4v7m1fny6da8jidvwzyn46nll4";
-      name = "juk-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/juk-16.08.2.tar.xz";
+      sha256 = "0l0scc3706ap2jfyvhv0shp3l5jw5r5jma1y6ikv0r85h9sxv6lw";
+      name = "juk-16.08.2.tar.xz";
     };
   };
   kaccessible = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kaccessible-16.08.1.tar.xz";
-      sha256 = "086spk1aignmb2bry6hbw11nssm99dk38mnk4s89f444ydczs3fs";
-      name = "kaccessible-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kaccessible-16.08.2.tar.xz";
+      sha256 = "1j7zm4qk0sfax3h85mljrh40ys0snmilj5fqbqv5cad8kna3v3gg";
+      name = "kaccessible-16.08.2.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kaccounts-integration-16.08.1.tar.xz";
-      sha256 = "0pjj0d8pnnz5zjmkjzb0x157msv0r0hk4h5vdji1jr0bwwhmwaw9";
-      name = "kaccounts-integration-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kaccounts-integration-16.08.2.tar.xz";
+      sha256 = "03k7h6lg39d6yvmz6b1i9a4cfakfncr91iw5bvy47xf4myp16dkr";
+      name = "kaccounts-integration-16.08.2.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kaccounts-providers-16.08.1.tar.xz";
-      sha256 = "1ji88wgvymdh63ykmv12n5gnr0zwmsch56n7wpwn5wvxs34wimqx";
-      name = "kaccounts-providers-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kaccounts-providers-16.08.2.tar.xz";
+      sha256 = "1lz3wx78h0kpc218ngrgqnws89ar1cpra0h7dywswvh3ndnd1iiz";
+      name = "kaccounts-providers-16.08.2.tar.xz";
     };
   };
   kajongg = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kajongg-16.08.1.tar.xz";
-      sha256 = "0z8kin497631fa7wls6bi42q32ijqgy674cigcmz9jfgn2hwkbc0";
-      name = "kajongg-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kajongg-16.08.2.tar.xz";
+      sha256 = "08wz24z1rdqz3vkg0vwfm2w6mjl8psbs1c13x4h3ia2l456b2y73";
+      name = "kajongg-16.08.2.tar.xz";
     };
   };
   kalarmcal = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kalarmcal-16.08.1.tar.xz";
-      sha256 = "10r31l6ak6dbksfj5444ndv06qx0jl4si634hv3i77q20jys1j26";
-      name = "kalarmcal-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kalarmcal-16.08.2.tar.xz";
+      sha256 = "0h9xx2k78i0jyiqn4rcr79lcgqp7zsy980mbvv5zyddisjs5hd9x";
+      name = "kalarmcal-16.08.2.tar.xz";
     };
   };
   kalgebra = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kalgebra-16.08.1.tar.xz";
-      sha256 = "1wfiqlhhm36p137wcgpbvnhr6idqwkdann99pb1y463jblrdibv6";
-      name = "kalgebra-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kalgebra-16.08.2.tar.xz";
+      sha256 = "02y4nrkf7dk8crmqdz7wg6gflm0zg3392m55zfsj6ad3vy78p1gg";
+      name = "kalgebra-16.08.2.tar.xz";
     };
   };
   kalzium = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kalzium-16.08.1.tar.xz";
-      sha256 = "09rz69cqqmicmwm9dj9yzq4l3j4w74ih8wcw0xyky948p3x6dh2r";
-      name = "kalzium-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kalzium-16.08.2.tar.xz";
+      sha256 = "0jl77cr107gykfkdkxgnknlg1rhb9w6llwhva6863v57n6gq1hgh";
+      name = "kalzium-16.08.2.tar.xz";
     };
   };
   kamera = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kamera-16.08.1.tar.xz";
-      sha256 = "01fvdbwi10pnhwg9q7w5lyr027mpy67mzdwpcwv4h1js6dsi68nz";
-      name = "kamera-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kamera-16.08.2.tar.xz";
+      sha256 = "1pghfxs3l20iv92dl39qh9rvdgqcrzmlrwjbmdjs8rdyb4cm0ivc";
+      name = "kamera-16.08.2.tar.xz";
     };
   };
   kanagram = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kanagram-16.08.1.tar.xz";
-      sha256 = "0a2rk092sgp1ysaw7h47y6lmw9z269j7llnw5vzq3mblc2ay2sda";
-      name = "kanagram-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kanagram-16.08.2.tar.xz";
+      sha256 = "0q4v7g0a746qj62vjy09z5d50b6p6x3dfzciracz3jngsbngkkh6";
+      name = "kanagram-16.08.2.tar.xz";
     };
   };
   kapman = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kapman-16.08.1.tar.xz";
-      sha256 = "0x7b1d6hhl0nwyz8qzcz9nnjv8477ghifzgiyw3g1bx8044wqlsk";
-      name = "kapman-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kapman-16.08.2.tar.xz";
+      sha256 = "0rfbn8p2fbgb3w9w7kn6s7q8yk6024sqc5l1f2k1b79g4f3mng82";
+      name = "kapman-16.08.2.tar.xz";
     };
   };
   kapptemplate = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kapptemplate-16.08.1.tar.xz";
-      sha256 = "1zkq5hpi8y4bny0q8p0aa3s4jpd5bxw18m5jxadjm4gfznnw8afv";
-      name = "kapptemplate-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kapptemplate-16.08.2.tar.xz";
+      sha256 = "1anjn061cbssbdvv9mvbafjwpxck9lxvxrmbjj1hq4z47z2hdh4h";
+      name = "kapptemplate-16.08.2.tar.xz";
     };
   };
   kate = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kate-16.08.1.tar.xz";
-      sha256 = "0z1q5lnkqnx40zbxj3bnwg9wrx7xk7xzfwc8i02zzvx50n7qn57n";
-      name = "kate-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kate-16.08.2.tar.xz";
+      sha256 = "0ch23k1n3csk2pc8xmsbp262ya3vng3n5lc3hcr2g03jkrjab214";
+      name = "kate-16.08.2.tar.xz";
     };
   };
   katomic = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/katomic-16.08.1.tar.xz";
-      sha256 = "1ilaz15qg1fasd0yv03vcspxx54cbw2m99wl39zzrh7jc3df0ad8";
-      name = "katomic-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/katomic-16.08.2.tar.xz";
+      sha256 = "07njyf7lnysvy2h6jql0z28yl1h6j3njrqnlxz4mf83ds09d73w6";
+      name = "katomic-16.08.2.tar.xz";
     };
   };
   kblackbox = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kblackbox-16.08.1.tar.xz";
-      sha256 = "1w7rh9m6qwdid2li7xhmsfs0v7q95gyl24529xm17y79k1qxcbm7";
-      name = "kblackbox-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kblackbox-16.08.2.tar.xz";
+      sha256 = "13spiwy2sjcfiz7hjg2jrx5aflnmccg3d5ki37bk72vcwg21i30y";
+      name = "kblackbox-16.08.2.tar.xz";
     };
   };
   kblocks = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kblocks-16.08.1.tar.xz";
-      sha256 = "086b8k8zhs9v0rp06z9wx8gaaphc2178px5501rqx6062azxflil";
-      name = "kblocks-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kblocks-16.08.2.tar.xz";
+      sha256 = "0ck0b8jxxcpz84sailh4i9c80dqqrw95fy8jgknwwb85w1a82r5v";
+      name = "kblocks-16.08.2.tar.xz";
     };
   };
   kblog = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kblog-16.08.1.tar.xz";
-      sha256 = "1vc2a3c4iz2jm2137zw3i69n6qam2rlhvjr8ybv84xv9s7b3pz25";
-      name = "kblog-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kblog-16.08.2.tar.xz";
+      sha256 = "1n9camf91p4igbn54j3n8jgqv9154y54fvyn0dlajmwf3ir8lyk9";
+      name = "kblog-16.08.2.tar.xz";
     };
   };
   kbounce = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kbounce-16.08.1.tar.xz";
-      sha256 = "0a4khwdrhzg33i4bbz1kb7w2jyzahnj1agcdybpzbqjnczgv4rnn";
-      name = "kbounce-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kbounce-16.08.2.tar.xz";
+      sha256 = "0mka3s4vx1gbzavhdbhy24jfginkl8v6ab9za47cfyiwnirscry7";
+      name = "kbounce-16.08.2.tar.xz";
     };
   };
   kbreakout = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kbreakout-16.08.1.tar.xz";
-      sha256 = "14i4yyxxd9w72sgdfwp47y8drbdl7lsb8fxgdswg91dpcnm1jmgi";
-      name = "kbreakout-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kbreakout-16.08.2.tar.xz";
+      sha256 = "0kyxd112yfdp14d73s3dbg393r11gmb7bc0ibb4a5ab7ki3vvp5h";
+      name = "kbreakout-16.08.2.tar.xz";
     };
   };
   kbruch = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kbruch-16.08.1.tar.xz";
-      sha256 = "02dyc90ir79swf8vjd53flxqp2imaaa9c5dikflbxiahj4k6rpa4";
-      name = "kbruch-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kbruch-16.08.2.tar.xz";
+      sha256 = "0m4zk03gxim4bxxzy391jkspjslf4i3gk23h7jpzwvp2yppibzxk";
+      name = "kbruch-16.08.2.tar.xz";
     };
   };
   kcachegrind = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kcachegrind-16.08.1.tar.xz";
-      sha256 = "1d7i162a6v7xhykzpszmia7cizrsgh040wk0ql7ijgb838iawflg";
-      name = "kcachegrind-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kcachegrind-16.08.2.tar.xz";
+      sha256 = "0hflqnx4cbqjx61cmxh4y2xkxzqxfw52m7snwhzyd9nlc1f842f4";
+      name = "kcachegrind-16.08.2.tar.xz";
     };
   };
   kcalc = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kcalc-16.08.1.tar.xz";
-      sha256 = "18nhvmgd0d2m0ji23536fhqykf4xdnnky5x0hy6vkja0dw91aggg";
-      name = "kcalc-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kcalc-16.08.2.tar.xz";
+      sha256 = "19zxdikqw922q4nc5nfm63pcaq3dg2d6bvcgxw7nd8r1jbn94acm";
+      name = "kcalc-16.08.2.tar.xz";
     };
   };
   kcalcore = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kcalcore-16.08.1.tar.xz";
-      sha256 = "12q30gsaw2fr7wx6jpswa7aby8d58wldxagbcdkwcifv78d7bgk7";
-      name = "kcalcore-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kcalcore-16.08.2.tar.xz";
+      sha256 = "1r0r0mk7yzi8h6mn81aaldcfa4vgxsz17sj5dm5m2p0mr42jxip3";
+      name = "kcalcore-16.08.2.tar.xz";
     };
   };
   kcalutils = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kcalutils-16.08.1.tar.xz";
-      sha256 = "0fvhy2r5mw871ld18rab4nx9cv52fg7vwkxj31gbvx6rbzbmzsrs";
-      name = "kcalutils-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kcalutils-16.08.2.tar.xz";
+      sha256 = "0achb65qs07b17qhdvfhl7w2qjfls00bycmg8jl789lz0jpdsgg7";
+      name = "kcalutils-16.08.2.tar.xz";
     };
   };
   kcharselect = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kcharselect-16.08.1.tar.xz";
-      sha256 = "1mx2biawax867rfq42w0mi4b7v10j17anfq64gx5q6vi79k6jqaj";
-      name = "kcharselect-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kcharselect-16.08.2.tar.xz";
+      sha256 = "1r50jpyl8a79qgz3gb1apzwrgkx5h7s9m645smi1y5af7qh6dkvy";
+      name = "kcharselect-16.08.2.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kcolorchooser-16.08.1.tar.xz";
-      sha256 = "1s490hkjbinhlc3pf2waks9ka8dvkpq3l5vblmd11h1yckbpcdqi";
-      name = "kcolorchooser-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kcolorchooser-16.08.2.tar.xz";
+      sha256 = "1sms0wms94lrykpsj45y8g34dnkkibszahv5303zbzg1ndak4a5i";
+      name = "kcolorchooser-16.08.2.tar.xz";
     };
   };
   kcontacts = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kcontacts-16.08.1.tar.xz";
-      sha256 = "198qqs7001m2ywmryx9489jpay1g7i9g04bl9y25jr2a3lf4id87";
-      name = "kcontacts-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kcontacts-16.08.2.tar.xz";
+      sha256 = "0y8i5302jndpwms0wksf71yqxvz67x8wbwfkjjmlr3n6g477cvf3";
+      name = "kcontacts-16.08.2.tar.xz";
     };
   };
   kcron = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kcron-16.08.1.tar.xz";
-      sha256 = "062ndya5r67imkx0fw2whgppfm9j3jwxscfz8vd64g3532kai9n5";
-      name = "kcron-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kcron-16.08.2.tar.xz";
+      sha256 = "05v5lwcdys0r715x21ddzgl1f3m1vqw8jmyb7igcb4m14iixvfwk";
+      name = "kcron-16.08.2.tar.xz";
     };
   };
   kde-baseapps = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-baseapps-16.08.1.tar.xz";
-      sha256 = "0s9391mx2wh1yvi5ykp5nj3zfr5qvkqpwljjgvhfr2i1a4h24551";
-      name = "kde-baseapps-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-baseapps-16.08.2.tar.xz";
+      sha256 = "1p7h1jygqiwdgwi1g5pr7rq0219i6qq6mrg0c0shcfvvi926dg10";
+      name = "kde-baseapps-16.08.2.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdebugsettings-16.08.1.tar.xz";
-      sha256 = "0b3940wzm3bl0w0wdjk62ikf6cxlzipckwzq7skpnp115j90pnyp";
-      name = "kdebugsettings-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdebugsettings-16.08.2.tar.xz";
+      sha256 = "0aixcx4fcnrhz7g9dwl65khn2d5a667jchsxjnlwwrxhff2djy3z";
+      name = "kdebugsettings-16.08.2.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-dev-scripts-16.08.1.tar.xz";
-      sha256 = "1biw748yyiy2xwb4jyx1g4h6v9m0q3qwxh6kc4l7fb9qsjam0222";
-      name = "kde-dev-scripts-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-dev-scripts-16.08.2.tar.xz";
+      sha256 = "1iis5zlfz0ylycpz1i9s99grhp6pzskwv9hmsr620mj2fhcy3nwv";
+      name = "kde-dev-scripts-16.08.2.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-dev-utils-16.08.1.tar.xz";
-      sha256 = "00dgfclyl95nv5s77w56h472hb02v91fhdx0qkk0vikj2n1z7l9n";
-      name = "kde-dev-utils-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-dev-utils-16.08.2.tar.xz";
+      sha256 = "1sm540r4nfr8azw9bvsmjbqy709039sk0z7rv3d5mh3d6f363my1";
+      name = "kde-dev-utils-16.08.2.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdeedu-data-16.08.1.tar.xz";
-      sha256 = "0qh6ain1qi7l5455j3ir6fq7rs735j2q2czxl2ys8qji5j1yidwa";
-      name = "kdeedu-data-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdeedu-data-16.08.2.tar.xz";
+      sha256 = "1m8831nr9f97fz9vxca4bcwwvv5nicd4y74sgp6xm3v41xqwda6b";
+      name = "kdeedu-data-16.08.2.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdegraphics-mobipocket-16.08.1.tar.xz";
-      sha256 = "1lzwlvcf6wp1g2n46811cq2m3h212w161z6kasdg7wf7rcghbmvd";
-      name = "kdegraphics-mobipocket-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-mobipocket-16.08.2.tar.xz";
+      sha256 = "0y19q7r4pbfkqf0mb80h9rqzc13q9csllb9b8ca536bcjh41r6yy";
+      name = "kdegraphics-mobipocket-16.08.2.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdegraphics-thumbnailers-16.08.1.tar.xz";
-      sha256 = "068cvcnaf8kyls49143w8lwg24hk58byiv23qh2xxv180ps12hkm";
-      name = "kdegraphics-thumbnailers-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-thumbnailers-16.08.2.tar.xz";
+      sha256 = "155nfj6apbvrs2p69yj0ic0ybp59air0a3wdwz5sw84y47dslnaz";
+      name = "kdegraphics-thumbnailers-16.08.2.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ar-16.08.1.tar.xz";
-      sha256 = "0v1h0qciqr4kanb0mb6hjma35spjhp51vx0r7kb3girmv4ik2mii";
-      name = "kde-l10n-ar-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ar-16.08.2.tar.xz";
+      sha256 = "0aaxwb4sr2bq5cmcr0j7n7dbvih52d5gwbcx17ksip0fp7y0cgnr";
+      name = "kde-l10n-ar-16.08.2.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ast-16.08.1.tar.xz";
-      sha256 = "1srk025iqvrwjcks9hcjlzxqmlmfmzn3xlgi1c60nncb046q7xa6";
-      name = "kde-l10n-ast-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ast-16.08.2.tar.xz";
+      sha256 = "1s55wrb2ll4fh0f648yybg6mxgsvikanwplw88kk254gxailbvi4";
+      name = "kde-l10n-ast-16.08.2.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-bg-16.08.1.tar.xz";
-      sha256 = "014s77imwl3awy3fd4yzdv0k61j1h0rlvnlfk7mzkyyjgxhh9wqg";
-      name = "kde-l10n-bg-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bg-16.08.2.tar.xz";
+      sha256 = "15slc3an490xcbkwhfkysrzx3xg0h1mrwzp4bxsrsvqcjw4nlrdy";
+      name = "kde-l10n-bg-16.08.2.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-bs-16.08.1.tar.xz";
-      sha256 = "0ijsbkllls8966hrh19p2062fmnjan0hibl6650ihgypsci15y57";
-      name = "kde-l10n-bs-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bs-16.08.2.tar.xz";
+      sha256 = "1117i784lwi9ci1ryd46x01pjraw30lma0z4kcg987xpj6ww22ha";
+      name = "kde-l10n-bs-16.08.2.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ca-16.08.1.tar.xz";
-      sha256 = "12kn3skciqmsqwqdpx7n4286cz1w7rdgx4mggvk05db0bhrybjzg";
-      name = "kde-l10n-ca-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca-16.08.2.tar.xz";
+      sha256 = "07f6h2prkm7iq3bwvn5p9y32xzis3p21sgxpg1x6663w3603w2pa";
+      name = "kde-l10n-ca-16.08.2.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-16.08.1";
+    version = "ca_valencia-16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ca@valencia-16.08.1.tar.xz";
-      sha256 = "0dfjx9pfzwilz746lrdgpx51cig8wr9igbm7pdidpaz5wryqfsif";
-      name = "kde-l10n-ca_valencia-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca@valencia-16.08.2.tar.xz";
+      sha256 = "05fw1dj1rfsi1j8mzvjvqwvdv7zkjcj4y0fb9wm9wzcqlsl742wv";
+      name = "kde-l10n-ca_valencia-16.08.2.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-cs-16.08.1.tar.xz";
-      sha256 = "1b14wgczd6qfkgy1rfj2dmw0l0vc3jkf1yf0ih5y0s3zqx081k34";
-      name = "kde-l10n-cs-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-cs-16.08.2.tar.xz";
+      sha256 = "1vfn41kayimddrcg2h6zrx3sc31vq2zlv6bkpg29h6yddir6xjgk";
+      name = "kde-l10n-cs-16.08.2.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-da-16.08.1.tar.xz";
-      sha256 = "1hdppgawypnya6sk60bz62cc7dnhh5m1dcq68hx67a9wrf6hw21i";
-      name = "kde-l10n-da-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-da-16.08.2.tar.xz";
+      sha256 = "0k8cs5m9aypgjkrvwrff4qvaanppaizryc6wncqr9jj13hr2vz1q";
+      name = "kde-l10n-da-16.08.2.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-de-16.08.1.tar.xz";
-      sha256 = "0r0kkrmk4gzn9nhly9c908ajciy9k9rxy8wrqampj4gynxsrc07w";
-      name = "kde-l10n-de-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-de-16.08.2.tar.xz";
+      sha256 = "01kfh8zlf7r3dlmi96nvl4gksxryd10aqrnddhwjxni29l2sqjil";
+      name = "kde-l10n-de-16.08.2.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-el-16.08.1.tar.xz";
-      sha256 = "1d6ipj1hyjzwlcparbi533iqgvbx9lhdmqnzdhjxnim1hia25wan";
-      name = "kde-l10n-el-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-el-16.08.2.tar.xz";
+      sha256 = "1b6q3xriy9bv5537v2salz4vi4yx4hlx73aga4ic4pas8n0fn155";
+      name = "kde-l10n-el-16.08.2.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-16.08.1";
+    version = "en_GB-16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-en_GB-16.08.1.tar.xz";
-      sha256 = "102qlxmcynqf30x25ygmh7x6x0d12fbr4dri1nj8rkd8bmi214di";
-      name = "kde-l10n-en_GB-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-en_GB-16.08.2.tar.xz";
+      sha256 = "12cf5cx7kmc0wg752xpaz4jr4m3vxaahhxd0cp41p3lrb3079g2c";
+      name = "kde-l10n-en_GB-16.08.2.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-eo-16.08.1.tar.xz";
-      sha256 = "131y6259yi3kwzn17a11nx5xmxc1llg105g2x0sfayc7k4i5y24z";
-      name = "kde-l10n-eo-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eo-16.08.2.tar.xz";
+      sha256 = "07rwf3jcrs7r16hpyf4mz9fk41qi1nfm6x6qlf6xlpi7ynxgyyj0";
+      name = "kde-l10n-eo-16.08.2.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-es-16.08.1.tar.xz";
-      sha256 = "1qzwfi21cfs5j88hxmkbbrp8isrxv6b6c3ld2s41lj6a67sdw21k";
-      name = "kde-l10n-es-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-es-16.08.2.tar.xz";
+      sha256 = "1m366lxafwxa390nyvxwslbk653m1g6nwv9hr4mmpcnf2xxqsq2b";
+      name = "kde-l10n-es-16.08.2.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-et-16.08.1.tar.xz";
-      sha256 = "1dci7x9w8dzmzwj5f6c4i9x6v5g68ll9dwfvwf060vy2pnnnlw7g";
-      name = "kde-l10n-et-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-et-16.08.2.tar.xz";
+      sha256 = "0n08x8102hlzl3xp3d306lxf47b7870wxvr95krnchbrnmb847jv";
+      name = "kde-l10n-et-16.08.2.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-eu-16.08.1.tar.xz";
-      sha256 = "1n21mhqlr3wj6gd9kbfvfck5f1ql1ywanbp084afxqcbx82pb7j3";
-      name = "kde-l10n-eu-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eu-16.08.2.tar.xz";
+      sha256 = "0kacy7cbjd4pgzr54x9y28lk28rdbilqamg5gv2lxz3l2rqbnkpf";
+      name = "kde-l10n-eu-16.08.2.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fa-16.08.1.tar.xz";
-      sha256 = "15ay6hqgpdv80fa3gjksfmjiczr4zwpwh4mj1zdrdm241kdhp1jp";
-      name = "kde-l10n-fa-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fa-16.08.2.tar.xz";
+      sha256 = "1nznmql7i2dkziyam6czyd8j0spjg276l9nwqnznrzpjnpks1dl2";
+      name = "kde-l10n-fa-16.08.2.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fi-16.08.1.tar.xz";
-      sha256 = "130hpabvd2rjd0x11k9yxjl94aslaz90bhf3mfm5bnjjlm8iqwz5";
-      name = "kde-l10n-fi-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fi-16.08.2.tar.xz";
+      sha256 = "0rxf7hcjrhmv7zrrrc9bv65dxwiw0vywwn7j92jvsw5psbb9yf1x";
+      name = "kde-l10n-fi-16.08.2.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fr-16.08.1.tar.xz";
-      sha256 = "0mkbbba9jldks003cmcdbfiqw7g6nr4majz8skb7srq8ma7sf9x4";
-      name = "kde-l10n-fr-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fr-16.08.2.tar.xz";
+      sha256 = "07b9a4vlnampg7i7nb4ykh1cp77pdf5k0h6aa0mjg1rjycpwflv3";
+      name = "kde-l10n-fr-16.08.2.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ga-16.08.1.tar.xz";
-      sha256 = "0hmj03ajgijjg3lmrsypff2nxzf61vmvf0qwrxiy3q40vvgj5mbr";
-      name = "kde-l10n-ga-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ga-16.08.2.tar.xz";
+      sha256 = "08dgs9rz52mk4bl41h5k4p0cpqjw381aw3h6xw8080lj9zh0nvbn";
+      name = "kde-l10n-ga-16.08.2.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-gl-16.08.1.tar.xz";
-      sha256 = "0n0nim3pkhql2lx9kqplcs6v225c2cirhazsb6ldblkhxbk0hgfb";
-      name = "kde-l10n-gl-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-gl-16.08.2.tar.xz";
+      sha256 = "0986i04gfa6yw3ljmlx857src7lda8cwqdkk68cbxfi371ly0spl";
+      name = "kde-l10n-gl-16.08.2.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-he-16.08.1.tar.xz";
-      sha256 = "0x4rn81ijx2b0z4s2b67d69gnnx0ldl43c311jf0dn9cyadjws07";
-      name = "kde-l10n-he-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-he-16.08.2.tar.xz";
+      sha256 = "0xbbf3jpsmyq8k3d2qq3y75jq9wmf6iy46s52qbmr0pbdg288h3c";
+      name = "kde-l10n-he-16.08.2.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hi-16.08.1.tar.xz";
-      sha256 = "1if5h20ywpkh85fx95i0mrv993gfj1rm3yp9jzz8x250b6ggbfd5";
-      name = "kde-l10n-hi-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hi-16.08.2.tar.xz";
+      sha256 = "1cfmn3qafmps51mld735synlsf8h1nfb84ji9qv64qpw2gjvpp9n";
+      name = "kde-l10n-hi-16.08.2.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hr-16.08.1.tar.xz";
-      sha256 = "0fg27qkj23b49hvbksqsiv3jj571b4i9msk82ygzvxl2ay5him52";
-      name = "kde-l10n-hr-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hr-16.08.2.tar.xz";
+      sha256 = "11kfxqjavmh9bcaivm5zd82r0b3d4rz8zmc2awc1433i6wgdxrkq";
+      name = "kde-l10n-hr-16.08.2.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hu-16.08.1.tar.xz";
-      sha256 = "1nw0922gk4f89r06fkgqvs092dbi4kjbfxvj86gq98v1ms0pns69";
-      name = "kde-l10n-hu-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hu-16.08.2.tar.xz";
+      sha256 = "0m714qii2z1bc8kv112bf9wpq078yaqgzd1m4h2apyj1rzl8sni8";
+      name = "kde-l10n-hu-16.08.2.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ia-16.08.1.tar.xz";
-      sha256 = "0plsffy1khy9cacqhabr1j2g0xi3v21qgydj6phb6d5j82p1c79i";
-      name = "kde-l10n-ia-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ia-16.08.2.tar.xz";
+      sha256 = "1r10w7dpxmgby3igh57yli6hp1paxwh1m4vkzi5f91fgh2s8qjjg";
+      name = "kde-l10n-ia-16.08.2.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-id-16.08.1.tar.xz";
-      sha256 = "0ihir3axvkczkik2nnfh4mmqkx2gpmvzri48i34p5dz21n8ca4ha";
-      name = "kde-l10n-id-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-id-16.08.2.tar.xz";
+      sha256 = "1r26h3rlgh91f00qzmkzmd3sflsmvyxdcy92ljj1g64wh9cigh66";
+      name = "kde-l10n-id-16.08.2.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-is-16.08.1.tar.xz";
-      sha256 = "0qrayzxpx1phk2m6kcq5b6i05swds1fis4651r5xk69dc2zqlbjn";
-      name = "kde-l10n-is-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-is-16.08.2.tar.xz";
+      sha256 = "0ldxw1sl7sr7v0783cby6qp5ig2x5dq2s8w7k3fh1qa88cp1nsld";
+      name = "kde-l10n-is-16.08.2.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-it-16.08.1.tar.xz";
-      sha256 = "1qhv4rywr9qlszlx8a7crqshr5zmxxgscq8s1c735jcm57bk8wzl";
-      name = "kde-l10n-it-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-it-16.08.2.tar.xz";
+      sha256 = "0knvilb2p9s1cr354bzwhxzmfi49g17v3clqdvlcyglghkz94aam";
+      name = "kde-l10n-it-16.08.2.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ja-16.08.1.tar.xz";
-      sha256 = "1zwb8r1vanrl4q0mhqgd4qj8smyygqgka4b4zjqr6h2klklwsxsg";
-      name = "kde-l10n-ja-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ja-16.08.2.tar.xz";
+      sha256 = "0x3sfprw1pvjkivva05cg9nbzml2g4vzidvjq37vp7nkyfdxldcp";
+      name = "kde-l10n-ja-16.08.2.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-kk-16.08.1.tar.xz";
-      sha256 = "1zdhfhjxpr73f34nh24y6ddgp3zkqim4dy8mblk84w8wsg80i6gj";
-      name = "kde-l10n-kk-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-kk-16.08.2.tar.xz";
+      sha256 = "1jmqahyhxz798yqlc25lyj3x6xa426czkydbikpngb3775wy918z";
+      name = "kde-l10n-kk-16.08.2.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-km-16.08.1.tar.xz";
-      sha256 = "1qx2cm9cv7b33pkzpfgcqppr6q4qqzf9v152wjfdk096jq6yfijv";
-      name = "kde-l10n-km-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-km-16.08.2.tar.xz";
+      sha256 = "00p7grks0cjca5r2xvmf4kxvpjqasbjcss938x9ss6wc0knq8laa";
+      name = "kde-l10n-km-16.08.2.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ko-16.08.1.tar.xz";
-      sha256 = "18za5mpnx8xfkpmpjp2i04kl6a2chjgz8g7vhymi01m1dhf7ql5f";
-      name = "kde-l10n-ko-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ko-16.08.2.tar.xz";
+      sha256 = "0w14n8vzvmwiliqnakg4s76cka1qp0j0azc632aaiy6d17g0yw2k";
+      name = "kde-l10n-ko-16.08.2.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-lt-16.08.1.tar.xz";
-      sha256 = "147z5af6qn7c6qrxxzmcc9qkagc4y6nffqal3fsrs84pjrsav72j";
-      name = "kde-l10n-lt-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lt-16.08.2.tar.xz";
+      sha256 = "1yj119r7p9bjk405ml5383y5jqrhaj9v4ksjiyhjs8l5zx0pjb3b";
+      name = "kde-l10n-lt-16.08.2.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-lv-16.08.1.tar.xz";
-      sha256 = "19pf8khdszfnlfybrsdwm0gbnphr43109b81fa6bsxcc57knagwg";
-      name = "kde-l10n-lv-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lv-16.08.2.tar.xz";
+      sha256 = "0g173n4nqiw7mk6phys4dlis6dfd9iw0kpv4hhvz4b54i67wamvw";
+      name = "kde-l10n-lv-16.08.2.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-mr-16.08.1.tar.xz";
-      sha256 = "0vwa1mz9igx592bq89fnq7350ln4g5cvdmm1hnay94c5qxc12s0z";
-      name = "kde-l10n-mr-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-mr-16.08.2.tar.xz";
+      sha256 = "1696gqib17f250p5y0vfjxcx8w4wx1lhi8nqy9bbjj6acmahishj";
+      name = "kde-l10n-mr-16.08.2.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nb-16.08.1.tar.xz";
-      sha256 = "1dz3a5bwsmbckdmh2v2crnal7183sqav6y5z01xdq0wyjjy8kizc";
-      name = "kde-l10n-nb-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nb-16.08.2.tar.xz";
+      sha256 = "0z2v14m329r8687qpvf0qxnbvpp48mvl1yri16203bya8q44764j";
+      name = "kde-l10n-nb-16.08.2.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nds-16.08.1.tar.xz";
-      sha256 = "1gjvwg6gmxbvk7q26f7i50ivfmh4s2djl7m9dsaj6rk53cknhd8s";
-      name = "kde-l10n-nds-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nds-16.08.2.tar.xz";
+      sha256 = "0d7nzwll2hqlb3ca3zdwr9x4rnhvv3fgxammzac07gib1aq27lap";
+      name = "kde-l10n-nds-16.08.2.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nl-16.08.1.tar.xz";
-      sha256 = "1r3mwnkkr8k3zb87j6lr4lrgq02rccqpp5m273z1c5n0kqcbp50h";
-      name = "kde-l10n-nl-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nl-16.08.2.tar.xz";
+      sha256 = "0hq7gqg6nqb06kg8pgjf36w6lx6kv0z4v0lz4wac47v10jipcix4";
+      name = "kde-l10n-nl-16.08.2.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nn-16.08.1.tar.xz";
-      sha256 = "0r38zvmh05mcfh7grayb771mrdl2637xnx75nx7lnvkvmlf6dngh";
-      name = "kde-l10n-nn-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nn-16.08.2.tar.xz";
+      sha256 = "02935kj4gw93lyjik6vqk40rnpblib0pq1dl0im2mavfym2nacjj";
+      name = "kde-l10n-nn-16.08.2.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pa-16.08.1.tar.xz";
-      sha256 = "04828d9wsd51g3a45nzddxhxdwwk447qlkswxjzayiy7w6pjspch";
-      name = "kde-l10n-pa-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pa-16.08.2.tar.xz";
+      sha256 = "08qq6lkr9jrsl12slqfhp83vkamr5nv9x7hr91g8xgg1s9i3aj3z";
+      name = "kde-l10n-pa-16.08.2.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pl-16.08.1.tar.xz";
-      sha256 = "068ab65ivm4qw3hmhv97v8ck2qg7z8aglfwq0lqrlb5famg158di";
-      name = "kde-l10n-pl-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pl-16.08.2.tar.xz";
+      sha256 = "0ylsc89nsmbjm4c5gbnh5qczmr7bal7037bm5nsmrh7aqkwg1s1x";
+      name = "kde-l10n-pl-16.08.2.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pt-16.08.1.tar.xz";
-      sha256 = "1ix32ry9zzgdwmpqfvzsfdz357l56nwqd42rnszgjzs4sdikl3y8";
-      name = "kde-l10n-pt-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt-16.08.2.tar.xz";
+      sha256 = "0cbaf2vnr56qa0qfhr4cgdmbq3hbck9wfcx5a7bvvaglck95f4gq";
+      name = "kde-l10n-pt-16.08.2.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-16.08.1";
+    version = "pt_BR-16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pt_BR-16.08.1.tar.xz";
-      sha256 = "0id10qm9gzg2c9as2np8a0sfnx9acsnf06igvwxnyazar8k831hs";
-      name = "kde-l10n-pt_BR-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt_BR-16.08.2.tar.xz";
+      sha256 = "048ssv4bhx8bn2q8nsh5n0m1nl64qadndwrh3hx3avd7jjnj7l4s";
+      name = "kde-l10n-pt_BR-16.08.2.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ro-16.08.1.tar.xz";
-      sha256 = "1j6vdc62xw4pbn0lz0zmwylc43m9kxn78zx0qn5gc51i2n3sb8bm";
-      name = "kde-l10n-ro-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ro-16.08.2.tar.xz";
+      sha256 = "05pi6v5hp3yki0hiy19gggz1mpk7ykjz6f94k6cv63vinvai6gpw";
+      name = "kde-l10n-ro-16.08.2.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ru-16.08.1.tar.xz";
-      sha256 = "1bqrjgh89yskqx5hpd08z949nplp7f53is1vm9slrvn94hcslc46";
-      name = "kde-l10n-ru-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ru-16.08.2.tar.xz";
+      sha256 = "18kk3iyn1dyir43dxlrs0jcdin001h0qfzm9cszxlz52yx5vn4ba";
+      name = "kde-l10n-ru-16.08.2.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sk-16.08.1.tar.xz";
-      sha256 = "18w6zbix3iwrgyswlr8390yb3q4fli1krana7pimfhll29wg9s2v";
-      name = "kde-l10n-sk-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sk-16.08.2.tar.xz";
+      sha256 = "0gxia3j689a315jww9cfw802vhz226zd3ci6i45ffrj5sdpm0bcs";
+      name = "kde-l10n-sk-16.08.2.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sl-16.08.1.tar.xz";
-      sha256 = "1q9gjl8cz02nwy90w31apr8rv5bhp8xanmc6ckijfl7xz5a5r7ig";
-      name = "kde-l10n-sl-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sl-16.08.2.tar.xz";
+      sha256 = "1d6gxc2jcnjzjrp6aw63l86wsqkdg4qw3zz5pc0j1qc5ihaak6pm";
+      name = "kde-l10n-sl-16.08.2.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sr-16.08.1.tar.xz";
-      sha256 = "019m72c4l486rwq6cm309jsaasz96grv2bb8wrgxy2r69y2qnzqj";
-      name = "kde-l10n-sr-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sr-16.08.2.tar.xz";
+      sha256 = "0mixdfpvryg1ch917nxc469m7fzgy5dkbxadc55kzgy9k18vry30";
+      name = "kde-l10n-sr-16.08.2.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sv-16.08.1.tar.xz";
-      sha256 = "0ml489l1jv07x1d157gacsgnyx95j4fapd0r6q4d2r5mdm77w36b";
-      name = "kde-l10n-sv-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sv-16.08.2.tar.xz";
+      sha256 = "10day8y3fqdf9rg24wmxa38snpkry08swcgzh2qxy2wlg7w1n2ld";
+      name = "kde-l10n-sv-16.08.2.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-tr-16.08.1.tar.xz";
-      sha256 = "008fjcf7p2pk1g4mzsc98vqlaaagf1bkmha323rgqrz07jzjax63";
-      name = "kde-l10n-tr-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-tr-16.08.2.tar.xz";
+      sha256 = "19a5cribm12pi0y84vfwmigkyvn8d4ylvx07g9df4iapjf2kgs54";
+      name = "kde-l10n-tr-16.08.2.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ug-16.08.1.tar.xz";
-      sha256 = "1d38j4cyzzxv35i39rmhrlyc097n56gghvwcl16nj55qbm41nb22";
-      name = "kde-l10n-ug-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ug-16.08.2.tar.xz";
+      sha256 = "0p2ijv13wk02sm065nk328pdl2qn22sashwdzw5viy6hr67z8igv";
+      name = "kde-l10n-ug-16.08.2.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-uk-16.08.1.tar.xz";
-      sha256 = "1684139ic7vsr68jfk91kmlvw5bjxm2p2p2zkim0md8gmjw279bd";
-      name = "kde-l10n-uk-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-uk-16.08.2.tar.xz";
+      sha256 = "0m03z8yac3mbsp78zskyiw316im7fr2197lmjl6prfz8hdvblyqm";
+      name = "kde-l10n-uk-16.08.2.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-wa-16.08.1.tar.xz";
-      sha256 = "07nalfxn0gw8ygi5cjq5xzyszk4pa4bb2lyll5nfh0h971kiwrk0";
-      name = "kde-l10n-wa-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-wa-16.08.2.tar.xz";
+      sha256 = "08zv0pl9gm7xpykzvb7cf4gx0r78jrfx33281iam3496bgl9iz63";
+      name = "kde-l10n-wa-16.08.2.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-16.08.1";
+    version = "zh_CN-16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-zh_CN-16.08.1.tar.xz";
-      sha256 = "120f7a4qwxjh0l6n0pcckwi0y5lzy99l7p40i032yd4awjm0jdx6";
-      name = "kde-l10n-zh_CN-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_CN-16.08.2.tar.xz";
+      sha256 = "1fzkykipaqlabzmddzk694h26cw15r8vwn3f6033pbgpd47rxmh7";
+      name = "kde-l10n-zh_CN-16.08.2.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-16.08.1";
+    version = "zh_TW-16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-zh_TW-16.08.1.tar.xz";
-      sha256 = "00z9rld3a76lw3gb621zqclfkdww46fvd86sdws3r6d71zv659h0";
-      name = "kde-l10n-zh_TW-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_TW-16.08.2.tar.xz";
+      sha256 = "0i02bbpkn802wzavyj3ilmp889v6frkbb1zp8q9wsrvdwv71zmrj";
+      name = "kde-l10n-zh_TW-16.08.2.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.24";
+    version = "4.14.25";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdelibs-4.14.24.tar.xz";
-      sha256 = "1vs60cwwva59fifhg392c60wwp49bvwmm7m6xlai24wzfgl67rj5";
-      name = "kdelibs-4.14.24.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdelibs-4.14.25.tar.xz";
+      sha256 = "00idq3iqd72gjyqj79ci8992jlww877m3znjvvlnh8s97y4kwpds";
+      name = "kdelibs-4.14.25.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdenetwork-filesharing-16.08.1.tar.xz";
-      sha256 = "0gkyi2s4hiq3i17cizh0c6dzvc7b19d8bcan22jxb6jx6drm8yq3";
-      name = "kdenetwork-filesharing-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdenetwork-filesharing-16.08.2.tar.xz";
+      sha256 = "0k9c1mjdr754qgzhfmx0qrh7lf1hlp698wq6mynw31b45ngx26n9";
+      name = "kdenetwork-filesharing-16.08.2.tar.xz";
     };
   };
   kdenlive = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdenlive-16.08.1.tar.xz";
-      sha256 = "0aza2y5xybgj8qnfsc4vbpvmvdvscdmv1bqc67nks72z7c48cpfl";
-      name = "kdenlive-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdenlive-16.08.2.tar.xz";
+      sha256 = "1lw0dayp2hryqpfw2090fzj7yqxi1y8bmpzadljqkl1glb6sd16l";
+      name = "kdenlive-16.08.2.tar.xz";
     };
   };
   kdepim = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdepim-16.08.1.tar.xz";
-      sha256 = "0ibbc9whg6wy0ipfza5jjwf5y6lz5cbd30nxj93p3adfd4bl55by";
-      name = "kdepim-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdepim-16.08.2.tar.xz";
+      sha256 = "15w9yyyld84hp0mzlw0iv9bl3f4dk560l6mynrq5ccya90lfrnc2";
+      name = "kdepim-16.08.2.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdepim-addons-16.08.1.tar.xz";
-      sha256 = "0mbr9m9h79wvklzh6lh5mmq47b69xi2dy589hham3xy69s067g0n";
-      name = "kdepim-addons-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdepim-addons-16.08.2.tar.xz";
+      sha256 = "06plflqj1p3jhn8c2jm2vm55yhiwa7wsvndh86q39ajw5qw60mhx";
+      name = "kdepim-addons-16.08.2.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdepim-apps-libs-16.08.1.tar.xz";
-      sha256 = "0nwsdham4gf97d0d1wn1v440grbny8rj0gj29z10ia2v3zkx6cgd";
-      name = "kdepim-apps-libs-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdepim-apps-libs-16.08.2.tar.xz";
+      sha256 = "1vygdkh43b0aajxywy6sa01khx8zvsv1n3aainqcbn8jndxlkb82";
+      name = "kdepim-apps-libs-16.08.2.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdepim-runtime-16.08.1.tar.xz";
-      sha256 = "097jxiwv9vg3scc95j563v3y28iv4a6rkq0w2w1d5f499d6bc7wf";
-      name = "kdepim-runtime-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdepim-runtime-16.08.2.tar.xz";
+      sha256 = "0dg3ww5l6mq7xi4z1j7b4w2d7i425wbz1gwml0a9ajy3v0k14vqb";
+      name = "kdepim-runtime-16.08.2.tar.xz";
     };
   };
   kde-runtime = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kde-runtime-16.08.1.tar.xz";
-      sha256 = "0szmm32m3gifdpvib4ik5cwcm0ixz5npfzs0gkasq6k9mnf68z65";
-      name = "kde-runtime-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kde-runtime-16.08.2.tar.xz";
+      sha256 = "1q0m4nywap0qmg9fj9z2d8b7j9bvykniqq9jga3jmys5g2cjn205";
+      name = "kde-runtime-16.08.2.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdesdk-kioslaves-16.08.1.tar.xz";
-      sha256 = "09g4ax7ah52ihdmp9xrymarq945kymkh65qqqd1rgf0zjaj2af7p";
-      name = "kdesdk-kioslaves-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdesdk-kioslaves-16.08.2.tar.xz";
+      sha256 = "11png8q0ci86if2g49nrmx63l8pxcmp789k9kkamnzsx79y6arq2";
+      name = "kdesdk-kioslaves-16.08.2.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdesdk-thumbnailers-16.08.1.tar.xz";
-      sha256 = "0ygkndgfihb8jissn5jq35vd2j73z5i2rdj2jbgik7hrm2rzjzfs";
-      name = "kdesdk-thumbnailers-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdesdk-thumbnailers-16.08.2.tar.xz";
+      sha256 = "1dmmm6l5yy64l6hqqjx4d5cycgx1wzjv81ll9jizgg8c5cknhi8l";
+      name = "kdesdk-thumbnailers-16.08.2.tar.xz";
     };
   };
   kdewebdev = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdewebdev-16.08.1.tar.xz";
-      sha256 = "1xi72wfj57z06s2d7ijjc2vpi14nqdavcp2gmczp08lf4n7lkfjr";
-      name = "kdewebdev-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdewebdev-16.08.2.tar.xz";
+      sha256 = "0dm013da1i2z0n6svmm0yqzgn3j608ldc2w80dvgkvykh85z5ccy";
+      name = "kdewebdev-16.08.2.tar.xz";
     };
   };
   kdf = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdf-16.08.1.tar.xz";
-      sha256 = "02azfa3j9m95m6ch1h4b5r2cwbyq987rxzyxsldsbna3x80kqpsv";
-      name = "kdf-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdf-16.08.2.tar.xz";
+      sha256 = "0lvzyxn434rqknqmzwi6ih60gvkd24i2ms0ziypkh5ihs9scbmg7";
+      name = "kdf-16.08.2.tar.xz";
     };
   };
   kdgantt2 = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdgantt2-16.08.1.tar.xz";
-      sha256 = "1qz44461wk2h2bi5xpyrh5s201azqigph3vclp92phy55s12q83s";
-      name = "kdgantt2-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdgantt2-16.08.2.tar.xz";
+      sha256 = "1hhfrcjv6yx69ahnhc641h6sh9fp9m69jkb85aav2pydnps1p4bp";
+      name = "kdgantt2-16.08.2.tar.xz";
     };
   };
   kdiamond = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kdiamond-16.08.1.tar.xz";
-      sha256 = "0w2kxndpjq2s35qz05vsbr1qnd30lnxhmkyxmy5r7qcqkfdjfwbb";
-      name = "kdiamond-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kdiamond-16.08.2.tar.xz";
+      sha256 = "0kaqxxm30kxvkbzgzj69zzsql903qbkczlkmxfb9x2zp2484f7jq";
+      name = "kdiamond-16.08.2.tar.xz";
     };
   };
   kfloppy = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kfloppy-16.08.1.tar.xz";
-      sha256 = "133ib3kicmaxryc4623fmayk12gp4nnymi3g3d97kyk0nmrx1vg7";
-      name = "kfloppy-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kfloppy-16.08.2.tar.xz";
+      sha256 = "0jkbamqbdggf72k1xszaan890nhqz4qwhd8d0mbgm2nhzbs9q1cb";
+      name = "kfloppy-16.08.2.tar.xz";
     };
   };
   kfourinline = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kfourinline-16.08.1.tar.xz";
-      sha256 = "0114ldvw1826v75az3wdppd4qdnhswiixm03801rsp680fg9fm9s";
-      name = "kfourinline-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kfourinline-16.08.2.tar.xz";
+      sha256 = "0cb2kap8bp35ijnhghp9df4kai7vizayzcax0p3wamv0zy4zfx4b";
+      name = "kfourinline-16.08.2.tar.xz";
     };
   };
   kgeography = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kgeography-16.08.1.tar.xz";
-      sha256 = "0psxpq1ap8cm3adf5j6hr0z858wx41aag95n8mx7vgyfjgaj81s4";
-      name = "kgeography-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kgeography-16.08.2.tar.xz";
+      sha256 = "0s88gzyy0ldz10vlklnvwi7aip0vn5gnawikqn80xfw3vwb5zyki";
+      name = "kgeography-16.08.2.tar.xz";
     };
   };
   kget = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kget-16.08.1.tar.xz";
-      sha256 = "0brihzmn7fz43mi1mf8flkbbk80pv2sg3ny1il4cdkk6nwryk3dn";
-      name = "kget-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kget-16.08.2.tar.xz";
+      sha256 = "1pna3rw76n1lg9l805ccisxirrmxw23n2az5nd95wsck77lgxnr6";
+      name = "kget-16.08.2.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kgoldrunner-16.08.1.tar.xz";
-      sha256 = "10bllkkiisb4ci97wzfln5b8bxs5l72k29mbd4qqxhq69r8xqi5c";
-      name = "kgoldrunner-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kgoldrunner-16.08.2.tar.xz";
+      sha256 = "0r14mspzyigj4md7zzjq06sswb1y4m4232kfkwg4p7yp8xpsr56c";
+      name = "kgoldrunner-16.08.2.tar.xz";
     };
   };
   kgpg = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kgpg-16.08.1.tar.xz";
-      sha256 = "0zpq8smwh648jsxkf82pc2xvz980f07ilp2rzd8yr3w2n18gz120";
-      name = "kgpg-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kgpg-16.08.2.tar.xz";
+      sha256 = "0bx4d4i4n8v58yyqcb7pz70cpikymmjz9nd69mly9g8hj8jwqnll";
+      name = "kgpg-16.08.2.tar.xz";
     };
   };
   khangman = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/khangman-16.08.1.tar.xz";
-      sha256 = "1jz8wardcsip8c3r7s7lz1zn5gifb9jdksi0hdzn1kv1ha70dfyr";
-      name = "khangman-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/khangman-16.08.2.tar.xz";
+      sha256 = "172ciifrcydyhmawzxx3k1aq564ywjlj5wqfbjgxaf7pj3pbxndk";
+      name = "khangman-16.08.2.tar.xz";
     };
   };
   khelpcenter = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/khelpcenter-16.08.1.tar.xz";
-      sha256 = "0nv7i3dm6d7wr9y34l009fybdlmp4j5891wl9wwzp6ccnw2qls4g";
-      name = "khelpcenter-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/khelpcenter-16.08.2.tar.xz";
+      sha256 = "1iiz4w4zzf28g336hypmhf50lndwl6rj3y46wbj1mzpc99wrrxhr";
+      name = "khelpcenter-16.08.2.tar.xz";
     };
   };
   kholidays = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kholidays-16.08.1.tar.xz";
-      sha256 = "0dcnlbkmpzj58l9qvggsxk54cf1gspax388dniz5ihs07mkksg24";
-      name = "kholidays-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kholidays-16.08.2.tar.xz";
+      sha256 = "12fawyvy5nyiyr4zfbkwi5p0m5kgbcs4ly4f7bdq7qy7qbw6k8b6";
+      name = "kholidays-16.08.2.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kidentitymanagement-16.08.1.tar.xz";
-      sha256 = "1cdm4p62idsmzb3q6ywlqll7ivkrbbraia6bdc3ad9p2m6mjkwkk";
-      name = "kidentitymanagement-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kidentitymanagement-16.08.2.tar.xz";
+      sha256 = "00q21hfyfyhkh7ip14q0a8rgngigm17hs5gp8r6gymvcysp3glny";
+      name = "kidentitymanagement-16.08.2.tar.xz";
     };
   };
   kig = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kig-16.08.1.tar.xz";
-      sha256 = "0slpafdkhyfpixm6iypd62y85j85f62fi2yd3hrmq8859qsp7n74";
-      name = "kig-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kig-16.08.2.tar.xz";
+      sha256 = "14p9cl7mbb04lz5l2ajbfxlqli065v09bc22nyjcsin45rxvdvmn";
+      name = "kig-16.08.2.tar.xz";
     };
   };
   kigo = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kigo-16.08.1.tar.xz";
-      sha256 = "10mrb94vlhg598r4bpydxj2llzh9239c0ziz3yllnw2jh7xw94rs";
-      name = "kigo-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kigo-16.08.2.tar.xz";
+      sha256 = "13lkzhb00bmynkwrshvwl8r270zsxp6bj5ca75xy3g4vmp04gy0i";
+      name = "kigo-16.08.2.tar.xz";
     };
   };
   killbots = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/killbots-16.08.1.tar.xz";
-      sha256 = "1fr7vj9y5bh9dcznvslzsp3f20qrmqfaq8jl4rbas08882lx7am4";
-      name = "killbots-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/killbots-16.08.2.tar.xz";
+      sha256 = "1vrzj91ff78g6w34vb68ljp2dpckc80545n9bhk8x1pr1s3jl3ks";
+      name = "killbots-16.08.2.tar.xz";
     };
   };
   kimap = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kimap-16.08.1.tar.xz";
-      sha256 = "01nlqmprbzirw0kwqw1m1klwq401nz3sfc51gi1r01ghhskwfjj0";
-      name = "kimap-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kimap-16.08.2.tar.xz";
+      sha256 = "1j0bsbzp669mxizr3vaxfg3wjavg7zx3xfrjrmwabl0h04hmkn0g";
+      name = "kimap-16.08.2.tar.xz";
     };
   };
   kio-extras = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kio-extras-16.08.1.tar.xz";
-      sha256 = "08cis03pzl7ncmpxc6wss7zm4jwgyxqw873ab70mvibcax9wfky0";
-      name = "kio-extras-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kio-extras-16.08.2.tar.xz";
+      sha256 = "1j5bmnq77yg5wpha0xl2cm4n2m0frw5dvr24i4ypvvqnpb1gim7q";
+      name = "kio-extras-16.08.2.tar.xz";
     };
   };
   kiriki = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kiriki-16.08.1.tar.xz";
-      sha256 = "15p205hcvvf9w1bwcciwaq8igf6nspzjili48x13pzcmmgjf46m8";
-      name = "kiriki-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kiriki-16.08.2.tar.xz";
+      sha256 = "03vanq33hd7hlspckfydbbiavzv7g7maswca4zzd9sinybx45r7a";
+      name = "kiriki-16.08.2.tar.xz";
     };
   };
   kiten = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kiten-16.08.1.tar.xz";
-      sha256 = "1n94jzy50imvhgan3d5av9iifd0g2bn65gi5bxf9yzq48a6npnkv";
-      name = "kiten-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kiten-16.08.2.tar.xz";
+      sha256 = "0kj1abs4f1ff0spkzwn5xxabcfb0xny7dlsa7lb0fbyvyczq3jgd";
+      name = "kiten-16.08.2.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kjumpingcube-16.08.1.tar.xz";
-      sha256 = "1i8agl9l996yf1x88s1xg2a3gahjjy2swscw5lb35li565rm7vyr";
-      name = "kjumpingcube-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kjumpingcube-16.08.2.tar.xz";
+      sha256 = "1rnmwz729jain4pv0wpb8x95k6cx0bvb2wk46sjm2p80202clb0r";
+      name = "kjumpingcube-16.08.2.tar.xz";
     };
   };
   kldap = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kldap-16.08.1.tar.xz";
-      sha256 = "0m28i0rprj36b3ds51ljmhlpkld4ghl0259z9cc5fh4k7pnfi6jr";
-      name = "kldap-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kldap-16.08.2.tar.xz";
+      sha256 = "18myysm48c8b6lpgl76x70na0k6qw47zrmmax2yfhbi4fsi13sg4";
+      name = "kldap-16.08.2.tar.xz";
     };
   };
   kleopatra = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kleopatra-16.08.1.tar.xz";
-      sha256 = "0f7ydyfp9iyg3jzrn02x8bm1x41yysixzwlcpl8l3qimibs65840";
-      name = "kleopatra-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kleopatra-16.08.2.tar.xz";
+      sha256 = "0pi2j6yrdw5nhm7kb3k5gg1qgs2dyijqv6r07xx3r260v98jz9jb";
+      name = "kleopatra-16.08.2.tar.xz";
     };
   };
   klettres = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/klettres-16.08.1.tar.xz";
-      sha256 = "11xhprq24hq3f7vvifp1ilmcihadxwyk0jmpb643w898kh6qv9hd";
-      name = "klettres-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/klettres-16.08.2.tar.xz";
+      sha256 = "07jqr3n67g0rgcdnxh4bmak6335w86irdla791bpkdl1swxwmvqi";
+      name = "klettres-16.08.2.tar.xz";
     };
   };
   klickety = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/klickety-16.08.1.tar.xz";
-      sha256 = "1hrplywk2b5qkw9ijpkyxgln2zwqj1ja2prp3acqs1683rsdndam";
-      name = "klickety-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/klickety-16.08.2.tar.xz";
+      sha256 = "08nk4ihr8np36kzs4g94psh9xd5d8rpbhjd047pmw5226yv0lcr5";
+      name = "klickety-16.08.2.tar.xz";
     };
   };
   klines = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/klines-16.08.1.tar.xz";
-      sha256 = "07754lvllpjb016da1r7y4n72mp07h8bn16mq38qsxa1d0rdjjd6";
-      name = "klines-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/klines-16.08.2.tar.xz";
+      sha256 = "18w4mc781ysjhr9krvvwac2c0hz7hqzks957i35d0jvs5675l1ds";
+      name = "klines-16.08.2.tar.xz";
     };
   };
   kmag = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kmag-16.08.1.tar.xz";
-      sha256 = "0d75z94p28zwh7pz7ss75fscwfcphvnxdd4bj0yr1hz4rzk5bmd2";
-      name = "kmag-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kmag-16.08.2.tar.xz";
+      sha256 = "0x5x2gs5cs3vhr0ss14iy4pd5rxx1ry67ic52nnj7baa3b4kqssq";
+      name = "kmag-16.08.2.tar.xz";
     };
   };
   kmahjongg = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kmahjongg-16.08.1.tar.xz";
-      sha256 = "0xap6jw1gx86k8yhs7mmyp69jg4401551kmrhwbfz8cdpbzdrgz3";
-      name = "kmahjongg-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kmahjongg-16.08.2.tar.xz";
+      sha256 = "03yj71cz4ca847niw26vrssd56pjjgc04fmzv7vxlx25jb73cn13";
+      name = "kmahjongg-16.08.2.tar.xz";
     };
   };
   kmailtransport = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kmailtransport-16.08.1.tar.xz";
-      sha256 = "052pnk3pqv9g58l5zlpz1mj17x72zrzjds77gd9vavmgmngzz2nd";
-      name = "kmailtransport-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kmailtransport-16.08.2.tar.xz";
+      sha256 = "0dggvmhp0w085pq0fwf83zzv3rhckmcnzzjznsn7fzw2lxj6ns90";
+      name = "kmailtransport-16.08.2.tar.xz";
     };
   };
   kmbox = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kmbox-16.08.1.tar.xz";
-      sha256 = "10v9x4i1waqrdq28lk4fvxg8bjpldjajdfsv2qv1wyl28kkr8xkb";
-      name = "kmbox-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kmbox-16.08.2.tar.xz";
+      sha256 = "1jny5qcadw1ssfcfwbhfwwn0v5n6rd1v0rj92n7vj814ni41yk62";
+      name = "kmbox-16.08.2.tar.xz";
     };
   };
   kmime = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kmime-16.08.1.tar.xz";
-      sha256 = "188lwyp345vigjgqbljlvw84jsjisfs6drvknx4qvk74a6idj078";
-      name = "kmime-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kmime-16.08.2.tar.xz";
+      sha256 = "06rg1w5k53dvrhr2pcclhdlpf9784c4s7d3zyklwlc7r93bk0mch";
+      name = "kmime-16.08.2.tar.xz";
     };
   };
   kmines = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kmines-16.08.1.tar.xz";
-      sha256 = "1m7p0bwpq4ry1dw78nic73jcyf78zyrxc4cw9phdavrwvfvajzng";
-      name = "kmines-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kmines-16.08.2.tar.xz";
+      sha256 = "02dbsrspg5x2avgdc0hrl522qzkki3hzr9k8zrbcjdh3j2rli965";
+      name = "kmines-16.08.2.tar.xz";
     };
   };
   kmix = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kmix-16.08.1.tar.xz";
-      sha256 = "0ikiillqsi1s2rl65j8f9883xg5y78a53nfha7wrzav5insyvrd0";
-      name = "kmix-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kmix-16.08.2.tar.xz";
+      sha256 = "0fgvzcvxvic72mckxj8hwwh0fs851c61p560rvp13lzwwjl1l290";
+      name = "kmix-16.08.2.tar.xz";
     };
   };
   kmousetool = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kmousetool-16.08.1.tar.xz";
-      sha256 = "0dfmjs9d1pr4sxa5v6fk2bbx4anawm0841spg8vijxikwi67vayk";
-      name = "kmousetool-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kmousetool-16.08.2.tar.xz";
+      sha256 = "13fa5r3gzngbcma8xmgr5im5kwxqcpnb260z0jmx7la67rrd4igh";
+      name = "kmousetool-16.08.2.tar.xz";
     };
   };
   kmouth = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kmouth-16.08.1.tar.xz";
-      sha256 = "01hin9yzv8zvj1pihr409clci905i3fhrwqz9izk1nhq3djxg7ld";
-      name = "kmouth-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kmouth-16.08.2.tar.xz";
+      sha256 = "11xhzxh7rg0lzwq1wkr9a0dlsy70fy2d7nrmhi787xlgmcq1d1h8";
+      name = "kmouth-16.08.2.tar.xz";
     };
   };
   kmplot = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kmplot-16.08.1.tar.xz";
-      sha256 = "069qsi1bk385sil9m75y0zs7nzv8qscrfpdm8iip53fwf10bx5qa";
-      name = "kmplot-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kmplot-16.08.2.tar.xz";
+      sha256 = "1mflaypy1ncg22pchfm632ik3kj65c3g1h48zirb6a0njzma81bf";
+      name = "kmplot-16.08.2.tar.xz";
     };
   };
   knavalbattle = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/knavalbattle-16.08.1.tar.xz";
-      sha256 = "0xxx053p42j8r6zlz6vv6avx6iqqm5aq6q3ggjib70w4ixl1wqmp";
-      name = "knavalbattle-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/knavalbattle-16.08.2.tar.xz";
+      sha256 = "1w85z4m5yfj51z4yn60w83yfm2fnx96b313j4ysqgwzn6qsvw269";
+      name = "knavalbattle-16.08.2.tar.xz";
     };
   };
   knetwalk = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/knetwalk-16.08.1.tar.xz";
-      sha256 = "15nrfcd6l08lkshh6gyqfawr2b9izsirwdg9mqnnymdji8lg91nl";
-      name = "knetwalk-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/knetwalk-16.08.2.tar.xz";
+      sha256 = "1nd2ddcf1m7nbxsmqiv8b9kxsifxyczy0qkdm02fl27hjz45jsa3";
+      name = "knetwalk-16.08.2.tar.xz";
     };
   };
   kolf = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kolf-16.08.1.tar.xz";
-      sha256 = "040fsd1kdww4yv258w1na3b5x3sxb14dj035rmw1y48lw883g439";
-      name = "kolf-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kolf-16.08.2.tar.xz";
+      sha256 = "1afbdms3fzbl62g76c40d2k96djf5srl4xkpa20rm0by1ksfjcbg";
+      name = "kolf-16.08.2.tar.xz";
     };
   };
   kollision = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kollision-16.08.1.tar.xz";
-      sha256 = "0w9wsgdqcpgklv31iqhbd79n6qiqk49jkhrc2c6zhmxqp588wy14";
-      name = "kollision-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kollision-16.08.2.tar.xz";
+      sha256 = "18bi7diwzql96w41s7kmrvynrwg1h8ihifw2cb8ganjlp215r216";
+      name = "kollision-16.08.2.tar.xz";
     };
   };
   kolourpaint = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kolourpaint-16.08.1.tar.xz";
-      sha256 = "1siari77ivnrbllncviy504sz8q1f1mhdpjp45z69hsjn6bw8rcz";
-      name = "kolourpaint-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kolourpaint-16.08.2.tar.xz";
+      sha256 = "12rs8qgc30vma45ri7k3awigiqsk703lbl6k8dxbiir6nqdvz4n9";
+      name = "kolourpaint-16.08.2.tar.xz";
     };
   };
   kompare = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kompare-16.08.1.tar.xz";
-      sha256 = "0xmr3g2azrzhrjz1n9sp8wif7rxh574a1mg3prhl636pqcijq1bw";
-      name = "kompare-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kompare-16.08.2.tar.xz";
+      sha256 = "130019r4623wkmw44s62wnn01l96bc0b0d3l0m6nzgilxq8xj7xw";
+      name = "kompare-16.08.2.tar.xz";
     };
   };
   konquest = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/konquest-16.08.1.tar.xz";
-      sha256 = "1hsh9n17gqwnash5f8z8zpnwxl0n09zn9hv1qn39zad23vg6fjjd";
-      name = "konquest-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/konquest-16.08.2.tar.xz";
+      sha256 = "1m5pifwhzviz5hry0a26nvfh4j962mc7dnvl5n7yjwgnmk8m609m";
+      name = "konquest-16.08.2.tar.xz";
     };
   };
   konsole = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/konsole-16.08.1.tar.xz";
-      sha256 = "0dgphhg2icqagaw16i8z3x3mw8rmmpl3wmafbaca1gn9xw67md1g";
-      name = "konsole-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/konsole-16.08.2.tar.xz";
+      sha256 = "0kjf2yj5kz70pswrpkggz1zhwvm819r1qhg16i6xg43cpsfsim85";
+      name = "konsole-16.08.2.tar.xz";
     };
   };
   kontactinterface = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kontactinterface-16.08.1.tar.xz";
-      sha256 = "0a8swis8i3dbv9nbbw8ksbghj5pvfsba6kkh2l4lgmkbdi0m9a3s";
-      name = "kontactinterface-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kontactinterface-16.08.2.tar.xz";
+      sha256 = "1c8q9jywr8c3yag2vxlmkl5ri7wm7miyhgqkxavs9lyxbqqkcgnw";
+      name = "kontactinterface-16.08.2.tar.xz";
     };
   };
   kopete = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kopete-16.08.1.tar.xz";
-      sha256 = "0l2wkf8b2jp6gnr2930xxxz9jqmh6mlms5h8934k89z9x00ha1p5";
-      name = "kopete-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kopete-16.08.2.tar.xz";
+      sha256 = "0jxrgb36snfgqbl4q1myala63pyrvaw1jvc9pf5bbkx8xpr5pk2c";
+      name = "kopete-16.08.2.tar.xz";
     };
   };
   kpat = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kpat-16.08.1.tar.xz";
-      sha256 = "1gpvha8636lwlb1qcdkirs5whil2fh6fp5xd3yh31dppxwryadaf";
-      name = "kpat-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kpat-16.08.2.tar.xz";
+      sha256 = "12mm57bpx92kbrk9f1xzvlg7knfhivgrqwa90lj6mgdsa39g27v2";
+      name = "kpat-16.08.2.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kpimtextedit-16.08.1.tar.xz";
-      sha256 = "1a73s0w49jrblxmzfsp25pknvpggx1p765w2hflij4yr0cb0ganz";
-      name = "kpimtextedit-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kpimtextedit-16.08.2.tar.xz";
+      sha256 = "1ybwx73zzyknlrg7yw8yb8dkr0wwk9632s3w7g64nskm5ps51vvv";
+      name = "kpimtextedit-16.08.2.tar.xz";
     };
   };
   kppp = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kppp-16.08.1.tar.xz";
-      sha256 = "00fv4r6fiq7kkfi3awvk8b7ccj21hm5f7jdgkhacs6np5kv4spnd";
-      name = "kppp-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kppp-16.08.2.tar.xz";
+      sha256 = "0xp6qcdnl3dcivkx0mavzjw2shah1wl8vd5b15chnf1qn1pa00qv";
+      name = "kppp-16.08.2.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kqtquickcharts-16.08.1.tar.xz";
-      sha256 = "0xy84v0z0mx30ynsym7qian2khck8mfgkm62sfd5v3xkgffhhdyh";
-      name = "kqtquickcharts-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kqtquickcharts-16.08.2.tar.xz";
+      sha256 = "16qzqv3g7kckc5biphzzv7gmly2519mihd89118yksymp70cznh6";
+      name = "kqtquickcharts-16.08.2.tar.xz";
     };
   };
   krdc = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/krdc-16.08.1.tar.xz";
-      sha256 = "1mq867gv8l6i1xlykm0fnfsgz52h60hb3s06aq1rp97yddclr4q1";
-      name = "krdc-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/krdc-16.08.2.tar.xz";
+      sha256 = "1jxkv7fsml1iq87y9jm04dhp7qxqyv5dnvp1yg5225xnvq2lhrzn";
+      name = "krdc-16.08.2.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kremotecontrol-16.08.1.tar.xz";
-      sha256 = "09iyp1sfva7rzxrp7ma90l3ls8yda5hyypvvn3kliv6rap0vrwv5";
-      name = "kremotecontrol-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kremotecontrol-16.08.2.tar.xz";
+      sha256 = "1p5cvls132p585v5yxaw6b9fadmr1qzijh86z232amfb8iax23zg";
+      name = "kremotecontrol-16.08.2.tar.xz";
     };
   };
   kreversi = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kreversi-16.08.1.tar.xz";
-      sha256 = "15g87r85wh4b9vx21bsxp2vavfgzy8kdgwyvv39gg87rl62j7qxf";
-      name = "kreversi-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kreversi-16.08.2.tar.xz";
+      sha256 = "10nn66422vr5sav7yf5z1vq84v7kl94f4zv2w4ywrgbaknwkhyf7";
+      name = "kreversi-16.08.2.tar.xz";
     };
   };
   krfb = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/krfb-16.08.1.tar.xz";
-      sha256 = "0952cxnfbwab6d1ji6wwx3snv4a9k031h8pph3n47xxr12nkjj19";
-      name = "krfb-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/krfb-16.08.2.tar.xz";
+      sha256 = "0kz7x4mwby8v7d3wr9fpd362db9fmh0agym5rq4q8d68wvzgbyi9";
+      name = "krfb-16.08.2.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kross-interpreters-16.08.1.tar.xz";
-      sha256 = "1026amgj0r1r180535mpnm5f780pm7v25ilk7ynf834lad3is95k";
-      name = "kross-interpreters-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kross-interpreters-16.08.2.tar.xz";
+      sha256 = "13jc263vj0jsqvhlcag8an5ixs3dn2q35q1p29wyy1fpd80snhcj";
+      name = "kross-interpreters-16.08.2.tar.xz";
     };
   };
   kruler = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kruler-16.08.1.tar.xz";
-      sha256 = "0j3hi77wlf5nwdmqiq5g34zb8pdzxn313hmc0k99p1gvkb1xn4zp";
-      name = "kruler-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kruler-16.08.2.tar.xz";
+      sha256 = "1cy7jx8nc9ajzpis13dvg7hpd1a76splc5yrqyhbmb7cga50098l";
+      name = "kruler-16.08.2.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ksaneplugin-16.08.1.tar.xz";
-      sha256 = "0bx7vaw5vkr7fvmn6ywil8997d1qy6qv7sycxz3ydc5ljg1ansmr";
-      name = "ksaneplugin-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ksaneplugin-16.08.2.tar.xz";
+      sha256 = "1glvx52gzrprywmi8n3npjfm5ixx8ibx7126n6n284jwigcr580g";
+      name = "ksaneplugin-16.08.2.tar.xz";
     };
   };
   kscd = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kscd-16.08.1.tar.xz";
-      sha256 = "1a6sq2dgkgvhycjxz95xa2b2xdibhl0ky54chj7hmdf43w69bdzc";
-      name = "kscd-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kscd-16.08.2.tar.xz";
+      sha256 = "0axjc68ag84pvdskbhwqyg40qmnil9n6m8x3z4k24cgajr83hmbq";
+      name = "kscd-16.08.2.tar.xz";
     };
   };
   kshisen = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kshisen-16.08.1.tar.xz";
-      sha256 = "1j33byc485rxbcf3wk8kra7vxq4r1sg8cpfrlxwiyb9ibk762jlh";
-      name = "kshisen-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kshisen-16.08.2.tar.xz";
+      sha256 = "1605fmsrg2pyydg303kf49hncdjcdq8m2g2xam0c96bdn44kd7cp";
+      name = "kshisen-16.08.2.tar.xz";
     };
   };
   ksirk = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ksirk-16.08.1.tar.xz";
-      sha256 = "121j8jz9gabdqv5fh4c2qcsg4ndj72xnmavvdrlib8a7qidjzaga";
-      name = "ksirk-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ksirk-16.08.2.tar.xz";
+      sha256 = "196fjfyrwspzcm2hlqr09a079sr8p4gp80c4xfj1dhmfavs3cmvx";
+      name = "ksirk-16.08.2.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ksnakeduel-16.08.1.tar.xz";
-      sha256 = "1qzqr5ai5d7azh7xmm2vihbz3jzxxvb6qvhpfrix0yf4yr8m8fxz";
-      name = "ksnakeduel-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ksnakeduel-16.08.2.tar.xz";
+      sha256 = "0nw1fsd7q9ar0922v3gkpig8smvlw0va6jh9a4v8g4pfsk5avii5";
+      name = "ksnakeduel-16.08.2.tar.xz";
     };
   };
   kspaceduel = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kspaceduel-16.08.1.tar.xz";
-      sha256 = "0zy6m325gaivwfrr20mfwn8pdgl1i4ym1ymwb5dyw7a5yfi27m7n";
-      name = "kspaceduel-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kspaceduel-16.08.2.tar.xz";
+      sha256 = "1ww7cz89jkn28qpk0a3xpcv9ngh39wwzpiam64pjlnniycxw3zk8";
+      name = "kspaceduel-16.08.2.tar.xz";
     };
   };
   ksquares = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ksquares-16.08.1.tar.xz";
-      sha256 = "1rccb2qifqfb68apag01i3y97jbrskarf3480p61ixk7lrmbbrx4";
-      name = "ksquares-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ksquares-16.08.2.tar.xz";
+      sha256 = "04j30ld2ly6gm1va0yw2vsfrvab5kla6dlxir31375b1w85gfhil";
+      name = "ksquares-16.08.2.tar.xz";
     };
   };
   kstars = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kstars-16.08.1.tar.xz";
-      sha256 = "1fwl9hry23lmhyx5ldqspa7hp6bvmjp8kzwi6p9y1kbwzbzmki0k";
-      name = "kstars-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kstars-16.08.2.tar.xz";
+      sha256 = "117hk0wj649f2b158sad0jcqsrb1a8cw0blx3yz83fxw8z160j2x";
+      name = "kstars-16.08.2.tar.xz";
     };
   };
   ksudoku = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ksudoku-16.08.1.tar.xz";
-      sha256 = "1msxx4hay0njp7bxjgplq7ylblbr56mf01l70sywj5madvvrmh8y";
-      name = "ksudoku-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ksudoku-16.08.2.tar.xz";
+      sha256 = "0y3w626g3ah8r3yipxsqg71gh886higlmr8ai0sc8179gcmy84zd";
+      name = "ksudoku-16.08.2.tar.xz";
     };
   };
   ksystemlog = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ksystemlog-16.08.1.tar.xz";
-      sha256 = "0garxwsgzdc5j6426gv3wqqgxra6qfdlk7xrk6mhlyg3wnwy8lz9";
-      name = "ksystemlog-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ksystemlog-16.08.2.tar.xz";
+      sha256 = "02l7bchc767jcdpyras24k57qddq7pk4h7jaa22ns134977rw8yb";
+      name = "ksystemlog-16.08.2.tar.xz";
     };
   };
   kteatime = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kteatime-16.08.1.tar.xz";
-      sha256 = "0m6rri4mgr9qzcpxr5ifm1xs5mpmx7nz074gscff662nv4cj1h5n";
-      name = "kteatime-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kteatime-16.08.2.tar.xz";
+      sha256 = "02knfjpb0p3bgdfwqjp3fqnqz4i6cqshhy14w71wviprybb40cxd";
+      name = "kteatime-16.08.2.tar.xz";
     };
   };
   ktimer = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktimer-16.08.1.tar.xz";
-      sha256 = "0n94r34d24dnpi8rr6lb2vqrx1bz29xb92a63dm3s6pvbrw7zmhr";
-      name = "ktimer-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktimer-16.08.2.tar.xz";
+      sha256 = "197m6ywq2bs7kclwxsdv7w4mqfhs9ad3wgcbw6m3yvkyz03xl3p8";
+      name = "ktimer-16.08.2.tar.xz";
     };
   };
   ktnef = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktnef-16.08.1.tar.xz";
-      sha256 = "0gjq14gcc34mqx21f74kzqb1575fhckaq13fpf00ascar0s1w0sx";
-      name = "ktnef-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktnef-16.08.2.tar.xz";
+      sha256 = "0mpavsp6p2ipxf90ararnvz7qvb51fy3w7rh5giv3j9wc37awi39";
+      name = "ktnef-16.08.2.tar.xz";
     };
   };
   ktouch = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktouch-16.08.1.tar.xz";
-      sha256 = "0jjn59hjbj5mc0svd8nrnqdwa4xz4wj76512gx1w1lga37ysk5gx";
-      name = "ktouch-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktouch-16.08.2.tar.xz";
+      sha256 = "08zzibxcv8gh527j0qwnhjs4rsk01hrx5iqa9d4r2b508h6xcwm2";
+      name = "ktouch-16.08.2.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-accounts-kcm-16.08.1.tar.xz";
-      sha256 = "12icgnf165v549nlwzpn3dn7237k7xi3vfg0a1i7r2mzbhdw6xf5";
-      name = "ktp-accounts-kcm-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-accounts-kcm-16.08.2.tar.xz";
+      sha256 = "1ql13gkc16a0xjs159pjkw810dph0f3c8lvjxlgzg5dnavjpkmsm";
+      name = "ktp-accounts-kcm-16.08.2.tar.xz";
     };
   };
   ktp-approver = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-approver-16.08.1.tar.xz";
-      sha256 = "08qkcn2avc5aiakn6ksjikd50x5xd1ilwy5cf2fk1jqn6zbxglm0";
-      name = "ktp-approver-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-approver-16.08.2.tar.xz";
+      sha256 = "1n885817as1j9s8c6ppj02hcih4v7k778q88lbxwnps32la7m6n9";
+      name = "ktp-approver-16.08.2.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-auth-handler-16.08.1.tar.xz";
-      sha256 = "0wjz5r287f13p2s34hdjg0sy23xanwnp0274pk2hxbybf9v4ryvi";
-      name = "ktp-auth-handler-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-auth-handler-16.08.2.tar.xz";
+      sha256 = "1vfnj1id8jisxsalghr13blx8x19r376dc2v4w46jqxj1xaiwglx";
+      name = "ktp-auth-handler-16.08.2.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-call-ui-16.08.1.tar.xz";
-      sha256 = "1gbw3a1yfm6kc85gpqhx6q7kp2fwmjgmxp819w9wrgg1qwmjyxrw";
-      name = "ktp-call-ui-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-call-ui-16.08.2.tar.xz";
+      sha256 = "0jk09x53cimcs24cj3ay9al0r91xjwqf5cjnj16ibbnqhxd8rym1";
+      name = "ktp-call-ui-16.08.2.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-common-internals-16.08.1.tar.xz";
-      sha256 = "0ylpwjn3jknp77f8g69mkcj1zcjn9khfhxla6mci4h7cbxka9wdf";
-      name = "ktp-common-internals-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-common-internals-16.08.2.tar.xz";
+      sha256 = "1mw4cmrpk705dcka1v3fhvfz3q1r142yrik98jma8v4pjlm84n70";
+      name = "ktp-common-internals-16.08.2.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-contact-list-16.08.1.tar.xz";
-      sha256 = "0ach7dvlch162jyyw01hdlbwwh72gdp6rmmkkx65cf3g0sqhvwp4";
-      name = "ktp-contact-list-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-list-16.08.2.tar.xz";
+      sha256 = "0rsljaimdqvrxfp8sq1bckzkx23xr5pq2q9mrgh0zy39abmdak25";
+      name = "ktp-contact-list-16.08.2.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-contact-runner-16.08.1.tar.xz";
-      sha256 = "0721mys632jn4i040v541997fb5pca2fr2nj9p49bp0r7kmgj6qr";
-      name = "ktp-contact-runner-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-runner-16.08.2.tar.xz";
+      sha256 = "0b3rhrvgmkwcsk9jdr6j8kg80zrwdsza8297hrzfv76bpxn60dbn";
+      name = "ktp-contact-runner-16.08.2.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-desktop-applets-16.08.1.tar.xz";
-      sha256 = "1fln9kndpwl8arsr1i8vsicz0cv10r00w4niv163al11yqk3ng5g";
-      name = "ktp-desktop-applets-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-desktop-applets-16.08.2.tar.xz";
+      sha256 = "0d8ypp531zhb6i8w703hr02cb863z0g8sbaadrrp3x4h2dff2kcv";
+      name = "ktp-desktop-applets-16.08.2.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-filetransfer-handler-16.08.1.tar.xz";
-      sha256 = "01581r1xylj6f78vqqxi0gf5nyj2k3vyyvkz5vjkq7di140mmw97";
-      name = "ktp-filetransfer-handler-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-filetransfer-handler-16.08.2.tar.xz";
+      sha256 = "0vh6h9cbamscjm22rib1dx8crr6r4a1bq5p2rrq6bq56zp78gkfb";
+      name = "ktp-filetransfer-handler-16.08.2.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-kded-module-16.08.1.tar.xz";
-      sha256 = "1dpaay5qkqnxy0q80gqp2mydjngx815xrdmxcvh9pm3c4w0as8lh";
-      name = "ktp-kded-module-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-kded-module-16.08.2.tar.xz";
+      sha256 = "1lh1pi7xi60dsyz5g608lsfhpr5p8vqsfdc2cmyaalkcixb7s4wg";
+      name = "ktp-kded-module-16.08.2.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-send-file-16.08.1.tar.xz";
-      sha256 = "1nchxvc2n8a2d02cz8vlazr4fl8gpngl44lq3jymdggz58w8rji9";
-      name = "ktp-send-file-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-send-file-16.08.2.tar.xz";
+      sha256 = "0q6mnirx6k8xs6pkfwrrhgg1i75xrd9bsg2liyjrjgbgm1lwm0jz";
+      name = "ktp-send-file-16.08.2.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktp-text-ui-16.08.1.tar.xz";
-      sha256 = "0mj5zih4pbqdc2m62s85ck7r3m12ywh0frg6n4hi8xw909w7x25m";
-      name = "ktp-text-ui-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktp-text-ui-16.08.2.tar.xz";
+      sha256 = "1wrxa65rx0vjd57qk4c7ak43vb9h8yv7r7618hnfycjr0mgr6gf5";
+      name = "ktp-text-ui-16.08.2.tar.xz";
     };
   };
   ktuberling = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/ktuberling-16.08.1.tar.xz";
-      sha256 = "1brm1xdma1d5fcgbyn8nw3pwncnyvxknrwlbr7capgwqn7s9pckl";
-      name = "ktuberling-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/ktuberling-16.08.2.tar.xz";
+      sha256 = "0337fvw21h62y8zlib93fyk5wbwrgkakpyd78q5mcn5sazq7nb67";
+      name = "ktuberling-16.08.2.tar.xz";
     };
   };
   kturtle = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kturtle-16.08.1.tar.xz";
-      sha256 = "1d6kw35dzyq3c62j7pqsl57l8cpw98awr6bdr1v2w8xdiw9xi73c";
-      name = "kturtle-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kturtle-16.08.2.tar.xz";
+      sha256 = "1fljwnxr8vvy78mlwf58p48wv45g6k4w9xs6kzb0j3xayg389x36";
+      name = "kturtle-16.08.2.tar.xz";
     };
   };
   kubrick = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kubrick-16.08.1.tar.xz";
-      sha256 = "1x34gyqa77b03hqs50vajqcmw9yrqxq1f4niyfj43wkw2b4jks9f";
-      name = "kubrick-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kubrick-16.08.2.tar.xz";
+      sha256 = "19avy6001n7kbxnbqbxxv62qwn015z8jjslys6s81if8bh9b81bl";
+      name = "kubrick-16.08.2.tar.xz";
     };
   };
   kuser = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kuser-16.08.1.tar.xz";
-      sha256 = "0dkv9x052iavp3hnrvnarm8hv3416kamdizwp3c22w2cfz3q4rdc";
-      name = "kuser-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kuser-16.08.2.tar.xz";
+      sha256 = "0vlckiy3n0ghfzjkl22pk29qrl8y7hh6a9q4bfj7a8mwmkskr8qc";
+      name = "kuser-16.08.2.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kwalletmanager-16.08.1.tar.xz";
-      sha256 = "1w99076da86qw2271hkknrjc0mfp7f0xi5544kbk76aanaj73wvm";
-      name = "kwalletmanager-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kwalletmanager-16.08.2.tar.xz";
+      sha256 = "0nmriayyhxhf43kladp6bpzrrmdfgf6lbyr1ibpqp33mqrxqgiqf";
+      name = "kwalletmanager-16.08.2.tar.xz";
     };
   };
   kwordquiz = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/kwordquiz-16.08.1.tar.xz";
-      sha256 = "08n6ajpx5x2vpf63d4fnfw2a4hcfmca2q4nd5y04kl1sccx67zig";
-      name = "kwordquiz-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/kwordquiz-16.08.2.tar.xz";
+      sha256 = "0xlhl3n1dl1y6d1kbbcw4p60hkyjlvavrslq1h7wwjp99pmqr333";
+      name = "kwordquiz-16.08.2.tar.xz";
     };
   };
   libgravatar = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libgravatar-16.08.1.tar.xz";
-      sha256 = "1izh80plcd3ss3brl0mi0alics4y53d355smpgjkfqyc80zxs7wz";
-      name = "libgravatar-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libgravatar-16.08.2.tar.xz";
+      sha256 = "0nssi286sra4rggvljwvqwx5r2h0h26wmafq764vj97qqw2r3ikw";
+      name = "libgravatar-16.08.2.tar.xz";
     };
   };
   libkcddb = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkcddb-16.08.1.tar.xz";
-      sha256 = "1i9xb96xari03q8fw20laqh5d3fyvigzqkdw6lw61fwxzpjrphk8";
-      name = "libkcddb-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkcddb-16.08.2.tar.xz";
+      sha256 = "0hvhl4266h1a05bvid1x7kfaxqa5fcnr4f243k5ksjp7sxcba1j2";
+      name = "libkcddb-16.08.2.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkcompactdisc-16.08.1.tar.xz";
-      sha256 = "1qjij6kvvs8k650sg7skbgh0n4wgdkyjdsg8rydg93r0fqh5yagq";
-      name = "libkcompactdisc-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkcompactdisc-16.08.2.tar.xz";
+      sha256 = "1vvhbqg7rzcfqadglvjrifnla6gi6aawh0ki36zshi48jhpg978w";
+      name = "libkcompactdisc-16.08.2.tar.xz";
     };
   };
   libkdcraw = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkdcraw-16.08.1.tar.xz";
-      sha256 = "05206lbf2j0pry640ja5ajdlmalz4szfg2xzddfp00m87bgxbr2b";
-      name = "libkdcraw-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkdcraw-16.08.2.tar.xz";
+      sha256 = "179dv05qkn2h0szzqm6l09ln491q2jz6j0fwczakh7lvlrdb2zxa";
+      name = "libkdcraw-16.08.2.tar.xz";
     };
   };
   libkdegames = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkdegames-16.08.1.tar.xz";
-      sha256 = "11r5bf23fyymqqsj3ckbmya3f0zsdgrd4fw7jkfbxw7bfjjpr890";
-      name = "libkdegames-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkdegames-16.08.2.tar.xz";
+      sha256 = "1zzpdlyrhhzqis9f9q3b1b50ljcsmpccxq0bdqkjm3ahzw8rvdig";
+      name = "libkdegames-16.08.2.tar.xz";
     };
   };
   libkdepim = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkdepim-16.08.1.tar.xz";
-      sha256 = "0p72dk6w0bvn7qikpqlxd7yhlrnn9wqnrq6b6p0ngnzhrsybjffm";
-      name = "libkdepim-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkdepim-16.08.2.tar.xz";
+      sha256 = "1w7bkkcpyw4b14qz7jh9kw5z2q7qdk78lac3fh448xdhf1ci6svg";
+      name = "libkdepim-16.08.2.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkeduvocdocument-16.08.1.tar.xz";
-      sha256 = "113z6hi6v7mj4z6qk3gj04ah60ys8fn14jwlrxj8xf5qb0fvhzbn";
-      name = "libkeduvocdocument-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkeduvocdocument-16.08.2.tar.xz";
+      sha256 = "1f0vyblxyha6c09nkya7q4v0j24463qpxxkkghm2z1xb0fwc852x";
+      name = "libkeduvocdocument-16.08.2.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkexiv2-16.08.1.tar.xz";
-      sha256 = "1h7bd3p03xap6m6qpb0ww8ganyb9z7sdk2hpp25ar12snjpfgh0y";
-      name = "libkexiv2-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkexiv2-16.08.2.tar.xz";
+      sha256 = "00phw7qax09k2aapyx1rp5w7ifn73i7w83jpz3sr24njxbg49261";
+      name = "libkexiv2-16.08.2.tar.xz";
     };
   };
   libkface = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkface-16.08.1.tar.xz";
-      sha256 = "19fqg7xja2pk6wp4bvamanwpfcs5qiyzsgldpr0q4y650ipbrf4w";
-      name = "libkface-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkface-16.08.2.tar.xz";
+      sha256 = "10arzszgjx8zs0d2b0i74bf00bs0csikny4d9j5w5hiim4qhxza6";
+      name = "libkface-16.08.2.tar.xz";
     };
   };
   libkgeomap = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkgeomap-16.08.1.tar.xz";
-      sha256 = "0zlcd4k8yfz9l5skky7vyc2p5hgx2wnan1g0jawi2f2xzsy655nz";
-      name = "libkgeomap-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkgeomap-16.08.2.tar.xz";
+      sha256 = "1h91bdld51snajrws9g4pr7n3nlwmpnpg95xhh91fykiqlw919ig";
+      name = "libkgeomap-16.08.2.tar.xz";
     };
   };
   libkipi = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkipi-16.08.1.tar.xz";
-      sha256 = "1mksgr0x446ilbqmb0wb5lh5afj8q7a88r31wzf6x3698n0s9fdb";
-      name = "libkipi-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkipi-16.08.2.tar.xz";
+      sha256 = "13gkcjx3x6j5150pkbb5ijzasl4418rhlfxq70966zrsn9a7v6ad";
+      name = "libkipi-16.08.2.tar.xz";
     };
   };
   libkleo = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkleo-16.08.1.tar.xz";
-      sha256 = "0a216q291vgf4v758l79aywp1f8wn40239jn9gx6ngw3p8zzf357";
-      name = "libkleo-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkleo-16.08.2.tar.xz";
+      sha256 = "16k8qqhrchxc8hk4l6hi94nhn8pavqm0snh357bx293f5rxvk51g";
+      name = "libkleo-16.08.2.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkmahjongg-16.08.1.tar.xz";
-      sha256 = "1bvm86xcmx3cdslm98n5kg61rmyc9p86aj8scrp3gb8di1y987zx";
-      name = "libkmahjongg-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkmahjongg-16.08.2.tar.xz";
+      sha256 = "12lnqpdpzcpljsdhj7y624g4iigam2cym7yv1czir26nfflk61ij";
+      name = "libkmahjongg-16.08.2.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libkomparediff2-16.08.1.tar.xz";
-      sha256 = "1cqd1amnxpylwzw5vdgy29wh1llhrvbqf5kmjxxb3a3kh2rafb53";
-      name = "libkomparediff2-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libkomparediff2-16.08.2.tar.xz";
+      sha256 = "0d08mgswjck9lfagf0wh556vy1k2k8414ps6jhikmsbff6s44i35";
+      name = "libkomparediff2-16.08.2.tar.xz";
     };
   };
   libksane = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libksane-16.08.1.tar.xz";
-      sha256 = "0g8vhdknph32736inzf9xbrdi51asb9md254m12cabglb1mfhia3";
-      name = "libksane-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libksane-16.08.2.tar.xz";
+      sha256 = "1clk8yh3sb61xll0wpni2ccixsvxp4d0k5k8ygyb3m1glf802z5a";
+      name = "libksane-16.08.2.tar.xz";
     };
   };
   libksieve = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/libksieve-16.08.1.tar.xz";
-      sha256 = "1paq508fsb1q7nfry3za7ykz41ly3qb6splf65d9n9l8aqbfx9fx";
-      name = "libksieve-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/libksieve-16.08.2.tar.xz";
+      sha256 = "0a0gym7y4qp83fs94y0xvm5i1qbh1vxy1wz2rw74k82cbj1yzviw";
+      name = "libksieve-16.08.2.tar.xz";
     };
   };
   lokalize = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/lokalize-16.08.1.tar.xz";
-      sha256 = "1dg6sw4zm7cq4di9zgjc4b1nk73sngc3ilshsr1wgdylpxaq9vrf";
-      name = "lokalize-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/lokalize-16.08.2.tar.xz";
+      sha256 = "13misqakj232y7ib89clgcc7r6byw7n2894x0ylkahj8synm1y3c";
+      name = "lokalize-16.08.2.tar.xz";
     };
   };
   lskat = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/lskat-16.08.1.tar.xz";
-      sha256 = "08ds76m66ni7pfmz0cnqx6b1p6l7m8fy5mz54kh9aahchw8lwpmk";
-      name = "lskat-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/lskat-16.08.2.tar.xz";
+      sha256 = "1i2s10csw9k6zjw9yk03l9p5xmg2gpw86xbsxp094xcncg7yml3v";
+      name = "lskat-16.08.2.tar.xz";
     };
   };
   mailcommon = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/mailcommon-16.08.1.tar.xz";
-      sha256 = "0f25z2s8bm51p2qxl2srdjf6df9h006ji6y9vn06m1vwsyfzmg3g";
-      name = "mailcommon-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/mailcommon-16.08.2.tar.xz";
+      sha256 = "1s3n834i9c33ldrrsq8vqsllnnicaginrqj7cm6lm317q0mgiiiw";
+      name = "mailcommon-16.08.2.tar.xz";
     };
   };
   mailimporter = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/mailimporter-16.08.1.tar.xz";
-      sha256 = "18hy1brpl07zcwzwv83mikn17h7xrgyc5q8xqvl5awgn8cj1zk9d";
-      name = "mailimporter-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/mailimporter-16.08.2.tar.xz";
+      sha256 = "08a0b7yk02df2fhr7cazm4x3v1qg67rzk0z2f14ssp7sz835bpia";
+      name = "mailimporter-16.08.2.tar.xz";
     };
   };
   marble = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/marble-16.08.1.tar.xz";
-      sha256 = "0fmgqx1nc77agrrcb6qxq0zkndxkxhqybvxpf0dxyd7mpwg00zd2";
-      name = "marble-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/marble-16.08.2.tar.xz";
+      sha256 = "1y8mqafji4lr8q1caipdgbrqcbivirzi8r6vw1iz3fjfbhi71c77";
+      name = "marble-16.08.2.tar.xz";
     };
   };
   messagelib = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/messagelib-16.08.1.tar.xz";
-      sha256 = "0kjladmrj2plj5kjmjkhh35mlijc2k3q8pdmi91xq0paawlrziyc";
-      name = "messagelib-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/messagelib-16.08.2.tar.xz";
+      sha256 = "1kmiww8051bfldxb1yx1b45k78ihvsm3z7pbmdnw06nlz8a8xycb";
+      name = "messagelib-16.08.2.tar.xz";
     };
   };
   minuet = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/minuet-16.08.1.tar.xz";
-      sha256 = "1qa2a3216p8x0vr9i3jw42i134qij4v0jj0625m606ihfs2mfhbq";
-      name = "minuet-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/minuet-16.08.2.tar.xz";
+      sha256 = "1cshjbzdjfs0g8lqxq6n7hnh032scrymapfc8il58rb3hir2fa0s";
+      name = "minuet-16.08.2.tar.xz";
     };
   };
   okteta = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/okteta-16.08.1.tar.xz";
-      sha256 = "1q9pni82frj48lncj9ipkvdb120bg49f53p09vcpfxyax6hhnb5k";
-      name = "okteta-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/okteta-16.08.2.tar.xz";
+      sha256 = "0gzriksvd8f409j63hyiqrj4j739f6apf99r4ic6271y50np9fk0";
+      name = "okteta-16.08.2.tar.xz";
     };
   };
   okular = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/okular-16.08.1.tar.xz";
-      sha256 = "0x3njxxwacy9cj4rzsgphl3za01d59wpbax9wxhxcdwqfi332a0d";
-      name = "okular-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/okular-16.08.2.tar.xz";
+      sha256 = "1hih12hk0jckprfphb0l67qpsrc2vgxvvvjb9wnvxqyvy29sk37k";
+      name = "okular-16.08.2.tar.xz";
     };
   };
   palapeli = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/palapeli-16.08.1.tar.xz";
-      sha256 = "15dfh9802kdmlwzjfqciszf4lwy2pr9ypnk1s2i4aj69jwqygn62";
-      name = "palapeli-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/palapeli-16.08.2.tar.xz";
+      sha256 = "1skx37v3vx45xdn8m3g69qw1rnkhzzmnfxv5z0yiqvc9jdxl1zrh";
+      name = "palapeli-16.08.2.tar.xz";
     };
   };
   parley = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/parley-16.08.1.tar.xz";
-      sha256 = "0pwwng4rx82l7j8n9llhwn6779jjhakl84nal1s6fc4i8vack49v";
-      name = "parley-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/parley-16.08.2.tar.xz";
+      sha256 = "19m8czgzvr7rg5hcgig4sf28rngqdsx27c3p7qrmwg9xw2b3pgbr";
+      name = "parley-16.08.2.tar.xz";
     };
   };
   picmi = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/picmi-16.08.1.tar.xz";
-      sha256 = "0lfmswabkkj6snwmx27iv9w5c2qpw6z85rvi997ccrw5yg1627hc";
-      name = "picmi-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/picmi-16.08.2.tar.xz";
+      sha256 = "1z90b98rf7b089kl4gcll86xlq4d49lh4nl6lngbb6vv7xgcz740";
+      name = "picmi-16.08.2.tar.xz";
     };
   };
   pimcommon = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/pimcommon-16.08.1.tar.xz";
-      sha256 = "1n15i70mgfx0jnl4952gkn05ynpnkqz4fkmwycj0ib0ry9wvi2vh";
-      name = "pimcommon-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/pimcommon-16.08.2.tar.xz";
+      sha256 = "1gkx3qqnmckf9hy9kysgil2m6kg1h920ywj8kq0fafxhg57w6pc1";
+      name = "pimcommon-16.08.2.tar.xz";
     };
   };
   poxml = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/poxml-16.08.1.tar.xz";
-      sha256 = "0cwnpcagsg1dbvfhra473g7wqmk5x2frw8y3831zwr47y6kgdr0c";
-      name = "poxml-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/poxml-16.08.2.tar.xz";
+      sha256 = "0kpimgj0mrdbpma0pm2la1686y2nac4y5zd61qlmsczk0sc0g1d5";
+      name = "poxml-16.08.2.tar.xz";
     };
   };
   print-manager = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/print-manager-16.08.1.tar.xz";
-      sha256 = "1nhfkw56ri8y2pik3x76v5w3dl39k2a2ajd4gdql627sc3116c5q";
-      name = "print-manager-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/print-manager-16.08.2.tar.xz";
+      sha256 = "06560241d1r4ca17n62r26yxdccnkx58k4w127z1xsi12bjihf1v";
+      name = "print-manager-16.08.2.tar.xz";
     };
   };
   rocs = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/rocs-16.08.1.tar.xz";
-      sha256 = "1qif7qj67rzljpkmbqjfm0gaji8wk7mc8fbddi7fpczgnz5jcmd5";
-      name = "rocs-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/rocs-16.08.2.tar.xz";
+      sha256 = "0404sp8hf73r0mxn94j4371m2ks6gkwkm13mn8ycig2ys0w6dc6w";
+      name = "rocs-16.08.2.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/signon-kwallet-extension-16.08.1.tar.xz";
-      sha256 = "0l68iz23d5k24ciyzdb7iywamfias34yhdcm69dpqpw1jchfcrkv";
-      name = "signon-kwallet-extension-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/signon-kwallet-extension-16.08.2.tar.xz";
+      sha256 = "12vsk3fydpjwai3l4gm1irhc0157qn8hb81d96kr07zg8k3jqjhf";
+      name = "signon-kwallet-extension-16.08.2.tar.xz";
     };
   };
   spectacle = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/spectacle-16.08.1.tar.xz";
-      sha256 = "0a9gka5xllwcdvvdbr8fj91v8zg2hlzhrh6myb0ycj7ang45gc88";
-      name = "spectacle-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/spectacle-16.08.2.tar.xz";
+      sha256 = "1aylgyfsmg2jmgg090glns2qmy5bqsf43fwglvwmmfbly0h5i03h";
+      name = "spectacle-16.08.2.tar.xz";
     };
   };
   step = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/step-16.08.1.tar.xz";
-      sha256 = "0135568xaccswfj8zfimh5fbpb8ib3lz2aq9qsw05bbmrjfv4398";
-      name = "step-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/step-16.08.2.tar.xz";
+      sha256 = "1kiyc009cf0pw6qfn3ravfbch8cvsv5iv6cas8mcszh1wil3y14h";
+      name = "step-16.08.2.tar.xz";
     };
   };
   svgpart = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/svgpart-16.08.1.tar.xz";
-      sha256 = "0ws41853wcfj1nbd31mr5qr23rzlijprvbpr1y7wq6g9agdfdwxs";
-      name = "svgpart-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/svgpart-16.08.2.tar.xz";
+      sha256 = "1idfmmmg65cqga1klmd2vwp8abpafda4z1fsd4p383wfjkmwgp09";
+      name = "svgpart-16.08.2.tar.xz";
     };
   };
   sweeper = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/sweeper-16.08.1.tar.xz";
-      sha256 = "0ywrpdhy61hm61drclk17mlmp8i0717871mc48b5rlpgkxa31aaz";
-      name = "sweeper-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/sweeper-16.08.2.tar.xz";
+      sha256 = "0y777yz51rs9m9lrx41mrj0wmp83vz6xc353acdk8ilm8lfqc9qh";
+      name = "sweeper-16.08.2.tar.xz";
     };
   };
   syndication = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/syndication-16.08.1.tar.xz";
-      sha256 = "06hpw3lr3idrrbv92qd5smnnbv4yvpn5kn99bbx5rjwxbcnrklml";
-      name = "syndication-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/syndication-16.08.2.tar.xz";
+      sha256 = "171swz7dqxp8c198hlprpj3lzdryvbz3603iawxh6663fa1da2lx";
+      name = "syndication-16.08.2.tar.xz";
     };
   };
   umbrello = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/umbrello-16.08.1.tar.xz";
-      sha256 = "14kalb7fpknsflkxychian1j724kfw4klcb4l361cn53imqq0ngk";
-      name = "umbrello-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/umbrello-16.08.2.tar.xz";
+      sha256 = "0m32lxzilzyycw9jb72zxzprcwk19sj5h45hvz6w9nvrk9k80a6h";
+      name = "umbrello-16.08.2.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "16.08.1";
+    version = "16.08.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.1/src/zeroconf-ioslave-16.08.1.tar.xz";
-      sha256 = "00p6hwrc5zhll9vfs5vzff469lgp7xbmvpa2s11ix45wh8d2wm91";
-      name = "zeroconf-ioslave-16.08.1.tar.xz";
+      url = "${mirror}/stable/applications/16.08.2/src/zeroconf-ioslave-16.08.2.tar.xz";
+      sha256 = "0yl1cnpn86gkbdg0h8y1kdyjj4b3n3wmp9ifmczfd6jw7hsvwrm6";
+      name = "zeroconf-ioslave-16.08.2.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh
index 5a19edffe9b..a5ddcf35677 100644
--- a/pkgs/desktops/kde-5/plasma/fetch.sh
+++ b/pkgs/desktops/kde-5/plasma/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.1/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.2/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix
index 8ff8f210315..5fc836f10a8 100644
--- a/pkgs/desktops/kde-5/plasma/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   bluedevil = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/bluedevil-5.8.1.tar.xz";
-      sha256 = "0j2mrx2qchcl1s13j3bhqrbgx7myq901clb20x4v9bfdcv1j9cp1";
-      name = "bluedevil-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/bluedevil-5.8.2.tar.xz";
+      sha256 = "1m8bhvh27af8hwqyicsrqbxsfl6mmwlyc9y9cv5fh4rkf0lkcsnd";
+      name = "bluedevil-5.8.2.tar.xz";
     };
   };
   breeze = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/breeze-5.8.1.tar.xz";
-      sha256 = "1s9z8j4jzs951yv1742lq5yh4pz82rkc1d80d7q2yh6964ck733p";
-      name = "breeze-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/breeze-5.8.2.tar.xz";
+      sha256 = "1n87n2vaxgb7wpg5jmb6x6l1z6gwl8jh9kjrgaq0blm1qkhac3k8";
+      name = "breeze-5.8.2.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/breeze-grub-5.8.1.tar.xz";
-      sha256 = "1d3skcj2yg82f5nqghpz9nbz1yb0b5kps3lf28hsq2k2vpqrp4mc";
-      name = "breeze-grub-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/breeze-grub-5.8.2.tar.xz";
+      sha256 = "1q4i87xvxajz67lkdf9k9z6vy6l0wlirz31n043fyy32gw0mrmf1";
+      name = "breeze-grub-5.8.2.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/breeze-gtk-5.8.1.tar.xz";
-      sha256 = "0nmf6h9kvq5l73yqri3xvldyw669a3rgbjmjizzq1qisri3y0qsz";
-      name = "breeze-gtk-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/breeze-gtk-5.8.2.tar.xz";
+      sha256 = "1vdn7nh1vn8cjxd6cvaj12imd523g7qjc7rlhih6q76ly6h9hv7k";
+      name = "breeze-gtk-5.8.2.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/breeze-plymouth-5.8.1.tar.xz";
-      sha256 = "149af4ja38h9sln7sfi05zxwnd8whhmp849zyxgbvdrjc3xxsvcz";
-      name = "breeze-plymouth-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/breeze-plymouth-5.8.2.tar.xz";
+      sha256 = "1dkp0h3idzpfbvwrmjzn5sbq0077ndr36qh087yyhdjwj1mlk98r";
+      name = "breeze-plymouth-5.8.2.tar.xz";
     };
   };
   discover = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/discover-5.8.1.tar.xz";
-      sha256 = "01njqp15qlqvkppn83m2y0yf64v53378f7l2zkzcyxx00pvq2ivk";
-      name = "discover-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/discover-5.8.2.tar.xz";
+      sha256 = "00zmdr6di37rcqncss4z51557a8zzli7n01imjjv8h784vkn0p04";
+      name = "discover-5.8.2.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kactivitymanagerd-5.8.1.tar.xz";
-      sha256 = "0pdr4m9qm62v7qansax1jl8va9j4iarmw0iw4cm60m7g6z1aaf4m";
-      name = "kactivitymanagerd-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kactivitymanagerd-5.8.2.tar.xz";
+      sha256 = "1dgdxpdxkdz0l498sadgfbp21by8d73r11ibb6mvxwmrba6q4lsc";
+      name = "kactivitymanagerd-5.8.2.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kde-cli-tools-5.8.1.tar.xz";
-      sha256 = "1bvirh2cbp8cmqrm9h1kdpjdrzbbl9nxsgwh3fw7374k3lsiry01";
-      name = "kde-cli-tools-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kde-cli-tools-5.8.2.tar.xz";
+      sha256 = "1gwp6hkpfaijxxc1v4km6kcwrzvwagkn5dgl181xghra26ar0bca";
+      name = "kde-cli-tools-5.8.2.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kdecoration-5.8.1.tar.xz";
-      sha256 = "09d59f10jsvhsh8dwnz9vd4ngiy22si5wcpj0idml4xvkq1sn1gj";
-      name = "kdecoration-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kdecoration-5.8.2.tar.xz";
+      sha256 = "0wbi6z3k9s18fi1vc7larnhwcdzrxrc13plpcnl365la8zrnp766";
+      name = "kdecoration-5.8.2.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kde-gtk-config-5.8.1.tar.xz";
-      sha256 = "1yz9abniqjsp8xc4dndcsbvjigff10787fflwczz4f48is611s3f";
-      name = "kde-gtk-config-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kde-gtk-config-5.8.2.tar.xz";
+      sha256 = "16kn6wy71x1zjpfppiwpmj6skw97ni5pyg2b2af733spfbkx0ca7";
+      name = "kde-gtk-config-5.8.2.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kdeplasma-addons-5.8.1.tar.xz";
-      sha256 = "1148kxdkrdyspy5y3wbs4l7asig4imjjlmssn5g0p8h3q8ag8lbx";
-      name = "kdeplasma-addons-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kdeplasma-addons-5.8.2.tar.xz";
+      sha256 = "18d9a2iwvr4klgm10yvsjjhszkc6zk26kmsay4c2q4pqbsvq7nqq";
+      name = "kdeplasma-addons-5.8.2.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kgamma5-5.8.1.tar.xz";
-      sha256 = "1v390jlfd56v2pins903yx3z4i32dkjf4cg48ah66shxqp2lr55g";
-      name = "kgamma5-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kgamma5-5.8.2.tar.xz";
+      sha256 = "0l73w2arpvv7x4yawp044j781pwmwpijr23mwhfcmnw7bmc7g5vn";
+      name = "kgamma5-5.8.2.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/khotkeys-5.8.1.tar.xz";
-      sha256 = "1g3qd9v2mxi8a9556x8hrj30d0wcv0bqr414zxl631c8sm0rwami";
-      name = "khotkeys-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/khotkeys-5.8.2.tar.xz";
+      sha256 = "17cmlny98ip0ckdafhlqm97p0rkrr9w2d18xf0hdxcypj13q4ba5";
+      name = "khotkeys-5.8.2.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kinfocenter-5.8.1.tar.xz";
-      sha256 = "0iarh97wpq0l5llasb2ikd2f53v41rilj4f6qj1flmxligs4pwdd";
-      name = "kinfocenter-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kinfocenter-5.8.2.tar.xz";
+      sha256 = "1j1l3fczw7sy43dff0mcwpvyvfz4r7ja7zg7x8vq5v2hi3c3f865";
+      name = "kinfocenter-5.8.2.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kmenuedit-5.8.1.tar.xz";
-      sha256 = "128cqnxw6rkb378p05s33i7yyz6yydnfdbf462ngiq628n6aqvrp";
-      name = "kmenuedit-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kmenuedit-5.8.2.tar.xz";
+      sha256 = "0r214s2pqm925l1mpzj4cwk73xvsf00wbm4g495dc63kwxpamx21";
+      name = "kmenuedit-5.8.2.tar.xz";
     };
   };
   kscreen = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kscreen-5.8.1.tar.xz";
-      sha256 = "0m9ddmp4vi38vkzik8bi5mir1mw66il2dfrf77h7amwfsnkicvfi";
-      name = "kscreen-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kscreen-5.8.2.tar.xz";
+      sha256 = "03i2zwpalq4d1y38bkwacvkqfanzdsdpafpqw17qjcan3jgxkkwr";
+      name = "kscreen-5.8.2.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kscreenlocker-5.8.1.tar.xz";
-      sha256 = "08ibp746w1xp6p5ccyl0p16giwcfrvq3nakwhwvhlwh0lirgvlrh";
-      name = "kscreenlocker-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kscreenlocker-5.8.2.tar.xz";
+      sha256 = "0may2h54yamzzd3jfv50skcxsws2liw36vb4smvyv9j8nvqvwyp1";
+      name = "kscreenlocker-5.8.2.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/ksshaskpass-5.8.1.tar.xz";
-      sha256 = "0yma28axv91zl0zjanrnwjjws9l187l6m4cjshy4ai77prcyzlqn";
-      name = "ksshaskpass-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/ksshaskpass-5.8.2.tar.xz";
+      sha256 = "1wk8jrwlr7lndsbhngkffvpjrqwi88x19vrxivb18gcr28m6403s";
+      name = "ksshaskpass-5.8.2.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/ksysguard-5.8.1.tar.xz";
-      sha256 = "1msrxhlln561y78gi6rdqzkv9sc0pk3w0znca9fjlsnacl7dbcn9";
-      name = "ksysguard-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/ksysguard-5.8.2.tar.xz";
+      sha256 = "1myg260bn7bjv18wadwzfwns9jc63r5plk3psdf6w727hcmizvnn";
+      name = "ksysguard-5.8.2.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kwallet-pam-5.8.1.tar.xz";
-      sha256 = "1nl0lb71s2sqhdplyfn5xl01q8zrqj544vlmjd2vc1a18p6qlkcy";
-      name = "kwallet-pam-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kwallet-pam-5.8.2.tar.xz";
+      sha256 = "1iw8cyr44kwjfqhf1ybnjy0pjv4yk87w3vir8j91an4mxhdcc2sb";
+      name = "kwallet-pam-5.8.2.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kwayland-integration-5.8.1.tar.xz";
-      sha256 = "1qwdlv7k6r7rzzihvmfhp4bsnz0nlfbi70fxxkdxdr49k1wqhxih";
-      name = "kwayland-integration-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kwayland-integration-5.8.2.tar.xz";
+      sha256 = "12zmf11117y5zp307ymfy5gsjpcf97sqw1n3nzk55p9kzlfln1pa";
+      name = "kwayland-integration-5.8.2.tar.xz";
     };
   };
   kwin = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kwin-5.8.1.tar.xz";
-      sha256 = "0b1p6vz87ffy30ja5nz9n1q0i1nhjllcr0rfqnwa1b6wkiv7dabl";
-      name = "kwin-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kwin-5.8.2.tar.xz";
+      sha256 = "04c9bvbd487pgf4l7a7vxaydjr9hwdjg149mzcxzm5y1nx7ll08y";
+      name = "kwin-5.8.2.tar.xz";
     };
   };
   kwrited = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/kwrited-5.8.1.tar.xz";
-      sha256 = "0sk7lwrwl7h174x7bips9a4nzb4wrfqyby0whp8qjpxq891cxbgy";
-      name = "kwrited-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/kwrited-5.8.2.tar.xz";
+      sha256 = "1659783rca0hcisrhxz1bnimn0q17825sbs6zlwxlwsh2qq8fq23";
+      name = "kwrited-5.8.2.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/libkscreen-5.8.1.tar.xz";
-      sha256 = "1pgpn49vgjx9ydqvnvvrs87sjc7zkfcyddw00270m6pk76zcxvc4";
-      name = "libkscreen-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/libkscreen-5.8.2.tar.xz";
+      sha256 = "0p2nhgvr3cxq0js6zkcnhglwqffnrnws8vdi7lyl069y9r8lvp7c";
+      name = "libkscreen-5.8.2.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/libksysguard-5.8.1.tar.xz";
-      sha256 = "1l9gwirs6b3iingq6fcv3yfhkqifjwwg0vwpz9041rj4rry4h73p";
-      name = "libksysguard-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/libksysguard-5.8.2.tar.xz";
+      sha256 = "158n30wbpsgbw3axhhsc58hnwhwdd02j3zc9hhcybmnbkfl5c96l";
+      name = "libksysguard-5.8.2.tar.xz";
     };
   };
   milou = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/milou-5.8.1.tar.xz";
-      sha256 = "0znxcmm0h3ghzy22bpcca3jkxypq9zhlwbka4a7skw7ckl55xszm";
-      name = "milou-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/milou-5.8.2.tar.xz";
+      sha256 = "0ikba2xk2d4v66rhdln97d89avrkbhpjh1zir5ds3s103yyrj4q9";
+      name = "milou-5.8.2.tar.xz";
     };
   };
   oxygen = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/oxygen-5.8.1.tar.xz";
-      sha256 = "0fbj96614f59xkl7ia3k810in793jkmqmzb5csmng19qw1qjg5wk";
-      name = "oxygen-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/oxygen-5.8.2.tar.xz";
+      sha256 = "1n0gfgn7m0953dd69nvl0ikp97zmcn3hjm01s43nxjma3gp8pqar";
+      name = "oxygen-5.8.2.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/plasma-desktop-5.8.1.tar.xz";
-      sha256 = "1da96cy3pkryhff6f5cnyvvicz8brjjjh17k0rg5vbrd53zgsz4r";
-      name = "plasma-desktop-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/plasma-desktop-5.8.2.tar.xz";
+      sha256 = "0023wb3fnk0cap7v2zwig6h3vqvykrwwq9vyl0xbsj5vzx3f8yqj";
+      name = "plasma-desktop-5.8.2.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/plasma-integration-5.8.1.tar.xz";
-      sha256 = "1xfc7nn5gcfccmby7ivwh7clrk1z4k8m1qag14r1rxfv8gnswm67";
-      name = "plasma-integration-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/plasma-integration-5.8.2.tar.xz";
+      sha256 = "1z7pd5j7llac1iv4w4q4r9wysqi4shc65fcg6bh637gxqjgyq4rf";
+      name = "plasma-integration-5.8.2.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/plasma-nm-5.8.1.tar.xz";
-      sha256 = "0v34nvc004zini3i3ya9xw6cvyyh3r7i7z2kijjaqi70vnhx1dp6";
-      name = "plasma-nm-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/plasma-nm-5.8.2.tar.xz";
+      sha256 = "035nhs8z977gp3d041ywnam1y4vk7458mx81f2qrx2bv8g6znq22";
+      name = "plasma-nm-5.8.2.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/plasma-pa-5.8.1.tar.xz";
-      sha256 = "1dhqljwn1ihr4wj4785ggja6gvjm5cwfyc5gvmkvb2ls226k2ihb";
-      name = "plasma-pa-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/plasma-pa-5.8.2.tar.xz";
+      sha256 = "1j55q4brjh77i1imr7pb9gp9a8vaynnr2ljdsm4jqsijwcjj1yhi";
+      name = "plasma-pa-5.8.2.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/plasma-sdk-5.8.1.tar.xz";
-      sha256 = "0gav6b7bnxl9myf440lygiaymj8jmj6b5mf2nr4vnibymiiq6asm";
-      name = "plasma-sdk-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/plasma-sdk-5.8.2.tar.xz";
+      sha256 = "0h6393qxwms0xdq69nyzs18kbyl6amzff26l20fqpp49xrqpq95y";
+      name = "plasma-sdk-5.8.2.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/plasma-tests-5.8.1.tar.xz";
-      sha256 = "1g5cx7vbghw2av7c943whgmsasgw612ccb9nl5kdfb0g0icpxalk";
-      name = "plasma-tests-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/plasma-tests-5.8.2.tar.xz";
+      sha256 = "0ls8mxabvw39xb8nrl89n1jn0bkgykzx7hcv45q17aw5jm8s0wy5";
+      name = "plasma-tests-5.8.2.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/plasma-workspace-5.8.1.tar.xz";
-      sha256 = "0p7d9a612qqhfm296gg2qda4cqnqy51znbapddyra5dq9ywkhnn0";
-      name = "plasma-workspace-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-5.8.2.tar.xz";
+      sha256 = "1dxvxz9qvkg1h79j997qgs573l730w1g0n1dy78n344bnvn8zx44";
+      name = "plasma-workspace-5.8.2.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/plasma-workspace-wallpapers-5.8.1.tar.xz";
-      sha256 = "17xz75pfpgyzynjy7n1bdm2cnbqyrqhi0d7b4ghpvygg0m1iba9s";
-      name = "plasma-workspace-wallpapers-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-wallpapers-5.8.2.tar.xz";
+      sha256 = "0wkkpl1n6ggicgj6lszmb661wrmddhq9wx3djr3hyvvi5r586rxi";
+      name = "plasma-workspace-wallpapers-5.8.2.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.8.1";
+    version = "1-5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/polkit-kde-agent-1-5.8.1.tar.xz";
-      sha256 = "1q5wfr308ayqarvq0fr049aqfwz36hyx8wl7pirllralnz2wmvgv";
-      name = "polkit-kde-agent-1-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/polkit-kde-agent-1-5.8.2.tar.xz";
+      sha256 = "1ipli3xq4dc8lnyamqfzsjcfh3808gbw3qaaqksng2ki0i84aw8f";
+      name = "polkit-kde-agent-1-5.8.2.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/powerdevil-5.8.1.tar.xz";
-      sha256 = "0qkmdnck3im0wd1v9a24p8pxwxi38x7kx1a4z8zddsd8pd8d8sjv";
-      name = "powerdevil-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/powerdevil-5.8.2.tar.xz";
+      sha256 = "0bjk08f3bliy4cz3pcs77qhsc3l82fqk3q0djiwgmsr77ksabj7x";
+      name = "powerdevil-5.8.2.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/sddm-kcm-5.8.1.tar.xz";
-      sha256 = "0kflarcq3q1gbd1blxpspq918cyxxwyigwv8jsmr29yfx947ik17";
-      name = "sddm-kcm-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/sddm-kcm-5.8.2.tar.xz";
+      sha256 = "1n3r2hjwrsxiwzzgkpf4xgp2645kzzdl49i91qcsqznhiqp7kjx3";
+      name = "sddm-kcm-5.8.2.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/systemsettings-5.8.1.tar.xz";
-      sha256 = "04f0z4gq7zyyljb84na184q1wn6mkr9mg06mfv9zkbamsfaiazd8";
-      name = "systemsettings-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/systemsettings-5.8.2.tar.xz";
+      sha256 = "157knafprh4b689jjr8w4bqrh9kp92ggvf40s4ny8cfyjr2bzcvi";
+      name = "systemsettings-5.8.2.tar.xz";
     };
   };
   user-manager = {
-    version = "5.8.1";
+    version = "5.8.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.1/user-manager-5.8.1.tar.xz";
-      sha256 = "1bccibypnv58gkmh895w1b9lnmhwda1kypxbd34b9hcldq1dgag7";
-      name = "user-manager-5.8.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.2/user-manager-5.8.2.tar.xz";
+      sha256 = "1344qvzrlswc69wvnaqic300wxra6ix6w6iczj29sprxsa5ycf91";
+      name = "user-manager-5.8.2.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index f8ede8cae45..991ed0eb6be 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -22,7 +22,8 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
 
   exo             = callPackage ./core/exo.nix { };
   garcon          = callPackage ./core/garcon.nix { };
-  gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = true; }; # ToDo: when should be used?
+  gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix
+    { withGtk3 = false; }; # = true; was completely breaking GTK3 app layout
   libxfce4ui      = callPackage ./core/libxfce4ui.nix { };
   libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
   libxfce4util    = callPackage ./core/libxfce4util.nix { };
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
new file mode 100644
index 00000000000..63b4b4c2c4f
--- /dev/null
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, bison }:
+
+stdenv.mkDerivation rec {
+  name = "glslang-git-${version}";
+  version = "2016-08-26";
+
+  # `vulkan-loader` requires a specific version of `glslang` as specified in
+  # `<vulkan-loader-repo>/glslang_revision`.
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "glslang";
+    rev = "81cd764b5ffc475bc73f1fb35f75fd1171bb2343";
+    sha256 = "1vfwl6lzkjh9nh29q32b7zca4q1abf3q4nqkahskijgznw5lr59g";
+  };
+
+  patches = [ ./install-headers.patch ];
+
+  buildInputs = [ cmake bison ];
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Khronos reference front-end for GLSL and ESSL";
+  };
+}
diff --git a/pkgs/development/compilers/glslang/install-headers.patch b/pkgs/development/compilers/glslang/install-headers.patch
new file mode 100644
index 00000000000..9ad6f5e1906
--- /dev/null
+++ b/pkgs/development/compilers/glslang/install-headers.patch
@@ -0,0 +1,26 @@
+diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+index 48a6c46..593d941 100755
+--- a/SPIRV/CMakeLists.txt
++++ b/SPIRV/CMakeLists.txt
+@@ -42,3 +42,8 @@ endif(WIN32)
+ 
+ install(TARGETS SPIRV SPVRemapper
+         ARCHIVE DESTINATION lib)
++
++foreach(file ${HEADERS} ${SPVREMAP_HEADERS})
++    get_filename_component(dir ${file} DIRECTORY)
++    install(FILES ${file} DESTINATION include/SPIRV/${dir})
++endforeach()
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index ff91135..4318279 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -90,3 +90,8 @@ endif(WIN32)
+ 
+ install(TARGETS glslang 
+         ARCHIVE DESTINATION lib)
++
++foreach(file ${HEADERS})
++    get_filename_component(dir ${file} DIRECTORY)
++    install(FILES ${file} DESTINATION include/glslang/${dir})
++endforeach()
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 0f78646e1aa..3def735ec8d 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     rm -r $out/share/go/pkg/bootstrap
-    mv $out/share/go/bin $out/bin
+    ln -s $out/share/go/bin $out/bin
   '';
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index a39f013d1a9..17351ae8736 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
+{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin }:
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 22dea611c79..8086f980bcf 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -15,10 +15,16 @@
 , libcxxabi
 , debugVersion ? false
 , enableSharedLibraries ? true
+, darwin
 }:
 
 let
   src = fetch "llvm" "0j49lkd5d7nnpdqzaybs2472bvcxyx0i4r3iccwf3kj2v9wk3iv6";
+  shlib = if stdenv.isDarwin then "dylib" else "so";
+
+  # Used when creating a version-suffixed symlink of libLLVM.dylib
+  shortVersion = with stdenv.lib;
+    concatStringsSep "." (take 2 (splitString "." version));
 in stdenv.mkDerivation rec {
   name = "llvm-${version}";
 
@@ -33,7 +39,8 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
 
   buildInputs = [ perl groff cmake libxml2 python libffi ]
-    ++ stdenv.lib.optional stdenv.isDarwin libcxxabi;
+    ++ stdenv.lib.optionals stdenv.isDarwin
+         [ libcxxabi darwin.cctools darwin.apple_sdk.libs.xpc ];
 
   propagatedBuildInputs = [ ncurses zlib ];
 
@@ -70,6 +77,7 @@ in stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals (isDarwin) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DCAN_TARGET_i386=false"
+    "-DCMAKE_LIBTOOL=${darwin.cctools}/bin/libtool"
   ];
 
   postBuild = ''
@@ -81,13 +89,17 @@ in stdenv.mkDerivation rec {
   postInstall = ""
   + stdenv.lib.optionalString (enableSharedLibraries) ''
     moveToOutput "lib/libLLVM-*" "$lib"
-    moveToOutput "lib/libLLVM.so" "$lib"
+    moveToOutput "lib/libLLVM.${shlib}" "$lib"
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
   ''
   + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
-    install_name_tool -id $out/lib/libLLVM.dylib $out/lib/libLLVM.dylib
-    ln -s $out/lib/libLLVM.dylib $out/lib/libLLVM-${version}.dylib
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+    install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib
+    install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${version}.dylib
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index f1b27bdb54f..e8d737e0082 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "101";
+  patchVersion = "111";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0p9nvaifb1mn7scmprbcyv9a4lyqy8i0mf7rsb59cli30vpi44mi";
-  sha256_x86_64 = "0a0kb3c7xfh81vx5sicw2frgxq0gyv5qp0d725rviwldlcxk4zs6";
+  sha256_i686 = "07wyyds52c3fp4ha1fnzp6mbxwq0rs3vx59167b57gkggg7qz3ls";
+  sha256_x86_64 = "0x4937c3307v78wx1jf227b89cf5lsd5yarmbjrxs4pq6lidlzhq";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index b760ac7135a..fc2e6448fc3 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "102";
+  patchVersion = "112";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "1bsypgf9va8jds0rlpnwp9n9p11hz77gqlmb0b0w2qwfmlmi227d";
-  sha256_x86_64 = "1dq4kqi8k2k11sc28fnbp6cmncfj86jv57iy1gkap94i0fyf1yvw";
+  sha256_i686 = "19b9vwb7bd17s9p04y47zzjkccazzmpy4dqx4rgxd79k1fw2yz0y";
+  sha256_x86_64 = "19blsx81x5p2f6d9vig89z7cc8778cp6qdjy9ylsa2444vaxfyvp";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 93ce5037fed..9d451c2e4f3 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -1,16 +1,19 @@
-{stdenv, glibc, fetchFromGitHub, llvm, makeWrapper, openssl, pcre2, coreutils }:
+{ stdenv, fetchFromGitHub, llvm, makeWrapper, pcre2, coreutils, which, libressl,
+  cc ? stdenv.cc, lto ? !stdenv.isDarwin }:
 
-stdenv.mkDerivation {
-  name = "ponyc-2016-07-26";
+stdenv.mkDerivation ( rec {
+  name = "ponyc-${version}";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
-    rev = "4eec8a9b0d9936b2a0249bd17fd7a2caac6aaa9c";
-    sha256 = "184x2jivp7826i60rf0dpx0a9dg5rsj56dv0cll28as4nyqfmna2";
+    rev = version;
+    sha256 = "14c6qs3cqn9hk2hrq2d5rd4cmwzzz2fcb02dg5q1blq17pj7mcxa";
   };
 
-  buildInputs = [ llvm makeWrapper ];
+  buildInputs = [ llvm makeWrapper which ];
+  propagatedBuildInputs = [ cc ];
 
   # Disable problematic networking tests
   patches = [ ./disable-tests.patch ];
@@ -18,37 +21,69 @@ stdenv.mkDerivation {
   preBuild = ''
     # Fix tests
     substituteInPlace packages/process/_test.pony \
-        --replace "/bin/cat" "${coreutils}/bin/cat"
+        --replace '"/bin/' '"${coreutils}/bin/'
+    substituteInPlace packages/process/_test.pony \
+        --replace '=/bin' "${coreutils}/bin"
+
+
+    # Fix llvm-ar check for darwin
+    substituteInPlace Makefile \
+        --replace "llvm-ar-3.8" "llvm-ar"
+
+    # Remove impure system refs
+    substituteInPlace src/libponyc/pkg/package.c \
+        --replace "/usr/local/lib" ""
+    substituteInPlace src/libponyc/pkg/package.c \
+        --replace "/opt/local/lib" ""
+
+    for file in `grep -irl '/usr/local/opt/libressl/lib' ./*`; do
+      substituteInPlace $file  --replace '/usr/local/opt/libressl/lib' "${stdenv.lib.getLib libressl}/lib"
+    done
+
+    # Fix ponypath issue
+    substituteInPlace Makefile \
+        --replace "PONYPATH=." "PONYPATH=.:\$(PONYPATH)"
 
     export LLVM_CONFIG=${llvm}/bin/llvm-config
+  '' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (!cc.isClang) && lto) ''
+    export LTO_PLUGIN=`find ${cc.cc}/ -name liblto_plugin.so`
+  '' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (cc.isClang) && lto) ''
+    export LTO_PLUGIN=`find ${cc.cc}/ -name LLVMgold.so`
   '';
 
-  makeFlags = [ "config=release" ];
+  makeFlags = [ "config=release" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ]
+              ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ];
 
   enableParallelBuilding = true;
 
   doCheck = true;
 
-  checkTarget = "test";
+  checkTarget = "test-ci";
 
   preCheck = ''
-    export LIBRARY_PATH="$out/lib:${stdenv.lib.makeLibraryPath [ openssl pcre2 ]}"
+    export PONYPATH="$out/lib:${stdenv.lib.makeLibraryPath [ pcre2 libressl ]}"
   '';
 
   installPhase = ''
-    make config=release prefix=$out install
+    make config=release prefix=$out ''
+    + stdenv.lib.optionalString stdenv.isDarwin '' bits=64 ''
+    + stdenv.lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no ''
+    + '' install
     mv $out/bin/ponyc $out/bin/ponyc.wrapped
     makeWrapper $out/bin/ponyc.wrapped $out/bin/ponyc \
-      --prefix LIBRARY_PATH : "$out/lib" \
-      --prefix LIBRARY_PATH : "${openssl.out}/lib" \
-      --prefix LIBRARY_PATH : "${pcre2}/lib"
+      --prefix PONYPATH : "$out/lib" \
+      --prefix PONYPATH : "${stdenv.lib.getLib pcre2}/lib" \
+      --prefix PONYPATH : "${stdenv.lib.getLib libressl}/lib"
   '';
 
+  # Stripping breaks linking for ponyc
+  dontStrip = true;
+
   meta = {
     description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
     homepage = http://www.ponylang.org;
     license = stdenv.lib.licenses.bsd2;
     maintainers = [ stdenv.lib.maintainers.doublec ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/development/compilers/ponyc/disable-tests.patch b/pkgs/development/compilers/ponyc/disable-tests.patch
index 9335ebd6eea..804a99fddcd 100644
--- a/pkgs/development/compilers/ponyc/disable-tests.patch
+++ b/pkgs/development/compilers/ponyc/disable-tests.patch
@@ -1,16 +1,17 @@
 diff --git a/packages/net/_test.pony b/packages/net/_test.pony
-index d6c3e56..dc37dd9 100644
+index ce26bd7..9a98cc7 100644
 --- a/packages/net/_test.pony
 +++ b/packages/net/_test.pony
-@@ -7,11 +7,6 @@ actor Main is TestList
+@@ -5,11 +5,7 @@ actor Main is TestList
+   new make() => None
+
    fun tag tests(test: PonyTest) =>
-     test(_TestReadBuffer)
-     test(_TestWriteBuffer)
 -    test(_TestBroadcast)
+-    test(_TestTCPWritev)
 -    ifdef not windows then
 -      test(_TestTCPExpect)
--      test(_TestTCPWritev)
 -    end
- 
- class iso _TestReadBuffer is UnitTest
-   """
++    None
+
+ class _TestPing is UDPNotify
+   let _h: TestHelper
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
new file mode 100644
index 00000000000..df0c136d05f
--- /dev/null
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, glslang, spirv-tools, python }:
+
+stdenv.mkDerivation rec {
+  name = "shaderc-git-${version}";
+  version = "2016-09-08";
+
+  # `vulkan-loader` requires a specific version of `glslang` as specified in
+  # `<vulkan-loader-repo>/glslang_revision`.
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "shaderc";
+    rev = "e17bb8ba3b8b0b9142b788d988612a40541c54ce";
+    sha256 = "17qfjqkz6j355qi130kixaz51svl09k9b5sfikksgnbmzglzcwki";
+  };
+
+  patchPhase = ''
+    cp -r ${spirv-tools.src} third_party/spirv-tools
+    chmod -R +w third_party/spirv-tools
+    ln -s ${spirv-tools.headers} third_party/spirv-tools/external/spirv-headers
+  '';
+
+  buildInputs = [ cmake glslang python ];
+  enableParallelBuilding = true;
+
+  cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" "-DSHADERC_GLSLANG_DIR=${glslang.src}" ];
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "A collection of tools, libraries and tests for shader compilation.";
+  };
+}
diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix
index a5f12e2cfe3..291b410ef93 100644
--- a/pkgs/development/guile-modules/guile-ncurses/default.nix
+++ b/pkgs/development/guile-modules/guile-ncurses/default.nix
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
   preConfigure =
     '' configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site" '';
 
+  postFixup =
+    '' for f in $out/share/guile/site/ncurses/**.scm; do \
+           substituteInPlace $f \
+             --replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \
+       done
+    '';
+
   doCheck = false;  # XXX: 1 of 65 tests failed
 
   meta = {
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index fa84e5ce508..3b8a93f2108 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -8,7 +8,7 @@ self: super: {
   cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; });
 
   # Link statically to avoid runtime dependency on GHC.
-  jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
+  jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; };
 
   # Apply NixOS-specific patches.
   ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
@@ -46,7 +46,6 @@ self: super: {
       sha256 = "1j29ydbw86j3qd4qb4l348pcnjd24irgdra9ss2afi6w2pn60yjn";
       rev = drv.version;
     };
-    doCheck = false;  # version 6.20160907 has a test suite failure; reported upstream
   })).overrideScope (self: super: {
     # https://github.com/prowdsponsor/esqueleto/issues/137
     persistent = self.persistent_2_2_4_1;
@@ -781,19 +780,9 @@ self: super: {
     src = pkgs.fetchFromGitHub {
       owner = "chrisdone";
       repo = "structured-haskell-mode";
-      sha256 = "1vrycvqp4n2pp6sq7z2v0zkqz6662nvacm7cla5hrrzl157cg0j5";
-      rev = "1ffb4db1e7049d4089fea430d4f20bce2eff263d";
+      rev = "dde5104ee28e1c63ca9fbc37c969f8e319b4b903";
+      sha256 = "0g5qpnxzr9qmgzvsld5mg94rb28xb8kd1a02q045r6zlmv1zx7lp";
     };
-    patches = [ (pkgs.fetchpatch {
-                  url = "https://github.com/chrisdone/structured-haskell-mode/pull/140.patch";
-                  sha256 = "1zwyxfmkl04dy34mbifk24qj9g0sfpz0j8rm688qdah8lavp44df";
-                })
-                (pkgs.fetchpatch {
-                  url = "https://github.com/chrisdone/structured-haskell-mode/pull/141.patch";
-                  sha256 = "1bqgzw8cvxs0yg3yipsayksf7djccslamksm0nkw0kfp22axzmng";
-                })
-              ];
-    jailbreak = false;
     # Statically linked Haskell libraries make the tool start-up much faster,
     # which is important for use in Emacs.
     enableSharedExecutables = false;
@@ -980,10 +969,10 @@ self: super: {
   });
 
   # https://github.com/commercialhaskell/stack/issues/2263
-  stack = (dontJailbreak super.stack).overrideScope (self: super: {
+  stack = super.stack.overrideScope (self: super: {
     http-client = self.http-client_0_5_3_2;
     http-client-tls = self.http-client-tls_0_3_3;
-    http-conduit = self.http-conduit_2_2_2_1;
+    http-conduit = self.http-conduit_2_2_3;
     optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;
     criterion = super.criterion.override { inherit (super) optparse-applicative; };
   });
@@ -1029,6 +1018,9 @@ self: super: {
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = doJailbreak super.applicative-quoters;
 
+  # https://github.com/roelvandijk/terminal-progress-bar/issues/13
+  terminal-progress-bar = doJailbreak super.terminal-progress-bar;
+
   # https://github.com/vshabanov/HsOpenSSL/issues/11
   HsOpenSSL = doJailbreak super.HsOpenSSL;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 1207a8c68bc..32348f2c909 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -49,12 +49,6 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
-  # The jailbreak is unnecessary in this package set.
-  deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
-
-  # Newer versions don't compile.
-  Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
-
   # We have no working cabal-install at the moment.
   cabal-install = markBroken super.cabal-install;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index 4cbe3b6b148..16c1ff4f065 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -46,12 +46,9 @@ self: super: {
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
-  # Newer versions don't compile.
-  Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
-
   # https://github.com/peti/jailbreak-cabal/issues/9
   jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = dontJailbreak (self.Cabal_1_20_0_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
+    Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; };
   };
 
   # Haddock chokes on the prologue from the cabal file.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index c06e0f7d11b..95629c37532 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -37,10 +37,7 @@ self: super: {
   xhtml = null;
 
   # Enable latest version of cabal-install.
-  cabal-install = (doDistribute (dontJailbreak (dontCheck (super.cabal-install)))).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; });
-
-  # Jailbreaking is required for the test suite only (which we don't run).
-  Cabal_1_24_0_0 = dontJailbreak (dontCheck super.Cabal_1_24_0_0);
+  cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; });
 
   # Build jailbreak-cabal with the latest version of Cabal.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_0_0; };
@@ -148,7 +145,7 @@ self: super: {
   tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
 
   # http://hub.darcs.net/ivanm/graphviz/issue/5
-  graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch));
+  graphviz = dontCheck (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch);
 
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 385df64fadb..5aea83e7567 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -44,15 +44,12 @@ self: super: {
   # https://github.com/haskell/cabal/issues/2322
   Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_4_1; process = self.process_1_2_3_0; };
 
-  # Newer versions don't compile.
-  Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
-
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
   # https://github.com/peti/jailbreak-cabal/issues/9
   jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = dontJailbreak (self.Cabal_1_20_0_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
+    Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; };
   };
 
   # Haddock chokes on the prologue from the cabal file.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index aca043e240b..32d3c89d5fe 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -50,7 +50,7 @@ self: super: {
   hashable = dontCheck super.hashable;
 
   # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 06836080bcf..1c579b9d6e2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -49,7 +49,7 @@ self: super: {
   hashable = dontCheck super.hashable;
 
   # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 1b5f01c8475..f7410689866 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -38,7 +38,7 @@ self: super: {
   xhtml = null;
 
   # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
 
   # mtl 2.2.x needs the latest transformers.
   mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; };
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 5c7348678b7..e0629457d9e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -60,4 +60,7 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
+  # https://github.com/nkaretnikov/titlecase/issues/6
+  titlecase = doJailbreak super.titlecase;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4daacce6376..3d526621c51 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -32,7 +32,7 @@ core-packages:
   - xhtml-3000.2.1
 
 default-package-overrides:
-  # LTS Haskell 7.3
+  # LTS Haskell 7.4
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -461,7 +461,7 @@ default-package-overrides:
   - djinn-lib ==0.0.1.2
   - dlist ==0.8.0.2
   - dlist-instances ==0.1.1.1
-  - dns ==2.0.6
+  - dns ==2.0.7
   - do-list ==1.0.1
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.4
@@ -576,7 +576,7 @@ default-package-overrides:
   - fold-debounce-conduit ==0.1.0.4
   - foldl ==1.2.1
   - FontyFruity ==0.5.3.2
-  - force-layout ==0.4.0.5
+  - force-layout ==0.4.0.6
   - forecast-io ==0.2.0.0
   - foreign-store ==0.2
   - formatting ==6.2.2
@@ -780,7 +780,7 @@ default-package-overrides:
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
   - hapistrano ==0.2.1.2
-  - happstack-authenticate ==2.3.4.5
+  - happstack-authenticate ==2.3.4.6
   - happstack-clientsession ==7.3.1
   - happstack-hsp ==7.3.7.1
   - happstack-jmacro ==7.0.11
@@ -898,7 +898,7 @@ default-package-overrides:
   - hslua ==0.4.1
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.2.4
+  - HsOpenSSL ==0.11.3.1
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.2.3
@@ -1005,7 +1005,7 @@ default-package-overrides:
   - io-streams ==1.3.5.0
   - io-streams-haproxy ==1.0.0.1
   - ip6addr ==0.5.1.3
-  - iproute ==1.7.0
+  - iproute ==1.7.1
   - IPv6Addr ==0.6.1.0
   - irc ==0.6.1.0
   - irc-client ==0.4.4.0
@@ -1113,7 +1113,7 @@ default-package-overrides:
   - makefile ==0.1.0.5
   - managed ==1.0.5
   - mandrill ==0.5.2.3
-  - markdown ==0.1.14
+  - markdown ==0.1.15
   - markdown-unlit ==0.4.0
   - markup ==3.1.0
   - math-functions ==0.2.0.2
@@ -1280,7 +1280,7 @@ default-package-overrides:
   - pagination ==0.1.1
   - palette ==0.1.0.4
   - pandoc ==1.17.1
-  - pandoc-citeproc ==0.10.1.1
+  - pandoc-citeproc ==0.10.1.2
   - pandoc-types ==1.16.1.1
   - pango ==0.13.3.0
   - parallel ==3.2.1.0
@@ -1390,7 +1390,7 @@ default-package-overrides:
   - protobuf-simple ==0.1.0.2
   - protocol-buffers ==2.4.0
   - protocol-buffers-descriptor ==2.4.0
-  - protolude ==0.1.7
+  - protolude ==0.1.8
   - proxied ==0.2
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
@@ -1465,14 +1465,14 @@ default-package-overrides:
   - relational-record ==0.1.5.1
   - relational-schemas ==0.1.3.1
   - renderable ==0.2.0.1
-  - repa ==3.4.1.1
+  - repa ==3.4.1.2
   - repa-algorithms ==3.4.1.1
   - repa-io ==3.4.1.1
   - RepLib ==0.5.4
   - reroute ==0.4.0.1
   - resolve-trivial-conflicts ==0.3.2.2
   - resource-pool ==0.2.3.2
-  - resourcet ==1.1.7.5
+  - resourcet ==1.1.8
   - rest-client ==0.5.1.1
   - rest-core ==0.39
   - rest-gen ==0.19.0.3
@@ -1658,7 +1658,7 @@ default-package-overrides:
   - stylish-haskell ==0.6.1.0
   - success ==0.2.6
   - sundown ==0.6
-  - svg-builder ==0.1.0.1
+  - svg-builder ==0.1.0.2
   - svg-tree ==0.5.1.2
   - SVGFonts ==1.5.0.1
   - swagger ==0.2.2
@@ -1713,7 +1713,7 @@ default-package-overrides:
   - test-framework-th ==0.2.4
   - test-simple ==0.1.8
   - testing-feat ==0.4.0.3
-  - texmath ==0.8.6.5
+  - texmath ==0.8.6.6
   - text ==1.2.2.1
   - text-all ==0.3.0.2
   - text-binary ==0.2.1.1
@@ -1780,7 +1780,7 @@ default-package-overrides:
   - turtle ==1.2.8
   - turtle-options ==0.1.0.4
   - twitter-conduit ==0.2.1
-  - twitter-feed ==0.2.0.9
+  - twitter-feed ==0.2.0.10
   - twitter-types ==0.7.2.2
   - twitter-types-lens ==0.7.2
   - type-aligned ==0.9.6
@@ -1859,7 +1859,7 @@ default-package-overrides:
   - vinyl ==0.5.2
   - vinyl-utils ==0.3.0.0
   - void ==0.7.1
-  - vty ==5.11
+  - vty ==5.11.1
   - wai ==3.2.1.1
   - wai-app-static ==3.1.6.1
   - wai-conduit ==3.0.0.3
@@ -1875,7 +1875,7 @@ default-package-overrides:
   - wai-middleware-crowd ==0.1.4.2
   - wai-middleware-metrics ==0.2.3
   - wai-middleware-prometheus ==0.1.0.1
-  - wai-middleware-static ==0.8.0
+  - wai-middleware-static ==0.8.1
   - wai-middleware-throttle ==0.2.1.0
   - wai-middleware-verbs ==0.3.2
   - wai-predicates ==0.9.0
@@ -1950,7 +1950,7 @@ default-package-overrides:
   - xmlhtml ==0.2.3.5
   - xmonad ==0.12
   - xss-sanitize ==0.3.5.7
-  - yackage ==0.8.0
+  - yackage ==0.8.1
   - yahoo-finance-api ==0.1.0.0
   - yaml ==0.8.18.7
   - Yampa ==0.10.5
@@ -1976,7 +1976,7 @@ default-package-overrides:
   - yesod-newsfeed ==1.6
   - yesod-persistent ==1.4.0.6
   - yesod-sitemap ==1.4.0.1
-  - yesod-static ==1.5.0.4
+  - yesod-static ==1.5.0.5
   - yesod-static-angular ==0.1.8
   - yesod-table ==2.0.3
   - yesod-test ==1.5.3
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d18f4ca5125..770fafe59bf 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -8050,12 +8050,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "HUnit_1_4_0_0" = callPackage
+  "HUnit_1_5_0_0" = callPackage
     ({ mkDerivation, base, call-stack, deepseq, filepath }:
      mkDerivation {
        pname = "HUnit";
-       version = "1.4.0.0";
-       sha256 = "dce3bd1ac11ed34e0181f39aba16cb6ff0f5005f663bbe37e6ab0162dcf3ec95";
+       version = "1.5.0.0";
+       sha256 = "65c51d17ced1c0646d888cd8caf195df67f6fdc1394c34459bcfd1be0f9ddea0";
        libraryHaskellDepends = [ base call-stack deepseq ];
        testHaskellDepends = [ base call-stack deepseq filepath ];
        homepage = "https://github.com/hspec/HUnit#readme";
@@ -8112,6 +8112,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HUnit-approx_1_1" = callPackage
+    ({ mkDerivation, base, HUnit }:
+     mkDerivation {
+       pname = "HUnit-approx";
+       version = "1.1";
+       sha256 = "d7cc9e120092e8f845b3347a5da99fab59135eda34c57871f3ff1f09224830a6";
+       libraryHaskellDepends = [ base HUnit ];
+       testHaskellDepends = [ base 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
@@ -9224,8 +9238,8 @@ self: {
      }:
      mkDerivation {
        pname = "HsOpenSSL";
-       version = "0.11.2.4";
-       sha256 = "9c38800459534966f12bf25380844c4d26fead17af4d0a8773a95e2c9e3bc1b8";
+       version = "0.11.3.1";
+       sha256 = "93304b32a09668870843708de9cc94048006e27279f4ceaafe7f5bdcf63047db";
        libraryHaskellDepends = [
          base bytestring integer-gmp network time
        ];
@@ -9239,6 +9253,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
+  "HsOpenSSL_0_11_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
+     , time
+     }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.3.2";
+       sha256 = "4b5ba629b64a0288faa35eccde5ce0ebb8b3127d17e064eb6f100c5fbbebce3f";
+       libraryHaskellDepends = [
+         base bytestring integer-gmp network time
+       ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/vshabanov/HsOpenSSL";
+       description = "Partial OpenSSL binding for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "HsOpenSSL-x509-system" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
      mkDerivation {
@@ -9897,6 +9930,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "JuicyPixels-extra_0_1_1" = callPackage
+    ({ mkDerivation, base, hspec, JuicyPixels }:
+     mkDerivation {
+       pname = "JuicyPixels-extra";
+       version = "0.1.1";
+       sha256 = "d37b257e7780e18a4e8335523b2f8962efb845da3b1dd84435a684b24a82b9fd";
+       libraryHaskellDepends = [ base JuicyPixels ];
+       testHaskellDepends = [ base hspec 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 {
@@ -17214,15 +17261,16 @@ self: {
      }) {};
 
   "WaveFront" = callPackage
-    ({ mkDerivation, base, Cartesian, containers, filepath, GLUtil
-     , lens, linear, OpenGL
+    ({ mkDerivation, attoparsec, base, Cartesian, containers, either
+     , filepath, lens, linear, QuickCheck, text, transformers, vector
      }:
      mkDerivation {
        pname = "WaveFront";
-       version = "0.1.2.0";
-       sha256 = "7a169c00d1c008904ca827ddcf99db1026e3af9b3b4f48cf62486b269339bb80";
+       version = "0.5.0.0";
+       sha256 = "c2fa7005b6a6e5fc5ec0eb965b9fafe13f477f5fc8079fa4e0e0d417b785887d";
        libraryHaskellDepends = [
-         base Cartesian containers filepath GLUtil lens linear OpenGL
+         attoparsec base Cartesian containers either filepath lens linear
+         QuickCheck text transformers vector
        ];
        description = "Parsers and utilities for the OBJ WaveFront 3D model format";
        license = stdenv.lib.licenses.mit;
@@ -19353,14 +19401,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "active_0_2_0_11" = callPackage
+  "active_0_2_0_12" = callPackage
     ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
      , semigroups, vector
      }:
      mkDerivation {
        pname = "active";
-       version = "0.2.0.11";
-       sha256 = "0305aefae4d0cecb0854536b1d2f3c9dc8f88eadb344f3684070538b3a3e4e18";
+       version = "0.2.0.12";
+       sha256 = "55281f8fad2b2776969d04d1769fb99498477b58570e02f7a5c69022e3a8b91e";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -20828,14 +20876,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "alex_3_2_0" = callPackage
+  "alex_3_2_1" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy, process
      , QuickCheck
      }:
      mkDerivation {
        pname = "alex";
-       version = "3.2.0";
-       sha256 = "8034ef1e7f66145295a5b0e70de5b6caa409e36888fe4123d0e022aac97a4d92";
+       version = "3.2.1";
+       sha256 = "a4e7f7ec729f4fae5a5c778bc48421a90acf65c7278f6970cf123fb3b6230e6c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -23995,6 +24043,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "app-settings_0_2_0_9" = callPackage
+    ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
+     , parsec, text
+     }:
+     mkDerivation {
+       pname = "app-settings";
+       version = "0.2.0.9";
+       sha256 = "ee844c5ed2847539c84d13d81e827fd2a4f0f9b0b53308f65d24244a027e9024";
+       libraryHaskellDepends = [
+         base containers directory mtl parsec text
+       ];
+       testHaskellDepends = [
+         base containers directory hspec HUnit mtl parsec text
+       ];
+       homepage = "https://github.com/emmanueltouzery/app-settings";
+       description = "A library to manage application settings (INI file-like)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "appar" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -26122,18 +26190,22 @@ self: {
      }) {};
 
   "aur" = callPackage
-    ({ mkDerivation, aeson, base, http-client, http-client-tls, mtl
-     , servant, servant-client, text, transformers
+    ({ mkDerivation, aeson, base, http-client, http-client-tls, servant
+     , servant-client, tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "aur";
-       version = "5.0.1";
-       sha256 = "84182e6288734890c02582814009185a6644760cc4ad0f2a83acc5c6f916227b";
+       version = "6.0.0";
+       sha256 = "d70c3c5954b7003b6ea71266acf1de22e8ecd9e6a4288368ec7a084db02dcdbe";
+       revision = "1";
+       editedCabalFile = "4a58f5e075ddc72a9701937c3d1dd1da4d13095ee307e0918cad04311c99578e";
        libraryHaskellDepends = [
-         aeson base http-client http-client-tls mtl servant servant-client
-         text transformers
+         aeson base http-client servant servant-client text
        ];
-       homepage = "https://github.com/fosskers/haskell-aur";
+       testHaskellDepends = [
+         base http-client http-client-tls tasty tasty-hunit
+       ];
+       homepage = "https://github.com/aurapm/aura";
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30350,14 +30422,14 @@ self: {
      , conduit-combinators, containers, data-default-class
      , double-conversion, hexpat, http-conduit, IntervalMap
      , math-functions, matrices, mtl, optparse-applicative, palette
-     , parallel, primitive, random, samtools, shelly, split, statistics
-     , tasty, tasty-golden, tasty-hunit, text, transformers
+     , parallel, primitive, random, shelly, split, statistics, tasty
+     , tasty-golden, tasty-hunit, text, transformers
      , unordered-containers, vector, vector-algorithms, word8
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.2.3";
-       sha256 = "e83249daa14c7d71319fc167288f791ba3045d43a5fbe9f43ef64eaa918ff2f9";
+       version = "0.2.4";
+       sha256 = "e9ef7a074e8d7fd0d6fb7270f18010dd3d61c69bb06f421acf0930010181a25c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30365,8 +30437,8 @@ self: {
          case-insensitive clustering colour conduit-combinators containers
          data-default-class double-conversion hexpat http-conduit
          IntervalMap math-functions matrices mtl palette parallel primitive
-         samtools split statistics text transformers unordered-containers
-         vector vector-algorithms word8
+         split statistics text transformers unordered-containers vector
+         vector-algorithms word8
        ];
        executableHaskellDepends = [
          base bytestring clustering data-default-class double-conversion
@@ -37479,6 +37551,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "choose" = callPackage
+    ({ mkDerivation, base, MonadRandom }:
+     mkDerivation {
+       pname = "choose";
+       version = "0.1.0.0";
+       sha256 = "e369ec4b733c8ad0e2eb151e171cb1fd4b1f13536975ace6533a437d6ca0fecf";
+       libraryHaskellDepends = [ base MonadRandom ];
+       description = "Choose random elements from a stream";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "choose-exe" = callPackage
+    ({ mkDerivation, base, choose, optparse-applicative, text }:
+     mkDerivation {
+       pname = "choose-exe";
+       version = "0.1.0.0";
+       sha256 = "f842c1f033185fe429a777f65476494a9ce1e9b8d4d3d42f1e6335978c1d8b1b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base choose optparse-applicative text ];
+       executableHaskellDepends = [
+         base choose optparse-applicative text
+       ];
+       description = "Command-line program to choose random element from a stream";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "chorale" = callPackage
     ({ mkDerivation, base, containers, HUnit, ieee754, QuickCheck, safe
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -38255,10 +38354,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.6.23";
-       sha256 = "ec13dd8c85c452751860d761f44744c9a1d70ad81c053fc8a5747c6359a3378c";
-       revision = "2";
-       editedCabalFile = "8755a6b93d6722500034289e29e12fed3c0845fcc33179a9c51b1a0059b375e4";
+       version = "0.6.24";
+       sha256 = "03fddd334133dafc57110657542b1024749fd06d66cecad62853aad4d402acf8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -38285,6 +38382,8 @@ self: {
        pname = "clash-lib";
        version = "0.6.21";
        sha256 = "2b0135d15e5e3b66a59ccdb40a3bf38bb8895bf67c49eb9b54a80082752b98ad";
+       revision = "1";
+       editedCabalFile = "4dc5af7e94897c9afc254661bb7e19a09acd0467be034c8d82bbe5b2582bd262";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath ghc hashable
@@ -38308,6 +38407,8 @@ self: {
        pname = "clash-prelude";
        version = "0.10.14";
        sha256 = "bf99eabf5a0ac6a86523c95a122242d3f5631d1b1870ba83d8e7319f245ef7f2";
+       revision = "1";
+       editedCabalFile = "badae6cf81fc1997c660b45485f9779eeeda298e676b2df6c07b060919b63f19";
        libraryHaskellDepends = [
          array base data-default deepseq ghc-prim ghc-typelits-extra
          ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
@@ -38350,6 +38451,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-systemverilog_0_6_10" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-systemverilog";
+       version = "0.6.10";
+       sha256 = "20c33d2966648ecf383793308b0292437cccd06c4bd5535c1f280689180a2d6b";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-verilog" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
@@ -38368,6 +38487,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-verilog_0_6_10" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-verilog";
+       version = "0.6.10";
+       sha256 = "943c2c8752a3b44badce60595ffc5bbea2c87316681cd69460d75053e00fb26c";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Verilog backend";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-vhdl" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
@@ -38376,6 +38513,8 @@ self: {
        pname = "clash-vhdl";
        version = "0.6.16";
        sha256 = "42f4be26a545144c0e950c2a0b3d59516e93e73ed2c6d32d3c449e233d32b0c8";
+       revision = "1";
+       editedCabalFile = "b2816898222a54367e8426adb2f3359fd32b1ec8e00d546f32ff3f2839c01b3c";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -40002,8 +40141,8 @@ self: {
     ({ mkDerivation, base, bytestring, contravariant, text, vector }:
      mkDerivation {
        pname = "colonnade";
-       version = "0.4.5";
-       sha256 = "df6608adc72dfa980e93ba09ee226ed161aacb810d513662b8557997a8059f0a";
+       version = "0.4.6";
+       sha256 = "8dc53d83e276c1768099491ab9754ac4f04a60aacbe361ad1cdf0db1c05e1aeb";
        libraryHaskellDepends = [
          base bytestring contravariant text vector
        ];
@@ -40132,8 +40271,8 @@ self: {
      }:
      mkDerivation {
        pname = "combinat";
-       version = "0.2.8.1";
-       sha256 = "5a6c09490085056f2b042c814df6f7333b394581dba1c5c7b788bcad81861937";
+       version = "0.2.8.2";
+       sha256 = "d0426b33f1b948f6fbe2a396ff1cabfb3acf6072ab27fffaeebc47140a9af044";
        libraryHaskellDepends = [
          array base containers random transformers
        ];
@@ -40660,6 +40799,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "compiler-warnings" = callPackage
+    ({ mkDerivation, base, binary, parsec, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, text
+     }:
+     mkDerivation {
+       pname = "compiler-warnings";
+       version = "0.1.0";
+       sha256 = "8cf4c57e1b4d61b1163969faa6e9f2cb8f22073fa75bf982d9b8a328225f5ce3";
+       libraryHaskellDepends = [ base binary parsec text ];
+       testHaskellDepends = [
+         base binary parsec tasty tasty-hunit tasty-quickcheck tasty-th text
+       ];
+       homepage = "https://github.com/yi-editor/compiler-warnings#readme";
+       description = "Parser for common compiler warning formats";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "complex-generic" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -42040,8 +42196,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "constraint-classes";
-       version = "0.3.0";
-       sha256 = "369f8b61d20c1f83e6460768a8316b029c32f61c4bfe38e2538c9c075802e8f2";
+       version = "0.4.0";
+       sha256 = "0a5dda19ad7688081e43ec1445eac7a1ae0c4ae54139c4b92fd91e5f872a45b8";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/guaraqe/constraint-classes#readme";
        description = "Prelude classes using ConstraintKinds";
@@ -42732,6 +42888,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "convert-annotation" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, containers, HTTP
+     , lens, lens-aeson, optparse-generic, pipes, pipes-bytestring
+     , pipes-csv, safe, text, wreq
+     }:
+     mkDerivation {
+       pname = "convert-annotation";
+       version = "0.2.0.1";
+       sha256 = "93db09c63eed3c744673d89e20560c028f6e424396933d9a67fb49f78a764449";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers HTTP lens lens-aeson safe text
+         wreq
+       ];
+       executableHaskellDepends = [
+         base bytestring cassava lens optparse-generic pipes
+         pipes-bytestring pipes-csv text
+       ];
+       homepage = "http://github.com/GregorySchwartz/convert-annotation#readme";
+       description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "convertible" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, old-locale
      , old-time, text, time
@@ -45548,8 +45728,8 @@ self: {
     ({ mkDerivation, base, mtl, tasty, tasty-hunit }:
      mkDerivation {
        pname = "curryrs";
-       version = "0.1.0.0";
-       sha256 = "428b80a547271ac00a78a78c457ff827085514e80ff89286d83bb3d4cf3aae42";
+       version = "0.1.1.0";
+       sha256 = "d7e44d1726192f13a9227ca90008d3dc37c0dcc294b9f1dad2260806b803da71";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/mgattozzi/curryrs#readme";
@@ -51629,8 +51809,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process";
-       version = "0.6.4";
-       sha256 = "013d53a6768cb1bbb14b50898cc75033cc058c6f289e6e5add30852a0449414f";
+       version = "0.6.6";
+       sha256 = "e881775dabea50ccd3370242c8a3acd87c9b8ce9e47f3d4c2d0a6b2ec7b3b7d0";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static exceptions hashable mtl network-transport random
@@ -51943,10 +52123,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-simplelocalnet";
-       version = "0.2.3.2";
-       sha256 = "c3351cf8a782dda756689b3747ede1e3879dcb913a07065eb4ec0052a963825f";
-       revision = "1";
-       editedCabalFile = "6cc30bffb992a3af6027e6563720ab3b6a994037066125ffde7024081b58c8e7";
+       version = "0.2.3.3";
+       sha256 = "7b98498f2d6ce185ae0a855ff35e97a9ad1bd1ec7872b2d75aa0bb1f1fb24316";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor distributed-process
          network network-multicast network-transport network-transport-tcp
@@ -52038,8 +52216,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-tests";
-       version = "0.4.6";
-       sha256 = "ba64f41f3e5a5ebd14a9a8e7c4114ea988b1554a80310c528c464746dcd6bf53";
+       version = "0.4.7";
+       sha256 = "8be7d1adf75753957925705fa1b5af20f3d90f71803352bd74e82484c46917b1";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
@@ -52337,8 +52515,8 @@ self: {
      }:
      mkDerivation {
        pname = "dns";
-       version = "2.0.6";
-       sha256 = "148342aaca67c4c6f4a7c15bc50eb13d7f145943277e6f55c1a455208531c0f2";
+       version = "2.0.7";
+       sha256 = "4032a94d66042eb989cb13c7d6dabd4dff898116d7cdb31bc0fa44a056550f8f";
        libraryHaskellDepends = [
          attoparsec base binary bytestring bytestring-builder conduit
          conduit-extra containers iproute mtl network random resourcet safe
@@ -54326,8 +54504,8 @@ self: {
      }:
      mkDerivation {
        pname = "ec2-unikernel";
-       version = "0.9.1";
-       sha256 = "0d35dc753f634dcb5d324843c4914d8271e09356708385c462a1c1759f5e57a1";
+       version = "0.9.2";
+       sha256 = "61485223a42a58d52045c2a44ec7c125f636246cb6152548e706192aae6cde0a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -57638,8 +57816,8 @@ self: {
      }:
      mkDerivation {
        pname = "exhaustive";
-       version = "1.1.2";
-       sha256 = "658e1542d9f11f608a8898a7d4a7953b558095ea337d47dc1ab9996fc060127b";
+       version = "1.1.3";
+       sha256 = "4cda23481da99bf008046726ed4c31ecec5eb41222a11e067a4d7e0f2dda783a";
        libraryHaskellDepends = [
          base generics-sop template-haskell transformers
        ];
@@ -57687,12 +57865,14 @@ self: {
      }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
-    ({ mkDerivation, base, constraints, singletons }:
+    ({ mkDerivation, base, constraints, profunctors, singletons }:
      mkDerivation {
        pname = "exinst";
-       version = "0.1.2";
-       sha256 = "61f1ad1d9ea25e7ff6edca9ac4b01681e6ab5d0af577c1c07c78afdac1ef5cfa";
-       libraryHaskellDepends = [ base constraints singletons ];
+       version = "0.2";
+       sha256 = "64c8d5a121db7274436f4e0fdb5c7ea3c9746419a84c0f16e6edb92bb83c7a3b";
+       libraryHaskellDepends = [
+         base constraints profunctors singletons
+       ];
        homepage = "https://github.com/k0001/exinst";
        description = "Derive instances for your existential types";
        license = stdenv.lib.licenses.bsd3;
@@ -57703,8 +57883,8 @@ self: {
     ({ mkDerivation, aeson, base, constraints, exinst, singletons }:
      mkDerivation {
        pname = "exinst-aeson";
-       version = "0.1.0.2";
-       sha256 = "da509d6ab2c73c22cf718c3b08dcf2327b42abb0f5d0273d38ae4c530f737fa1";
+       version = "0.2";
+       sha256 = "595b0b7b597f73c823a2ceb4758090f09a03b340351ce9abed2f94ece661168b";
        libraryHaskellDepends = [
          aeson base constraints exinst singletons
        ];
@@ -57718,8 +57898,8 @@ self: {
     ({ mkDerivation, base, bytes, constraints, exinst, singletons }:
      mkDerivation {
        pname = "exinst-bytes";
-       version = "0.1.0.2";
-       sha256 = "cc830f4af107b32738f83ef87eb1f77f08453758645bd0519d734beb311dec29";
+       version = "0.2";
+       sha256 = "d25e758ddd2353046204415655b20f7f3f0639db1cb8b8f5b6b24e498777b267";
        libraryHaskellDepends = [
          base bytes constraints exinst singletons
        ];
@@ -57733,8 +57913,8 @@ self: {
     ({ mkDerivation, base, constraints, deepseq, exinst }:
      mkDerivation {
        pname = "exinst-deepseq";
-       version = "0.1.0.1";
-       sha256 = "078e2bb2f7759555976305fcabae776e7ae331f21a9ac3e5d563f923198f3799";
+       version = "0.2";
+       sha256 = "3fc11e61a23996cd923189bc1ef6d67f0c0d2190a021b73cc623476a78c12e61";
        libraryHaskellDepends = [ base constraints deepseq exinst ];
        homepage = "https://github.com/k0001/exinst";
        description = "Derive instances for the `deepseq` library for your existential types";
@@ -57746,8 +57926,8 @@ self: {
     ({ mkDerivation, base, constraints, exinst, hashable, singletons }:
      mkDerivation {
        pname = "exinst-hashable";
-       version = "0.1.0.2";
-       sha256 = "3a3051b1a0ccdd13317dcf190944609604f6ce5004a7b05d8327b7202a90ee65";
+       version = "0.2";
+       sha256 = "be4da58f52ffeb99730063d8adc24a1b4635611b3f08f5bbff49fe9cc620e5f0";
        libraryHaskellDepends = [
          base constraints exinst hashable singletons
        ];
@@ -60691,12 +60871,17 @@ self: {
      }) {};
 
   "fixplate" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, containers, QuickCheck, tasty
+     , tasty-quickcheck
+     }:
      mkDerivation {
        pname = "fixplate";
-       version = "0.1.6";
-       sha256 = "c3227c94b7ccaf27991384bee8bef3288a4a9a87691b50121da1f4b84edc2e43";
+       version = "0.1.7";
+       sha256 = "5e515d0d6256482b13cb1bafcdbcc1e87d094a0e2cd3150b0d648c3577a1342f";
        libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base containers QuickCheck tasty tasty-quickcheck
+       ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Uniplate-style generic traversals for optionally annotated fixed-point types";
        license = stdenv.lib.licenses.bsd3;
@@ -61653,6 +61838,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {foma = null;};
 
+  "font-awesome-type" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "font-awesome-type";
+       version = "0.1";
+       sha256 = "f01932a0d8a2262c79b3eedc57611c53eb66997cd44882706ca2549ddf8c5cda";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/spl/font-awesome-type";
+       description = "A Font Awesome data type enumerating all icon classes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "font-opengl-basic4x6" = callPackage
     ({ mkDerivation, base, GLFW-b, OpenGL }:
      mkDerivation {
@@ -61745,8 +61942,8 @@ self: {
      }:
      mkDerivation {
        pname = "force-layout";
-       version = "0.4.0.5";
-       sha256 = "eac5d4804abe042448fe29cf42d56d782b4853a8c686cd01f0c7b499b2bf65cb";
+       version = "0.4.0.6";
+       sha256 = "f7729855b1b14e0b255325faaca9f4834004e02bd21def6a865d2c55c734259d";
        libraryHaskellDepends = [
          base containers data-default-class lens linear
        ];
@@ -66148,8 +66345,8 @@ self: {
     ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }:
      mkDerivation {
        pname = "ghcjs-dom";
-       version = "0.4.1.0";
-       sha256 = "aa3c9e44ae5ff47b224c8624ea8131cfb02d54f8d7d98935e649a8011f3593c8";
+       version = "0.5.0.0";
+       sha256 = "e3ae6d76bdbff7011baa242123d707c4480dd51e3837d93d87109607c77f39fd";
        libraryHaskellDepends = [
          base ghcjs-dom-jsaddle text transformers
        ];
@@ -66163,8 +66360,8 @@ self: {
     ({ mkDerivation, base, ghcjs-dom, mtl }:
      mkDerivation {
        pname = "ghcjs-dom-hello";
-       version = "3.0.0.0";
-       sha256 = "1cf743f986fe9cd97951efb6182ebf6e5d7b6c920cb92354c11ebea86273b7e5";
+       version = "4.0.0.0";
+       sha256 = "c4ce7931a8121f7f3c78df896af8449eeca4fd11abdd90b4fa338fa207da6c6d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ghcjs-dom mtl ];
@@ -66178,8 +66375,8 @@ self: {
     ({ mkDerivation, jsaddle-dom }:
      mkDerivation {
        pname = "ghcjs-dom-jsaddle";
-       version = "0.4.1.0";
-       sha256 = "e9906ab7606eb22dbb7e48147e1602f0bb62787f3baacda79550d3e9225c14d8";
+       version = "0.5.0.0";
+       sha256 = "8886b7ee0f737b23139845d5dd5c56b79e891df15f632378a064f26d404bbda8";
        libraryHaskellDepends = [ jsaddle-dom ];
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC using jsaddle";
@@ -66191,8 +66388,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "ghcjs-dom-jsffi";
-       version = "0.4.1.0";
-       sha256 = "5cf3d984c17817d0104d7792003d14fd21978571a7b3c977edbd266c8a68c1fe";
+       version = "0.5.0.0";
+       sha256 = "5b7197d8f2869af44f2d7aa925083af2253efbf93be59a09de1b5998ee22f385";
        isLibrary = false;
        isExecutable = false;
        description = "DOM library using JSFFI and GHCJS";
@@ -71803,8 +72000,8 @@ self: {
      }:
      mkDerivation {
        pname = "grid";
-       version = "7.8.5";
-       sha256 = "dc5841ddffcc2dacd6667031fc78d2c0df86a7c8e112b76ba134831e84741fb8";
+       version = "7.8.6";
+       sha256 = "a511a0146446018536176c84e5a134c9bc5ad477717c24bff3e92d52d40bf352";
        libraryHaskellDepends = [ base cereal containers ];
        testHaskellDepends = [
          base containers QuickCheck test-framework
@@ -74042,19 +74239,26 @@ self: {
      }) {};
 
   "hackernews" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, either
-     , HsOpenSSL, hspec, http-streams, io-streams, text, time
-     , transformers
+    ({ mkDerivation, aeson, base, basic-sop, generics-sop, hspec
+     , http-client, http-client-tls, http-types, QuickCheck
+     , quickcheck-instances, servant, servant-client, string-conversions
+     , text, transformers
      }:
      mkDerivation {
        pname = "hackernews";
-       version = "0.5.0.1";
-       sha256 = "dfef879e6256945f2348996dc0c8b8db0d69887e55ef99cae93a46e14c79720e";
+       version = "1.0.0.0";
+       sha256 = "a5fc6c2a3dae3b92eb63cd7bfa5353189919ed22f0e022a17790d510fec2b1e0";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring either HsOpenSSL http-streams
-         io-streams text time transformers
+         aeson base http-client http-types servant servant-client
+         string-conversions text transformers
+       ];
+       executableHaskellDepends = [ base http-client http-client-tls ];
+       testHaskellDepends = [
+         aeson base basic-sop generics-sop hspec http-client http-client-tls
+         QuickCheck quickcheck-instances transformers
        ];
-       testHaskellDepends = [ base hspec transformers ];
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74711,39 +74915,40 @@ self: {
 
   "hakyll" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
-     , cmdargs, containers, cryptohash, data-default, deepseq, directory
-     , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache
-     , mtl, network, network-uri, pandoc, pandoc-citeproc, parsec
-     , process, QuickCheck, random, regex-base, regex-tdfa, resourcet
-     , scientific, snap-core, snap-server, system-filepath, tagsoup
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, time-locale-compat, unordered-containers, utillinux
-     , vector, yaml
+     , containers, cryptohash, data-default, deepseq, directory
+     , filepath, fsnotify, http-conduit, http-types, lrucache, mtl
+     , network, network-uri, optparse-applicative, pandoc
+     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
+     , regex-tdfa, resourcet, scientific, system-filepath, tagsoup
+     , tasty, tasty-hunit, tasty-quickcheck, text, time
+     , time-locale-compat, unordered-containers, utillinux, vector, wai
+     , wai-app-static, warp, yaml
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.8.3.2";
-       sha256 = "ddc8c659590d29ba34afdced18ff1e60dc9d1bfb102a5cc7df447e31ee5e0b39";
+       version = "4.9.0.0";
+       sha256 = "6c21697efaf30166a1afc508f1122e2b828ade9d8d4d53408b13c1216337295e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring cmdargs containers
+         base binary blaze-html blaze-markup bytestring containers
          cryptohash data-default deepseq directory filepath fsnotify
-         http-conduit http-types lrucache mtl network network-uri pandoc
-         pandoc-citeproc parsec process random regex-base regex-tdfa
-         resourcet scientific snap-core snap-server system-filepath tagsoup
-         text time time-locale-compat unordered-containers vector yaml
+         http-conduit http-types lrucache mtl network network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process random
+         regex-base regex-tdfa resourcet scientific system-filepath tagsoup
+         text time time-locale-compat unordered-containers vector wai
+         wai-app-static warp yaml
        ];
        executableHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring cmdargs containers
+         base binary blaze-html blaze-markup bytestring containers
          cryptohash data-default deepseq directory filepath fsnotify
-         http-conduit http-types HUnit lrucache mtl network network-uri
-         pandoc pandoc-citeproc parsec process QuickCheck random regex-base
-         regex-tdfa resourcet scientific snap-core snap-server
-         system-filepath tagsoup test-framework test-framework-hunit
-         test-framework-quickcheck2 text time time-locale-compat
-         unordered-containers vector yaml
+         http-conduit http-types lrucache mtl network network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process
+         QuickCheck random regex-base regex-tdfa resourcet scientific
+         system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text
+         time time-locale-compat unordered-containers vector wai
+         wai-app-static warp yaml
        ];
        testToolDepends = [ utillinux ];
        homepage = "http://jaspervdj.be/hakyll";
@@ -75129,6 +75334,27 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "halvm-web" = callPackage
+    ({ mkDerivation, async, base, bytestring, cereal, containers
+     , HALVMCore, hans, HTTP, mime-types, network-uri, simple-tar, text
+     , XenDevice
+     }:
+     mkDerivation {
+       pname = "halvm-web";
+       version = "0.3.0.0";
+       sha256 = "d1f2da05f50c235cf01112b5d31dfc4e7aa0b0cfc7b3bdaaf735190dd3535992";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async base bytestring cereal containers HALVMCore hans HTTP
+         mime-types network-uri simple-tar text XenDevice
+       ];
+       homepage = "http://halvm.org";
+       description = "A simple, static HaLVM web server";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {HALVMCore = null; XenDevice = null;};
+
   "hamid" = callPackage
     ({ mkDerivation, base, HCodecs, newtype }:
      mkDerivation {
@@ -75639,8 +75865,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-authenticate";
-       version = "2.3.4.5";
-       sha256 = "65553a742d47f7209e0f42234c2e6f790a98f68386eea108a42b9c3a46fc4cd2";
+       version = "2.3.4.6";
+       sha256 = "633fb4d68122bd33725adb4f39e348b0ca293041abbf9941a3e5e2ce784d641a";
        libraryHaskellDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
          bytestring containers data-default email-validate filepath
@@ -76249,6 +76475,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) capstone;};
 
+  "haquery" = callPackage
+    ({ mkDerivation, base, containers, parsec, split, tagsoup, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "haquery";
+       version = "0.1.1.3";
+       sha256 = "6a07f654bee6628fee163d7203380ac8b55f1e916ad47d22d8ec43c841803096";
+       libraryHaskellDepends = [
+         base containers parsec split tagsoup text transformers
+       ];
+       homepage = "https://github.com/crufter/haquery";
+       description = "jQuery for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "har" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath, text
      }:
@@ -88998,6 +89240,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsexif_0_6_0_10" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
+     , iconv, text, time
+     }:
+     mkDerivation {
+       pname = "hsexif";
+       version = "0.6.0.10";
+       sha256 = "64cb8abfa31085475ae45fddfc2716cb40764714d47c0fc6146fec2b8ab65d33";
+       libraryHaskellDepends = [
+         base binary bytestring containers iconv text time
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers hspec HUnit iconv text time
+       ];
+       homepage = "https://github.com/emmanueltouzery/hsexif";
+       description = "EXIF handling library in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsfacter" = callPackage
     ({ mkDerivation, base, containers, language-puppet, text }:
      mkDerivation {
@@ -89195,8 +89457,8 @@ self: {
     ({ mkDerivation, base, directory, filepath }:
      mkDerivation {
        pname = "hsinstall";
-       version = "1.4";
-       sha256 = "d0be47492395a079e447bcebd54f63522b6f957c51bee9f78b5d4cddaa548869";
+       version = "1.5";
+       sha256 = "77848b03600f68d6cceab565aa6ac165c11855c061cbd27b03b4edb3985c1a1c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -89679,15 +89941,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_3_1" = callPackage
+  "hspec_2_3_2" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.3.1";
-       sha256 = "62b501f1150c40d65836bef9cafcd427390db9dc48c9a3aa7d4633ea6cc7b22c";
+       version = "2.3.2";
+       sha256 = "e852f69cd585cc945c2a9aa191ae6f8894f2e7e10685d60bfed29b521f032fb4";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -89773,7 +90035,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_3_1" = callPackage
+  "hspec-core_2_3_2" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq
      , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
      , quickcheck-io, random, setenv, silently, tf-random, time
@@ -89781,8 +90043,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.3.1";
-       sha256 = "3136a34ae0ff45aec4449b1aab90a9dbb61ae57d7adfa4ef567eb39728fd9008";
+       version = "2.3.2";
+       sha256 = "1c6d5d07475a4de72837b1739e0e94cfa2896e762af403d1978ee4df683541b9";
        libraryHaskellDepends = [
          ansi-terminal async base call-stack deepseq hspec-expectations
          HUnit QuickCheck quickcheck-io random setenv tf-random time
@@ -89815,12 +90077,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_3_1" = callPackage
+  "hspec-discover_2_3_2" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.3.1";
-       sha256 = "3c8fa99104ca21a6aa247d4b9db9211b2cf800d48f61e6396c184aaff8d92d97";
+       version = "2.3.2";
+       sha256 = "fd36c9b91d417d0bb9041e0c2f148fa593dd752d4d62a8ca156fb3d8f88fe35f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -89844,12 +90106,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-expectations_0_8_0" = callPackage
+  "hspec-expectations_0_8_2" = callPackage
     ({ mkDerivation, base, call-stack, HUnit, nanospec }:
      mkDerivation {
        pname = "hspec-expectations";
-       version = "0.8.0";
-       sha256 = "e861250530897df93716a198b147f2cf90e02c34149bef3c41584ba0c90d4baa";
+       version = "0.8.2";
+       sha256 = "819607ea1faf35ce5be34be61c6f50f3389ea43892d56fb28c57a9f5d54fb4ef";
        libraryHaskellDepends = [ base call-stack HUnit ];
        testHaskellDepends = [ base call-stack HUnit nanospec ];
        homepage = "https://github.com/hspec/hspec-expectations#readme";
@@ -90065,17 +90327,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-meta_2_3_1" = callPackage
+  "hspec-meta_2_3_2" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq
      , directory, filepath, hspec-expectations, HUnit, QuickCheck
      , quickcheck-io, random, setenv, time, transformers
      }:
      mkDerivation {
        pname = "hspec-meta";
-       version = "2.3.1";
-       sha256 = "ec482dc49765d88de40064e02307f8d9dea3ba1caec38047869a7974f1487f95";
-       revision = "1";
-       editedCabalFile = "36a143859e8b1e1c8f07c5dc29b822a1676cd8e5d1b1ac85282bf8ddfc4394a4";
+       version = "2.3.2";
+       sha256 = "59b1ba3f32f443fdcdef345905a4d0b60c31c36894e56d34a9ac6cf406578a8b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90619,6 +90879,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hsqml-demo-manic" = callPackage
+    ({ mkDerivation, base, containers, hsqml, MonadRandom, text }:
+     mkDerivation {
+       pname = "hsqml-demo-manic";
+       version = "0.3.4.0";
+       sha256 = "a663ed9f750a0d0f0a37a2640212ea992dc025912d723e8944e9875295699626";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers hsqml MonadRandom text
+       ];
+       homepage = "http://www.gekkou.co.uk/software/hsqml/";
+       description = "HsQML-based clone of Pipe Mania";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hsqml-demo-morris" = callPackage
     ({ mkDerivation, base, containers, deepseq, directory, hsqml
      , OddWord, text
@@ -91972,7 +92248,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http-conduit_2_2_2_1" = callPackage
+  "http-conduit_2_2_3" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, connection, cookie
      , data-default-class, exceptions, hspec, http-client
@@ -91982,8 +92258,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.2.2.1";
-       sha256 = "1ec7feb0ee0263559ccccc729e760990f4908cf1b1eeb2af221afeec34d23c57";
+       version = "2.2.3";
+       sha256 = "eee51e80fe76b3bf4b4041545f452e126e0593f70a0623a5a35ee47d72fe0dc3";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra exceptions http-client
          http-client-tls http-types lifted-base monad-control mtl resourcet
@@ -92246,15 +92522,16 @@ self: {
      }) {};
 
   "http-pony" = callPackage
-    ({ mkDerivation, base, bytestring, network, pipes, pipes-network
-     , pipes-safe, transformers
+    ({ mkDerivation, base, bytestring, exceptions, network, pipes
+     , pipes-network, pipes-safe, transformers
      }:
      mkDerivation {
        pname = "http-pony";
-       version = "0.1.0.3";
-       sha256 = "b65e845f84d98fd9fc774049f0c3aaa2e0183e875085d793cfa9b9705d1cd1fa";
+       version = "0.1.0.5";
+       sha256 = "255ca693eeb4cff7c3315e75fe63414b987f56a0424ec80e579d2c0f357f78e1";
        libraryHaskellDepends = [
-         base bytestring network pipes pipes-network pipes-safe transformers
+         base bytestring exceptions network pipes pipes-network pipes-safe
+         transformers
        ];
        homepage = "https://github.com/nfjinjing/http-pony";
        description = "A type unsafe http library";
@@ -92285,10 +92562,11 @@ self: {
     ({ mkDerivation, base, case-insensitive, lens, profunctors }:
      mkDerivation {
        pname = "http-pony-transformer-case-insensitive";
-       version = "0.1.0.1";
-       sha256 = "6a2ebc104954c62b91444e1789f1672ee6bc1237ca3e1b0d86b43c3455881c1c";
+       version = "0.1.0.2";
+       sha256 = "399b3dffbe4ee4f6723ac92c3f6914bfa261499977919752de7e69bc0ac7cb91";
        libraryHaskellDepends = [ base case-insensitive lens profunctors ];
        homepage = "https://github.com/nfjinjing/http-pony-transformer-case-insensitive";
+       description = "Tag http headers as case insensitive";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -92298,11 +92576,12 @@ self: {
      }:
      mkDerivation {
        pname = "http-pony-transformer-http";
-       version = "0.1.0.0";
-       sha256 = "645623db8c4bf92746358fbbc0cf4e7d19392565f4c019f9dc8d1df515efeba3";
+       version = "0.1.0.2";
+       sha256 = "67671bdaf54937aa21054be059910748db9b736cf2d56146825e09d9a1dd67fe";
        libraryHaskellDepends = [
          attoparsec base bytestring pipes pipes-attoparsec transformers
        ];
+       description = "Transform raw TCP stream to a basic HTTP type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -92310,8 +92589,8 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, http-types, lens }:
      mkDerivation {
        pname = "http-pony-transformer-startline";
-       version = "0.1.0.0";
-       sha256 = "a0aa55e3ce44b1256588c7c584622b3f6685dd2134f499532e2afd99ab034bb3";
+       version = "0.1.0.1";
+       sha256 = "797995f992cc366b94c16f3e85d5c5cadec3fc4475f72511472d12f2ec67bf39";
        libraryHaskellDepends = [
          attoparsec base bytestring http-types lens
        ];
@@ -93191,18 +93470,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hw-bits_0_2_0_2" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap
-     , parsec, QuickCheck, resourcet, safe, vector
+  "hw-bits_0_3_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim
+     , hw-string-parse, mmap, QuickCheck, resourcet, safe, vector
      }:
      mkDerivation {
        pname = "hw-bits";
-       version = "0.2.0.2";
-       sha256 = "32dd71a6265b6c7ab296dbf23eb865247f111a4e3bfba01ea18d8e5d7e169641";
+       version = "0.3.0.0";
+       sha256 = "86195b35765604cead092fdb27a48852b1d587d672646721aab9d4d8e6696251";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring hw-prim parsec safe vector
+         base bytestring hw-prim hw-string-parse safe vector
        ];
        executableHaskellDepends = [
          base criterion mmap resourcet vector
@@ -93212,7 +93491,7 @@ self: {
        ];
        homepage = "http://github.com/haskell-works/hw-bits#readme";
        description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -93629,6 +93908,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hxt_9_3_1_16" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , directory, filepath, hxt-charproperties, hxt-regex-xmlschema
+     , hxt-unicode, mtl, network-uri, parsec
+     }:
+     mkDerivation {
+       pname = "hxt";
+       version = "9.3.1.16";
+       sha256 = "0d55e35cc718891d0987b7c8e6c43499efa727c68bc92e88e8b99461dff403e3";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq directory filepath
+         hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
+         parsec
+       ];
+       homepage = "https://github.com/UweSchmidt/hxt";
+       description = "A collection of tools for processing XML with Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hxt-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, bzlib, deepseq
      , haskell98, hxt
@@ -93648,15 +93947,15 @@ self: {
 
   "hxt-cache" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , directory, filepath, hxt, SHA, time, unix
+     , directory, filepath, hxt, SHA, time, unix-compat
      }:
      mkDerivation {
        pname = "hxt-cache";
-       version = "9.1.0.1";
-       sha256 = "f470012bcde9fe0a534b540abddd3434b61814c89f596858b88619147a8223ce";
+       version = "9.1.0.2";
+       sha256 = "5899644e5fa375ec8417febd8dbdcbdda50822963f91a9fdedfc95e706a6e41f";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath hxt
-         SHA time unix
+         SHA time unix-compat
        ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "Cache for HXT XML Documents and other binary data";
@@ -93788,6 +94087,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hxt-regex-xmlschema_9_2_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, hxt-charproperties
+     , parsec, text
+     }:
+     mkDerivation {
+       pname = "hxt-regex-xmlschema";
+       version = "9.2.0.3";
+       sha256 = "f4743ba65498d6001cdfcf5cbc3317d4bc43941be5c7030b60beb83408c892b0";
+       libraryHaskellDepends = [
+         base bytestring hxt-charproperties parsec text
+       ];
+       testHaskellDepends = [ base bytestring HUnit parsec text ];
+       homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
+       description = "A regular expression library for W3C XML Schema regular expressions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hxt-relaxng" = callPackage
     ({ mkDerivation, base, containers, hxt, hxt-charproperties
      , hxt-regex-xmlschema, network-uri, parsec
@@ -94236,8 +94553,8 @@ self: {
      }:
      mkDerivation {
        pname = "hylolib";
-       version = "1.5.2";
-       sha256 = "6aa2533ab21c08b9d55036d67c6a10f6836f42dbeabe18673bfda28f764d7082";
+       version = "1.5.3";
+       sha256 = "8b3c5ffe38b149ba990bf2afd508dfa372b44eb09930497cc8c45276f87df5ca";
        libraryHaskellDepends = [
          array base containers mtl pretty random uniplate
        ];
@@ -94276,6 +94593,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hyper" = callPackage
+    ({ mkDerivation, base, blaze-html, deepseq, text }:
+     mkDerivation {
+       pname = "hyper";
+       version = "0.1.0.0";
+       sha256 = "04c76c0c88f658e9878f8090cc2e1351977128861ce4c03ce52d11c42e44b3da";
+       libraryHaskellDepends = [ base blaze-html deepseq text ];
+       description = "Display class for the HyperHaskell graphical Haskell interpreter";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hyper-extra" = callPackage
+    ({ mkDerivation, base, diagrams-lib, diagrams-svg, hyper
+     , svg-builder, text
+     }:
+     mkDerivation {
+       pname = "hyper-extra";
+       version = "0.1.0.0";
+       sha256 = "1c36de58e0f51cfc3f47c83185c9d08539491d208c3b956f7de1119cd94858c8";
+       libraryHaskellDepends = [
+         base diagrams-lib diagrams-svg hyper svg-builder text
+       ];
+       description = "Display instances for the HyperHaskell graphical Haskell interpreter";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hyper-haskell-server" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions, hint
+     , hyper, scotty, text, transformers
+     }:
+     mkDerivation {
+       pname = "hyper-haskell-server";
+       version = "0.1.0.0";
+       sha256 = "dcbd3d4e9b4026d6531fb54041e5ce595cec4094098a902d9e24c8f7b69516b8";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring deepseq exceptions hint hyper scotty text
+         transformers
+       ];
+       description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hyperdrive" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing
      , extensible-exceptions, mtl, network, pipes, pretty
@@ -97558,6 +97919,8 @@ self: {
        pname = "ion";
        version = "1.0.0.0";
        sha256 = "24a364e30e6baeb531c8f040d3cea6d368c6457cabe58a21fb98f21333b7cc0d";
+       revision = "1";
+       editedCabalFile = "468bd67b256d96d6a7950870abb2c90f98815b759f89658022ece91fe234c3d9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97673,6 +98036,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ip6addr_0_5_1_4" = callPackage
+    ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
+     mkDerivation {
+       pname = "ip6addr";
+       version = "0.5.1.4";
+       sha256 = "fe5f93753026cc82123cbf626473d9353c94d8f681e90771b63dfebdd2f1f2f8";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base cmdargs IPv6Addr text ];
+       homepage = "https://github.com/MichelBoucey/ip6addr";
+       description = "Commandline tool to generate IPv6 address text representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ipatch" = callPackage
     ({ mkDerivation, base, bytestring, darcs, directory, filepath
      , hashed-storage, process, unix
@@ -97759,8 +98137,8 @@ self: {
      }:
      mkDerivation {
        pname = "iproute";
-       version = "1.7.0";
-       sha256 = "65dd0033101702cd3ba291ff52d5d2563a89087fda7bb7e4bd5a301042049ede";
+       version = "1.7.1";
+       sha256 = "57b8d03ca8ce92f8ec1334564f3edff53a0621ccbc43c00ba02eaa5007ee3eee";
        libraryHaskellDepends = [
          appar base byteorder containers network
        ];
@@ -98583,6 +98961,8 @@ self: {
        pname = "ivory";
        version = "0.1.0.3";
        sha256 = "e842ec8c195c2f148c393d09471c96bcae09c1fd5260f102df6b26b591da91e6";
+       revision = "1";
+       editedCabalFile = "2149b10ef5f9149f362f51960ddd252205c4ee348869741e70d3a33892fe66be";
        libraryHaskellDepends = [
          array base base-compat containers dlist filepath monadLib pretty
          template-haskell text th-lift
@@ -99597,17 +99977,17 @@ self: {
 
   "jsaddle" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, doctest
-     , filepath, http-types, lens, primitive, process, QuickCheck, stm
-     , template-haskell, text, time, transformers, vector, wai
-     , wai-app-static, wai-websockets, warp, websockets
+     , filepath, http-types, lens, primitive, process, QuickCheck
+     , ref-tf, stm, template-haskell, text, time, transformers, vector
+     , wai, wai-app-static, wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.5.1.0";
-       sha256 = "b97d31c176d1862103cabd8fe948c059f04de5c4ca4e4404001625827a5a506c";
+       version = "0.5.2.0";
+       sha256 = "216fe089de60352956df2aa3abcb1e28861e81d1943ae1a17ac7947aad18a4fb";
        libraryHaskellDepends = [
          aeson base bytestring containers filepath http-types lens primitive
-         process stm template-haskell text time transformers wai
+         process ref-tf stm template-haskell text time transformers wai
          wai-app-static wai-websockets warp websockets
        ];
        testHaskellDepends = [
@@ -99625,8 +100005,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-dom";
-       version = "0.4.1.0";
-       sha256 = "c9038d2d124dfd330112470caee81a69b3918de186135f0c24525f4f81ec1b74";
+       version = "0.5.0.0";
+       sha256 = "7edcda4cc112e983651be34824cf44109685e93360157b68f618ff05a7601c73";
        libraryHaskellDepends = [
          base base-compat jsaddle lens text transformers
        ];
@@ -104644,8 +105024,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion";
-       version = "0.5.0.0";
-       sha256 = "d9361ee7d554b7700d71ca13a258773513f5931ebfa5d7874cfbb45b6f794c44";
+       version = "0.5.0.1";
+       sha256 = "2863daa3d874bd257a22b6795c502c4bfe73d3790e200462983d32b5b53999d0";
        libraryHaskellDepends = [
          aeson attoparsec base binary binary-conduit bytestring
          canteven-http canteven-log conduit conduit-extra containers
@@ -104659,14 +105039,59 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "legion-discovery" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, Cabal
+     , canteven-http, canteven-log, conduit, containers
+     , data-default-class, http-types, legion, legion-extra
+     , monad-logger, scotty, scotty-resource, SHA, text, time
+     , transformers, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "legion-discovery";
+       version = "0.2.1.1";
+       sha256 = "9ecb4471cf9a52fd973d95c356d35542e4b12306eb7078f43e4a279d0c478131";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring Cabal canteven-http canteven-log
+         conduit containers data-default-class http-types legion
+         legion-extra monad-logger scotty scotty-resource SHA text time
+         transformers wai wai-extra warp
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/owensmurray/legion-discovery#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "legion-discovery-client" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , data-default-class, http-client, http-types, load-balancing
+     , network, text
+     }:
+     mkDerivation {
+       pname = "legion-discovery-client";
+       version = "0.1.0.1";
+       sha256 = "6235b5f23411bfe0807274e4e31b5e9f805045b214f63a2cfbefed29d9fe27f1";
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal containers data-default-class
+         http-client http-types load-balancing network text
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/owensmurray/legion-discovery-client#readme";
+       description = "Client library for communicating with legion-discovery";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "legion-extra" = callPackage
     ({ mkDerivation, aeson, base, bytestring, canteven-log, containers
      , data-default-class, legion, network, safe, split, yaml
      }:
      mkDerivation {
        pname = "legion-extra";
-       version = "0.1.0.1";
-       sha256 = "62687c1c0f6175338fe9bbfbb1c94befddf8f580baf7b603e11308a23e999f5d";
+       version = "0.1.0.3";
+       sha256 = "f53bec687bb2a6d878dbc63a7ba90955f6cfa77a99a074bcc7a3ee9d44702a5e";
        libraryHaskellDepends = [
          aeson base bytestring canteven-log containers data-default-class
          legion network safe split yaml
@@ -106497,8 +106922,8 @@ self: {
      }:
      mkDerivation {
        pname = "linear-opengl";
-       version = "0.2.0.10";
-       sha256 = "9dc10dc309a2b6eb64da004106fa6a4c50beabc6c06e5fbb917e46ce5133217d";
+       version = "0.3.0.0";
+       sha256 = "d95cc9b0cce5162c0942550d4b8884fc13664994395237a8362279c0aa7ee01f";
        libraryHaskellDepends = [
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
@@ -107492,8 +107917,8 @@ self: {
      }:
      mkDerivation {
        pname = "live-sequencer";
-       version = "0.0.4";
-       sha256 = "d4981f43c98752a8258a67b40e2ecd49821a03c0795176a5fbd48b73aed0c812";
+       version = "0.0.5.1";
+       sha256 = "d4453e597c7804b14554b873b1b2d40c043d79b488868e7c1879e50346927ac1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base event-list non-negative ];
@@ -107986,6 +108411,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "load-balancing" = callPackage
+    ({ mkDerivation, base, containers, hslogger, PSQueue, stm }:
+     mkDerivation {
+       pname = "load-balancing";
+       version = "1.0.1.0";
+       sha256 = "332a7c437b9115b33913becd78d855ff7dc0407f58cfe065e8cd14ce0f7eb99f";
+       libraryHaskellDepends = [ base containers hslogger PSQueue stm ];
+       homepage = "https://github.com/SumAll/haskell-load-balancing";
+       description = "Client-side load balancing utilities";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "load-env" = callPackage
     ({ mkDerivation, base, directory, hspec, HUnit, parsec }:
      mkDerivation {
@@ -110731,30 +111168,6 @@ self: {
      }:
      mkDerivation {
        pname = "markdown";
-       version = "0.1.14";
-       sha256 = "204e9e0c100c8477266ab6b43990a5215ba07ac9ea280912794c32eef38dd42f";
-       libraryHaskellDepends = [
-         attoparsec base blaze-html blaze-markup conduit conduit-extra
-         containers data-default text transformers xml-conduit xml-types
-         xss-sanitize
-       ];
-       testHaskellDepends = [
-         base blaze-html conduit conduit-extra containers directory filepath
-         hspec text transformers
-       ];
-       homepage = "https://github.com/snoyberg/markdown";
-       description = "Convert Markdown to HTML, with XSS protection";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "markdown_0_1_15" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
-     , conduit, conduit-extra, containers, data-default, directory
-     , filepath, hspec, text, transformers, xml-conduit, xml-types
-     , xss-sanitize
-     }:
-     mkDerivation {
-       pname = "markdown";
        version = "0.1.15";
        sha256 = "5bf44c4a0df5a9c43dc7fcac86cbbd586c703e1a5f8ba6a77ea8f8207152e628";
        libraryHaskellDepends = [
@@ -110769,7 +111182,6 @@ self: {
        homepage = "https://github.com/snoyberg/markdown";
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown-kate" = callPackage
@@ -111365,21 +111777,21 @@ self: {
 
   "maxsharing" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, boxes, containers
-     , containers-unicode-symbols, HaLeX, IndentParser, mtl, parsec
+     , containers-unicode-symbols, fgl, HaLeX, indentparser, mtl, parsec
      , process, uuagc, uuagc-cabal
      }:
      mkDerivation {
        pname = "maxsharing";
-       version = "1.0.3";
-       sha256 = "4b9ae7230c590b7d9e6060d791e01d9bda953ae41d47c6e88912325b30e8a284";
+       version = "1.1";
+       sha256 = "1cd275f8fc8994ba00320a243a2acad13f457eb2f0e2a9e4797a8b0f54f0646f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base base-unicode-symbols boxes containers
-         containers-unicode-symbols HaLeX IndentParser mtl parsec process
-         uuagc uuagc-cabal
+         containers-unicode-symbols fgl HaLeX indentparser mtl parsec
+         process uuagc uuagc-cabal
        ];
-       homepage = "http://rochel.info/maxsharing/";
+       homepage = "http://arxiv.org/abs/1401.1460";
        description = "Maximal sharing of terms in the lambda calculus with letrec";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116756,6 +117168,8 @@ self: {
        pname = "multistate";
        version = "0.7.1.1";
        sha256 = "609650cbbfd102c775b44be3fd7bb4f6732127e64b21dd45ea1af057c5ffb8a6";
+       revision = "1";
+       editedCabalFile = "a5bd571eb919e74f8ba5313ffca801dce8c1fe1dd2c6699eadab39b0e37ae13b";
        libraryHaskellDepends = [
          base monad-control mtl tagged transformers transformers-base
        ];
@@ -118835,13 +119249,13 @@ self: {
      }:
      mkDerivation {
        pname = "netwire";
-       version = "5.0.1";
-       sha256 = "199dd2bb49fdf31ed125e4063ba3545a0d73eff36c3ed38014df30965524f4c7";
+       version = "5.0.2";
+       sha256 = "4d790f19642c62e555d167d53d88da56cc83daf093ff4ee37c83e21a2112cd83";
        libraryHaskellDepends = [
          base containers deepseq parallel profunctors random semigroups time
          transformers
        ];
-       homepage = "http://hub.darcs.net/ertes/netwire";
+       homepage = "https://github.com/esoeylemez/netwire";
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119367,8 +119781,8 @@ self: {
     ({ mkDerivation, base, network }:
      mkDerivation {
        pname = "network-multicast";
-       version = "0.1.1";
-       sha256 = "f44c0b10569a10349d6e5a587ba3ed85a61a56a001939f1b6fb1b15911e8b742";
+       version = "0.1.2";
+       sha256 = "82dcd07dd7f62d0ba23f4b37469768f07bcf6bd888dd54ebe61603f6fd2ccefb";
        libraryHaskellDepends = [ base network ];
        description = "Simple multicast library";
        license = stdenv.lib.licenses.publicDomain;
@@ -119922,6 +120336,8 @@ self: {
        pname = "newtype-generics";
        version = "0.4.1";
        sha256 = "a5ed63130601fa2f97b105adeced7e691ee7924bcfd3f7da6605495f7a655fe2";
+       revision = "1";
+       editedCabalFile = "75d1f6c129b225524a80de19734b5477f45c63a185258954d59f4da5e6a35873";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "A typeclass and set of functions for working with newtypes, with generics support";
@@ -120018,8 +120434,8 @@ self: {
     ({ mkDerivation, async, base, bytestring, template-haskell, unix }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.2.0.0";
-       sha256 = "fce59fdf3b552509a291d50c485a5847a28cfd6f6199158c2621a13f07ddd26c";
+       version = "0.2.1.0";
+       sha256 = "877cdac98af15734ceb0fef6d4096a48a78c40e20fceabc0d9dd15811a2e760f";
        libraryHaskellDepends = [
          async base bytestring template-haskell unix
        ];
@@ -121367,6 +121783,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "obd" = callPackage
+    ({ mkDerivation, base, bytestring, dimensional, either, haskeline
+     , io-streams, lens, mtl, optparse-applicative, serialport, split
+     , stm, stm-chans, transformers
+     }:
+     mkDerivation {
+       pname = "obd";
+       version = "0.1.0.0";
+       sha256 = "99625705214cc2b4d0445a138fbdcd2f47beadfcc31aeedb4cde282127ed5cd1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring dimensional either io-streams lens mtl serialport
+         split stm stm-chans transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring haskeline mtl optparse-applicative transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/hverr/haskell-obd#readme";
+       description = "Communicate to OBD interfaces over ELM327";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "obdd" = callPackage
     ({ mkDerivation, array, base, containers, mtl, random }:
      mkDerivation {
@@ -122276,8 +122716,8 @@ self: {
     ({ mkDerivation, atomspace-cwrapper, base, transformers }:
      mkDerivation {
        pname = "opencog-atomspace";
-       version = "0.1.0.3";
-       sha256 = "c4848b27f3c2d6f7e2fc22d338a9bc1547c5282d970c0d7d4d83672a948e4dd0";
+       version = "0.1.0.4";
+       sha256 = "86d9371d31722da33abb7ca7690e064f87e0d772622d4b798c23f8b8cee5e52e";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ atomspace-cwrapper ];
        homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell";
@@ -122828,6 +123268,8 @@ self: {
        pname = "operational";
        version = "0.2.3.3";
        sha256 = "25489ee5475e5dd8bc5fb415a0189ef6f7e84253f4e392ff5f40b3c3ff1e406c";
+       revision = "1";
+       editedCabalFile = "5a688a78ec908382a5bfebd425340268ef6b53f5985ca7d13a54aeffa86c079b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl ];
@@ -124179,8 +124621,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.10.1.1";
-       sha256 = "67ea382f068ecc5eea1ad44c515e7aaa56d3e60e6be18ed3d2ec5cfd85eb8432";
+       version = "0.10.1.2";
+       sha256 = "be7b3776a338c4fc46565978bc8c89783e90c3853fe5bc447ddc9bf053bf5f39";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124378,6 +124820,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-types_1_17_0_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+     , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "pandoc-types";
+       version = "1.17.0.4";
+       sha256 = "531996e547714e34a2e4134e9e80dad9929bbc6814ebb5515f95538fa76c3f74";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq ghc-prim QuickCheck syb
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers HUnit QuickCheck string-qq
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "http://johnmacfarlane.net/pandoc";
+       description = "Types for representing a structured document";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-unlit" = callPackage
     ({ mkDerivation, base, pandoc }:
      mkDerivation {
@@ -124874,6 +125338,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pareto" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "pareto";
+       version = "0.1.0.0";
+       sha256 = "edc54861e89b3f4b36f4c1be63e424adbe4a2068ed6c5c8fefeb61c9d387a3dd";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://bitbucket.org/hyllos/pareto-haskell";
+       description = "A library for cause-effect relationships";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "parport" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -125477,19 +125953,21 @@ self: {
      }) {};
 
   "patat" = callPackage
-    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
-     , directory, filepath, mtl, optparse-applicative, pandoc
-     , terminal-size, time
+    ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
+     , bytestring, containers, directory, filepath, highlighting-kate
+     , mtl, optparse-applicative, pandoc, terminal-size, text, time
+     , yaml
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.1.0.0";
-       sha256 = "565b5885113d5805e15cb29be37feb1a45b10bd3202b474acc04a14bfe82c87e";
+       version = "0.3.0.0";
+       sha256 = "898abcb5b2eda94e9943cde4605e7594d3b1be04fdb477e7ac0560f8139c3d18";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal ansi-wl-pprint base containers directory filepath mtl
-         optparse-applicative pandoc terminal-size time
+         aeson ansi-terminal ansi-wl-pprint base bytestring containers
+         directory filepath highlighting-kate mtl optparse-applicative
+         pandoc terminal-size text time yaml
        ];
        homepage = "http://github.com/jaspervdj/patat";
        description = "Terminal-based presentations using Pandoc";
@@ -127413,8 +127891,8 @@ self: {
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
        pname = "phaser";
-       version = "0.1.1.0";
-       sha256 = "54ecb42b832a83dba458c0974c07ce956e274d579b72aa7ba3e85fee039b063e";
+       version = "0.2.0.0";
+       sha256 = "2026931bbcd25bd60809bada559f82126ce357c60f536da103a33ab3700fda88";
        libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/quickdudley/phaser";
        description = "Incremental multiple pass parser library";
@@ -128382,6 +128860,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-extras_1_0_7" = callPackage
+    ({ mkDerivation, base, foldl, HUnit, pipes, test-framework
+     , test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-extras";
+       version = "1.0.7";
+       sha256 = "f4d441160cf5d50ad83c15c88c80b835e39d7a73a4e7943c6a6d4c796df28be2";
+       libraryHaskellDepends = [ base foldl pipes transformers ];
+       testHaskellDepends = [
+         base HUnit pipes test-framework test-framework-hunit transformers
+       ];
+       description = "Extra utilities for pipes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-fastx" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, pipes
      , pipes-attoparsec, pipes-bytestring
@@ -128669,8 +129164,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-protolude";
-       version = "0.1.0.0";
-       sha256 = "e4ac3b48483efe76378cfbc1c6401f44de735f3431a5900d36e3b920c27f4979";
+       version = "0.1.0.1";
+       sha256 = "7f3d93fb093250f6d85c7e9262bd243c6966451ed867fe204af3fe0b56abea73";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -133139,23 +133634,6 @@ self: {
      }:
      mkDerivation {
        pname = "protolude";
-       version = "0.1.7";
-       sha256 = "7b8386d3e6d15f477bbbe4e8901ae840509bb6d0d63c6e98f8ca7c13f2473b79";
-       libraryHaskellDepends = [
-         async base bytestring containers deepseq ghc-prim mtl safe stm text
-         transformers
-       ];
-       homepage = "https://github.com/sdiehl/protolude";
-       description = "A sensible set of defaults for writing custom Preludes";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "protolude_0_1_8" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , ghc-prim, mtl, safe, stm, text, transformers
-     }:
-     mkDerivation {
-       pname = "protolude";
        version = "0.1.8";
        sha256 = "014d3a551d4e0929df615ff2df7e0215d67e34af8f03928e98bbaffec98860bc";
        libraryHaskellDepends = [
@@ -133165,7 +133643,6 @@ self: {
        homepage = "https://github.com/sdiehl/protolude";
        description = "A sensible set of defaults for writing custom Preludes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proton-haskell" = callPackage
@@ -133417,12 +133894,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "publicsuffix_0_20161003" = callPackage
+  "publicsuffix_0_20161014" = callPackage
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20161003";
-       sha256 = "f3a94499b546da47dea02e260ada8d0ca7444d3261a88fdaf13dad7041999ce7";
+       version = "0.20161014";
+       sha256 = "7fe7abfe8727dc20951c6c7dec35c8ca71ddc34972615f5abe24ae7d3ce99622";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -134891,12 +135368,27 @@ self: {
        pname = "quickcheck-io";
        version = "0.1.3";
        sha256 = "d798584e26c51e4cbb0dadd1097cf14472c917240d09fc3d9a2b74961673c8b4";
+       revision = "1";
+       editedCabalFile = "9c0af3d194aa2d469c4cde8e26ad6566af32685face8ddb17919960f424c357a";
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "https://github.com/hspec/quickcheck-io#readme";
        description = "Use HUnit assertions as QuickCheck properties";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "quickcheck-io_0_1_4" = callPackage
+    ({ mkDerivation, base, HUnit, QuickCheck }:
+     mkDerivation {
+       pname = "quickcheck-io";
+       version = "0.1.4";
+       sha256 = "6b3750590871b03908530764cdaa69ce67d5b514f533c1a4a6f4755f8267389d";
+       libraryHaskellDepends = [ base HUnit QuickCheck ];
+       homepage = "https://github.com/hspec/quickcheck-io#readme";
+       description = "Use HUnit assertions as QuickCheck properties";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quickcheck-poly" = callPackage
     ({ mkDerivation, base, haskell98, hint, MonadCatchIO-mtl
      , QuickCheck, regex-compat, regex-tdfa
@@ -135547,8 +136039,8 @@ self: {
      }:
      mkDerivation {
        pname = "raft";
-       version = "0.3.7.0";
-       sha256 = "5f54a03b971f1853ee4d8033aaa134c6765d254d070e1d31b5871b2e187839b3";
+       version = "0.3.7.2";
+       sha256 = "40c46755aa43abd764d59610b7b8a7af75b5e5efe7c509c34ede6a157ee2a0e9";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring containers data-default
          ghc-prim mtl parallel scientific split text time tostring zlib
@@ -136108,14 +136600,14 @@ self: {
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
        pname = "rapid";
-       version = "0.1.2";
-       sha256 = "f65a4fc1560266c9e51c6efe19d2797ef4af51850b23a458167c087da4079035";
+       version = "0.1.3";
+       sha256 = "163a894363584b712ab44598f17a8bcd90e0814327cf2cecf0ddc4dc6cf29758";
        libraryHaskellDepends = [
          async base containers foreign-store stm
        ];
-       homepage = "http://hub.darcs.net/esz/rapid";
+       homepage = "https://github.com/esoeylemez/rapid";
        description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values";
-       license = stdenv.lib.licenses.asl20;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "rascal" = callPackage
@@ -136309,6 +136801,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rawfilepath" = callPackage
+    ({ mkDerivation, base, bytestring, unix }:
+     mkDerivation {
+       pname = "rawfilepath";
+       version = "0.1.0.0";
+       sha256 = "1673897fbcb4a4a194bb66ff8514a21db6c1d9f6ba0d960dc20677c9902c2614";
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/xtendo-org/rawfilepath#readme";
+       description = "Use RawFilePath instead of FilePath";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rawr" = callPackage
     ({ mkDerivation, base, deepseq, doctest, ghc-datasize, ghc-prim
      , lens, tasty, tasty-hunit, template-haskell
@@ -136452,8 +136957,8 @@ self: {
      }:
      mkDerivation {
        pname = "rdf4h";
-       version = "3.0.0";
-       sha256 = "aa50b95e37655e3abdfb4f83679096bd6c188750a8cb3a61132e2e8399e928db";
+       version = "3.0.1";
+       sha256 = "a4ecf539e33f038a13f40e5b2b21ee1b364ed259b66f2d435439c0de287f8534";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137756,15 +138261,15 @@ self: {
 
   "reflex-dom-colonnade" = callPackage
     ({ mkDerivation, base, colonnade, containers, contravariant, reflex
-     , reflex-dom, semigroups, vector
+     , reflex-dom, semigroups, text, vector
      }:
      mkDerivation {
        pname = "reflex-dom-colonnade";
-       version = "0.4.4";
-       sha256 = "e75354a6d37c854349566471e27248cbdfcfca4e0cfaf1ed46f5adc1f9a980ff";
+       version = "0.4.6";
+       sha256 = "b67ce02af09d3c2c30569cfac2758cc7439cbe1dab27323e6119ef5cc7267c17";
        libraryHaskellDepends = [
          base colonnade containers contravariant reflex reflex-dom
-         semigroups vector
+         semigroups text vector
        ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Use colonnade with reflex-dom";
@@ -138772,6 +139277,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_8_3_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, quickcheck-simple, sql-words
+     , template-haskell, text, th-reify-compat, time, time-locale-compat
+     , transformers
+     }:
+     mkDerivation {
+       pname = "relational-query";
+       version = "0.8.3.2";
+       sha256 = "20899f2fcf142e11036e6e6b7360c873e17ded7bb856616e9d40f92d0298d09b";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist names-th persistable-record
+         sql-words template-haskell text th-reify-compat time
+         time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base containers quickcheck-simple transformers
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Typeful, Modular, Relational, algebraic query engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, relational-query
@@ -139127,8 +139656,8 @@ self: {
      }:
      mkDerivation {
        pname = "repa";
-       version = "3.4.1.1";
-       sha256 = "c6f6aeb84e7167b50ec7fc241329bf966a4865ffc824e38f75be3f8bb1734917";
+       version = "3.4.1.2";
+       sha256 = "57f80bbbf6df1c7bca0045a9de8694a25bebe0e5696f59276cc72f165b01dc57";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -139814,8 +140343,8 @@ self: {
      }:
      mkDerivation {
        pname = "resourcet";
-       version = "1.1.7.5";
-       sha256 = "05d30e225eb96a300718ec0534ffb03cb3bb8c7f87d463dbddb115d01c7f405a";
+       version = "1.1.8";
+       sha256 = "b36c9900ef4d330281b413684bcf13b53036303187dc3ca0f0d83b56152c5c4b";
        libraryHaskellDepends = [
          base containers exceptions lifted-base mmorph monad-control mtl
          transformers transformers-base transformers-compat
@@ -143117,6 +143646,25 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "scalpel_0_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, curl, data-default
+     , fail, HUnit, regex-base, regex-tdfa, tagsoup, text, vector
+     }:
+     mkDerivation {
+       pname = "scalpel";
+       version = "0.4.0";
+       sha256 = "ed252c502b138e3a3d87d8fa4b1bf88836c6bd297870532e0bf445c2f72415d8";
+       libraryHaskellDepends = [
+         base bytestring containers curl data-default fail regex-base
+         regex-tdfa tagsoup text vector
+       ];
+       testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
+       homepage = "https://github.com/fimad/scalpel";
+       description = "A high level web scraping library for Haskell";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scan" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -144778,16 +145326,14 @@ self: {
 
   "sensei" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-compat, bytestring
-     , directory, filepath, fsnotify, hspec, hspec-wai, http-client
-     , http-types, interpolate, mockery, network, process, silently, stm
-     , text, time, unix, wai, warp
+     , directory, filepath, fsnotify, hspec, hspec-meta, hspec-wai
+     , http-client, http-types, interpolate, mockery, network, process
+     , silently, stm, text, time, unix, wai, warp
      }:
      mkDerivation {
        pname = "sensei";
-       version = "0.1.0";
-       sha256 = "fd3c1edc901298173782bf8c65744dd4fb25cdfb9d1012e28a6e5038dc7114ab";
-       revision = "1";
-       editedCabalFile = "315d7e05f9dbe6eb51d2a1f569f884e66c3edaf12d4973230e47d6c799de2854";
+       version = "0.2.0";
+       sha256 = "aa38cfab092cbb256ea8a4a64cd171fe241b7a7f964bd13bf1b6e402327cf4b0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -144797,8 +145343,9 @@ self: {
        ];
        testHaskellDepends = [
          ansi-terminal base base-compat bytestring directory filepath
-         fsnotify hspec hspec-wai http-client http-types interpolate mockery
-         network process silently stm text time unix wai warp
+         fsnotify hspec hspec-meta hspec-wai http-client http-types
+         interpolate mockery network process silently stm text time unix wai
+         warp
        ];
        homepage = "https://github.com/hspec/sensei#readme";
        description = "Automatically run Hspec tests on file modifications";
@@ -145655,6 +146202,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-db" = callPackage
+    ({ mkDerivation, base, servant }:
+     mkDerivation {
+       pname = "servant-db";
+       version = "0.2.0.1";
+       sha256 = "99c618f6be7a7bc58217cc209b395cbcdd1a9cd573f484ee96b1835dd96dda8a";
+       libraryHaskellDepends = [ base servant ];
+       description = "Servant types for defining API with relational DBs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-db-postgresql" = callPackage
+    ({ mkDerivation, base, bytestring, containers, derive, hspec, HUnit
+     , monad-logger, optparse-applicative, postgresql-query
+     , postgresql-simple, QuickCheck, quickcheck-instances, servant
+     , servant-db, text, time, transformers-base
+     }:
+     mkDerivation {
+       pname = "servant-db-postgresql";
+       version = "0.2.1.0";
+       sha256 = "6f3cefb7b24bf3d4e50efe84d903e79edc936b85950cc260855af4a50ac11071";
+       libraryHaskellDepends = [
+         base bytestring containers postgresql-query postgresql-simple
+         servant servant-db text
+       ];
+       testHaskellDepends = [
+         base bytestring derive hspec HUnit monad-logger
+         optparse-applicative postgresql-query QuickCheck
+         quickcheck-instances servant-db text time transformers-base
+       ];
+       description = "Derive a postgres client to database API specified by servant-db";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-docs" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , bytestring-conversion, case-insensitive, control-monad-omega
@@ -146115,8 +146696,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-quickcheck";
-       version = "0.0.2.1";
-       sha256 = "4ac4467627724f118c1d735724b961a5b69d79f83b67d94b6cb60acef950e84d";
+       version = "0.0.2.2";
+       sha256 = "72878553ed9d7f134bd10e11ca7eaf69ba3d341e591aa3af4c73c43c7af866c5";
        libraryHaskellDepends = [
          aeson base base-compat bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
@@ -146124,7 +146705,7 @@ self: {
          split string-conversions temporary text time warp
        ];
        testHaskellDepends = [
-         base base-compat hspec hspec-core http-client QuickCheck
+         base base-compat bytestring hspec hspec-core http-client QuickCheck
          quickcheck-io servant servant-client servant-server transformers
          warp
        ];
@@ -147242,8 +147823,8 @@ self: {
     ({ mkDerivation, base, bytestring, bzlib, shake, tar }:
      mkDerivation {
        pname = "shake-pack";
-       version = "0.1.2";
-       sha256 = "413dc10d9b141ba885b3067b2ab76aee7f2978a930e874885fa0baf3d8b1c247";
+       version = "0.2.0";
+       sha256 = "5fad6c240305f85bfa1c2001d9d52cb23ecdce006f98e590efe335dba2b9698f";
        libraryHaskellDepends = [ base bytestring bzlib shake tar ];
        homepage = "https://github.com/LukeHoersten/shake-pack";
        description = "Shake File Pack Rule";
@@ -147665,8 +148246,8 @@ self: {
      }:
      mkDerivation {
        pname = "shellmate";
-       version = "0.3.3";
-       sha256 = "4b104089f1c46f05c1c86592ecfeee507092106d862c31c6ca4d95e52180c689";
+       version = "0.3.4";
+       sha256 = "b2db36ff28c21d78bdac8142e35b4ab002d70193f55f7e603c8c3d0eb49c0ce8";
        libraryHaskellDepends = [
          base bytestring directory filepath process temporary transformers
          unix
@@ -147677,16 +148258,16 @@ self: {
      }) {};
 
   "shellmate-extras" = callPackage
-    ({ mkDerivation, base, bytestring, feed, HTTP, mime-types
-     , network-uri, shellmate, tagsoup, text, xml
+    ({ mkDerivation, base, bytestring, feed, http-conduit, http-types
+     , mime-types, shellmate, tagsoup, text, utf8-string, xml
      }:
      mkDerivation {
        pname = "shellmate-extras";
-       version = "0.3.3";
-       sha256 = "fa3ade318f08c7b4d21bff10a82703480fb9ee3e572083be5cb99c0974e7a6a3";
+       version = "0.3.4";
+       sha256 = "46aecef64462ab34789f63dd338dc1b72aff77f4eaa2ecbf97c32dd9b6130b52";
        libraryHaskellDepends = [
-         base bytestring feed HTTP mime-types network-uri shellmate tagsoup
-         text xml
+         base bytestring feed http-conduit http-types mime-types shellmate
+         tagsoup text utf8-string xml
        ];
        homepage = "https://github.com/valderman/shellmate";
        description = "Extra functionality for shellmate";
@@ -148010,8 +148591,8 @@ self: {
      }:
      mkDerivation {
        pname = "sibe";
-       version = "0.1.0.0";
-       sha256 = "456846a9c4bcd467e9f95899677d216d21bf94e0d51b70e22b173272526a8db8";
+       version = "0.2.0.1";
+       sha256 = "964a03b7ba59444dcd0a776da94164840e402d6ca737ca2619a678080571046c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -148025,7 +148606,7 @@ self: {
        ];
        testHaskellDepends = [ base hmatrix ];
        homepage = "https://github.com/mdibaiee/sibe";
-       description = "Initial project template from stack";
+       description = "Machine Learning algorithms";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -148849,13 +149430,19 @@ self: {
      }) {};
 
   "simple-vec3" = callPackage
-    ({ mkDerivation, base, vector }:
+    ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
+     , tasty-th, vector, vector-th-unbox
+     }:
      mkDerivation {
        pname = "simple-vec3";
-       version = "0.1.0.1";
-       sha256 = "441b08acf63ad72fc20acd3f5e02cb5c2957dab2e4ff765652803c9e1b42fdef";
-       libraryHaskellDepends = [ base vector ];
-       homepage = "http://github.com/dzhus/simple-vec3/";
+       version = "0.2";
+       sha256 = "65a8987ee8ebff519c2702a8df038f77a28dda711feb1a6e556eb8c19be0f680";
+       libraryHaskellDepends = [ base QuickCheck vector vector-th-unbox ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-quickcheck tasty-th vector
+         vector-th-unbox
+       ];
+       homepage = "https://github.com/dzhus/simple-vec3#readme";
        description = "Three-dimensional vectors of doubles with basic operations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149513,19 +150100,22 @@ self: {
 
   "slack-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, errors
-     , HsOpenSSL, io-streams, lens, lens-aeson, monad-loops, mtl
-     , network, network-uri, openssl-streams, text, time
-     , time-locale-compat, transformers, websockets, wreq
+     , hashable, io-streams, lens, lens-aeson, monad-loops, mtl, network
+     , network-uri, text, time, time-locale-compat, tls, transformers
+     , websockets, wreq, wuss
      }:
      mkDerivation {
        pname = "slack-api";
-       version = "0.9";
-       sha256 = "397967f49fbdd25afac310b27baeb6d46ac7f095a9699bb01a0326857ddd4e38";
+       version = "0.10";
+       sha256 = "0b9b6688858b85d9c40a6cfd670658330671173ac309326936ff07c931afb452";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers errors HsOpenSSL io-streams lens
-         lens-aeson monad-loops mtl network network-uri openssl-streams text
-         time time-locale-compat transformers websockets wreq
+         aeson base bytestring containers errors hashable io-streams lens
+         lens-aeson monad-loops mtl network network-uri text time
+         time-locale-compat tls transformers websockets wreq wuss
        ];
+       executableHaskellDepends = [ base lens mtl text ];
        testHaskellDepends = [ base ];
        description = "Bindings to the Slack RTM API";
        license = stdenv.lib.licenses.mit;
@@ -152332,6 +152922,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sparse-linear-algebra" = callPackage
+    ({ mkDerivation, base, containers, criterion, hspec, mtl
+     , mwc-random, primitive, QuickCheck
+     }:
+     mkDerivation {
+       pname = "sparse-linear-algebra";
+       version = "0.2.0.4";
+       sha256 = "ef390020094294f52fbe37d40b3fc6cd21b38f021eb2ab5ef81af719c3ceecbe";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers hspec mtl mwc-random primitive QuickCheck
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers criterion hspec mtl mwc-random primitive
+       ];
+       homepage = "https://github.com/ocramz/sparse-linear-algebra";
+       description = "Numerical computation in native Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "sparsebit" = callPackage
     ({ mkDerivation, base, haskell98 }:
      mkDerivation {
@@ -153204,8 +153816,8 @@ self: {
     ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }:
      mkDerivation {
        pname = "sqlite-simple-errors";
-       version = "0.3.0.0";
-       sha256 = "0d8cb4b9b51aeadc6daf112ae75b2b38a13f2da2fba574c2b4d2fafa18600c9d";
+       version = "0.5.0.0";
+       sha256 = "33db4862ead8ec91016838d62ed6f232eb4643dcf271ac833f148b0ea40f5c63";
        libraryHaskellDepends = [ base parsec sqlite-simple text ];
        testHaskellDepends = [ base mtl sqlite-simple text ];
        homepage = "https://github.com/caneroj1/sqlite-simple-errors";
@@ -154516,6 +155128,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "staversion" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath
+     , hspec, optparse-applicative, text, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "staversion";
+       version = "0.1.0.0";
+       sha256 = "df252adb8010dbe2553fcd467044a6f99b43ce0ad223762ead0f755484806073";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring directory filepath optparse-applicative text
+         unordered-containers yaml
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base filepath hspec text ];
+       homepage = "https://github.com/debug-ito/staversion";
+       description = "What version is the package X in stackage lts-Y.ZZ?";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stb-image" = callPackage
     ({ mkDerivation, base, bitmap, bytestring }:
      mkDerivation {
@@ -154529,13 +155162,15 @@ self: {
      }) {};
 
   "stb-image-redux" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, vector }:
+    ({ mkDerivation, base, hspec, vector }:
      mkDerivation {
        pname = "stb-image-redux";
-       version = "0.1.0.3";
-       sha256 = "7a3519a1832f39b3d621207cddd679e7e8bb4f1057f33bfd170de2d3e07313b7";
+       version = "0.1.0.4";
+       sha256 = "317ba2e3347d54050262568b3b0cf75891919eccd9a9594ba71c60265d195dbb";
+       revision = "1";
+       editedCabalFile = "59533529f7bdf491b9b35d24431ccf65e6c3dc4163ceb89860d23773dffcd84a";
        libraryHaskellDepends = [ base vector ];
-       testHaskellDepends = [ base hspec QuickCheck vector ];
+       testHaskellDepends = [ base hspec vector ];
        homepage = "https://github.com/sasinestro/stb-image-redux#readme";
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
@@ -156530,16 +157165,15 @@ self: {
      }) {};
 
   "sump" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, either, lens
-     , serialport, transformers, vector
+    ({ mkDerivation, base, bytestring, data-default, lens, serialport
+     , transformers, vector
      }:
      mkDerivation {
        pname = "sump";
-       version = "0.1.0.1";
-       sha256 = "b7fa21630a6965fffd913280a7dd08a77a6e3f05b2bf04ad61c41ed601a0d1f7";
+       version = "0.1.0.2";
+       sha256 = "aab5fe4a465a328586fe5b25f6a808b90071e976f0570b35a30a537565cc43bc";
        libraryHaskellDepends = [
-         base bytestring data-default either lens serialport transformers
-         vector
+         base bytestring data-default lens serialport transformers vector
        ];
        homepage = "http://github.com/bgamari/sump";
        description = "A Haskell interface to SUMP-compatible logic analyzers";
@@ -156815,22 +157449,6 @@ self: {
      }:
      mkDerivation {
        pname = "svg-builder";
-       version = "0.1.0.1";
-       sha256 = "91c1a879e4b656355e9c843f29761a46dba6fd6c96c38a073dbb61b101923c9d";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring hashable text unordered-containers
-       ];
-       homepage = "http://github.com/jeffreyrosenbluth/svg-builder.git";
-       description = "DSL for building SVG";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "svg-builder_0_1_0_2" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, hashable, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "svg-builder";
        version = "0.1.0.2";
        sha256 = "81490cf0c843d6d7795ba32ac6cb05acf4a92431fe7702aa634ec52d60bfee54";
        libraryHaskellDepends = [
@@ -156839,7 +157457,6 @@ self: {
        homepage = "http://github.com/jeffreyrosenbluth/svg-builder.git";
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg-tree" = callPackage
@@ -159260,6 +159877,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.3";
        sha256 = "3c597d948cad9c61355a56811533abbad130eb6e4068fd930ab5514c759bfe31";
+       revision = "1";
+       editedCabalFile = "01a77505da91de5d767129a556b345bf6b26265fa047a9f2b7cd8677adab1412";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck random tagged tasty
          tasty-quickcheck tasty-smallcheck
@@ -159765,19 +160384,19 @@ self: {
      }) {};
 
   "telegram-api" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, either
-     , filepath, hjpath, hspec, http-api-data, http-client
-     , http-client-tls, http-media, http-types, mime-types
-     , optparse-applicative, servant, servant-client, string-conversions
-     , text, transformers, utf8-string
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath
+     , hjpath, hspec, http-api-data, http-client, http-client-tls
+     , http-media, http-types, mime-types, mtl, optparse-applicative
+     , servant, servant-client, string-conversions, text, transformers
+     , utf8-string
      }:
      mkDerivation {
        pname = "telegram-api";
-       version = "0.5.0.1";
-       sha256 = "24eca611772e6810f837b372dca1b0fb7492cff8b72b68d66d886193da030ef3";
+       version = "0.5.1.1";
+       sha256 = "2d253937a83605fd947a0d68d86208f0801bef97bf45679c81528d6c4d4e5d1d";
        libraryHaskellDepends = [
-         aeson base bytestring either http-api-data http-client http-media
-         http-types mime-types servant servant-client string-conversions
+         aeson base bytestring http-api-data http-client http-media
+         http-types mime-types mtl servant servant-client string-conversions
          text transformers
        ];
        testHaskellDepends = [
@@ -160459,8 +161078,8 @@ self: {
        pname = "test-framework-hunit";
        version = "0.3.0.2";
        sha256 = "95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8";
-       revision = "1";
-       editedCabalFile = "50dfa482f626505b45ab433d0110f275e314f872a198b5fc24d1a640af755880";
+       revision = "2";
+       editedCabalFile = "f3b7d4b2bf246b88de781a03806e5c90a499c64b2b0c040be50dd980764fcc62";
        libraryHaskellDepends = [
          base extensible-exceptions HUnit test-framework
        ];
@@ -160922,8 +161541,8 @@ self: {
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.8.6.5";
-       sha256 = "33f8c3d78f2f46246b64cecab47e27f1f4e587f05b2375e94a8a43dfce446c90";
+       version = "0.8.6.6";
+       sha256 = "9c78e53e685b4537a39a4d2bc785df1d0d0ee775085bd532d8ae88d10d4c58b4";
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
@@ -161790,24 +162409,23 @@ self: {
      }) {};
 
   "th-context" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, data-default
-     , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, lens, mtl
-     , mtl-unleashed, syb, template-haskell, text, th-desugar
-     , th-orphans, th-reify-many, th-typegraph
+    ({ mkDerivation, array, atp-haskell, base, bytestring, containers
+     , data-default, deepseq, ghc-prim, haskell-src-exts, hspec
+     , hspec-core, lens, mtl, mtl-unleashed, pretty, syb
+     , template-haskell, text, th-desugar, th-orphans, th-reify-many
      }:
      mkDerivation {
        pname = "th-context";
-       version = "0.23";
-       sha256 = "54b65f7692f211426c7f3fc1751d938d756fee64f2970ebe6db30476f95c219f";
+       version = "0.24";
+       sha256 = "a04e7033443836628ee2bccfe4d4aefd0a65576f3e8c30fdcbc4abd916373949";
        libraryHaskellDepends = [
-         base containers data-default haskell-src-exts lens mtl
-         mtl-unleashed syb template-haskell th-desugar th-orphans
-         th-typegraph
+         atp-haskell base containers data-default haskell-src-exts lens mtl
+         mtl-unleashed pretty syb template-haskell th-desugar th-orphans
        ];
        testHaskellDepends = [
-         array base bytestring containers deepseq ghc-prim hspec hspec-core
-         lens mtl mtl-unleashed syb template-haskell text th-desugar
-         th-orphans th-reify-many th-typegraph
+         array atp-haskell base bytestring containers data-default deepseq
+         ghc-prim hspec hspec-core lens mtl mtl-unleashed syb
+         template-haskell text th-desugar th-orphans th-reify-many
        ];
        homepage = "https://github.com/seereason/th-context";
        description = "Test instance context";
@@ -162097,16 +162715,17 @@ self: {
     ({ mkDerivation, array, base, base-compat, bytestring, containers
      , data-default, deepseq, ghc-prim, haskell-src-exts, hspec
      , hspec-core, lens, mtl, mtl-unleashed, pretty, set-extra, syb
-     , template-haskell, text, th-desugar, th-orphans, th-reify-many
+     , template-haskell, text, th-context, th-desugar, th-lift-instances
+     , th-orphans, th-reify-many
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.33.1";
-       sha256 = "4b9ba6823398c2ce042728c0358e670533ba146bfd7c5e72019069da1c594080";
+       version = "0.35.1";
+       sha256 = "30995f3cf18b3752b353a4e178bc196647238c70d165134b975990f4f0c487df";
        libraryHaskellDepends = [
          base base-compat containers data-default haskell-src-exts lens mtl
-         mtl-unleashed pretty set-extra syb template-haskell th-desugar
-         th-orphans
+         mtl-unleashed pretty set-extra syb template-haskell th-context
+         th-desugar th-lift-instances th-orphans
        ];
        testHaskellDepends = [
          array base bytestring containers data-default deepseq ghc-prim
@@ -164446,8 +165065,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "tracy";
-       version = "0.1.3.0";
-       sha256 = "9c298b7ff70dd4f5aaf839e7bccbc9810f0235833bb5b723babe0838eac5d301";
+       version = "0.1.4.0";
+       sha256 = "e778ebf70161ac37878629bf8857021969a71bea1b04140a0c306d0b9d0f430f";
        libraryHaskellDepends = [ base ];
        description = "Convenience wrappers for non-intrusive debug tracing";
        license = stdenv.lib.licenses.mit;
@@ -166187,8 +166806,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-feed";
-       version = "0.2.0.9";
-       sha256 = "570e20335adce61cddbdefa8f3f01131e44f266fb1970ccbe65d3716fbe72960";
+       version = "0.2.0.10";
+       sha256 = "8dc2ea040a332086588b8e314bd3ba389446e1e7d8746d1fca188e01c9005de0";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -166200,15 +166819,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "twitter-feed_0_2_0_10" = callPackage
+  "twitter-feed_0_2_0_11" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
      , containers, http-conduit, HUnit, test-framework
      , test-framework-hunit
      }:
      mkDerivation {
        pname = "twitter-feed";
-       version = "0.2.0.10";
-       sha256 = "8dc2ea040a332086588b8e314bd3ba389446e1e7d8746d1fca188e01c9005de0";
+       version = "0.2.0.11";
+       sha256 = "8b98b4ddfb88f4c14f8eb43bd74a4c4e7941a92d44b90717e9b8dbe4c454c889";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -167342,6 +167961,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libudev;};
 
+  "udp-conduit" = callPackage
+    ({ mkDerivation, base, chunked-data, conduit-combinators
+     , mono-traversable, network
+     }:
+     mkDerivation {
+       pname = "udp-conduit";
+       version = "0.1.0.2";
+       sha256 = "eb2c50cdffe220c5913d434dac25b345d7c12516a0caae5c844529a8f3084903";
+       libraryHaskellDepends = [
+         base chunked-data conduit-combinators mono-traversable network
+       ];
+       homepage = "https://github.com/kqr/udp-conduit#readme";
+       description = "Simple fire-and-forget conduit UDP wrappers";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "uglymemo" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -170943,6 +171578,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vgrep" = callPackage
+    ({ mkDerivation, async, attoparsec, base, cabal-file-th, containers
+     , directory, doctest, fingertree, lens, lifted-base, mmorph, mtl
+     , pipes, pipes-concurrency, process, QuickCheck, stm, tasty
+     , tasty-quickcheck, template-haskell, text, transformers, unix, vty
+     }:
+     mkDerivation {
+       pname = "vgrep";
+       version = "0.1.4.0";
+       sha256 = "353bd92260e225c892d26d6926e9668016187d8ef50311b8f80ae55fc82ed29b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async attoparsec base containers fingertree lens lifted-base mmorph
+         mtl pipes pipes-concurrency process stm text transformers unix vty
+       ];
+       executableHaskellDepends = [
+         async base cabal-file-th containers directory lens mtl pipes
+         pipes-concurrency process template-haskell text unix vty
+       ];
+       testHaskellDepends = [
+         base containers doctest lens QuickCheck tasty tasty-quickcheck text
+       ];
+       homepage = "http://github.com/fmthoma/vgrep#readme";
+       description = "A pager for grep";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "vhd" = callPackage
     ({ mkDerivation, base, byteable, bytestring, cereal, cipher-aes
      , cryptohash, directory, filepath, mmap, QuickCheck, random
@@ -171507,42 +172170,6 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.11";
-       sha256 = "e6f21d7e62d1368637025eadb1b60d3bf9c58113b91b0510b9352bcc8aab0a32";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers data-default deepseq
-         directory filepath hashable microlens microlens-mtl microlens-th
-         mtl parallel parsec stm terminfo text transformers unix utf8-string
-         vector
-       ];
-       executableHaskellDepends = [
-         base containers data-default microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers data-default deepseq
-         HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions
-         random smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       homepage = "https://github.com/coreyoconnor/vty";
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_11_1" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , data-default, deepseq, directory, filepath, hashable, HUnit
-     , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec
-     , QuickCheck, quickcheck-assertions, random, smallcheck, stm
-     , string-qq, terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "vty";
        version = "5.11.1";
        sha256 = "4d6fa0bd9ad3f53c87cca1d02dab246326a9d79737b4861674ba4ff68646d23a";
        isLibrary = true;
@@ -171566,7 +172193,6 @@ self: {
        homepage = "https://github.com/coreyoconnor/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -172643,27 +173269,6 @@ self: {
      }) {};
 
   "wai-middleware-static" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, containers
-     , cryptohash, directory, expiring-cache-map, filepath, http-types
-     , mime-types, mtl, old-locale, text, time, wai
-     }:
-     mkDerivation {
-       pname = "wai-middleware-static";
-       version = "0.8.0";
-       sha256 = "a37aaf452e3816928934d39b4eef3c1f7186c9db618d0b303e5136fc858e5e58";
-       revision = "3";
-       editedCabalFile = "819eb104224cefb36cb6d8db5c43a2103e0add6c5bb799fad8bde0762493bfa9";
-       libraryHaskellDepends = [
-         base base16-bytestring bytestring containers cryptohash directory
-         expiring-cache-map filepath http-types mime-types mtl old-locale
-         text time wai
-       ];
-       homepage = "https://github.com/scotty-web/wai-middleware-static";
-       description = "WAI middleware that serves requests to static files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-middleware-static_0_8_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, cryptonite
      , directory, expiring-cache-map, filepath, hpc-coveralls
      , http-types, memory, mime-types, mtl, old-locale, semigroups, text
@@ -172682,7 +173287,6 @@ self: {
        homepage = "https://github.com/scotty-web/wai-middleware-static";
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-static-caching" = callPackage
@@ -173185,8 +173789,8 @@ self: {
      }:
      mkDerivation {
        pname = "warc";
-       version = "0.2.0";
-       sha256 = "dc53a6f3442b659cf79a9bfd56195b83fe3dcdbc731b4a15ad5e9ee2ea02c03c";
+       version = "0.3.0";
+       sha256 = "f1a2d1f51ec16ccf21b5fd0a74a5e485d3bc207deda8ba0e6944971688b19dfc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -174505,6 +175109,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wikicfp-scraper_0_1_0_5" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
+     , scalpel, text, time
+     }:
+     mkDerivation {
+       pname = "wikicfp-scraper";
+       version = "0.1.0.5";
+       sha256 = "0a34feeaf03f5f98ebb4c43c9d711323814c0148e062f2eebacb524f489769ee";
+       libraryHaskellDepends = [
+         attoparsec base bytestring scalpel text time
+       ];
+       testHaskellDepends = [ base bytestring filepath hspec time ];
+       homepage = "https://github.com/debug-ito/wikicfp-scraper";
+       description = "Scrape WikiCFP web site";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wikipedia4epub" = callPackage
     ({ mkDerivation, base, bytestring, directory, epub, filepath
      , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url
@@ -174803,8 +175425,8 @@ self: {
      }:
      mkDerivation {
        pname = "wkt";
-       version = "0.3.0";
-       sha256 = "2154fdd2bfe62ebef45319896e2eedb7a3d386d144b686bd7f3b5169621c0e4f";
+       version = "0.3.1";
+       sha256 = "22ed4f892e845b4f660d40bd1b5edca7fcb5e1e05007154d72c093311d975ddd";
        libraryHaskellDepends = [ base lens linear trifecta ];
        testHaskellDepends = [
          base filepath lens linear tasty tasty-golden trifecta
@@ -175056,18 +175678,18 @@ self: {
      }) {};
 
   "word24" = callPackage
-    ({ mkDerivation, base, QuickCheck, test-framework
+    ({ mkDerivation, base, deepseq, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "word24";
-       version = "1.0.7";
-       sha256 = "115ac84f16562a1b95649b70fafc1ff5f6e70576947672838781bb9aa53107e6";
-       libraryHaskellDepends = [ base ];
+       version = "2.0.0";
+       sha256 = "b02d7fd126d93c514d56b5592b959706a7fda5124452eeacbc646d09f3f932ae";
+       libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
-         base QuickCheck test-framework test-framework-quickcheck2
+         base deepseq QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "http://www.tiresiaspress.us/haskell/word24";
+       homepage = "https://github.com/winterland1989/word24";
        description = "24-bit word and int types for GHC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176420,6 +177042,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "xls" = callPackage
+    ({ mkDerivation, base, conduit, filepath, getopt-generics
+     , resourcet, transformers
+     }:
+     mkDerivation {
+       pname = "xls";
+       version = "0.1.0";
+       sha256 = "c582a2ecd64986c3d254ddad20ad2411e45061d073caaaffdb6214f6336e43f0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base conduit filepath resourcet transformers
+       ];
+       executableHaskellDepends = [
+         base conduit getopt-generics resourcet transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/harendra-kumar/xls";
+       description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xlsior" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-markup, bytestring
      , conduit, conduit-extra, data-default, exceptions, mtl, resourcet
@@ -177127,8 +177771,8 @@ self: {
        pname = "xmlhtml";
        version = "0.2.3.5";
        sha256 = "e333a1c7afd5068b60b143457fea7325a34408cc65b3ac55f5b342eb0274b06d";
-       revision = "1";
-       editedCabalFile = "6a4d1fc061c4dd01628d762d947e63619a25714aa0dd36b6fe674a7ec62b9045";
+       revision = "2";
+       editedCabalFile = "7ef4b85552808a9169da9c650ece3b9994a6c6106185a92e73aad50c5e98e6f1";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring containers
          parsec text unordered-containers
@@ -177785,22 +178429,23 @@ self: {
      }) {};
 
   "yackage" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-html, bytestring, Cabal
-     , cmdargs, conduit, containers, directory, http-conduit, http-types
-     , shakespeare, tar, text, transformers, unordered-containers
-     , vector, wai, warp, yaml, yesod-core, yesod-form, zlib
+    ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
+     , Cabal, cmdargs, conduit, containers, directory, http-conduit
+     , http-types, shakespeare, tar, text, transformers
+     , unordered-containers, vector, wai, warp, yaml, yesod-core
+     , yesod-form, zlib
      }:
      mkDerivation {
        pname = "yackage";
-       version = "0.8.0";
-       sha256 = "b42c5fe3b93dbb4c900f462c60e5f6286aed679664e8a4ccdddae7f56f042015";
+       version = "0.8.1";
+       sha256 = "1d48064cbfd2c51f4fd33a6289c9efe1c8d49f063d850a9dd7ae3a226136cae5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base blaze-builder blaze-html bytestring Cabal cmdargs conduit
-         containers directory http-conduit http-types shakespeare tar text
-         transformers unordered-containers vector wai warp yaml yesod-core
-         yesod-form zlib
+         aeson base blaze-builder blaze-html bytestring Cabal cmdargs
+         conduit containers directory http-conduit http-types shakespeare
+         tar text transformers unordered-containers vector wai warp yaml
+         yesod-core yesod-form zlib
        ];
        homepage = "http://github.com/snoyberg/yackage";
        description = "Personal Hackage replacement for testing new packages";
@@ -177964,6 +178609,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_19_0" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
+     , bytestring, conduit, containers, directory, enclosed-exceptions
+     , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
+     , semigroups, template-haskell, temporary, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.19.0";
+       sha256 = "750ced274e3124face6808d5c7a999b12ac578cae102f15507aa47adc77375d1";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         enclosed-exceptions filepath resourcet scientific semigroups
+         template-haskell text transformers unordered-containers vector
+       ];
+       libraryPkgconfigDepends = [ libyaml ];
+       executableHaskellDepends = [ aeson base bytestring ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat bytestring conduit directory hspec
+         HUnit mockery resourcet temporary text transformers
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/snoyberg/yaml/";
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libyaml;};
+
   "yaml-config" = callPackage
     ({ mkDerivation, base, deepseq, hashable, QuickCheck, tasty
      , tasty-quickcheck, text, unordered-containers, yaml
@@ -178639,6 +179316,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-auth-hashdb_1_6_0_1" = callPackage
+    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
+     , hspec, http-conduit, http-types, monad-logger, network-uri
+     , persistent, persistent-sqlite, pwstore-fast, resourcet, text
+     , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
+     , yesod-form, yesod-persistent, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-auth-hashdb";
+       version = "1.6.0.1";
+       sha256 = "8fe73fb7e4301e02e69cac312227078fd01927c8a006224f7e3fd8a93aa9cb75";
+       libraryHaskellDepends = [
+         aeson base bytestring persistent pwstore-fast text yesod-auth
+         yesod-core yesod-form yesod-persistent
+       ];
+       testHaskellDepends = [
+         aeson base basic-prelude bytestring containers hspec http-conduit
+         http-types monad-logger network-uri persistent-sqlite resourcet
+         text unordered-containers wai-extra yesod yesod-auth yesod-core
+         yesod-test
+       ];
+       homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
+       description = "Authentication plugin for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-kerberos" = callPackage
     ({ mkDerivation, authenticate-kerberos, base, bytestring
      , shakespeare, text, transformers, yesod-auth, yesod-core
@@ -178855,6 +179559,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-colonnade" = callPackage
+    ({ mkDerivation, base, colonnade, text, yesod-core }:
+     mkDerivation {
+       pname = "yesod-colonnade";
+       version = "0.1";
+       sha256 = "5e98908136715fadc3f46153bcc99c559affef85ed64bcde4bd2314e962dca79";
+       libraryHaskellDepends = [ base colonnade text yesod-core ];
+       homepage = "https://github.com/andrewthad/colonnade#readme";
+       description = "Helper functions for using yesod with colonnade";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-comments" = callPackage
     ({ mkDerivation, base, bytestring, directory, friendly-time
      , gravatar, old-locale, persistent, template-haskell, text, time
@@ -179878,8 +180594,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-static";
-       version = "1.5.0.4";
-       sha256 = "55a91e85739fb3e06de50f34def5929c7bb8b74810b9fe621c4e2e3f3ebc82b0";
+       version = "1.5.0.5";
+       sha256 = "3cf3f0a1da82caf974343fe03c8efa7794f56d13c6747846fa746f16b029f459";
        libraryHaskellDepends = [
          async attoparsec base base64-bytestring blaze-builder byteable
          bytestring conduit conduit-extra containers cryptohash
@@ -180211,7 +180927,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi_0_13_1" = callPackage
+  "yi_0_13_2" = callPackage
     ({ mkDerivation, base, microlens-platform, mtl
      , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty
      , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell
@@ -180219,8 +180935,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.13.1";
-       sha256 = "78e1140fd9d4ca2f880bb621c18325845dfbc54a9a213cf1fb7715c6741c4c08";
+       version = "0.13.2";
+       sha256 = "ecdc9100717aa46929895e1c8b4e0e0dce2291c680e57c5d0274db8fc1ff8a33";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = false;
        isExecutable = true;
@@ -180267,8 +180983,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-core";
-       version = "0.13.1";
-       sha256 = "df42e9b6bd3d2546ef972e088734a9d2394617cef4d63512c8a24cdb8396062e";
+       version = "0.13.2";
+       sha256 = "014a0a6e7a9c5a8435c7505ed13088ec00f608d6d0c561118d8d566bb5fdd991";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-default
          directory dlist dynamic-state dyre exceptions filepath hashable
@@ -180310,8 +181026,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-pango";
-       version = "0.13.1";
-       sha256 = "897fae1674b6564ce54ad016a2e35e1cd771cc16f464933a6dc9fcc63ff3b279";
+       version = "0.13.2";
+       sha256 = "3954fd213b431808f7dc2ae7d2b0db6764f2bd5e28109e3e38af835d540e61f4";
        libraryHaskellDepends = [
          base containers filepath glib gtk microlens-platform mtl
          oo-prototypes pango pointedlist text transformers-base yi-core
@@ -180329,8 +181045,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-vty";
-       version = "0.13.1";
-       sha256 = "38dc95447ea4baf8780ad21f6bdd8f1bfe6883e23baf2993d8c026782d51d06e";
+       version = "0.13.2";
+       sha256 = "8c3f235cd4ea8b92be2bb5872af97da408e4389bcd3935c25577c3e3275473f6";
        libraryHaskellDepends = [
          base containers data-default dlist microlens-platform pointedlist
          stm text vty yi-core yi-language
@@ -180358,6 +181074,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-fuzzy-open_0_13_2" = callPackage
+    ({ mkDerivation, base, binary, containers, data-default, directory
+     , filepath, mtl, text, transformers-base, vector, yi-core
+     , yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-fuzzy-open";
+       version = "0.13.2";
+       sha256 = "3186c6af375a33427c5a38e182d23f0077b27801b8f786a0d30128e79b2c9b9f";
+       libraryHaskellDepends = [
+         base binary containers data-default directory filepath mtl text
+         transformers-base vector yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Fuzzy open plugin for yi";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-gtk" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -180376,8 +181111,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-ireader";
-       version = "0.13.1";
-       sha256 = "222212c92f7271f62dd297a4298ec51b326c08bcbe515e97ede3a9fd4cc23131";
+       version = "0.13.2";
+       sha256 = "7c5f0cdadc2758fe774b4424812f239cd74595d8aa030f3b686611c9507b7a35";
        libraryHaskellDepends = [
          base binary bytestring containers data-default microlens-platform
          text yi-core yi-language yi-rope
@@ -180393,8 +181128,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-cua";
-       version = "0.13.1";
-       sha256 = "2f35799c34970675b0f381db7d5ba77b32ad05f76ee21d30fe8233599f02c38a";
+       version = "0.13.2";
+       sha256 = "e3630512c92d720c75b43fb696777a7428dc75504a938995e063bf1c54b7d694";
        libraryHaskellDepends = [
          base microlens-platform text yi-core yi-keymap-emacs yi-rope
        ];
@@ -180411,8 +181146,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-emacs";
-       version = "0.13.1";
-       sha256 = "dcb51f973325e9c7dfc6db781886ecd4b7f4761a8d1a88b1443ab457b4bf3f3d";
+       version = "0.13.2";
+       sha256 = "abd09be4752f7b023e3ed1179d33c18eea5ad12ee3b54ae006984ecb68d5d120";
        libraryHaskellDepends = [
          base containers filepath Hclip microlens-platform mtl oo-prototypes
          semigroups text transformers-base yi-core yi-language yi-misc-modes
@@ -180433,8 +181168,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-vim";
-       version = "0.13.1";
-       sha256 = "16913f6be574a6a4705dc3736fdfe7a3b3f4e3f4e1127d846fe510495410d85b";
+       version = "0.13.2";
+       sha256 = "8df50b084dc4eabee5b51c51356e3ecbb9997f505c44b93494c63524dc87f8b8";
        libraryHaskellDepends = [
          attoparsec base binary containers data-default directory filepath
          Hclip microlens-platform mtl oo-prototypes pointedlist safe
@@ -180479,7 +181214,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-language_0_13_1" = callPackage
+  "yi-language_0_13_2" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
      , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
@@ -180488,8 +181223,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-language";
-       version = "0.13.1";
-       sha256 = "22ab333ec6bbeba4da562996a4783f20437b2383639e5f1fa144d98369a6c747";
+       version = "0.13.2";
+       sha256 = "0ff97092dda3132bcc047b7a2b94182f3cc3ed4440e0d208deb50999e3d49309";
        libraryHaskellDepends = [
          array base binary containers data-default hashable
          microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
@@ -180515,8 +181250,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-misc-modes";
-       version = "0.13.1";
-       sha256 = "12ebcb20d106dcab4da2588f0d8ef357cecea52a35ff1b6e1eb197287c58d06e";
+       version = "0.13.2";
+       sha256 = "9580862c8c17778c19961ba357dee62157beaa5aff31ba6fa62408c0ec709201";
        libraryHaskellDepends = [
          array base binary data-default filepath microlens-platform
          semigroups text yi-core yi-language yi-rope
@@ -180536,8 +181271,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-mode-haskell";
-       version = "0.13.1";
-       sha256 = "55e78a4323eec19aab49d473fa9b5a874cb56e8bbb137756b8048696b75bab9e";
+       version = "0.13.2";
+       sha256 = "91e66f823e733043f83e0814036fdfca4f54bfcd822817b77f0bf0bc4f85fb0b";
        libraryHaskellDepends = [
          array base binary data-default microlens-platform text yi-core
          yi-language yi-rope
@@ -180560,8 +181295,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-mode-javascript";
-       version = "0.13.1";
-       sha256 = "fdbad8e3fc6de90aaade5cda3881d161284fcc97b6e88c493d0005eb3923b990";
+       version = "0.13.2";
+       sha256 = "eb3ca37f65db4d0016487ce3dc7846c49482edc63e2a43484bdc4b846b09047f";
        libraryHaskellDepends = [
          array base binary data-default dlist filepath microlens-platform
          mtl text yi-core yi-language yi-rope
@@ -180626,14 +181361,23 @@ self: {
      }) {};
 
   "yi-snippet" = callPackage
-    ({ mkDerivation, base, containers, yi, yi-rope }:
+    ({ mkDerivation, base, binary, containers, data-default, free, lens
+     , mtl, tasty-hunit, tasty-th, text, vector, yi-core, yi-rope
+     }:
      mkDerivation {
        pname = "yi-snippet";
-       version = "0.1.0.0";
-       sha256 = "2d8d646ed19ab1f911d15a0095942abefce3fd6f743fdc9e8169ed454f2f7661";
-       libraryHaskellDepends = [ base containers yi yi-rope ];
-       homepage = "https://github.com/yi-editor/yi-snippet";
-       description = "Snippet support for Yi";
+       version = "0.13.2";
+       sha256 = "6d118cf4bc071ca909f4fc8f0012481dac52965af367faec513530bf2f95b2f0";
+       libraryHaskellDepends = [
+         base binary containers data-default free lens mtl text vector
+         yi-core yi-rope
+       ];
+       testHaskellDepends = [
+         base binary containers data-default free lens mtl tasty-hunit
+         tasty-th text vector yi-core yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Snippet support for yi";
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 8679c7122c9..97f8f61a98e 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -7,11 +7,11 @@
  else stdenv.mkDerivation)
 
 (rec {
-  name = "guile-2.0.12";
+  name = "guile-2.0.13";
 
   src = fetchurl {
     url = "mirror://gnu/guile/${name}.tar.xz";
-    sha256 = "1sdpjq0jf1h65w29q0zprj4x6kdp5jskkvbnlwphy9lvdxrqg0fy";
+    sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";
   };
 
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index ae8256dfaea..96c85704f5e 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -19,7 +19,8 @@ let
 
       enableParallelBuilding = true;
 
-      buildInputs = [ flex bison pkgconfig systemd ];
+      buildInputs = [ flex bison pkgconfig ]
+        ++ lib.optional stdenv.isLinux systemd;
 
       configureFlags = [
         "EXTENSION_DIR=$(out)/lib/php/extensions"
@@ -301,12 +302,12 @@ let
 
 in {
   php56 = generic {
-    version = "5.6.26";
-    sha256 = "0dk2ifn50iv8jvw2jyw2pr9xqnkksxfv9qbpay84na54hf0anynl";
+    version = "5.6.27";
+    sha256 = "0g1adx231c738694gc4bh8x65c7fwsqdbm42n9xwrsdncyhd6xrv";
   };
 
   php70 = generic {
-    version = "7.0.11";
-    sha256 = "1wgpkfzpiap29nxjzqjjvpgirpg61n61xbqq9f25i60lq6fp56zr";
+    version = "7.0.12";
+    sha256 = "09va788b9zk5igzmsfxr593ly174qf9kmihd4fq3kclgzsa75i1q";
   };
 }
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index aa4fca9bf35..5db1498689a 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -96,7 +96,7 @@ let
     '' + optionalString stdenv.isDarwin ''
       substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
       substituteInPlace Lib/multiprocessing/__init__.py \
-        --replace 'os.popen(comm)' 'os.popen("nproc")'
+        --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")'
     '';
 
   configureFlags = [
diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix
index 6b3de6d3b62..eaf7b135eb5 100644
--- a/pkgs/development/libraries/avro-c++/default.nix
+++ b/pkgs/development/libraries/avro-c++/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchurl, cmake, boost155, python2
-}:
+{ stdenv, fetchurl, cmake, boost, python2}:
 
-let version = "1.7.5"; in
+let version = "1.8.1"; in
 
 stdenv.mkDerivation {
   name = "avro-c++-${version}";
 
   src = fetchurl {
     url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
-    sha256 = "064ssbbgrc3hyalzj8rn119bsrnyk1vlpkhl8gghv96jgqbpdyb3";
+    sha256 = "6559755ac525e908e42a2aa43444576cba91e522fe989088ee7f70c169bcc403";
   };
 
   buildInputs = [
     cmake
-    boost155
     python2
+    boost
   ];
 
+  preConfigure = ''
+    substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT"
+    substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE"
+  '';
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 361acf632fa..a2586b011de 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.10.10";
-  sha256 = "0hwsfczhx2djmc9116vj5v230i7gpjihwh3vbljs1ldlk831v3wx";
+  version = "1.10.12";
+  sha256 = "0pa71vf5c0d7k3gni06iascmplj0j5g70wbc833ayvi71d1pj2i1";
 
 self =  stdenv.mkDerivation {
     name = "dbus-${version}";
diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix
index fd5ce7c19d8..fb14ca47598 100644
--- a/pkgs/development/libraries/ffmpeg/3.1.nix
+++ b/pkgs/development/libraries/ffmpeg/3.1.nix
@@ -5,9 +5,9 @@
 }@args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.3";
+  version = "${branch}.4";
   branch = "3.1";
-  sha256 = "0f4ajs0c4088nkal4gqagx05wfyhd1izfxmzxxsdh56ibp38kg2q";
+  sha256 = "1ynb1f0py5jb6hs78ypynpwc3jlqrw51vl8y1wnd44nwlisxz6bw";
   darwinFrameworks = [ Cocoa CoreMedia ];
   patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
 })
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
new file mode 100644
index 00000000000..add520558ba
--- /dev/null
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "flatbuffers-${version}";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "flatbuffers";
+    rev = "v${version}";
+    sha256 = "0jsqk49h521d5h4c9gk39a8968g6rcd6520a8knbfc7ssc4028y0";
+  };
+
+  buildInputs = [ cmake ];
+  enableParallelBuilding = true;
+
+  # Not sure how tests are supposed to be run.
+  # "make: *** No rule to make target 'check'.  Stop."
+  doCheck = false;
+
+  meta = {
+    description = "Memory Efficient Serialization Library.";
+    longDescription = ''
+      FlatBuffers is an efficient cross platform serialization library for
+      games and other memory constrained apps. It allows you to directly
+      access serialized data without unpacking/parsing it first, while still
+      having great forwards/backwards compatibility.
+    '';
+    maintainers = [ stdenv.lib.maintainers.teh ];
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.unix;
+    homepage = http://google.github.io/flatbuffers;
+  };
+}
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index a08a653dc71..4506d3c4104 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -5,15 +5,6 @@ stdenv.mkDerivation {
 
   inherit (ghostscript) src;
 
-  patches = [
-    # http://bugs.ghostscript.com/show_bug.cgi?id=696246
-    (fetchpatch {
-      name = "devijs-account-for-device-subclassing.patch";
-      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=b68e05c3";
-      sha256 = "1c3fzfjzvf15z533vpw3l3da8wcxw98qi3p1lc6lf13940a57c7n";
-    })
-  ];
-
   postPatch = "cd ijs";
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/kirigami/default.nix b/pkgs/development/libraries/kirigami/default.nix
new file mode 100644
index 00000000000..0fd80d7fa53
--- /dev/null
+++ b/pkgs/development/libraries/kirigami/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, ecm, pkgconfig, plasma-framework, qtbase, qtquickcontrols }:
+
+stdenv.mkDerivation rec {
+  pname = "kirigami";
+  version = "1.1.0";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${name}.tar.xz";
+    sha256 = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6";
+  };
+
+  buildInputs = [ qtbase qtquickcontrols plasma-framework ];
+
+  nativeBuildInputs = [ cmake pkgconfig ecm ];
+
+  meta = with stdenv.lib; {
+    license = licenses.lgpl2;
+    homepage = http://www.kde.org;
+    maintainers = with maintainers; [ ttuegel peterhoeg ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libgumbo/default.nix b/pkgs/development/libraries/libgumbo/default.nix
new file mode 100644
index 00000000000..210a66e654a
--- /dev/null
+++ b/pkgs/development/libraries/libgumbo/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "libgumbo-${version}";
+  version = "0.10.1";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "gumbo-parser";
+    rev = "v${version}";
+    sha256 = "0xslckwdh2i0g2qjsb6rnm8mjmbagvziz0hjlf7d1lbljfms1iw1";
+  };
+
+  buildInputs = [ autoconf automake libtool ];
+
+  preConfigure = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    description = "C99 HTML parsing algorithm";
+    homepage = https://github.com/google/gumbo-parser;
+    maintainers = [ maintainers.nico202 ];
+    platforms = platforms.linux;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index bb6907c7b04..b632b910f01 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }:
 
 let
   version = "4.0.6";
@@ -19,6 +19,38 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/01-CVE-2015-8665_and_CVE-2015-8683.patch";
+      sha256 = "1c4zmvxj124873al8fvkiv8zq7wx5mv2vd4f1y9w8liv92cm7hkc";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/02-fix_potential_out-of-bound_writes_in_decode_functions.patch";
+      sha256 = "0rsc7zh7cdhgcmx2vbjfaqrb0g93a3924ngqkrzb14w5j2fqfbxv";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/03-fix_potential_out-of-bound_write_in_NeXTDecode.patch";
+      sha256 = "1s01xhp4sl04yhqhqwp50gh43ykcqk230mmbv62vhy2jh7v0ky3a";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/04-CVE-2016-5314_CVE-2016-5316_CVE-2016-5320_CVE-2016-5875.patch";
+      sha256 = "0by35qxpzv9ib3mnh980gd30jf3qmsfp2kl730rq4pq66wpzg9m8";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/05-CVE-2016-6223.patch";
+      sha256 = "0rh8ia0wsf5yskzwdjrlbiilc9m0lq0igs42k6922pl3sa1lxzv1";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/06-CVE-2016-5321.patch";
+      sha256 = "0n0igfxbd3kqvvj2k2xgysrp63l4v2gd110fwkk4apfpm0hvzwh0";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/07-CVE-2016-5323.patch";
+      sha256 = "1j6w8g6qizkx5h4aq95kxzx6bgkn4jhc8l22swwhvlkichsh4910";
+    })
+
+  ];
+
   doCheck = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 30339cfdae9..71a15b7e477 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl
 , CoreServices ? null }:
 
-let version = "4.12"; in
+let version = "4.13.1"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "1pk98bmc5xzbl62q5wf2d6mryf0v95z6rsmxz27nclwiaqg0mcg0";
+    sha256 = "5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index fd66d5bd41e..7ea32745ba0 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -68,6 +68,12 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "bindnow" "relro" ];
 
+  # Fix pkgconfig file that gets broken with multiple outputs
+  postFixup = ''
+    sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_old=.*|includedir_old=$dev/include/opencv|"
+    sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_new=.*|includedir_new=$dev/include|"
+  '';
+
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };
 
   meta = {
diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
new file mode 100644
index 00000000000..93c4320e78a
--- /dev/null
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "fastjet-${version}";
+  version = "3.2.0";
+
+  src = fetchurl {
+    url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz";
+    sha256 = "1qvmab7l4ps5xd1wvmblgpzyhkbs2gff41qgyg7r7b9nlgqjgacn";
+  };
+
+  configureFlags = "--enable-allcxxplugins";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A software package for jet finding in pp and e+e− collisions";
+    license     = stdenv.lib.licenses.gpl2;
+    homepage    = http://fastjet.fr/;
+    platforms   = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/physics/hepmc/default.nix b/pkgs/development/libraries/physics/hepmc/default.nix
new file mode 100644
index 00000000000..b935a3d56ea
--- /dev/null
+++ b/pkgs/development/libraries/physics/hepmc/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "hepmc-${version}";
+  version = "2.06.09";
+
+  src = fetchurl {
+    url = "http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-${version}.tar.gz";
+    sha256 = "020sc7hzy7d6d1i6bs352hdzy5zy5zxkc33cw0jhh8s0jz5281y6";
+  };
+
+  patches = [ ./in_source.patch ];
+  buildInputs = [ cmake ];
+
+  cmakeFlags = [
+    "-Dmomentum:STRING=GEV"
+    "-Dlength:STRING=MM"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators";
+    license     = stdenv.lib.licenses.gpl2;
+    homepage    = http://lcgapp.cern.ch/project/simu/HepMC/;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/libraries/physics/hepmc/in_source.patch b/pkgs/development/libraries/physics/hepmc/in_source.patch
new file mode 100644
index 00000000000..836a5655869
--- /dev/null
+++ b/pkgs/development/libraries/physics/hepmc/in_source.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,21 +37,6 @@ message(STATUS "default momentum and length are ${HEPMC_DEFAULT_MOM_UNIT} ${HEPM
+ # find the HepMC cmake modules
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules ${CMAKE_MODULE_PATH})
+ 
+-# make sure we are not building from within the source code directory
+-string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" in_source)
+-string( REGEX MATCH "${CMAKE_SOURCE_DIR}/" in_source_subdir
+-"${CMAKE_BINARY_DIR}")
+-if (in_source OR in_source_subdir)
+-  message(FATAL_ERROR "
+-ERROR: In source builds of this project are not allowed.
+-A separate build directory is required.
+-Please create one and run cmake from the build directory.
+-Also note that cmake has just added files to your source code directory.
+-We suggest getting a new copy of the source code.
+-Otherwise, delete `CMakeCache.txt' and the directory `CMakeFiles'.
+-  ")
+-endif ()
+-
+ # build_docs is OFF (false) by default
+ if ( build_docs )
+    message(STATUS "documents WILL be built and installed" )
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
new file mode 100644
index 00000000000..cb765f761d7
--- /dev/null
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchpatch, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "herwig-${version}";
+  version = "7.0.3";
+
+  src = fetchurl {
+    url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
+    sha256 = "0v7b84n0v3dhjpx0vfk5p8g87kivgg9svfivnih1yrfm749269m2";
+  };
+
+  patches = [
+    # Otherwise it causes an error
+    # lib/Herwig/HwMatchboxScales.so: undefined symbol: _Z8renScaleSt6vectorIN6ThePEG14Lorentz5VectorIdEESaIS2_EES4_S4_
+    (fetchpatch {
+      url = "https://herwig.hepforge.org/hg/herwig/rev/fe543583fa02?style=raw";
+      sha256 = "1y6a9q93wicw3c73xni74w5k25vidgcr60ffi2b2ymhb390jas83";
+    })
+  ];
+
+  nativeBuildInputs = [ autoconf automake libtool ];
+
+  buildInputs = [ boost fastjet gfortran gsl thepeg zlib ]
+    # There is a bug that requires for MMHT PDF's to be presend during the build
+    ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]);
+
+  preConfigure = ''
+    # needed for the patch above
+    autoreconf -i
+  '';
+
+  configureFlags = [
+    "--with-thepeg=${thepeg}"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A multi-purpose particle physics event generator";
+    license     = stdenv.lib.licenses.gpl2;
+    homepage    = https://herwig.hepforge.org/;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
new file mode 100644
index 00000000000..90a6d17f09a
--- /dev/null
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, boost, python2 }:
+
+stdenv.mkDerivation rec {
+  name = "lhapdf-${version}";
+  version = "6.1.6";
+
+  src = fetchurl {
+    url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
+    sha256 = "1sgbaxv8clcfy4d96fkwfyqcd4b29i0hwv32ry4vy69j5qiki0f2";
+  };
+
+  buildInputs = [ boost python2 ];
+
+  patches = [ ./distutils-c++.patch ];
+
+  configureFlags = "--with-boost=${boost.dev}";
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    pdf_sets = import ./pdf_sets.nix { inherit stdenv fetchurl; };
+  };
+
+  meta = {
+    description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files";
+    license     = stdenv.lib.licenses.gpl2;
+    homepage    = http://lhapdf.hepforge.org;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch b/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch
new file mode 100644
index 00000000000..822c3e38272
--- /dev/null
+++ b/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch
@@ -0,0 +1,24 @@
+--- a/wrappers/python/Makefile.am
++++ b/wrappers/python/Makefile.am
+@@ -25,7 +25,7 @@ fix-out-of-source: $(FIXSOURCES)
+ 
+ if WITH_PYTHON
+ 
+-PYEXT_ENV = CC=$(CC) CXX=$(CXX)
++PYEXT_ENV = CC=$(CXX) CXX=$(CXX)
+ 
+ ## Always force setup.py, it's not good at guessing what needs to rebuild
+ all-local: fix-out-of-source
+diff --git a/wrappers/python/Makefile.in b/wrappers/python/Makefile.in
+index 925460c..fdc8888 100644
+--- a/wrappers/python/Makefile.in
++++ b/wrappers/python/Makefile.in
+@@ -266,7 +266,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = lhapdf.cpp lhapdf.pyx clhapdf.pxd
+ FIXSOURCES = $(EXTRA_DIST) 
+-@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CC) CXX=$(CXX)
++@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CXX) CXX=$(CXX)
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
new file mode 100755
index 00000000000..b0ced3b24e0
--- /dev/null
+++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/"
+
+for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*<a href=\"\([^\"]*.tar.gz\)\".*/\1/;tx;d;:x"`; do
+	echo -n "    \"${pdf_set%.tar.gz}\" = \""
+	nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n'
+	echo "\";"
+done
diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
new file mode 100644
index 00000000000..c2a0babb4d5
--- /dev/null
+++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
@@ -0,0 +1,668 @@
+{ stdenv, fetchurl }:
+
+let
+  mkPdfSet = name: sha256:
+    stdenv.mkDerivation {
+      inherit name;
+
+      src = fetchurl {
+        url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/${name}.tar.gz";
+        inherit sha256;
+      };
+
+      preferLocalBuild = true;
+
+      installPhase = ''
+        mkdir -p $out/${name}/
+        cp * $out/${name}/
+      '';
+
+      setupHook = ./pdfset-hook.sh;
+    };
+in
+  stdenv.lib.mapAttrs mkPdfSet {
+    "ATLAS-epWZ12-EIG" = "01nj0zn19sk2ir4fk1202jsz457yrpqrsm99gn60a6rbamjybk73";
+    "ATLAS-epWZ12-VAR" = "13kra15c5ahjldprdvp343c7gd875g8hca7r1bx9ccz6nffxram6";
+    "CJ12max" = "1vk2zkaiqbl6fixaxy7mrggmmxv7lvnw736lxm5sh25dapg6s8ag";
+    "CJ12mid" = "0s2558ihypn0l9qqx25qwnawbc7fkbi2wwwhbyb108rjk2klaf8v";
+    "CJ12min" = "1kdla638m3axr65ndid9irmqhby4gl084r297xw3jxxlrb0b7hj9";
+    "CJ15lo" = "0hww26wbcb3i61z41s518gj41mn5gcikb08pdzyb5vyrl63b39bf";
+    "CJ15nlo" = "0acmyr5zpb7yzs2pikhgf8nx8l7csmai4sv361l7x3miqir56ss4";
+    "CT09MC1" = "18ap08vh1f4ivibq5z57wv7lwvw1pzwl865xznzzcr0jy4f59103";
+    "CT09MC2" = "04yxg4bl0dcgh6hb9g223wm084w0q1y2lbd4z7w8vmvvvn579ij8";
+    "CT09MCS" = "01vjpdgy79gvk3w4blwjgfqpf50mjdi5kmfcgnlnwxp5q0804pgf";
+    "CT10" = "17glhnqj4yknqy70zs7m097n1qq9fqljj3mna6qxchmgql04dvxw";
+    "CT10as" = "1709bb3ky4mpn4cgx9lda8swmvb2pl70ly1gzk4ahgsflkb8iaj3";
+    "CT10f3" = "0ijrx0wm03r0yg6f0n4vwp1c3kypdjpmmnv12gk79y193bfk362l";
+    "CT10f4" = "14icbh8lg9290wfalr1bsx0zff1df19x0qrjqh8n0y9ckqmkbh6l";
+    "CT10nlo" = "14ib003sxpxc8awywjckbw124aqhmi70wg4hlwc2nvdh46sqk11b";
+    "CT10nlo_as_0112" = "0n2abywijgjys56kz5qm30arh3v5k685l0gayl4mdablbw0ccaca";
+    "CT10nlo_as_0113" = "123kbzzfjlparffgmqpimygzjcn0wi1vnyrkjfjn2kwcdjazz8dp";
+    "CT10nlo_as_0114" = "17lgcbf7914dfb89d4v8fal69zq7gmadvha8gpz0wfw4p0pq765b";
+    "CT10nlo_as_0115" = "0rgpc3mcsd18yg4j41k9hhvbjbi3d1zrd9fq1314m4qvviq6d9j7";
+    "CT10nlo_as_0116" = "15xyhmipv9xbiz3jaqdj59nyczn35nq14183xz4py68l2v20smqi";
+    "CT10nlo_as_0117" = "1qf9azafrwqpyp5flc912g2frfpi899vb032yrrgqj2l1flg474x";
+    "CT10nlo_as_0118" = "1jra85s6df6vvmljkf8gg2jkj3r6b1yl6aidzlm3j59di0fk9xp8";
+    "CT10nlo_as_0119" = "0y7k0w592j777jpbrh8v2zh1l6n38xbxjvyiv5x4pvwi6zrp9ppf";
+    "CT10nlo_as_0120" = "0mh1hdmic5c3krlb1xypy0n6r86r7da0ay9183xwb68d1kh4j630";
+    "CT10nlo_as_0121" = "1gwvgj3bwv8fz8mbmgnfsy0bvsm4h9d898mf1kcaaivh56sfial8";
+    "CT10nlo_as_0122" = "1jkkqcmjynd30paxc9z9gpmxkfhs6ad3x5sms5980jx291rc8hgd";
+    "CT10nlo_as_0123" = "0gppcp49275pg3yv37mzkx7az6298wwy7gqla3gzxfzlas0ybg0b";
+    "CT10nlo_as_0124" = "1irl19q4wyw36dwhln1m4y7y40by5xgdjqpgj7sqaix8jvijc9bz";
+    "CT10nlo_as_0125" = "17c6n2prdsry2phqmaykrf1yc02mvhacb87r7yl0nhkhx80kysk2";
+    "CT10nlo_as_0126" = "183p4fd85zs2c1j0zwfsa08wq6v780xvwbg44bpm52m4ih1dgqy3";
+    "CT10nlo_as_0127" = "1vcpadkf90x9qiqaplc25hld7qljk5d3lzs1dssqi5fh1kci8qd1";
+    "CT10nlo_nf3" = "1dfzas3z075riwx26bkmvjck42pjgbm32d1flg5rccsxjn4pmmm0";
+    "CT10nlo_nf4" = "0npv1h5gi2vhgxzcbcsl740z2p7j9p8pg3jwfb0yz88wlbj5bkah";
+    "CT10nnlo" = "1la35l1b3hxdkihh9vkibfh68rghcfgq48q27x2b05dfhcvcz9lz";
+    "CT10nnlo_as_0110" = "0j1f6lbjhwcpgfb8kwzsij0hfmzb3dggi6zwwv9f2w39ax2rfb8i";
+    "CT10nnlo_as_0111" = "1519hvpi1zrjk8p31ksna39n9l8v02ggj5q775q243p9qyfayxlf";
+    "CT10nnlo_as_0112" = "0asnbr0va5p1j81kmv8ar267aciap638kcb48cs5ghz9fvhxp197";
+    "CT10nnlo_as_0113" = "1j5cfbv1d5q2hscyrvig6xkk7gfv4x5cxn1142qmd8pdm9ky2fdb";
+    "CT10nnlo_as_0114" = "03rkvf4ljv7bnzp0fyyrypbbx4rxd1y6id3dfvg4w22s65kp0csm";
+    "CT10nnlo_as_0115" = "1d8rkwvnymx4pi0v1s2vbc880mggdmfnzjppd7fghjqj4lkkanyi";
+    "CT10nnlo_as_0116" = "039i2bq4xr6hlvg0syzmyfv4lm7lrwr59myrhd609dybiky4aqd8";
+    "CT10nnlo_as_0117" = "0q3a5lbpxh24zv7ypbc680kqrkwy5m7xbgx5v44b6cdzlib6lvsn";
+    "CT10nnlo_as_0118" = "0b11mpgrkqn2n37asg8qg3qmhdhbr8lmj8qjixxpca0h1j7m71a5";
+    "CT10nnlo_as_0119" = "1j411yqrlbhqmby8mplgghmb4zxclf1h3pdsffx9iv8sq1q6dy2i";
+    "CT10nnlo_as_0120" = "1djf9qfqrywpsyv0w6igidg9a4ca739dvqgc7qz7qg2bpclbaly9";
+    "CT10nnlo_as_0121" = "0nlm5iwcvb02fd7kan4yp60qbc0fgir4dii3xg03n42xzqixy2qm";
+    "CT10nnlo_as_0122" = "1kwq04i5ln8wv32vf4akjnzid3jdq67zccfg7xriqrwd9367x5kv";
+    "CT10nnlo_as_0123" = "0w4fmsmyci09v0cxnmhdbqxv3xq3wa9ma7m4g39sg2gdsxqz1rgd";
+    "CT10nnlo_as_0124" = "0yzrj1pdigssi39z21k9jxbiahhc1785rjxhq7xl8zx38paspbg7";
+    "CT10nnlo_as_0125" = "0qvdvj3wkbkw0b0zv79ybds2pk5z9kbriwsm5ffpnycrfkzrm2kd";
+    "CT10nnlo_as_0126" = "1cf8bqi1g4c3xqg5k9m4fa8v8bcnwkzblmfn7zc396pgbzhhz610";
+    "CT10nnlo_as_0127" = "0zknrx60h8jdf2pfg2zq6xk73hn86gcv69ml78ik5ms0y5gp21av";
+    "CT10nnlo_as_0128" = "09yn8l3nv29frj3xn9pafiz2iamccp8ii8j7hmp63iaji6c7m5fg";
+    "CT10nnlo_as_0129" = "1ypq63r5myz2phn4y5sbb5dbxvycwis8jixjl0n95xmqlx5zhixi";
+    "CT10nnlo_as_0130" = "0ilr6ijbbh1zki66ma006h1qhdq7wmzm0ipki78bk01jnr5yl5sg";
+    "CT10w" = "1qkwz1drbkxcb4gskkfn0r7fsa6g9hjlc8716m633x35kha1v52j";
+    "CT10was" = "00s4n3nkngwyhh82l132v88c4jgkg03ff4x7m7nna21lvkv4wkb3";
+    "CT10wf3" = "1r43pzb1291bjcmahgfh0f86pvb3nhdpxw7gikqmypdmck0n2mqf";
+    "CT10wf4" = "18bf9k0jp95y9yz0m896sdzy9q1fyp0r4f5hrv4jq4d1z84zdis5";
+    "CT10wnlo" = "17wsw6p0h618q68swn9mjsahfyqikjgsiykiby7y27ryairv709n";
+    "CT10wnlo_as_0112" = "0p7mh56zyqh9i72llbmjchwm50ifa358snd8i1nqr3r6lr5265hb";
+    "CT10wnlo_as_0113" = "0nl4lk3cscsn6p50b3qqaabqfnkn5xgjmcxvfrr1n4njh411kmln";
+    "CT10wnlo_as_0114" = "1vck1i34dspbzskzpbqxbq11gp79drlrik52waklvsl5110xawnv";
+    "CT10wnlo_as_0115" = "070cl0prprqqkkzwxnvyw7r4ivvs8slb98v5yza0gvpwck0blnzn";
+    "CT10wnlo_as_0116" = "0v50pyjqpcrarbx886la0hr6vwvnavsldm9amcdp1vlck5w8mmg9";
+    "CT10wnlo_as_0117" = "108sb5h79mpgkvdzqlx830dykba5kw9zqgxa60i7bcyjnv0277si";
+    "CT10wnlo_as_0118" = "0zf335291hwfmdbhgl5v2y5pbc9slm7dmjfkijdv0jm33drpkcg2";
+    "CT10wnlo_as_0119" = "0kvwc0k5y51p4qvlb6hhxvn9c2n8x0xn0xyp5zkz75ad3vaz9yvn";
+    "CT10wnlo_as_0120" = "0yvbcni3xf718xild7s9g6cxw7dwa38f4iqdm5z7dd9ahxyw9rxv";
+    "CT10wnlo_as_0121" = "1z0mlrbdn8a9n6h0jpha3p1lqz4iamrwa80svqn9y4qii9h5pjkn";
+    "CT10wnlo_as_0122" = "1dh5czjvyjnwlzc14vz91693pr3nyls5g926g347rdrkqkjq8dcz";
+    "CT10wnlo_as_0123" = "0nf7qpgb83ahm5dkzr10xafhcx4lvb3zlxnz70jczl1jd4v2cld9";
+    "CT10wnlo_as_0124" = "14h07z06csxb6v6ai1w5ba0kygnsrzdwxr2nx1kcn93axcsqqbhv";
+    "CT10wnlo_as_0125" = "0g0w6mwy5y4l36cn4z8gfmigzharyn5xqk5ricasracrnf7ydix2";
+    "CT10wnlo_as_0126" = "0dbkkyimpll9r3979vbk4xqi5cfhzr6b28x6j73fbxxxi1xfavl5";
+    "CT10wnlo_as_0127" = "1svmgs55kg74rifjyns38lggv1c18mzmpmvsv116rrllklb19pfp";
+    "CT10wnlo_nf3" = "1m13if0d9xijq695x41snpwwrsgs5a0jvil6j2ww8cspc33d7vr3";
+    "CT10wnlo_nf4" = "1b9lz23rn2w7fqwxxgf6fcg620ac58dnb1ssj3ml3vfn7z88yx43";
+    "CT14llo" = "0sz2ni8xcjjg8034qjrhb77ak1akzlf5fwq00qs9c196lk5b2x7s";
+    "CT14llo_NF3" = "07zzs3jprh0haqx5bcsii213m99m2nh9vki76d9cbhicyzx23pc1";
+    "CT14llo_NF4" = "0bxkw5qms6dpab0zf1hhd8dllrjip2izbv23aqpg72d5rqxb6ny4";
+    "CT14llo_NF6" = "060fx2xrc90id3nb7rlmrvkxlyafx3g7nhdb5jmbr3hxwrzrq674";
+    "CT14lo" = "0y36qkjqd75zf1w1hs1q51qxgin7sm3bhmcbwczwrb17c3vb4m2m";
+    "CT14lo_NF3" = "06iad9lrpxsy0d365vrjv6gjlgggakylrmj1px17y6s796jq6c6g";
+    "CT14lo_NF4" = "18c03j26mbapjidq01s4yrfdh0i7j75gbswdhwcllwdvcg3gnki1";
+    "CT14lo_NF6" = "09ncggqnqcdpzakm16dzxd6ikay9gd5k8si80k52hrr9m2gf36ci";
+    "CT14nlo" = "137i0n7g9rgfsf5rx65d50njwsqawprazp5an513kmz1cwq0cqmd";
+    "CT14nlo_NF3" = "0pmamazh9i8pahalasr7mwx67ixbgrbsh8004grg0cimr2y4iwjj";
+    "CT14nlo_NF4" = "1k7sy8lpzkwy0dc4ig9i9134k854fk0r0lann6pj3jsxs0l6h5km";
+    "CT14nlo_NF6" = "1gfwr0sjbq41gx3057hqy8v6ysivjf1xrh6fp3qqn6m13gy2kbas";
+    "CT14nlo_as_0111" = "0kgg9r635grdwp152ylzklawzy8nf2ywlp75bjc1yyagg765k6jv";
+    "CT14nlo_as_0112" = "0j0bxx0gjdnj41gjasgd153gd811wyhsza56fvzrpka820bkk6rg";
+    "CT14nlo_as_0113" = "06if5wk1asazvff57ah944mnzkh5460yqkkwcs8zhnwx2kbq9v85";
+    "CT14nlo_as_0114" = "1szy7jwjvdvqqpjvcra1f0wn8qgrja6wx4kwcq9vf60pns7mzk7v";
+    "CT14nlo_as_0115" = "1kkahzmrbdr7s06v093arnss0xpxv7byqqx2f5aqh4fzimwp9n7v";
+    "CT14nlo_as_0116" = "0qpkmmpq1b33grf85jzkanwpa02j1cam39pkxchql95hv2jlgw4l";
+    "CT14nlo_as_0117" = "0381620r6h9s2qby52jvys4z8m6jfafa5qnia2fq3q1pc0xp1q2p";
+    "CT14nlo_as_0118" = "13hgxmjx6bv7njb6jdlypy1z61nqf5m5bavxsbrmwwfxlsl4jdzn";
+    "CT14nlo_as_0119" = "06pjl10js0xq7p14ifjn7xhndxyb39sxyc9ksd6wx55i6zyqf08l";
+    "CT14nlo_as_0120" = "1wyygxxjlcsh1qg6npk5szfbf59k4j80hnxnxhah9x9wrg5kg9j2";
+    "CT14nlo_as_0121" = "064afbxxqx4rsa3l73rki8wxa08a1rb53qyf3nwwjb4zb426jfgg";
+    "CT14nlo_as_0122" = "172xvndzcm8s4hzjgrq3szg6j7z4s2f4pgr07vr178zvn9986ham";
+    "CT14nlo_as_0123" = "0q2dansvna4p04ilb1sajz3s5mi89jgd8badqh6r72g26s96dman";
+    "CT14nnlo" = "1y3gd5wzpwv024xcrn70bz6h62n96mgqqwyl5r7q6czw0is52dzq";
+    "CT14nnloIC" = "05k55h97yc8iz9inzggy2yk6vbqiy0915m9c0dfxgr8m2iycndbh";
+    "CT14nnlo_NF3" = "0ijns9bjkw8zcinba7rflc7ic03mn5701lqfrxqjyq4q6kh8fia7";
+    "CT14nnlo_NF4" = "0fhyzaxnm17pi7wfh5hwaic9q4y0hb05ripd6r648wnnhhi353xy";
+    "CT14nnlo_NF6" = "1rnacbsh0y9qjd2x7ggs87zi9msrxrp2l6lidg92i2la4pri27zk";
+    "CT14nnlo_as_0111" = "1hl88j40czr73h9fbz0zbliawlqwng7ikrmq01hsfns190axm8w9";
+    "CT14nnlo_as_0112" = "1w9344v9ihr0w8vrfhhxn81gcnr0qm6ihwwijvcdds09jpdlp6vr";
+    "CT14nnlo_as_0113" = "11symfb1ljislbksrars1k766fa2n1inbarzbw3kp01vxpw8gxf5";
+    "CT14nnlo_as_0114" = "1s1zz0ibr72jvx9c7w3kcryiywnmg264gprn020yxl9sqfzm0kzz";
+    "CT14nnlo_as_0115" = "19c4c4s7djav1zai2nlxbvy8fzg8hqlynri1y4hyhc8hhl00lwb4";
+    "CT14nnlo_as_0116" = "1shjwky7jjwcci0frra2lfc0wycvza7na89c4bsqiksnk413v2z3";
+    "CT14nnlo_as_0117" = "1mp5xxv810khs59zg4kfsdj5qp6ny0878fbz7jf101mpyhdawf0m";
+    "CT14nnlo_as_0118" = "1mvyv13agnmc2c47i9yl8ki5d0qac3l6ipn3nf5rwxjgah495rv6";
+    "CT14nnlo_as_0119" = "02b14lrx3zpbl5s4nj1rvh30i9xdji37yvvg2xwjiw3i56vl8b2l";
+    "CT14nnlo_as_0120" = "0wf29wz9k2v39pbzh91bxwifbs4cn0gsnjdzm24cpgq7bnhyszn3";
+    "CT14nnlo_as_0121" = "1w12xmxqclrrwvfb2g3zvivkq858n0lpp0bzfibvh4wamdyyx3an";
+    "CT14nnlo_as_0122" = "1hgghn4ad7fj3ya17qnka3xcwz7sp4fl0vpcbqkrs9mbbz570fjc";
+    "CT14nnlo_as_0123" = "0m66gwhw2n668sg4srq683qbavwabrk4f4vfcsbppzbcgm7i4yz7";
+    "CT14qed_inc_neutron" = "0ph835nfx98i74nncmspj7qb5798yciq76hqvc505n5zd0hwp87x";
+    "CT14qed_inc_proton" = "0gv0rlr6l62gidqp02ifn75d1ribvbihgpaqc92fww73zwilr7l0";
+    "CT14qed_neutron" = "0ck1vmqk17i7rq42hra79cz2rm8ngxv4da6dvz62l6m2nrga3l2k";
+    "CT14qed_proton" = "1gijxkq5gpsljijblzd13kgr7xjjvnjv18v02jivylf73igsakd7";
+    "GRVPI0" = "0i5icsw9hf4jm25d0szxqc3r1131n417lv8b4gslg93xqj4ry1hf";
+    "GRVPI1" = "05j3mcrb0sq4nzv7y0k68f2m3v8vnd13mzbhq43gjq712cbj126p";
+    "HERAPDF15LO_EIG" = "12cqj3vqwi86sfgxkiwbd7rnpw1awnbqbc852b0x32d9j18nz9c2";
+    "HERAPDF15NLO_ALPHAS" = "06yiid611zi5i9snqrkjr3g4z2n1gwkvqjs606ha0b4nrwlpnkhc";
+    "HERAPDF15NLO_EIG" = "0h5brmk7w70dgbwhjikfpprni924c2f3kxsmxzcm2qlrlgj0nswd";
+    "HERAPDF15NLO_VAR" = "049bfsgkcfnz4z7vzkl4vr6ivp9kvak2f07nmarm8q2wwd6pjjqy";
+    "HERAPDF15NNLO_ALPHAS" = "09qf93b336yak3aqnfqlvz5j6xvvrsqkc4ag41xh4prpswj8fmrc";
+    "HERAPDF15NNLO_EIG" = "1yf48sr7nak6lph2s1vd3s91mrw0da9kjxlvqzcg3n9j48l3f3r0";
+    "HERAPDF15NNLO_VAR" = "0di4b75ag82iysyrv5wfvn8728jdi8mkq96ycpq534078ps2n3bd";
+    "HERAPDF20_AG_NLO_EIG" = "0jr2s4dj5w9xwidrqbqi8af2dqycm4vr36qy3x5javllp4dn04cr";
+    "HERAPDF20_AG_NNLO_EIG" = "11cdhjwz4qm2hxf8i5kl38ny4nbsrd2vf3jkwz17lrgls716wh00";
+    "HERAPDF20_HiQ2_NLO_EIG" = "09wwkv8lk7gy14avvamk3sqdsvig2bvnzha5d4v5s2ln7g6g7vhq";
+    "HERAPDF20_HiQ2_NLO_VAR" = "1cgprisw1bksi8nryqqsy6ac097ywxdgj5yg796izari7j72p4bh";
+    "HERAPDF20_HiQ2_NNLO_EIG" = "05670fr76fx14gp4ywywz71scr6f25jk14i4k84gpcb2l6rnbv9g";
+    "HERAPDF20_HiQ2_NNLO_VAR" = "15nxgq5hy6ncvqma6ai8k7601bfw97p0h9db2gqbbyyvxf2ldnc7";
+    "HERAPDF20_Jets_NLO_EIG" = "1c2n2cn9l8x9jc8c4dh2whgz3378nnnvb3448cgpv0qfm589ygxy";
+    "HERAPDF20_Jets_NLO_VAR_Duv" = "0z2pkmlpffy29x2bh0086m1ybbb94x507fkr4khmdb4d0h33ppdw";
+    "HERAPDF20_Jets_NLO_VAR_fsdn" = "1ya4hbr3shjggpqi6h3g9j3jnbmmgrva2djbsaxgp7icii39yf1a";
+    "HERAPDF20_Jets_NLO_VAR_fshdn" = "1sl2sq27xx40mj4zn00vc44k3vf1yxb7fwpqp0p3lqlp9gcwlycp";
+    "HERAPDF20_Jets_NLO_VAR_fshup" = "0qs8g45s70d0l3g7xh0bqhk65ac9g003bjpacd9v97gzpm6jvr45";
+    "HERAPDF20_Jets_NLO_VAR_fsup" = "17ix21qwjkp9gy9gvn3143d8ganzg9r78n6q47wdfxh12jzvgc7k";
+    "HERAPDF20_Jets_NLO_VAR_haddn" = "15rbsdddm5ayg5r0gljxxcmrrvzhfdr44ky2d6a70wjr2g6lc5yc";
+    "HERAPDF20_Jets_NLO_VAR_hadup" = "1x3rnr2hkcfglpmv732blziygzvdlw2rkks1ap9majnayh01vvfk";
+    "HERAPDF20_Jets_NLO_VAR_mbdn" = "1fi0rp4gpqj7yjmv6b68ac7m8v4f9m4q9kd6nq4ndk2gp11i6799";
+    "HERAPDF20_Jets_NLO_VAR_mbup" = "062dfx73lihlhndn5xjlsimfxalxbfhn1xyqzbk7bsqj9mffmwli";
+    "HERAPDF20_Jets_NLO_VAR_mcdn" = "092hwkx9kliib8lf405sy9bvxg6xgydnsxl92yjqwyicajihhij4";
+    "HERAPDF20_Jets_NLO_VAR_mcup" = "0qcirk0sqnkfyb3pdxlpkl51pbj2gybw7kgw9xzmj4j3jdg2zjqg";
+    "HERAPDF20_Jets_NLO_VAR_q0dn" = "1xv319ai4pwy1mcy6i3wk3mp4nkdpjb2zcnz17gxvdx2l6z1bz5m";
+    "HERAPDF20_Jets_NLO_VAR_q0up" = "0bfsqx23jsrjjsczl5j90hp3njvlwaw8mypj1si83mr1z0s9q4rx";
+    "HERAPDF20_Jets_NLO_VAR_q2mdn" = "16qfw118c3lh91zsg2nb49xjynbd9w1rh4y5ybr35v38i4acpdab";
+    "HERAPDF20_Jets_NLO_VAR_q2mup" = "1q80h7r0cklpz1jam3nzxs7h3i8jpgpc03l7c3g4mkz61ynh0ida";
+    "HERAPDF20_LO_EIG" = "1r6ylwi2yszsk5dmw27734s0ghkvdawmqa6fik1k3j82d9s22mkl";
+    "HERAPDF20_NLO_ALPHAS_110" = "0zmmg0k33bf52skbz42cgxdjw0ap33fyf0h1kfd9ciw4gra2rakn";
+    "HERAPDF20_NLO_ALPHAS_111" = "1mlc33kfs4zlmn305hifjh2d85byvym1mzdj9bc3nlypv4zcszlf";
+    "HERAPDF20_NLO_ALPHAS_112" = "0wswbdmkyv0a6fw531s1s7jnskzxsvwh9bydvgiav53pfpibsyx6";
+    "HERAPDF20_NLO_ALPHAS_113" = "0qx7kh3cmqz59sm6vjcvi2hj5c7d816mc7jfhqr03hvavqcsla14";
+    "HERAPDF20_NLO_ALPHAS_114" = "1n2434j9gvdz24h30sng8z5jmc9hhnm9nbr3hi82n6ssnwabsl97";
+    "HERAPDF20_NLO_ALPHAS_115" = "05wk9glb6xpg5n689slihcfkdvm3kgwpxw8dxp4rp8zyvrsh6l6f";
+    "HERAPDF20_NLO_ALPHAS_116" = "133vvg5bh1lx6zcacnaphkj11608wafim4rb6lcqx4mkpxabmzxa";
+    "HERAPDF20_NLO_ALPHAS_117" = "18n1s7qqzf67lg8gphpm606dvz802i6xmlz5if5jdhjz8r3qklzf";
+    "HERAPDF20_NLO_ALPHAS_118" = "07xj5j7k54bwi9xq51cf8zanqlkjcbdrvw9k8ch3h40bk961c5pz";
+    "HERAPDF20_NLO_ALPHAS_119" = "0njyfp84kf51m9rw9z3d3figp23043p5ml7cdb45dvh9hbpssh40";
+    "HERAPDF20_NLO_ALPHAS_120" = "02paa7bng9nycd8dd2zf2099592mbaz8c4a5hamcmvzqfz0sdy7d";
+    "HERAPDF20_NLO_ALPHAS_121" = "07hmbvpm96pm5yp9bsx9aksznksh6k4qrw0k28bns0wjn75khxsl";
+    "HERAPDF20_NLO_ALPHAS_122" = "1pjn3h1wr6l6sy7kjvk72qc409dr939z787q2qbaph7xh5rf7k2s";
+    "HERAPDF20_NLO_ALPHAS_123" = "09hz6pw4nklwf94krna7g80659v9c2c0f5rf99mnx900xyhk7pxa";
+    "HERAPDF20_NLO_ALPHAS_124" = "1d9gmc3g0j32kgwyfddmx9f3gxwrgnq3xcbrabdx9cw554ysd6sg";
+    "HERAPDF20_NLO_ALPHAS_125" = "0mi2q9yhkcdpj7336kbs1vw4zvm8c9fryz0c7hdj246kj26rb0mv";
+    "HERAPDF20_NLO_ALPHAS_126" = "067rng6gv24qf1j8lz37115mc42k8wjpzrfcw4jw2d1yg22ci0lb";
+    "HERAPDF20_NLO_ALPHAS_127" = "0v3xcdr8wsradqf3bzayvvlsdjzr54qa2kbqb5pyvfi3rafrwrmi";
+    "HERAPDF20_NLO_ALPHAS_128" = "0ywnd9c6bq5bp02s3b3pql8a74wm472p11alqi4b4pmlzphzk1ix";
+    "HERAPDF20_NLO_ALPHAS_129" = "055ya2wxscbzp2w3zx2a5xgs94wl60bm6c2vxrs2rgnab72382j9";
+    "HERAPDF20_NLO_ALPHAS_130" = "0k91azhwxrfni5yfasn83f67ma9w8fax2k1k9xc8pvgmbh3c14wi";
+    "HERAPDF20_NLO_EIG" = "1ryamdwblj1ysbha672q2z9qai62h6cibb0laizfq2nq4j4ml3vz";
+    "HERAPDF20_NLO_FF3A_EIG" = "1fs6ldnwflmn5ysqkq9aky2xskd0dvq372h48x89h4vmsvd302wn";
+    "HERAPDF20_NLO_FF3A_VAR" = "0jd9wgrhchqjcjrkh5hjx7x8agm43jq5p8dmyvk0rniz9zybx64d";
+    "HERAPDF20_NLO_FF3B_EIG" = "0r04zjfaaq686g3bd6c753vkcwsbgdcfzr67ngm7vsz27zscbjbz";
+    "HERAPDF20_NLO_FF3B_VAR" = "12qrfld8958gvk9c2q8l0mvccx6wkrgnsiapgzl37s6s6zcgid10";
+    "HERAPDF20_NLO_VAR" = "0q5ih9ac3z6n158h6q149h0ggkfjrdn5rqwf7nzi3j50fhs63swj";
+    "HERAPDF20_NNLO_ALPHAS_110" = "1828i4ybdzs7zj62lzsifgshxdas81vjvhfg86ixry4xqkfprlfg";
+    "HERAPDF20_NNLO_ALPHAS_111" = "011d1a900jjpa78ph05sdy353gfmrr8azpngcf0cjigcn4fwdna6";
+    "HERAPDF20_NNLO_ALPHAS_112" = "0xb2bnigwlhs0vs3fwzsz66zidchwgs97kn6vjfhxnik8xdfkyb8";
+    "HERAPDF20_NNLO_ALPHAS_113" = "13b8gh0qwpy574ra6184vgff3wba0blr44lxj56xrkaql9zi1jx1";
+    "HERAPDF20_NNLO_ALPHAS_114" = "09n30p5pbw2wyjss2jjz1h4nl9scin42s91sxdcrwinnc3y5n1in";
+    "HERAPDF20_NNLO_ALPHAS_115" = "0nlimqmfhx2ijx48ylciih5diwlsb5zzkli82rgnnxci3r4ycjq4";
+    "HERAPDF20_NNLO_ALPHAS_116" = "0nr8svx60zrf42nxg74v0h759y9lwg54892xpdmswg7mw0nwcrm9";
+    "HERAPDF20_NNLO_ALPHAS_117" = "0xiqdr2r5dyyp5q56b3w04wy3raqrh1mjsv1fm05xswxn2xwyhlq";
+    "HERAPDF20_NNLO_ALPHAS_118" = "";
+    "HERAPDF20_NNLO_ALPHAS_119" = "1w9nl0pnfc1cii4knmqdq4cnh6shhhgj8pg4a42bx20lvqc3aqgb";
+    "HERAPDF20_NNLO_ALPHAS_120" = "1lksn0rcxq2scwpnps8dawlzijhvwbg0pn2is4r29igbqck2jvb3";
+    "HERAPDF20_NNLO_ALPHAS_121" = "03d58rbibvgcvmsw86q3030qnw5nnvq8p6diqscd9srb8br06p8m";
+    "HERAPDF20_NNLO_ALPHAS_122" = "0541yx5fcadw7rggpypd8kg393m5hwzsw5jangsmsrsby1rc2m4a";
+    "HERAPDF20_NNLO_ALPHAS_123" = "1ckc8s04jf7x19xpwwb8g60likrlz3dp91qzaafljvbd9b27aa61";
+    "HERAPDF20_NNLO_ALPHAS_124" = "13dx2wh0dhxsjjk6ak7wy1gr8g297dpc9xvkxvb5ayd0rzmhjlwb";
+    "HERAPDF20_NNLO_ALPHAS_125" = "0yh6jakycsqhh4h6jqrilw1afmk1jkcq2px978z4qcz4y0m6bx4a";
+    "HERAPDF20_NNLO_ALPHAS_126" = "0045sa1kl4w75ja6an38i2a3fi78q6xg22av536l9h1c8j82ql13";
+    "HERAPDF20_NNLO_ALPHAS_127" = "1f5l9cy59dc3rc9xqrsq85g0mbhyaqkbpzi40f3gjg6bxjlgb4rx";
+    "HERAPDF20_NNLO_ALPHAS_128" = "1c2pbd4zam5av582r777197638l6i5a0chmw9ci7l05lzm19nzmi";
+    "HERAPDF20_NNLO_ALPHAS_129" = "1aipmxxn7s1r66m6gmrjgr2yca7sxvpf8r86s4a5j768akkgmlld";
+    "HERAPDF20_NNLO_ALPHAS_130" = "1g2q3438bivd20i685jmx565cq108yv72vhxmpmhysh4qwvwpqqw";
+    "HERAPDF20_NNLO_EIG" = "12zn49jx7qjr8apgpbhknzll4vwlz3x9y1ai908ix2h86pgap2ml";
+    "HERAPDF20_NNLO_VAR" = "152h21khvkhxwx87c5lqwzpakmahcpj1ixw6kgl0wrrwjknvfgxn";
+    "JR14NLO08FF" = "16azkqxf1yw1j32ay6j01gf8n9n7qm56jh4yzgjag0zdhm01lbip";
+    "JR14NLO08VF" = "1ilw38pp4vy8c8v1glfi4ixca73wjkdg3di1wh9p8xqrifdb096p";
+    "JR14NNLO08FF" = "1w0pywmjb4xi7bsvv1mdd4q2adf1g7khspfbkphmlh8zipx29nxx";
+    "JR14NNLO08VF" = "0kzszj1r141fcg9vbf53480224nxcc5wfk9zmpmzbmrxzi0w127r";
+    "JR14NNLO20FF" = "0wc3qib90dpd1wgiymrn5lzwhqmh58ji2s92vpj2v9v4spws7pdq";
+    "JR14NNLO20VF" = "18l4ipn80gmh9kdw7a1k49fwgbl7b1frgc0hsa04vbwnv6hm73hn";
+    "LUXqed_plus_PDF4LHC15_nnlo_100" = "009wb1ibh4yfbqh5fsznc2g9g50rl6g0pq0x9qf7iiq2vd40rzsz";
+    "METAv10LHC" = "1vn4wnx1blz6wylbzirswdqqf0knmyh1pcfh62wvj695mh7i0w16";
+    "METAv10LHCH" = "1p4wy7m1ksz0r1fylwz3cbq7jl8s58v817n3d898l83ic2ghp4vj";
+    "METAv10LHCHfull" = "1w623939fjdyx1316rxyaavf6kmxff19himr00br57jrw3v49nfg";
+    "METAv10LHCas0116" = "0y1l6djkmx8zcsii9j9krwhvgh071a9y5d4m1rkqpbqf6dnq9kll";
+    "METAv10LHCas0120" = "1g1izkf3j0vdrjskbjzh8lzsdn1bqssidr0gsapyzlx0dzc2ixdp";
+    "MMHT2014lo68cl" = "03wrjv448zdqblv4zx5b2p4m0nj8h4igabh8pzskj0327w7g91lm";
+    "MMHT2014lo_asmzsmallrange" = "07c2n0ddjh5183h4srskvh1d4fvzi4xrjgpkk7ap28j7r0q0maig";
+    "MMHT2014nlo68cl" = "039zw5zrzm661bgjv7d0imzhfv3j3ixnrssi13ynfpin9v2izy6g";
+    "MMHT2014nlo68cl_nf3" = "0bjmng4ifdswi88kf59zzxpdq8ka80m01208nb2ij3dkpw0n5hnf";
+    "MMHT2014nlo68cl_nf4" = "01g0bbfwxaqhgpv0yz17fvwa4q1a1vh9867kp9fyavn600kd91ds";
+    "MMHT2014nlo68cl_nf4as5" = "1wdrk7b1hs6s8f2gxp7b3c1qrxvncs41h4aph1dhf8zffn3653yy";
+    "MMHT2014nlo68clas118" = "1nv7h2j31z061mgph5154qgxn8rl5sdgwzzs3d3clxfshh5gcccn";
+    "MMHT2014nlo68clas118_nf3" = "1d7k0vablssy1vfimsvxdiklaachw44lg37fgj1im52k81qxzd3n";
+    "MMHT2014nlo68clas118_nf4" = "1s8gv434b4mz6y5rv4kms69ghliafcmih09icj4qwk66hj7pn5lj";
+    "MMHT2014nlo68clas118_nf4as5" = "00zvf9zkrp9lk9psqvzsn04l1rw1xmq37bd2c8mqc2px3zdq9q0f";
+    "MMHT2014nlo_asmzlargerange" = "186jz5r74qas28x04daqkxhs5p31i68hhy8a7q6lzd5nh42x6kk0";
+    "MMHT2014nlo_asmzsmallrange" = "0qvz3cri83i09xh6vm2wilc76cc3gri331f1vrrs8x71xinisv49";
+    "MMHT2014nlo_asmzsmallrange_nf3" = "0ckw5971pwvvix8idw2m6j7w6bjivqpa1ynm6ml0bhc75cmm6l4i";
+    "MMHT2014nlo_asmzsmallrange_nf4" = "1asnk3pl3dw1sh76k0s95jb57cv5k90zjgpbkr3nnrbhvnkizl5a";
+    "MMHT2014nlo_mbrange_nf3" = "0bghvriw01jxmzcm9isz7in43ph7vz6zzr0rmmi81snrwvg8918h";
+    "MMHT2014nlo_mbrange_nf4" = "1gad7269hz4jj3946yyqzmcx3zyxx2p4r0h88x3lfrm0rd0fg00d";
+    "MMHT2014nlo_mbrange_nf5" = "03id7bfds16kbnd0nwjla8sn4pl3q3qa5v0a3pykdwj14k9igi3n";
+    "MMHT2014nlo_mcrange_nf3" = "1zfmdclsgwf6517v88zg34wby40606sspcghh4yahc2bbznd6a63";
+    "MMHT2014nlo_mcrange_nf4" = "0hzhkv81a0z3ichj5kfhwnhc720xw48h63llijl0pcfv8qqpvl19";
+    "MMHT2014nlo_mcrange_nf5" = "148hg5dc60yhfmwsm0svasxc7l1py6ggj7lzv0mrshl07rwfh62a";
+    "MMHT2014nloas118_mbrange_nf3" = "03w1wish6ig3mw9j195rakxsjr7gr46qz8dh009sigqcgp3s9fad";
+    "MMHT2014nloas118_mbrange_nf4" = "1lbj3r1bbxx2y1ybnxpd0cw7jzkdz0rb1grn1pmwmrl0l13s7j59";
+    "MMHT2014nloas118_mbrange_nf5" = "12q0gkqzhxqwrvy8lpg66ldsxnwr8id6jv6k4dj6f0p93qif5wr8";
+    "MMHT2014nloas118_mcrange_nf3" = "093yh7wa3p4028x5zxw15pwkrkjxzfl7kcdm7jqlf08zwm52clyx";
+    "MMHT2014nloas118_mcrange_nf4" = "0q0y77i0fgdvjk9y76kqzxpn22jbzsh64qbx8186ri9fqzfi868i";
+    "MMHT2014nloas118_mcrange_nf5" = "187wsfm49ack0jh9rwy5h29b1511b17myqn28bm6nbn7r4rfvnkz";
+    "MMHT2014nnlo68cl" = "0sss77zwv94vcy4ghv6493vbw08xwm264dk081w34jc4ifa0vg90";
+    "MMHT2014nnlo68cl_nf3" = "06paq3nzs87babpksabnkqi38gvvyfvpqlh8p18140zrdpdffaj2";
+    "MMHT2014nnlo68cl_nf4" = "0lbqpdy66v3ns6ax9vj1ix4wjn2pwlw5y1z26hlbrxz3l8hbizg1";
+    "MMHT2014nnlo68cl_nf4as5" = "1bh5nsral3lrlqq6afvq9ahkfmhfw3mq0m0qcvsx4ma5jx5rv7dv";
+    "MMHT2014nnlo_asmzlargerange" = "00l2jqccsl3jfwdj7lndr4b5cpx44krjvnm3h0hjw6hkv4irxb5s";
+    "MMHT2014nnlo_asmzsmallrange" = "1x36pv9nhj74whibb16bc414ypcks6nd1s7q1jc0fb7ndf5rijy6";
+    "MMHT2014nnlo_asmzsmallrange_nf3" = "0svpc51n25cbz2b43zbd60bfckrlz3q2jn3x668xnha9qsd3c2vq";
+    "MMHT2014nnlo_asmzsmallrange_nf4" = "15jggp2nbm828nprxyyinmp7kfxngpm0apg446hvwd8hg7blb1a4";
+    "MMHT2014nnlo_mbrange_nf3" = "0r9gi5cw76zn0lq3fcs7s2xxh6jl9y5vdv31bhv6mac9jmhjb458";
+    "MMHT2014nnlo_mbrange_nf4" = "190wva3k49mymflbm1v5xd449j38jm7ylfcdiflym8pgkdvwcgyl";
+    "MMHT2014nnlo_mbrange_nf5" = "19mnv9nz01lmbiv01qmflhg24kldhqpmcc8mgp7bnkhicgivb5ib";
+    "MMHT2014nnlo_mcrange_nf3" = "0zskxladqr40v6wqafbl1pl04vq43babqf437c4xxg4sz9435l3l";
+    "MMHT2014nnlo_mcrange_nf4" = "0sny8r9zap8gnjh9id1klr59d9hs0bb40pf8hpy8q5pg6052vx3q";
+    "MMHT2014nnlo_mcrange_nf5" = "1l340c1x4fz647bhybrvbb6z00mla81b78jfqpnwd4vwfxnqmq9y";
+    "MRST2004qed" = "1kdrzk2arvs36lnpkbc94w06hx3nh8nixh2qjhb271c2blwgahzh";
+    "MRST2004qed_neutron" = "12vna0ic6gh313k22b44b0k9kd939v7zjl2hj65k1075j23mq425";
+    "MRST2004qed_proton" = "10z0cr8pnr0lfxxi916naiz381a2cqn461jblfzvvddwqmqbllbc";
+    "MRST2007lomod" = "13ar6hzw9al20zlm8lg0hvwmgrmv0dbam820gm36rj8p7i33qlr6";
+    "MRSTMCal" = "0kbyp4rypw8jm28zfpvf0grvfvxmsrp3grwsmfxpa2c38x6la3rq";
+    "MSTW2008CPdeutnlo68cl" = "1x2y7hl8ckplx175bp3wi04xafm44dd7vzfgnmvvai1x0072xi51";
+    "MSTW2008CPdeutnnlo68cl" = "1szsdqjkmny30mpw4pdzi97vj7i55agxm285dvnkzp06ycgp1ld3";
+    "MSTW2008lo68cl" = "0j12mv286r4ds9v7piqh4n44yjnc51hm74lqa4vv5xznxhibng7l";
+    "MSTW2008lo68cl_nf3" = "1s5z55b2aj37bx0p305lcgrdclgvyl99xgfrl0rhmdgr2byg33wi";
+    "MSTW2008lo68cl_nf4" = "0m539ihcz3dxy4gpfbam5badhhsimywlbgnczbybph8yn1118j9r";
+    "MSTW2008lo68cl_nf4as5" = "0vl1q7xnr425sscbk4djqi56jbpzpi8l3z2nknfqiy3l7ykg23ng";
+    "MSTW2008lo90cl" = "0af5j0s1i8yn0mjs4nb77migihw643lhd7dfl184v6wik3031yg3";
+    "MSTW2008lo90cl_nf3" = "1a6kc1lgswjk800jzcqlbpwzz4rs3g6agckhnlr8cizmp9p7risk";
+    "MSTW2008lo90cl_nf4" = "1bdjl58gslhw539650qwi7vbvsr22hpxpca17rkbqz9szh0ljhym";
+    "MSTW2008lo90cl_nf4as5" = "1crsm7dfcs0fn1i2ng18wy23z2ap01xr2rsnafqlra0q135m6hfp";
+    "MSTW2008nlo68cl" = "0pdvb5nshjjw7ddmdmj1v88m3jlk3vwfnab0pf2kf8hfx10hbv4q";
+    "MSTW2008nlo68cl_asmz+68cl" = "0gwmxs0f7raxvmpn12zavzqsrp3x0a82y1vq2kf9p9fq17in55yn";
+    "MSTW2008nlo68cl_asmz+68clhalf" = "1rmda4zpm6cs9kyxkhwpz38iv6g259156bmka4dc4zyfg1lcw85d";
+    "MSTW2008nlo68cl_asmz-68cl" = "15mmdnd3wwlrs5pwwhfa9f88vjpgza8vwxwxpyadxsmhx9jk79hy";
+    "MSTW2008nlo68cl_asmz-68clhalf" = "0dd7llc6ip6myy2yvf16riqs334f20l8wkmkksq53xngmz9qf263";
+    "MSTW2008nlo68cl_nf3" = "1j82imyylvnf3x39x1mb19hhp2nbcq2lk82hf7sj72c557l3qpjk";
+    "MSTW2008nlo68cl_nf4" = "08f008by768c8v3cmrsbgxpglqdj58nwwf22dmk2mbf2jq449s0n";
+    "MSTW2008nlo68cl_nf4as5" = "0hrqmmnp20vpj6dpz3bvm531i0pvl06als8irqz91cknv6zsvxf9";
+    "MSTW2008nlo90cl" = "1d3p4cialrngci9kn7225zcmyrr547dskzi74dfgdhbqc0256a2r";
+    "MSTW2008nlo90cl_asmz+90cl" = "19cd358yqklc8bxv0mg69cq3sf6zah7di0q9ilfqbiddmw1flw3p";
+    "MSTW2008nlo90cl_asmz+90clhalf" = "0ngn8f149agvmc54nrxjxqa0rifbd8a1hbcgpa443l75bmd9sqcp";
+    "MSTW2008nlo90cl_asmz-90cl" = "0fnqj7ywnp9nz5733ggjwmhxpy15zs2xgxjz7ixmql5mmaz3sxb6";
+    "MSTW2008nlo90cl_asmz-90clhalf" = "1jrp9q8li7a4bwhgh7q9h9zc0sdhck957zn14q9ca9kjsflyb9f5";
+    "MSTW2008nlo90cl_nf3" = "02ihabrcgp474wkq4w2fshpiqdznjaxyg5vawv52yj6hxifyy5a9";
+    "MSTW2008nlo90cl_nf4" = "1wrdl79qy8mimqk48705f3sd651zy130k1dmvvzwvdsjd9y8q58w";
+    "MSTW2008nlo90cl_nf4as5" = "18d1pvijcyfxkipmd2v2zrkxdbhxygkcyn3p8vz0vzq5q7s1s7r2";
+    "MSTW2008nlo_asmzrange" = "161364fvc8w8ggad58r1c58b0kngqa1bjpabaqi5cigmzazj3rl8";
+    "MSTW2008nlo_mbrange" = "1b7z4mm3f8wjjbxb8hs8l7kclh1yfz5yffzdsch2i09c7wh79616";
+    "MSTW2008nlo_mbrange_nf4" = "02s7ljzwamsha87i6nsd4kdfb9ky4k6m8xpqa1iz9wgrcy4pmw5p";
+    "MSTW2008nlo_mcrange" = "1bndxfi27r8k0m4r26bfsflbbrjc4s2vp5ixy7qidkw33g6mqh96";
+    "MSTW2008nlo_mcrange_fixasmz" = "10s2sfhdx5668cffwb0sbh5m54zq0inmpfnhkj0zk9ij4f5y815f";
+    "MSTW2008nlo_mcrange_fixasmz_nf3" = "0zwnicbmmqbak5sw92njpmvxpjnnhwl1ggvlj8q39hn5w5kdy1kq";
+    "MSTW2008nlo_mcrange_nf3" = "01mlzqwk30glr95g7n2y3yvvy7s6mkbdb5cqwl1m7k8d6m18n49g";
+    "MSTW2008nnlo68cl" = "0y6lv1wkhydfnlakjrrrjapxaapa0bcbmfx0w9c4psgy156kv1fv";
+    "MSTW2008nnlo68cl_asmz+68cl" = "0fhkbkshrc29kz0fc9vi2dqsg6irjm4sfw4sp0s4wkj766wg19nz";
+    "MSTW2008nnlo68cl_asmz+68clhalf" = "1z0fplsv1fij4fgrz7npr34hcmc2qkf7g398bq1smvb6b2qy5jb8";
+    "MSTW2008nnlo68cl_asmz-68cl" = "1qhjhdzpy67665ccwv0n3g7jlyb2vfk60cphjr0jb1adgv9fxa7q";
+    "MSTW2008nnlo68cl_asmz-68clhalf" = "0rlsis3r7l32jdiq2yhx1mz7q6qlzlsrarljvrmxf0g0g2d8nr4c";
+    "MSTW2008nnlo68cl_nf3" = "07nrz7afd1mcsqc3lqv9vk2phs1nfxdl63qh1bc0g7nznxwmmn97";
+    "MSTW2008nnlo68cl_nf4" = "1kd62hzk2p3q56kj79bs101arp55ajlyhwwa3vq3yp37i3ynz9ds";
+    "MSTW2008nnlo68cl_nf4as5" = "0x19rq5k9c97vzskqppf4k0fjahwiw2c1nb6iy5c2fq8mj1pz2gj";
+    "MSTW2008nnlo90cl" = "13xqlfys37b8chinah2yqmzd0clzli06p7vjk30ha22wgwm02dq3";
+    "MSTW2008nnlo90cl_asmz+90cl" = "0pd6imc3hvq7vgyv1db9y8rvpgz4ffwqv6rqzp27c7ipxg0wjyz0";
+    "MSTW2008nnlo90cl_asmz+90clhalf" = "1xn52ppixjg22ybd8ggf0azb3zg5zyilqjss033g0k9crq4a6y2v";
+    "MSTW2008nnlo90cl_asmz-90cl" = "10wxgh52zs0fp0bwd0b6csnz9x6mvp45gvjhk0y1dhgfwbcvw9y9";
+    "MSTW2008nnlo90cl_asmz-90clhalf" = "1kmvp1yfgsx4jhsjc4drg82cq4xs6as4grwrymfkrqnvhcg86vap";
+    "MSTW2008nnlo90cl_nf3" = "0vw0cmszwp49fsskacccl921za88cl5cfy0sqckgxzs4hx21x43n";
+    "MSTW2008nnlo90cl_nf4" = "1b3fy8mfclgsmvpyzfs34fjry6djmkjcjppdxni1ipjyp1bcaia3";
+    "MSTW2008nnlo90cl_nf4as5" = "05phi752spikwq74i0hfid7lsqi51hdvwxm520kdmbdz2pblbz4f";
+    "MSTW2008nnlo_asmzrange" = "1nj68qhvlsqi7299d9rrsmq7pr6bdil4gzr6yla2cgn4wwiggdwn";
+    "MSTW2008nnlo_mbrange" = "0jnmy4i593wz80lbm0r0cwdj9xw496p3in0lq8ksr4yjwz0agpbk";
+    "MSTW2008nnlo_mbrange_nf4" = "0lw3p4q0ixj7plcmwqh43lfgv1i7ljar3f3k1v6f0imyvz8swfgr";
+    "MSTW2008nnlo_mcrange" = "17v549iq2wn5zvxfdvq8pf5f7zvgnpa72i6gxvxzfqwkji7mv522";
+    "MSTW2008nnlo_mcrange_fixasmz" = "05c8z2q2866550clx2mwb1jvhpn0agkyg82vvrswi3h4hgkvlfjx";
+    "MSTW2008nnlo_mcrange_fixasmz_nf3" = "0r86xsl1wfphwdj2hhlilkwc2949m7bcn42dms14g7w45i24g6id";
+    "MSTW2008nnlo_mcrange_nf3" = "1c9lsggncwghvw9mgd18h50ljrnlpp1p5r2zlzf8z3g8i4f3aaih";
+    "NNPDF21_lo_as_0119_100" = "19qw2hp1yk82qgcrpx8wp2fg8wklaj6rr653m6mndhhr0aa0w80v";
+    "NNPDF21_lo_as_0130_100" = "0p5cw77dg5pkhl3d0y6r3k8vhw4m467wf3gd8kp2l5vcbdwb4izv";
+    "NNPDF21_lostar_as_0119_100" = "0i23axf0xl11nb2dn6p34bnm1xfisnn3a82db9dz863n60gqb5x4";
+    "NNPDF21_lostar_as_0130_100" = "1aka01747071l53jx4v7rgmfj5danzjillbwincgi1b28mw78yhq";
+    "NNPDF23_lo_as_0119_qed" = "02d85an11mr66yg3vi5fq4919ymbrh9h8b8qzzzm9dvfarzmbwxi";
+    "NNPDF23_lo_as_0130_qed" = "0qsxxw3nds42924xqnhs56wmd8ihmrip28glj47q9r9i3kgw3lv0";
+    "NNPDF23_nlo_FFN_NF4_as_0116" = "1d5wccg8l5xmdr8pvks6851zxrlgq1rk2y5dgp10k6r108059rgn";
+    "NNPDF23_nlo_FFN_NF4_as_0116_mc" = "1sc13cqah6di97fmlnb6qw454jyrp0i9jv2pfxvi8ix2vzd6km00";
+    "NNPDF23_nlo_FFN_NF4_as_0117" = "1gkzb46fnf9k97fgbbxljdnklffwnxmg58z01x55iklq4sn2aww3";
+    "NNPDF23_nlo_FFN_NF4_as_0117_mc" = "0nc3fx9ggqybymw5kglwq3kmznc9hm28sp58gs1l4gwx3xiy0bj6";
+    "NNPDF23_nlo_FFN_NF4_as_0118" = "1zlcqh0nfy8yf2cnzs0iy615nbmhpa2zh4carvifcqd4lv4azkp6";
+    "NNPDF23_nlo_FFN_NF4_as_0118_mc" = "0518z8jakc9r74kzanraf2n8haminfipp2rvr1288ymhsl5bxyp0";
+    "NNPDF23_nlo_FFN_NF4_as_0119" = "1k5mcql2411020m6vq26ck8ig3q01j79ndjgci2biq743m8nlvm2";
+    "NNPDF23_nlo_FFN_NF4_as_0119_mc" = "06yv9mwgvhag5442581r7by3nsxcy7c76llgaalphbzszqr2vy0p";
+    "NNPDF23_nlo_FFN_NF4_as_0120" = "1m97g47p44vq3izjji6agwmj2fwdvgddzy8w40mqqbr9fk19lbyi";
+    "NNPDF23_nlo_FFN_NF4_as_0120_mc" = "0bjllckv61jc1y6f8c1gqdh36r15glqn8fqp99q0kckaxyszy5vw";
+    "NNPDF23_nlo_FFN_NF5_as_0116" = "0x4kjj791hkwng4l5dvch8z0ig1nkliirlz9mkv02g54qrilnkmy";
+    "NNPDF23_nlo_FFN_NF5_as_0116_mc" = "055clf0m8l8gnby2lgwh4wkyqciskwp54y34vb1kwfbhdf71zmnj";
+    "NNPDF23_nlo_FFN_NF5_as_0117" = "1cplvrizlsjcixsjzlm2drssbjsrzj9bvq0k5mnv79r3p1xdp997";
+    "NNPDF23_nlo_FFN_NF5_as_0117_mc" = "17nic3kw991dbrhyjyxpk0zzv8rjh0r0whd6nl8v6wsf5q5h0ny2";
+    "NNPDF23_nlo_FFN_NF5_as_0118" = "07fgr71x2zk2ywcbnw0ikv0p9kzsmd83kdidfs49vm7azcbm0qfw";
+    "NNPDF23_nlo_FFN_NF5_as_0118_mc" = "0s365gsidichyj9x5926q1gm0x1bp52chv7fkpirflrrsywf0lc3";
+    "NNPDF23_nlo_FFN_NF5_as_0119" = "1qspxbwswz7ssqj2rx2jdg0bkj8prawwshvjd26ifz9i0l9qnqc0";
+    "NNPDF23_nlo_FFN_NF5_as_0119_mc" = "0aqyhrcrzs3kqhj1hndilpibvdwfw9qhg1x0cypx97h16n37j46x";
+    "NNPDF23_nlo_FFN_NF5_as_0120" = "1k9savpyg2iqr1ab4i5y7q1qhd8zxq413040h2v46jl8mp7x6bjn";
+    "NNPDF23_nlo_FFN_NF5_as_0120_mc" = "01g7mh7v62s47cwdf6ws6j37gxl4mrb26ivdzzwmhy6ydiw8ka53";
+    "NNPDF23_nlo_as_0114" = "0mmq32kddspgpacx2qj086das9z2bxh3l37qvp9yf84gqzjj7mml";
+    "NNPDF23_nlo_as_0115" = "0jn1gv137d2x3vxq7ny0qc0hnfmcd4hs3cxkyn7j26w7p59q81x7";
+    "NNPDF23_nlo_as_0116" = "1mnq360acd5vfwz9z8fzynldchkqrfiqhsxvi3s9a263h3p44bsa";
+    "NNPDF23_nlo_as_0116_mc" = "0ngw2hls52bax6dmis3nfa2ix8q8nh2d9mwjax4cjdkmmf7rdn2g";
+    "NNPDF23_nlo_as_0117" = "01wkq68b8zl3mznzvc4p7p9b4ik2bnqgjq97mw2287i448mnj9jn";
+    "NNPDF23_nlo_as_0117_mc" = "1s2g55240gh9j32ach9rban0iw4hjmw5haj1c21wgyh4nqiqlfwr";
+    "NNPDF23_nlo_as_0117_qed" = "1l2rbxn9fw72nmhqazfkh568q4df0q2jp0pn0fj368wdpf36fk0b";
+    "NNPDF23_nlo_as_0117_qed_neutron" = "17rpz4bdp3fxvafiz32aawxw64prkhqwqpnfnbqsigcslm18bwnc";
+    "NNPDF23_nlo_as_0118" = "01kax3g4d8nd6n1gip70d02kl3kvbqib93b99xgwc1f0np85p3r0";
+    "NNPDF23_nlo_as_0118_mc" = "0qhs7r4zzw68grrmfh7qdad49w4y4mvf55qnp86piri5vi8lklwk";
+    "NNPDF23_nlo_as_0118_qed" = "10xfv8nkg2jjy3yg9m9gakz6lixdvmahdy1z12znqyr1br57bdhy";
+    "NNPDF23_nlo_as_0118_qed_neutron" = "1zffxfykx2v3dniypsvyyqbz5pb4dcww653amaxv96hplw3fvr0h";
+    "NNPDF23_nlo_as_0119" = "1v24iwddahxy6sd43bxv6ywf8n7302qkwl9hv7d074q1d932kgr1";
+    "NNPDF23_nlo_as_0119_mc" = "0l95fgr5bwhsh0h3qqlnx9czkgmrf5y084zlzk3qhix3ldh8zbp4";
+    "NNPDF23_nlo_as_0119_qed" = "0rayscazcacy89lzg0ynpwrl9g4pnjwwp0l0vwc3gjz9cwznmwsk";
+    "NNPDF23_nlo_as_0119_qed_mc" = "1cc3candpavcfbv681zpg8gmwbh3g14vqkhs2s6v7rr9xhx6zqv1";
+    "NNPDF23_nlo_as_0119_qed_neutron" = "12h4x97yglcklrvwh937xa5bgqahq949a5wm3nyjbvrfsw9n330i";
+    "NNPDF23_nlo_as_0120" = "0f8lwydw45vy7c0mqmz60hpc0b40czx0gx35liyrhcbjvj9129m7";
+    "NNPDF23_nlo_as_0120_mc" = "0kqiizf0c0mbdavnv7ivk89kga84j7p7xprqi10589ggplchx8ag";
+    "NNPDF23_nlo_as_0121" = "17603srm35158sdwrqijyxm614splx7k6bjyzphgvznnkwpgi0i3";
+    "NNPDF23_nlo_as_0122" = "0c16498ngx436k9mb8fwkhhvcbdyjd4m0jh54v2n1dl354jz60sm";
+    "NNPDF23_nlo_as_0123" = "1j6d7k8d04gfx532iipd4vzm0nldbvy86pg8asgv4xrh80c1zslc";
+    "NNPDF23_nlo_as_0124" = "0dwv41kc9qsvvp22gvxi56gj13dnklgfp4ndrm0475q6gvfz25ak";
+    "NNPDF23_nlo_collider_as_0116" = "1hl7xw8jz0gijxh9cjkxv1rb1xncb1622ghf6wnsaarlqr4947ky";
+    "NNPDF23_nlo_collider_as_0117" = "08krhmjbgza9f4mbq7cdj9g7hh260aaniqqi5awbgp7idbn3nccj";
+    "NNPDF23_nlo_collider_as_0118" = "17645h9l8z8nk7pdaxdhvcfmcvi8ib8yylhiijkkw9yrywb5pakm";
+    "NNPDF23_nlo_collider_as_0119" = "0csf74lpxgzg48v6962falxd8n2nc9xdrqnxxwadqqyrnrfs06dw";
+    "NNPDF23_nlo_collider_as_0120" = "17xqx8hnwy7a67ah0ds8m3nv3cbq20vri83nlwahwfsbig7w505x";
+    "NNPDF23_nlo_noLHC_as_0116" = "02nhh7n2qzx3ak7ih2d3vw3a4dffxbbpv9wrh2yhz30zbrqqlzv2";
+    "NNPDF23_nlo_noLHC_as_0117" = "14j8hx346krwbi2fyyk77k60d7dlk2xlsc6zd543y03jdpk4ahlx";
+    "NNPDF23_nlo_noLHC_as_0118" = "0vwi6h1fkwjg28p2f3br1g601i8ca4dpfjs9vxg80kjzkif6k310";
+    "NNPDF23_nlo_noLHC_as_0119" = "02l15h62gn0njnj459pkp3k1nhiaivlknmbxb3giqpg6wmm2m9y1";
+    "NNPDF23_nlo_noLHC_as_0120" = "13lxmwmywg7wrwhgp0cb41b42479fgfa1bz3aqkbrnf6gi6pviln";
+    "NNPDF23_nnlo_FFN_NF4_as_0116" = "0j4ng2vl955vnq40zv5v9sb0wk8qari61v7995p2l0sxz268sz50";
+    "NNPDF23_nnlo_FFN_NF4_as_0117" = "1wjqlv6mbl2lgvwr5av47amrs8gnqkpkxzq91jvpaxkya3bmglc3";
+    "NNPDF23_nnlo_FFN_NF4_as_0118" = "113s8lxrmif79c6f11pnk5jz7q4lq7108gcfx84nanpksr9dmi6m";
+    "NNPDF23_nnlo_FFN_NF4_as_0119" = "1688qacmp9kl50q1vzffcprf9ydbi2bb2brc68jvid5f7bjkyfmw";
+    "NNPDF23_nnlo_FFN_NF4_as_0120" = "1i3cjnz5zgk8jw5jcrqy6kxx1i5v2a2lgy2fdck3j19cvn0iqqr9";
+    "NNPDF23_nnlo_FFN_NF5_as_0116" = "0v6ap405v9zapbi5sqldvs5lyhz5wsh4cxl8ssxj0l4789qm24hb";
+    "NNPDF23_nnlo_FFN_NF5_as_0117" = "153f95cqd0hkxfy9p81mf2dfdp13h3fhhp0qyxmiknhqm10ykdxq";
+    "NNPDF23_nnlo_FFN_NF5_as_0118" = "0fch9i9qj1k8h3sdwfdcd75idi0bv2q7a338dvj4697xqpxf2mj4";
+    "NNPDF23_nnlo_FFN_NF5_as_0119" = "03r72mrbvy9jkkbmgvp2776xxgjx0jyxsv4bvpxmhscpym9mjvq7";
+    "NNPDF23_nnlo_FFN_NF5_as_0120" = "0rsflim77kdp849pg6f87rq6j0wirj4gayvrnvi4xvfjlk1mxkll";
+    "NNPDF23_nnlo_as_0114" = "1p32hw48zwmvj9i5iyg9pqhf11zwf7m7g5q8prfj8825dvsgql94";
+    "NNPDF23_nnlo_as_0115" = "0smmwd7xla73sb3bci46grj1kfd751pybkf7fz3w3qdkp5jjglqp";
+    "NNPDF23_nnlo_as_0116" = "14blxcfb2jbdgwh73f2spvqxy5dhn5v6ygwi346dzwswipwbixir";
+    "NNPDF23_nnlo_as_0117" = "0di0a5dkskalllnh90ngfb046z5hm9ihjra1r1ck06v9ryam2w9c";
+    "NNPDF23_nnlo_as_0117_qed" = "0dvzz7ac45j4m655k0i3ycy6xwfm6y6801qsb5bgp1kdv7g2pj3z";
+    "NNPDF23_nnlo_as_0117_qed_neutron" = "0v05yw5nc1r7vh8sjag4fmdklkn4jmcdpsmgvwm7sblgfc6gnssm";
+    "NNPDF23_nnlo_as_0118" = "14p9y1ryc1j26gl01sn60pmrfpnkm81bhark2g98xz8dmfmjp7iq";
+    "NNPDF23_nnlo_as_0118_qed" = "15mcq4q20ijmf06pcc626jlk22fm8c473p4i80bmi27h5x2pl56i";
+    "NNPDF23_nnlo_as_0118_qed_neutron" = "15vsjjc1i2x6lb0603h6knj68si8cvxml2xk97pw343qn3p8h4ka";
+    "NNPDF23_nnlo_as_0119" = "1qzap9zlpwyyshh8hc0gm82y9rl9hpy232j03gd6vwmcw5pgm2d2";
+    "NNPDF23_nnlo_as_0119_qed" = "1cqvdmq0hm9rh6749bn08i6c94gshpjafmwv8siizdlm8v9af442";
+    "NNPDF23_nnlo_as_0119_qed_mc" = "0a77i8grscxwnybgikik94ldiddrif3yy6d4bqb6x1aj4hr9i5ag";
+    "NNPDF23_nnlo_as_0119_qed_neutron" = "182jqm5019n94givs4rwblpz02hp90mbizp0b5svrxf21zdyrmbx";
+    "NNPDF23_nnlo_as_0120" = "1v8ykgxnqbvfra57xpamhgbcjvj89dndhk62pmji004gvqpmwi61";
+    "NNPDF23_nnlo_as_0121" = "1fv1m86ya7zi77ajd8r1nls2zcr7n6s3wqrdiwq5ikxidqxc6cgy";
+    "NNPDF23_nnlo_as_0122" = "0bn6bmvs8w9qsqcpq8y8a7w64xbkvrqwiikm5shjprwqy9xbspyf";
+    "NNPDF23_nnlo_as_0123" = "0w7sqyyf98ymxpgqfh8gr9g1pdwr2pw12zc8gqykn5nkjbbmijgy";
+    "NNPDF23_nnlo_as_0124" = "1hilgda0gqyj81a5h0mxrl5g9ahlm1n6mhd3ajkicxz2fvxm2n1l";
+    "NNPDF23_nnlo_collider_as_0116" = "07m2jwjwzjc4bdsx9dkrp41qn04f9z3k2m6n4q308hwdq9lmcm99";
+    "NNPDF23_nnlo_collider_as_0117" = "0i4kggkkkp407r33a2nsdy329zxpx8h6dq0h0wwpvq1kmyrjk6i4";
+    "NNPDF23_nnlo_collider_as_0118" = "027wlw7lk04grz5qavyymj21ik4zr9fy9yk2kwjc9gx2ycp3sj2z";
+    "NNPDF23_nnlo_collider_as_0119" = "0jq3q3sh1p8rn1qap77794v9hh3j0b7pmfl24wxvpc4dly4al0vs";
+    "NNPDF23_nnlo_collider_as_0120" = "1s0jic8amasmxczdflbbhn6071nx8cxr3ynfrinllp36d92pmgsx";
+    "NNPDF23_nnlo_noLHC_as_0116" = "0jzn78p2gygsqip50jfnnrmwl7issbp4vzpf71cbvj39ihsmavy0";
+    "NNPDF23_nnlo_noLHC_as_0117" = "0zns2yy50c0bm91y8xaafmzhgx1wafvmv39cykw7xwsnkgclh487";
+    "NNPDF23_nnlo_noLHC_as_0118" = "0v5bdc8d9w5g606h42rpn6zw31y1a5nk9akgfd1lyrhilvh7ayck";
+    "NNPDF23_nnlo_noLHC_as_0119" = "1zacfd5jc5wvcig0g8g4jkr77zcxvzcvppa4ci81c1n8d0whnr5s";
+    "NNPDF23_nnlo_noLHC_as_0120" = "1lx7m8ajwvhkzxck2ngxng1g90fpay5r5iwdnk2w7xgp1hb1ayc3";
+    "NNPDF30_lo_as_0118" = "12adhizxskpjzdr6inc2hi6bxrs8ns3bnyihz09hfh9q53d5ayik";
+    "NNPDF30_lo_as_0118_nf_3" = "1gjaiwqdhlswf1qmw39xr6g0w4bnnbinfpwl9c37jnggk6dxwdjz";
+    "NNPDF30_lo_as_0118_nf_4" = "121xn280f5xx04q0rr4ina9iqzbc1v8cay78km836kqvgb3pcpyx";
+    "NNPDF30_lo_as_0118_nf_6" = "1s77g0bf1qjb9rn1svnpfx10laxx87lw660ark9fhhx14zgybs3i";
+    "NNPDF30_lo_as_0130" = "0nvpwbmdzm8fn4wlb2rhzar71kk4myfddpqsqhd7wb1fqxkj5b7y";
+    "NNPDF30_lo_as_0130_nf_3" = "10diiahiy3yk6y7m1r4bd6nr1kf4mnccgj5qyq2lw49highn4s8k";
+    "NNPDF30_lo_as_0130_nf_4" = "0j3b3rj5pr2ws3yaq6h74hhsjy7lv3d2x5nryc55q22xfkgf451i";
+    "NNPDF30_lo_as_0130_nf_6" = "0w7k4a9ir4xvfh3v6dba70rhwkkq7qk16z178wld26zl6a7gw1hk";
+    "NNPDF30_nlo_as_0115" = "15g9alyc317qydqy3g7sqlh6pc4pxn3xmhmzv9lcw2ghg3gn35fi";
+    "NNPDF30_nlo_as_0115_nf_3" = "05b5xl89jvk6bgp86yl5hwdh3x8211czdsbianqkfix35rqrvlx3";
+    "NNPDF30_nlo_as_0115_nf_4" = "02p9lhvricjl5r79pkcm2fv14p9gw1d2qizka4w254ang3i1hcm0";
+    "NNPDF30_nlo_as_0115_nf_6" = "1iabf2qszv1270ac2sr2bqs7rb3gm58fj388saqbhnra4p2kv9fw";
+    "NNPDF30_nlo_as_0117" = "01my1m7vx7yax8ldnjp7s1mz1w3x3m0h1gdd8mamfrvphaghwp4x";
+    "NNPDF30_nlo_as_0117_atlas" = "0vjfh6kihsypvkpg3fwqf96kd2ldq0azcl72ia6w1nr52rsqc27l";
+    "NNPDF30_nlo_as_0117_cms" = "1sbaq99731ihrkp9a2fj6lxj9dr2c9j4vp2335249nrkinfpf4mq";
+    "NNPDF30_nlo_as_0117_cons" = "14qwjsa633v3h0sbizmhifrwdm7fmglyk608lq4ims8y7nn491nq";
+    "NNPDF30_nlo_as_0117_hera" = "05gs9ril5vkm7xrnz5pvjd6pk8ivgk0bl4bh45gx658fgg2snhiy";
+    "NNPDF30_nlo_as_0117_nf_3" = "0jc8p8h9pny0l7j3hv55iwaw684ymj0hl62d6bxlvw8sqvhxcqyl";
+    "NNPDF30_nlo_as_0117_nf_4" = "0a37b46ach3m0gqniwk79qk963w0m96dknda2rhp1glpg5xdxl0z";
+    "NNPDF30_nlo_as_0117_nf_6" = "1hjj6k5g2fia7xq5piy0dhsqs9lwriasmppjwil9wxnwklnwmr2m";
+    "NNPDF30_nlo_as_0117_nojet" = "0z3s8ixmq2l4znv2dn0dcz9rq5f9b3jgnlwmvjzcab3wvj1za687";
+    "NNPDF30_nlo_as_0117_nolhc" = "1x9nbnxm72wzaky4rvlrq1kmqs86ypphqwvsng33n0zdd9yr82pr";
+    "NNPDF30_nlo_as_0118" = "0b51qb2i3h9d7hrviarfszwljsy88m8ibzgz7dd5gn88k9kardrm";
+    "NNPDF30_nlo_as_0118_1000" = "17yla3w0rqy1a5hxq3bfq94ddda2qv6zzj76lfrm4zahl6m02kdy";
+    "NNPDF30_nlo_as_0118_atlas" = "034h2wgakbm3mx70034nwb44ii38rca7xv3az3fhcnjbpg9vnf0p";
+    "NNPDF30_nlo_as_0118_cms" = "08g9315fpc4khwfjf76vvyqa9nannvwq0bpc42f9f7yc0pck71qa";
+    "NNPDF30_nlo_as_0118_cons" = "1lw0fhy9gwk3zr7vq7qh9p6zprbyd4faln3npnxs2snncic1mnz6";
+    "NNPDF30_nlo_as_0118_hera" = "0ndgfpxl9mrf1fk6w5q9ag3qm9rr4q3jkymfnr4frkmzcdxjnvzn";
+    "NNPDF30_nlo_as_0118_hera_1000" = "0lljb96d3q25yw3fz3cbk2in90q6srpc4alkz95nyrvgp25xgbgy";
+    "NNPDF30_nlo_as_0118_hessian" = "0h8d2zc02ccr1rmlsf4xd5a41irbs9q9wx68caj2xy0i7qr8rsmp";
+    "NNPDF30_nlo_as_0118_mc" = "12nnyzh2f6mv4gq4x4b8nlqx34lbj5y2y60zivfdbcpyg2spj5y8";
+    "NNPDF30_nlo_as_0118_nf_3" = "10f5md8bhf44n5x6r7ln8c58a9ylm4mfgxg30vd0d8mvjc3zpsng";
+    "NNPDF30_nlo_as_0118_nf_4" = "0q14zqkzqy2hgh8wli5db7dsqgsljgbc717da661wj8kqa23w4r4";
+    "NNPDF30_nlo_as_0118_nf_6" = "08ajfn1r27hdarff464j2gpi7ffjjxs6pwzh3vil8lpjij5y7d4l";
+    "NNPDF30_nlo_as_0118_nojet" = "0zzzk72n7nq1mcaalbv7mpfpb9kh095j0zazbzfjf2k6r3p0v082";
+    "NNPDF30_nlo_as_0118_nolhc" = "1p7iac75znr1li8qg9xf1my37i70flhvjkfjmrb5b0h3hk9agb1r";
+    "NNPDF30_nlo_as_0118_nolhc_1000" = "04mgjfq1ncy90gqljfdzw1iwzav5infkfv7zj2rid088n3qfs91p";
+    "NNPDF30_nlo_as_0119" = "0p0kgw17c97p99zy3ffr6g7pphhc8ccdhcq4iip5drqm4hc6nb58";
+    "NNPDF30_nlo_as_0119_atlas" = "1hpx2jm4y6kz9b4j42ags98j115hd2s41km670979z9zxmj2qm5q";
+    "NNPDF30_nlo_as_0119_cms" = "1j0135mxdiyn22iqrmg0d44w2w7ql1cdacprxgdz4jfb0ppn68rx";
+    "NNPDF30_nlo_as_0119_cons" = "00qvhq9ypqv62zvlg32k3x5gibl5jh0b78hyrpvxf1l3y2b77nw1";
+    "NNPDF30_nlo_as_0119_hera" = "008f4m8p9gi4w61mgjiqqpw346rgqxaayc1rncy2fggl4gs64yi1";
+    "NNPDF30_nlo_as_0119_nf_3" = "1bh0sl8pjy5n90j5dz9c80n3vy21hdsv8vxwbqkq0b2lkv8gzw5g";
+    "NNPDF30_nlo_as_0119_nf_4" = "0swgnmbxz0g3ziib1992s0454jfsdi7l0x3lrvs5qzzjk6rg6qgd";
+    "NNPDF30_nlo_as_0119_nf_6" = "001awj8h76wybmxj9vvkxgqixzak4zbhsvjmj2lscb2v5qq3y68r";
+    "NNPDF30_nlo_as_0119_nojet" = "1x961nmad1rxmf4yzbz2drpi5hfac2ag1bs1jbvvlw3p04xr2c38";
+    "NNPDF30_nlo_as_0119_nolhc" = "1yx6f4n577zqwhp0i440r6zk06702jg4kkib9nmgws3jl5f28big";
+    "NNPDF30_nlo_as_0121" = "10k01z1amzp3jmfvfb2snrm8d04vr31kly1m30pw4fv0qn78idlw";
+    "NNPDF30_nlo_as_0121_nf_3" = "1gb40ycnf42fkrbdwfhb8wp56nmzxyi7fzbqgvlkby7pn86m2f7m";
+    "NNPDF30_nlo_as_0121_nf_4" = "18ywp6b9f83rxmh7gfn648wslvvf5g4ffm83rradp308smr1sv6p";
+    "NNPDF30_nlo_as_0121_nf_6" = "12dps7n3glrzwb8vsfghwbvnh1yyxvjnvqfilbrrcy0dm3sams7b";
+    "NNPDF30_nlo_nf_4_pdfas" = "0hrx872m52bb894c32jrvlvm9lcpy3yllj5ps52nmywqd8n1simj";
+    "NNPDF30_nlo_nf_5_pdfas" = "0q25jxvwpz8inkax0j2zq9pj8swqfn4jmkhs4ibkl6xs78bhjfb8";
+    "NNPDF30_nnlo_as_0115" = "03apmzw7krj77zdyl6sxwqg5fyv3vicp8iax445qdx8ld9kv225w";
+    "NNPDF30_nnlo_as_0115_nf_3" = "08y1gjzkpnjn6mn247n7a9ya8z6pml3602p08rjha4ljggxhyffq";
+    "NNPDF30_nnlo_as_0115_nf_4" = "19mjfk1rib9dxbsn0473ggi6akwv1zs9y3q9nzjg47mdjqlspb2q";
+    "NNPDF30_nnlo_as_0115_nf_6" = "1zcjjbjwjgbkrhgh0kira7wzwmy5vvi1n15wycg33yk09m06db6b";
+    "NNPDF30_nnlo_as_0117" = "1225gj4ihmphnfav2h38rz17lj1dyi9j1lazqlwww8vizl8933bz";
+    "NNPDF30_nnlo_as_0117_atlas" = "0i9nc7q1cwl8cxxaj1xaz28wmj09q5bjmh19p1fcbcln7hklvj5x";
+    "NNPDF30_nnlo_as_0117_cms" = "01ffhsw191nrr58x6wnjizx7bbijkknicvgk73pjbwyr67gfj581";
+    "NNPDF30_nnlo_as_0117_cons" = "1blfi0p231r5j34wspk192fmbv34gbvx3bkisjh7wxpiab80qdws";
+    "NNPDF30_nnlo_as_0117_hera" = "0ds02aj1q6y4dndfk9l9fyxci0dhpwr7jx1jq1qb9g5bb7bbhzz1";
+    "NNPDF30_nnlo_as_0117_nf_3" = "087rz8bz3j2h7yk7rknlqz3rpbczgx2r2zdag8pjccdqi9jnk9pg";
+    "NNPDF30_nnlo_as_0117_nf_4" = "1w44bwx6m6g8r990vl6f505bgf3v583mi19r0nfh2pahx2k2djaw";
+    "NNPDF30_nnlo_as_0117_nf_6" = "1l7gwbsl2haqaj6hqsnnqwrnxrkdv1h63qbs7iwfdq6474ndzwsf";
+    "NNPDF30_nnlo_as_0117_nojet" = "1nmv44arab9gfhs02jf4zijdb0644pvdmi6k809bxbfhir9sry8v";
+    "NNPDF30_nnlo_as_0117_nolhc" = "0zn2b05jv9da7394in14mswvma48y26lvpw7rwh7wmyw323rxpfv";
+    "NNPDF30_nnlo_as_0118" = "09xxi0vq90n9vfzq72c0mbf4yz4zif3kl6xwcjdb8r620ihwrnfw";
+    "NNPDF30_nnlo_as_0118_1000" = "1iy5inrsfpn70w65hy42pmz0630pbrgg4l48qgsamcjgqdhd3n84";
+    "NNPDF30_nnlo_as_0118_atlas" = "013jm6f2hnmzc2di7spf6zp31fwhm6c9sddwql36hww63w8sys71";
+    "NNPDF30_nnlo_as_0118_cms" = "1w0ax68rg5877s35zlg13c451fcz2rij4adzwhz4yf4skkbgflng";
+    "NNPDF30_nnlo_as_0118_cons" = "1qniswwj6cmcs7bm4n11jx2disqcwszl08cb7im824nvrcjka2pg";
+    "NNPDF30_nnlo_as_0118_hera" = "07k4wlfd63zmhnxq06avdpfrgfnc2ziqhsgyy3w4lvara9i27il0";
+    "NNPDF30_nnlo_as_0118_hera_1000" = "0ssiw9fk5fqwg77rbycrxrclldws35n6gj4a4sj6d9yc87vz1g7z";
+    "NNPDF30_nnlo_as_0118_hessian" = "1hb32bamwlx5il8g2sf5gy6xjr7r4rky7xgvdhf5ndq7v3n1ncx1";
+    "NNPDF30_nnlo_as_0118_mc" = "1gxl4c5z2vh382y8l2kpr8vy4fqvbxvrw6xjc6dp229ak89cd6c2";
+    "NNPDF30_nnlo_as_0118_nf_3" = "0iccjcds9j9pp8s3mwrshhzl5anklax4rgcwm5im90hipj450rgj";
+    "NNPDF30_nnlo_as_0118_nf_4" = "002r0179jsl0l43psvw3hd1drg9fcrlzw57sbyndlswvq4zkyzyc";
+    "NNPDF30_nnlo_as_0118_nf_6" = "1mwh2dxymayxa2khxjfxqmbhaj85jdnz548wmq6fyrxr63cfmw07";
+    "NNPDF30_nnlo_as_0118_nojet" = "0nly14fxfww78qihrd8b6wk3da24x5sxkb13h8l2cgdxkq90fxbd";
+    "NNPDF30_nnlo_as_0118_nolhc" = "11yvr5h66v37376d5p2m2g8fajdycv9baqq6mjfphf4a2abrl7m5";
+    "NNPDF30_nnlo_as_0118_nolhc_1000" = "1bi0mxs6v1izlbvich55vi7qab72v1sizd4wj13787w47ffqm89p";
+    "NNPDF30_nnlo_as_0119" = "11bvbqqjbyz0vjd4kh5qyd0a4rb62l103n10d1cyffgdfxxsk8f9";
+    "NNPDF30_nnlo_as_0119_atlas" = "1fm46crfparx2swpxnyscpwqgicxb4skhclnc5xaijcpzraflzp7";
+    "NNPDF30_nnlo_as_0119_cms" = "0i2d4wq7bsbfp8hqdr88nbii980zhfmpg6758czz7swd5yv8076a";
+    "NNPDF30_nnlo_as_0119_cons" = "0v54zyz410rg3wcdw44japzynzvvrbjrspk91d0129rdv2xz51cg";
+    "NNPDF30_nnlo_as_0119_hera" = "09w3krirq117cnhfkxlb8pld3xb5g2r3nhgc11v3ksavq746jhvk";
+    "NNPDF30_nnlo_as_0119_nf_3" = "1k00h1c0lv6884lb02qmqki7sfmxkqpj88fkvf057frk120f59ah";
+    "NNPDF30_nnlo_as_0119_nf_4" = "0pqjvaw2ad3g9zzjdyhh72580jrj4p8hxlvy9h6q9hhpwdihnnmh";
+    "NNPDF30_nnlo_as_0119_nf_6" = "096fc9958s3z559knxqccwj3vylxviq2g58rwirj3qdjvy96y2cc";
+    "NNPDF30_nnlo_as_0119_nojet" = "0l5crj00jm2vxgyr5nhs6h1n64xnxwpanrsjk8f8qfis37s68ar7";
+    "NNPDF30_nnlo_as_0119_nolhc" = "1nl4gkjjz3kpq1sbzqk2d0d50vmb3ks7j5z14hqf9dib2xr39jl1";
+    "NNPDF30_nnlo_as_0121" = "1c0ddbjskxw4rq1p8sp63vayxkvcnls062qp16wvrrbw7zkj1jaa";
+    "NNPDF30_nnlo_as_0121_nf_3" = "1sj9g0wg6x2cvwp45i726dcs44hpqjiqa011xzindnjh8cq7m6xn";
+    "NNPDF30_nnlo_as_0121_nf_4" = "1j4khzpw52vc26n7a95xg1wyqz720fnz2kbb8l9a5bsbmxmaa7xv";
+    "NNPDF30_nnlo_as_0121_nf_6" = "1kln7zjgl0hwl621wnhhsih0m8f9ir2i8ligfg2s0qp8s3787lrg";
+    "NNPDF30_nnlo_nf_4_pdfas" = "0s460v9712ahz09fhzhlnsnkl9arsy3l82g1z6xjz4la8fwkr9wq";
+    "NNPDF30_nnlo_nf_5_pdfas" = "1vjfm9j39m4389b0r51axlbzdbkpk2vbs3vks3yqcr3hr09g9myk";
+    "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8";
+    "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8";
+    "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72";
+    "PDF4LHC15_nlo_30_pdfas" = "0xi4xydx0x4ina0wmqv9jf4978xhd8x0l91dwfxh5vy39r5x4lm4";
+    "PDF4LHC15_nlo_100" = "0m9d4zy7608iryqy1ypgkr1d3yhw2wv1nrrc70zrfih7x0fp7lz7";
+    "PDF4LHC15_nlo_100_pdfas" = "05wyqyh9y32sxflq69igcnnsl0ifnkyw3vnnnjn6kscl8h8hs7lp";
+    "PDF4LHC15_nlo_asvar" = "14hdgj5g8ia7y6hi40zbh925dacrk7hd6cli6lkhlqzxl755nbs3";
+    "PDF4LHC15_nlo_mc" = "09p7y0z04r6wdkf8gi3yj85qk5hmp0mmhab8c7a7lly4731fyf42";
+    "PDF4LHC15_nlo_mc_pdfas" = "0sds9rkvbjkk7pardwq959qqbrvgwswxmsqcfppky2p0qmdsjs0s";
+    "PDF4LHC15_nlo_nf4_30" = "1ysy6dqlacg4bwb2f16p1aza5gwm9qnhmc0g0mhsdw4d2i4ml5yg";
+    "PDF4LHC15_nnlo_30" = "10cm4wa0mk34rnvsr5q8g9w7fs9cblsryms2nl370wdvcrhzsxph";
+    "PDF4LHC15_nnlo_30_pdfas" = "13xln0y8l0qcj9951glj4f1kqfaagj8gwkxzlvdkgjnj1scdy6yj";
+    "PDF4LHC15_nnlo_100" = "1gcq3qrf39dhq2pmpjrj3z0i0ycrk76mjdwmgfvzdxysp530ax54";
+    "PDF4LHC15_nnlo_100_pdfas" = "16r8far43ymsd64a4bbqlj56qvbjmcyxbawv4lkfxysjvbydxj4w";
+    "PDF4LHC15_nnlo_asvar" = "03fh1jcbmvla7n2jj3zq4ibwvq66h0rniply7h93d94zawcgsy4v";
+    "PDF4LHC15_nnlo_mc" = "0c6nfkv3x1p5iw514knjvqcs1dcaryf74qqg1za8x234yr5ndi3p";
+    "PDF4LHC15_nnlo_mc_pdfas" = "0l8hlcz69cdii7mpgargi9nsx7iy746nad5pnn7pvycrc40marij";
+    "abkm09_3_nlo" = "0h268l7j1zkxm2nacari10f86lpha511xhgrg0q9r8hc47sw2vxs";
+    "abkm09_3_nnlo" = "1gzhvblckskscql53pfxp79qclhhhhm45sqjhc9jrm1bp3x52w8i";
+    "abkm09_4_nlo" = "0yq3gy0qgnk5dh0hh3ldrf5bqzx5wpkhw509nvz5arlh0bfwhyg4";
+    "abkm09_4_nnlo" = "1b8470v2n5v87mmhp2dhmfh7iv3280ad67z2vyl0sfv87iic409j";
+    "abkm09_5_nlo" = "1nhck955mw94h3pyhm2vd3q60qxwsmclkfqdscp06fc3avyvrzfv";
+    "abkm09_5_nnlo" = "0wklkcjknn7ys1akg56zxdrkd7ardlc5qnbjq51mva1nf2bxk0np";
+    "abm11_3n_nlo" = "06r54q3ph851a0hyn4di1ifwjmdkdklf3wlsdpz7qn0w4w3xcg29";
+    "abm11_3n_nnlo" = "03rgkj2hyn3zmj8yxllfnc2iqr12j8shjcpdjka33v270lim3gq2";
+    "abm11_4n_nlo" = "02r9ba7rz8f5438rfckzny5amnq9qjgl164x8il6xqh5crxn4vb3";
+    "abm11_4n_nnlo" = "0z6a9wxy6018qm9nyyip9wdq46j7rh2if5xch19h4qx20gx6m48a";
+    "abm11_5n_as_nlo" = "0x2w81w9cz955k9dd45872k98my57w83cjdsv4gvjb64d1hsygzq";
+    "abm11_5n_as_nnlo" = "0091vwjkc686d1dnfn2dpa7jb56p8gli2z687fpx5f8yhjzpbh80";
+    "abm11_5n_nlo" = "1bpf37mg5wgcf1id2am98l5mj162xrnb8k16ppfx3qxlakp0iabl";
+    "abm11_5n_nnlo" = "1mpk322mqs078pk2nxxk8fa29ka6cxzsf65ffiny38678djmfqd2";
+    "abm12lhc_3_nnlo" = "0hwgspbp6dpw5lz211i0vjgg45hag7zr3djfdk16gkr86sra7ba6";
+    "abm12lhc_4_nnlo" = "161qdm0axsqhg6lizx0h4kdg714kl2d6mb8y7wrvanr0v0db9zkl";
+    "abm12lhc_5_nnlo" = "0vshq0fx5nigzdf0vryr2v4kggc37byalzfjswm70l3nnjhxp6xs";
+    "cteq6" = "0wk6fmajvbdh8wmx1wmyd9n53m82vvh2gj4iric4b4ig9ssmbjx9";
+    "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap";
+    "cteq66" = "09i69ac3gkrai5jmazjyjvi5sl8k2vm48m90ijn6pl24p31qf68y";
+    "nCTEQ15FullNuc_1_1" = "0nx1n814mkikd01pxmpndk2qxpwqwd55cbn6z1kgxm8qlhhhd2zw";
+    "nCTEQ15FullNuc_3_2" = "1l2js36nh4jawwkpiq386blgwbmgi9ccvvzbwq92jb5kpd2fvh7z";
+    "nCTEQ15FullNuc_4_2" = "0fip3n3pjd94rz3f4gcv2szrx5k72m5b8xcmsgjfd1671r5kmlkd";
+    "nCTEQ15FullNuc_6_3" = "0v5yabjw3xkjq5c1zjqmj3wwb7yz1blkprxnrpvai54v17w3sk3r";
+    "nCTEQ15FullNuc_7_3" = "1ncarbncfkqk6l3rx3zg34a3sj7mpm2diqsafyldpn92cw66bcs2";
+    "nCTEQ15FullNuc_9_4" = "180ipb4m2zy54h7n4s0jwqk9k6562bygvnv7mg9dp2f7vf5317a1";
+    "nCTEQ15FullNuc_12_6" = "14z11wyzclx5k6dl46zr0jp6mja178bvd547cqqfy811nbzmmri3";
+    "nCTEQ15FullNuc_14_7" = "11i2xcd6ncp2aqw3y8pgcp63zkaj383ciwvqpzmjnqraiqqqa77i";
+    "nCTEQ15FullNuc_20_10" = "19vhxi7ch9vxa1vyjpxknk69hnnm2n5wpz4qybg1cznk59dvpi28";
+    "nCTEQ15FullNuc_27_13" = "09pflgyxl2ydzrmys7rv0mmvl32z3dmdx63wpilrw592aa70bc2i";
+    "nCTEQ15FullNuc_40_18" = "11pw23fbrz97i9278cxrvc0a4wbdyhz788axq8jn7yka9mg9kch6";
+    "nCTEQ15FullNuc_40_20" = "0raiqn6w90n17irf4l197my77999ygqwhim9lnjqgbn68yjqfqf3";
+    "nCTEQ15FullNuc_56_26" = "13msj49c1lfisgcigvc4wr32w597jwir8cggrcdq74b0d0ab85ch";
+    "nCTEQ15FullNuc_64_32" = "1spgcb340nz8by8051hngnh6pa1wjf19vi5a40xr8gyprdzhwb4a";
+    "nCTEQ15FullNuc_84_42" = "1z719mcx5lnx2ciwlnxxhgc4s00jrr9sfrxcimh69sj14hmzgx0d";
+    "nCTEQ15FullNuc_108_54" = "107klcpsr9d4dwavcqqs3849k90mdb3bdjam3pd79cmsy7ncr2hf";
+    "nCTEQ15FullNuc_119_59" = "14az155s3xfl8nscwpajzwj0dy94dadc4qdc64njlg3xlnxsgxy7";
+    "nCTEQ15FullNuc_131_54" = "1984nphc6sqizaq1c1laphw3hdvkp5k7sy7g563wq18578fifbmk";
+    "nCTEQ15FullNuc_184_74" = "1m311m5bkzq00qf117dli9xrmcmx8qqh716wff1yj8ri4c4h9m8x";
+    "nCTEQ15FullNuc_197_79" = "0vi29fdxaj7fnpc01k3y2ylb7ngpdnmbnzgxdnr6p9bj5wfa69z5";
+    "nCTEQ15FullNuc_197_98" = "0qjkdfgpbcmwc39wzyfb07wrqnkkwn7v8235y1m25x4wy5bbpjbg";
+    "nCTEQ15FullNuc_207_103" = "09py38s7shcyy07p5mxfiil5wlxijzbv9k4l3x0g1v191k0vi3m6";
+    "nCTEQ15FullNuc_208_82" = "1c9r5wr43291rw965axdzpshzjhnynsrlf28kfr17v7vpd9dykl4";
+    "nCTEQ15_1_1" = "14dlybcc038ssv2xbyhing27b9zx07nkqvgf66ysbb83ym5dvibs";
+    "nCTEQ15_3_2" = "0nq1aj4hxjih4z4xlhjfbza2dp2fyhwbccjgmgh2za5y7rzgz9fk";
+    "nCTEQ15_4_2" = "0c8r4vq3phi40v5h4p3nm7by72pz27zqwd67z9slmf1jy1yilnly";
+    "nCTEQ15_6_3" = "14ars149pssaiyhaln9zm7vz3wzj2597cy2xasyhlrfqhlgrq056";
+    "nCTEQ15_7_3" = "13b9wbm2hqx4lixq3dad1y3cr6didcch8kg7mqm9lgbism7dwaqw";
+    "nCTEQ15_9_4" = "1rkxhxwp0v9dm6f71c5635ihlspfx0sj666maif4iaw1sf4hazln";
+    "nCTEQ15_12_6" = "1xnnqp38zz3b61jb38hz54wv09w06fwwnb66sf93r1agcajvv1vi";
+    "nCTEQ15_14_7" = "164p2fhlsmkcc6fibi28lysbfn8q5vds4f0k0kppi96absgrfa70";
+    "nCTEQ15_20_10" = "1vhk2lmpf5kci9173v5qh2gsz7zghvjb11x1mln8yqcdxaq4az8x";
+    "nCTEQ15_27_13" = "1md9xv99m6jcdqldhbbypdix581nmhpyanvr049l5c1a2ab5nbpa";
+    "nCTEQ15_40_18" = "1gb4kfs207izq4dij9pqbmwm10vx6f1h7pdnf749jysmf6nayndh";
+    "nCTEQ15_40_20" = "0b44nkk315a9zaq3280wmsj67rkxw4jyk9v37s859fikr5v7s0sv";
+    "nCTEQ15_56_26" = "0ndyjjh7sxnhkamx182rpax0kcc2iqzwnmh391m5wh629zk0av8i";
+    "nCTEQ15_64_32" = "0ixbr2d30v6slqvp6gpry1159rx5m4hd1msymgli1w9k7pp7xjz5";
+    "nCTEQ15_84_42" = "12vkqpvjjyh0x0hbn7r4gx5za01yqs9a7lqirdxd15k04fp5rnjr";
+    "nCTEQ15_108_54" = "1bjx2d61qjhabfx28pfi64hf8br4gl67nzir3ygdpwdcah4k6lz8";
+    "nCTEQ15_119_59" = "0g7wffsyjh84r2wv8w67skx8gwdb3clv9c1dlpijwqmpkcm3b8q5";
+    "nCTEQ15_131_54" = "062sg81yrrdsc376gpq01xzsb6114sp6814ah9jbrd08qqxh04p2";
+    "nCTEQ15_184_74" = "1zqyvla6dj93cgfjw5z97b6wh6qy8pkrvcbwirjva769210rax75";
+    "nCTEQ15_197_79" = "0mp1gddlwxk2vdyhra5lafvblc82g6n2p19lmjwkmnrmjqdqsz12";
+    "nCTEQ15_197_98" = "0z2ymk9y0syzqj88mnr2kjn104602ajg17s31d9vi29lggy4cn44";
+    "nCTEQ15_207_103" = "1zpxky925n9jssdr036dyax8wxa0d478l4mjl50bjmzqhr8wl7hv";
+    "nCTEQ15_208_82" = "01jf2mrknx5igs0cvhm7xr25gr6z93bvj12cbq53k15fk5niyglv";
+    "nCTEQ15npFullNuc_1_1" = "1fq80hzfy16gs00knvl0g0yqrys27vzyk8h5jzs1ra981zgcw1zp";
+    "nCTEQ15npFullNuc_3_2" = "0rqjxc8q53jndxjrxd293r1m8gin3vif33jzr35y2ail9bhkjyzp";
+    "nCTEQ15npFullNuc_4_2" = "12gx03drv7hnmsgk6sni7mc7c4rbpag5gn2czyha1n19v13rry93";
+    "nCTEQ15npFullNuc_6_3" = "1gcxs7vcjcdyniczd1rprvzlc1p9yf08sy1fcrny2jfbxkfndqwx";
+    "nCTEQ15npFullNuc_7_3" = "09kwf5kbshw4pwh6iilqy1mzgvlg83jhakmvvgz27f569f20ci68";
+    "nCTEQ15npFullNuc_9_4" = "0gsh5jmyn7jlasp9ixx7imvkbp5rxmvfa480vy0bnxwjwz0924ia";
+    "nCTEQ15npFullNuc_12_6" = "0mb3zixcikagsqzpxb7jzrcg05dln37d7anz5359ssjyd6p1mqyi";
+    "nCTEQ15npFullNuc_14_7" = "1k2554rg82msxzkarjx85p6di3kmfqxmbfxpasi1x74laz38663n";
+    "nCTEQ15npFullNuc_20_10" = "03dv3z7j69l97xacd38wbp7iyyi36g0bbc2xmxhm3l64rjs21bmz";
+    "nCTEQ15npFullNuc_27_13" = "03lb2dznl5dpv0cwsl08dlrh7x26yi9acx3n70imr13gspfxp8ag";
+    "nCTEQ15npFullNuc_40_18" = "1827gpzdrxdkg9ikk7pjgv9h983mwzk21p60635l1zhwby5p4mn6";
+    "nCTEQ15npFullNuc_40_20" = "11mjdibgypwpphm1wmf4z311wg4lp37010vwyys8q6d927jzikn2";
+    "nCTEQ15npFullNuc_56_26" = "1hq6qv19gqzjv57msdajb9kc0lv5jvl3b6x2fc905lg0dc7h2ab5";
+    "nCTEQ15npFullNuc_64_32" = "15gq3l91p69dba5gfxvh7j4npwl7rwkakjnsv9lx84hvys7hgba9";
+    "nCTEQ15npFullNuc_84_42" = "0ah349jih2ia0x14mnrygzzw38prfgcmbxyw1hdvzqvgk73wazwa";
+    "nCTEQ15npFullNuc_108_54" = "1g8id10rpys9566r8h92diqrr43mww6q8nhvlns0kfjkvkr22m9y";
+    "nCTEQ15npFullNuc_119_59" = "0df499pvfls1281zkvngrhicnc0ac0bfwamzs027k7f2y6ygkfb4";
+    "nCTEQ15npFullNuc_131_54" = "0i83f1wg81nr742jf9407w7fbknigz6pyx64h7p65x82s4wmj9gf";
+    "nCTEQ15npFullNuc_184_74" = "1pnl4y2arxf87b1pp95b9jajzlqdyzs7mv82xhmw9fcn9yliy5s0";
+    "nCTEQ15npFullNuc_197_79" = "0d5c6g4185k6pwm5bs5fqlwc97l0gvf6bhk9l8a5vc039dggsgkj";
+    "nCTEQ15npFullNuc_197_98" = "0ql9xnwggsqibld13yisvsdkkymzph8wnqffnxhlyp5digwhl64v";
+    "nCTEQ15npFullNuc_207_103" = "04bg7hnngfsckk92gdrxbrxhsbb1ac1s7dscj7ycdy64fxn4lq8x";
+    "nCTEQ15npFullNuc_208_82" = "0f9ddimq9av2jr3yr15n630bi30bxh5nxrsbrcfw9cx8dwnjscwb";
+    "nCTEQ15np_1_1" = "1fndfff1lialb2qy08qp44w4605j9c2acrwpdb16k3awj88kx7mf";
+    "nCTEQ15np_3_2" = "0jxg5f5n4yp4zbdkm9y7xd40m89pbw5687hz7mylpn9n3phsi58y";
+    "nCTEQ15np_4_2" = "04q9gq8163lhfjrrp0ysqyb5sx2nkw5mpz70daqnxvybavbkg7mm";
+    "nCTEQ15np_6_3" = "1rr7wr9wwsjfgnrnfvm7nrplhb38zym6qiyg2sagq7saw6kqpprz";
+    "nCTEQ15np_7_3" = "0ndqi05g88b769p1chfc6maz6wvs33rx45r4k8f68n79yy6kvrh1";
+    "nCTEQ15np_9_4" = "0akxbyrs4y8gmnjiwma8z8ryrzmaw6dj148iq7ihsllwar3hp3p0";
+    "nCTEQ15np_12_6" = "0zv9g7r648f1h1f9qifii0mk2afdvphbfib3hp2sf960zb0d0nsv";
+    "nCTEQ15np_14_7" = "07pyaik3h2yi05hn49fv3x191i4x6429bb6kywy999bzfrkjndcp";
+    "nCTEQ15np_20_10" = "1ka5hnq9cmr4l12ajmw4fpgdzcf0pjlw2pk4lkw6ai1h5h5absa5";
+    "nCTEQ15np_27_13" = "02dmzdqqh58h7232s2hcjnpd76rll8vxynq1bx059mvxak5lr5kw";
+    "nCTEQ15np_40_18" = "0yp65xq318qw6xh3wm0n4s4a3s4ahvl14kq3cmwq9b954c5a5vkl";
+    "nCTEQ15np_40_20" = "1c367xb361p5mdwyda5iwswg7wb6s6gjibdv27n2kq41p1qp41y0";
+    "nCTEQ15np_56_26" = "1qgh3g6xwk9jc6sd7kjj89w8mr89bhpdaiml5g7lvdqn39l95ng6";
+    "nCTEQ15np_64_32" = "02966xmh15i7kg9iif19p5c27rv369yikpm1xqclf8dz45a7xsry";
+    "nCTEQ15np_84_42" = "0v968jw1m9ky1mh82w1bjidvg7r7cx23bnpv0vr4c1kqz0n5hb5s";
+    "nCTEQ15np_108_54" = "16hsl5ihcbx7wvrabrff5h422zfhlfrpskn5dy8s1phhla4r4ff3";
+    "nCTEQ15np_119_59" = "1bwhbfhw5xyb1dm18vxm095l1d9l9v0yl072qdbb6z9l29pa71dp";
+    "nCTEQ15np_131_54" = "19sn6ig1c5smxi845qyflrrqaivm4pphwbxpz2zd9r0qhn032mlm";
+    "nCTEQ15np_184_74" = "1s2vmirmi1npw3pkxpzxjf9i69gmrl1dqrm2s0cfzl6286h87scb";
+    "nCTEQ15np_197_79" = "0p7lnffr4gy8qad8nsm6qfaw05s9pndkw0n9yb6v5i6mqg0j3cgd";
+    "nCTEQ15np_197_98" = "0vmjvjqkdn5cixsnvl9lvg07lrq17yw5pf2mdbzkrrfblqki6g0x";
+    "nCTEQ15np_207_103" = "1fcaw2hqxnzhs9glrh9lxvpfh0sn3mwahgd8d7hnfikrw93v0sbz";
+    "nCTEQ15np_208_82" = "0glf5nw1mr42icmbcjliz627nlsb7a5hyp591ng9y7dh41hxr01w";
+  }
diff --git a/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh b/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh
new file mode 100644
index 00000000000..c499d370d86
--- /dev/null
+++ b/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh
@@ -0,0 +1,5 @@
+@name@ () {
+  addToSearchPath LHAPDF_DATA_PATH "@out@"
+}
+
+postHooks+=(@name@)
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix
new file mode 100644
index 00000000000..974563c9037
--- /dev/null
+++ b/pkgs/development/libraries/physics/nlojet/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, fetchpatch }:
+
+stdenv.mkDerivation rec {
+  name = "nlojet++";
+  version = "4.1.3";
+
+  src = fetchurl {
+    url = "http://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz";
+    sha256 = "18qfn5kjzvnyh29x40zm2maqzfmrnay9r58n8pfpq5lcphdhhv8p";
+  };
+
+  patches = [
+    ./nlojet_clang_fix.patch
+  ];
+
+  meta = {
+    homepage    = "http://www.desy.de/~znagy/Site/NLOJet++.html";
+    license     = stdenv.lib.licenses.gpl2;
+    description = "Implementation of calculation of the hadron jet cross sections";
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch b/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch
new file mode 100644
index 00000000000..917c57e8cb4
--- /dev/null
+++ b/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch
@@ -0,0 +1,30 @@
+diff -rupN nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h
+--- nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h	2010-05-11 11:06:00.000000000 -0400
++++ nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h	2014-08-23 03:22:51.000000000 -0400
+@@ -26,8 +26,11 @@
+ namespace nlo {
+ 
+   //   Spacializations
++  template<>
+   class lorentzvector<std::complex<float> >;
++  template<>
+   class lorentzvector<std::complex<double> >;
++  template<>
+   class lorentzvector<std::complex<long double> >;
+   
+   template<>
+diff -rupN nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h
+--- nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h	2010-05-11 11:06:00.000000000 -0400
++++ nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h	2014-08-23 03:23:09.000000000 -0400
+@@ -26,8 +26,11 @@
+ namespace nlo {
+   
+   //    Specializations
++  template<>
+   class threevector<std::complex<float> >;
++  template<>
+   class threevector<std::complex<double> >;
++  template<>
+   class threevector<std::complex<long double> >;
+   
+   template<>
diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix
new file mode 100644
index 00000000000..94074f6dcb4
--- /dev/null
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "pythia-${version}";
+  version = "8.219";
+
+  src = fetchurl {
+    url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
+    sha256 = "13fhphddl0jir8jyjvj6a9qz14wiv02q9lby8mcdyv8gsw0ir8hy";
+  };
+
+  buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];
+
+  preConfigure = ''
+    patchShebangs ./configure
+  '';
+
+  configureFlags = [
+    "--enable-shared"
+    "--with-hepmc2=${hepmc}"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A program for the generation of high-energy physics events";
+    license     = stdenv.lib.licenses.gpl2;
+    homepage    = http://home.thep.lu.se/~torbjorn/Pythia.html;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
new file mode 100644
index 00000000000..775ee75f61f
--- /dev/null
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc, imagemagick, less, python2, texlive, yoda, which, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "rivet-${version}";
+  version = "2.5.2";
+
+  src = fetchurl {
+    url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
+    sha256 = "01agf0bswqvci8nwp67kvrlwc2k0sg1s0lxpq2a9q58l99v2gakh";
+  };
+
+  pythonPath = []; # python wrapper support
+
+  patches = [
+    ./key_val.patch
+    ./zaxis_fix.patch
+  ];
+
+  latex = texlive.combine { inherit (texlive)
+    scheme-basic
+    collection-pstricks
+    collection-fontsrecommended
+    mathastext
+    pgf
+    relsize
+    sfmath
+    xcolor
+    xkeyval
+    ;};
+  buildInputs = [ ghostscript hepmc imagemagick python2 latex makeWrapper ];
+  propagatedBuildInputs = [ fastjet gsl yoda ];
+
+  preInstall = ''
+    substituteInPlace bin/make-plots \
+      --replace '"which"' '"${which}/bin/which"' \
+      --replace '"latex"' '"${latex}/bin/latex"' \
+      --replace '"dvips"' '"${latex}/bin/dvips"' \
+      --replace '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \
+      --replace '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \
+      --replace '"kpsewhich"' '"${latex}/bin/kpsewhich"' \
+      --replace '"convert"' '"${imagemagick.out}/bin/convert"'
+    substituteInPlace bin/rivet \
+      --replace '"less"' '"${less}/bin/less"'
+    substituteInPlace bin/rivet-buildplugin \
+      --replace '"which"' '"${which}/bin/which"' \
+      --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"}  #' \
+      --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK "
+    substituteInPlace bin/rivet-mkhtml \
+      --replace '"make-plots"' \"$out/bin/make-plots\" \
+      --replace '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\"
+  '';
+
+  configureFlags = [
+    "--with-fastjet=${fastjet}"
+    "--with-hepmc=${hepmc}"
+    "--with-yoda=${yoda}"
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    for prog in "$out"/bin/*; do
+      wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")
+    done
+  '';
+
+  meta = {
+    description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions";
+    license     = stdenv.lib.licenses.gpl2;
+    homepage    = https://rivet.hepforge.org;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/libraries/physics/rivet/key_val.patch b/pkgs/development/libraries/physics/rivet/key_val.patch
new file mode 100644
index 00000000000..0b24d703dac
--- /dev/null
+++ b/pkgs/development/libraries/physics/rivet/key_val.patch
@@ -0,0 +1,12 @@
+diff --git a/bin/rivet-cmphistos b/bin/rivet-cmphistos
+--- a/bin/rivet-cmphistos
++++ b/bin/rivet-cmphistos
+@@ -371,7 +371,7 @@ if __name__ == '__main__':
+         #     plot[key] = val
+         if plotoptions.has_key("PLOT"):
+             for key_val in plotoptions["PLOT"]:
+-                key, val = [s.strip() for s in key_val.split("=")]
++                key, val = [s.strip() for s in key_val.split("=", 1)]
+                 plot[key] = val
+         if opts.LINEAR:
+             plot['LogY'] = '0'
diff --git a/pkgs/development/libraries/physics/rivet/zaxis_fix.patch b/pkgs/development/libraries/physics/rivet/zaxis_fix.patch
new file mode 100644
index 00000000000..c255db565e6
--- /dev/null
+++ b/pkgs/development/libraries/physics/rivet/zaxis_fix.patch
@@ -0,0 +1,42 @@
+diff --git a/bin/make-plots b/bin/make-plots
+index abb024d..f59293d 100755
+--- a/bin/make-plots
++++ b/bin/make-plots
+@@ -1152,8 +1152,8 @@ class ColorScale(Described):
+ 
+         zcustommajortickmarks = int(self.description.get('ZMajorTickMarks', -1))
+         zcustomminortickmarks = int(self.description.get('ZMinorTickMarks', -1))
+-        zcustommajorticks=[]
+-        zcustomminorticks=[]
++        zcustommajorticks=None
++        zcustomminorticks=None
+         if self.description.has_key('ZCustomMajorTicks') and self.description['ZCustomMajorTicks']!='':
+             # TODO: Would be nice to have less invisible separation of the custom ticks than split on tabs
+             ticks = self.description['ZCustomMajorTicks'].strip().split('\t')
+@@ -2214,7 +2214,7 @@ class Ticks(object):
+ 
+ class XTicks(Ticks):
+ 
+-    def draw(self, custommajorticks=[], customminorticks=[], custommajortickmarks=-1, customminortickmarks=-1,drawlabels=True):
++    def draw(self, custommajorticks=None, customminorticks=None, custommajortickmarks=-1, customminortickmarks=-1,drawlabels=True):
+         twosided = bool(int(self.description.get('XTwosidedTicks', '0')))
+         out = ""
+         out += ('\n%\n% X-Ticks\n%\n')
+@@ -2265,7 +2265,7 @@ class XTicks(Ticks):
+ 
+ class YTicks(Ticks):
+ 
+-    def draw(self, custommajorticks=[], customminorticks=[], custommajortickmarks=-1, customminortickmarks=-1, drawlabels=True):
++    def draw(self, custommajorticks=None, customminorticks=None, custommajortickmarks=-1, customminortickmarks=-1, drawlabels=True):
+         twosided = bool(int(self.description.get('YTwosidedTicks', '0')))
+         out = ""
+         out += ('\n%\n% Y-Ticks\n%\n')
+@@ -2320,7 +2320,7 @@ class ZTicks(Ticks):
+         self.description = description
+         self.coors = coors
+ 
+-    def draw(self, custommajorticks=[], customminorticks=[],
++    def draw(self, custommajorticks=None, customminorticks=None,
+             custommajortickmarks=-1, customminortickmarks=-1,
+             drawlabels=True):
+         out = ""
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
new file mode 100644
index 00000000000..1216c34cdb8
--- /dev/null
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, boost, fastjet, gsl, hepmc, lhapdf, rivet, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "thepeg-${version}";
+  version = "2.0.3";
+
+  src = fetchurl {
+    url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
+    sha256 = "0d26linwv92iq23n4gx154jvyd0lz5vg41kf4nxa01nspy7scyy5";
+  };
+
+  buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];
+
+  configureFlags = [
+    "--with-hepmc=${hepmc}"
+    "--without-javagui"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Toolkit for High Energy Physics Event Generation";
+    license     = stdenv.lib.licenses.gpl2;
+    homepage    = https://herwig.hepforge.org/;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
new file mode 100644
index 00000000000..c1f0d3a2930
--- /dev/null
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, python2Packages, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "yoda-${version}";
+  version = "1.6.5";
+
+  src = fetchurl {
+    url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
+    sha256 = "1i8lmj63cd3qnxl9k2cb1abap2pirhx7ffinm834wbpy9iszwxql";
+  };
+
+  pythonPath = []; # python wrapper support
+
+  buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    for prog in "$out"/bin/*; do
+      wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")
+    done
+  '';
+
+  meta = {
+    description = "Provides small set of data analysis (specifically histogramming) classes";
+    license     = stdenv.lib.licenses.gpl2;
+    homepage    = https://yoda.hepforge.org;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
new file mode 100644
index 00000000000..4c00bb86142
--- /dev/null
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3,
+  python3Packages, glslang, spirv-tools, x11, libxcb, wayland }:
+
+assert stdenv.system == "x86_64-linux";
+
+let
+  version = "1.0.26.0";
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "Vulkan-LoaderAndValidationLayers";
+    rev = "sdk-${version}";
+    sha256 = "157m746hc76xrxd3qq0f44f5dy7pjbz8cx74ykqrlbc7rmpjpk58";
+  };
+  getRev = name: builtins.substring 0 40 (builtins.readFile "${src}/${name}_revision");
+in
+
+stdenv.mkDerivation rec {
+  name = "vulkan-loader-${version}";
+  inherit version src;
+
+  prePatch = ''
+    if [ "$(cat '${src}/spirv-tools_revision')" != '${spirv-tools.src.rev}' ] \
+      || [ "$(cat '${src}/spirv-headers_revision')" != '${spirv-tools.headers.rev}' ] \
+      || [ "$(cat '${src}/glslang_revision')" != '${glslang.src.rev}' ]
+    then
+      echo "Version mismatch, aborting!"
+      false
+    fi
+  '';
+
+  buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml
+                  glslang spirv-tools x11 libxcb wayland
+                ];
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default
+  ];
+
+  installPhase = ''
+    mkdir -p $out/lib
+    mkdir -p $out/bin
+    cp loader/libvulkan.so* $out/lib
+    cp demos/vulkaninfo $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "LunarG Vulkan loader";
+    homepage    = http://www.lunarg.com;
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix
index 087e93b0e05..313e99f1087 100644
--- a/pkgs/development/libraries/wxGTK-3.0/default.nix
+++ b/pkgs/development/libraries/wxGTK-3.0/default.nix
@@ -1,9 +1,12 @@
 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
 , gstreamer, gst_plugins_base, GConf, setfile
-, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
+, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
+, withWebKit ? false, webkitgtk2 ? null
 }:
 
+
 assert withMesa -> mesa != null;
+assert withWebKit -> webkitgtk2 != null;
 
 with stdenv.lib;
 
@@ -22,6 +25,7 @@ stdenv.mkDerivation {
     [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst_plugins_base GConf ]
     ++ optional withMesa mesa
+    ++ optional withWebKit webkitgtk2
     ++ optional stdenv.isDarwin setfile;
 
   nativeBuildInputs = [ pkgconfig ];
@@ -34,7 +38,9 @@ stdenv.mkDerivation {
     ++ optional withMesa "--with-opengl"
     ++ optionals stdenv.isDarwin
       # allow building on 64-bit
-      [ "--with-cocoa" "--enable-universal-binaries" ];
+      [ "--with-cocoa" "--enable-universal-binaries" ]
+    ++ optionals withWebKit
+      ["--enable-webview" "--enable-webview-webkit"];
 
   SEARCH_LIB = optionalString withMesa "${mesa}/lib";
 
diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix
new file mode 100644
index 00000000000..c2e5a1fc929
--- /dev/null
+++ b/pkgs/development/ocaml-modules/uchar/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, ocaml, ocamlbuild, opam }:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-uchar-0.0.1";
+
+  src = fetchurl {
+    url = https://github.com/ocaml/uchar/releases/download/v0.0.1/uchar-0.0.1.tbz;
+    sha256 = "0ficw1x7ymbd6m8hqw3w1aycwm1hbwd6bad3c5pspwnzh3qlikhi";
+  };
+
+  unpackCmd = "tar xjf $src";
+  buildInputs = [ ocaml ocamlbuild opam ];
+  buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
+  installPhase = ''
+    opam-installer --script --prefix=$out uchar.install > install.sh
+    sh install.sh
+    mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/
+    ln -s $out/lib/uchar $out/lib/ocaml/${ocaml.version}/site-lib/
+  '';
+
+
+  meta = {
+    description = "Compatibility library for OCaml’s Uchar module";
+    inherit (ocaml.meta) platforms license;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 31436d0ea38..0fd6c1873b5 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -14,7 +14,7 @@ let
     sha256 = "0533cr5w14da8wdb2q4py6aizvbvsdbk3sj7m1jx9lwznvnlf5n3";
   };
 in stdenv.mkDerivation rec {
-  name = "python-${python.version}-bootstrapped-pip-${version}";
+  name = "${python.libPrefix}-bootstrapped-pip-${version}";
   version = "8.1.2";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/activator/default.nix b/pkgs/development/tools/activator/default.nix
index a992a90623e..3e411b447c6 100644
--- a/pkgs/development/tools/activator/default.nix
+++ b/pkgs/development/tools/activator/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
 
   name = "${pname}-${version}";
   pname = "activator";
-  version = "1.3.10";
+  version = "1.3.11";
 
   src = fetchurl {
     url = "http://downloads.typesafe.com/typesafe-${pname}/${version}/typesafe-${name}.zip";
-    sha256 = "43693f041c8422ee06a2a90a805fd7b0e258dc85da31f0a4dca340dfd119b4ce";
+    sha256 = "1xpdh0mh97jiyh835524whq8n6rkvi1bl9fj9mc9fv73x4y2fg9k";
   };
 
   buildInputs = [ unzip jre ];
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
new file mode 100644
index 00000000000..7cb4afbc12e
--- /dev/null
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  name = "ammonite-repl-${version}";
+  version = "0.7.8";
+
+  src = fetchurl {
+    url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${version}";
+    sha256 = "0s34p168h5c7ij61rbmaygb95r654yj4j0wh6qya53k4ywl32vkp";
+  };
+
+  propagatedBuildInputs = [ jre ] ;
+  buildInputs = [ makeWrapper ] ;
+
+  phases = "installPhase";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${src} $out/bin/amm
+    chmod +x $out/bin/amm
+    wrapProgram $out/bin/amm --prefix PATH ":" ${jre}/bin ;
+  '';
+
+  meta = {
+    description = "Improved Scala REPL";
+    longDescription = ''
+        The Ammonite-REPL is an improved Scala REPL, re-implemented from first principles.
+        It is much more featureful than the default REPL and comes
+        with a lot of ergonomic improvements and configurability
+        that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh.
+    '';
+    homepage = http://www.lihaoyi.com/Ammonite/;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainer = [ lib.maintainers.nequissimus ];
+  };
+}
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 31d62bdae19..e25cb696a65 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "cppcheck";
-  version = "1.74";
+  version = "1.76.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "0m62byiprabm1m3mc4r2w54p7qyhgi8msipnpm66ychr8rz2yny0";
+    sha256 = "1l46bmzm5syfr9m5l0bqkj8lcyrynhw8gjf95s4fwhp2b7f0zisv";
   };
 
   nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "man" ];
 
+  enableParallelBuilding = true;
+
   postInstall = ''
     make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man
     mkdir -p $man/share/man/man1
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 5c76fc69ac3..fe4ec06322f 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "deis-${version}";
-  version = "1.13.0";
+  version = "1.13.3";
   rev = "v${version}";
-  
+
   goPackagePath = "github.com/deis/deis";
   subPackages = [ "client" ];
 
@@ -18,8 +18,20 @@ buildGoPackage rec {
     inherit rev;
     owner = "deis";
     repo = "deis";
-    sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw";
+    sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p";
   };
 
-  goDeps = ./deps.nix;
+  preBuild = ''
+    export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://deis.io;
+    description = "A command line utility used to interact with the Deis open source PaaS.";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [
+      jgeerds
+    ];
+  };
 }
diff --git a/pkgs/development/tools/deis/deps.nix b/pkgs/development/tools/deis/deps.nix
deleted file mode 100644
index 5a1b30a7e66..00000000000
--- a/pkgs/development/tools/deis/deps.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-[
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
-      sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
-    };
-  }
-  {
-    goPackagePath = "github.com/docopt/docopt-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docopt/docopt-go";
-      rev = "784ddc588536785e7299f7272f39101f7faccc3f";
-      sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
-      sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
-    };
-  }
-]
diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix
new file mode 100644
index 00000000000..3f818ea7be6
--- /dev/null
+++ b/pkgs/development/tools/deisctl/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "deis-${version}";
+  version = "1.13.3";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/deis/deis";
+  subPackages = [ "deisctl" ];
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "deis";
+    repo = "deis";
+    sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p";
+  };
+
+  preBuild = ''
+    export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://deis.io;
+    description = "A command-line utility used to provision and operate a Deis cluster.";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [
+      jgeerds
+    ];
+  };
+}
diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix
index f9e682d177f..e9da64b112b 100644
--- a/pkgs/development/tools/misc/hound/default.nix
+++ b/pkgs/development/tools/misc/hound/default.nix
@@ -16,12 +16,12 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
-    inherit (src) homepage;
+  meta = {
+    inherit (src.meta) homepage;
 
     description = "Lightning fast code searching made easy";
     license = stdenv.lib.licenses.mit;
-    maintainers = with lib.maintainers; [ grahamc ];
+    maintainers = with stdenv.lib.maintainers; [ grahamc ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
new file mode 100644
index 00000000000..b0c15a6df4b
--- /dev/null
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, cmake, python }:
+
+let
+
+spirv_sources = {
+  # `vulkan-loader` requires a specific version of `spirv-tools` and `spirv-headers` as specified in
+  # `<vulkan-loader-repo>/spirv-tools_revision`.
+  tools = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "SPIRV-Tools";
+    rev = "923a4596b44831a07060df45caacb522613730c9";
+    sha256 = "0hmgng2sv34amfsag3ya09prnv1w535djwlzfn8h2vh430vgawxa";
+  };
+  headers = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "SPIRV-Headers";
+    rev = "33d41376d378761ed3a4c791fc4b647761897f26";
+    sha256 = "1s103bpi3g6hhq453qa4jbabfkyxxpf9vn213j8k4vm26lsi8hs2";
+  };
+};
+
+in
+
+stdenv.mkDerivation rec {
+  name = "spirv-tools-${version}";
+  version = "2016-07-18";
+
+  src = spirv_sources.tools;
+  patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers'';
+  enableParallelBuilding = true;
+
+  buildInputs = [ cmake python ];
+
+  passthru = {
+    headers = spirv_sources.headers;
+  };
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules.";
+  };
+}
diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index 915a560be6e..f0a505a683a 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -9,4 +9,9 @@ import ./nodejs.nix (args // rec {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
     sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2";
   };
+
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace src/util.h \
+      --replace "tr1/type_traits" "type_traits"
+  '';
 })
diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix
new file mode 100644
index 00000000000..3b4fb6842db
--- /dev/null
+++ b/pkgs/games/frotz/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+  version = "2.44";
+  name = "frotz-${version}";
+
+  src = fetchFromGitHub {
+    owner = "DavidGriffith";
+    repo = "frotz";
+    rev = version;
+    sha256 = "0gjkk4gxzqmxfdirrz2lr0bms6l9fc31vkmlywigkbdlh8wxgypp";
+  };
+
+  makeFlags = ''CC=cc PREFIX=$(out) CURSES=-lncurses'';
+
+  buildInputs = [ ncurses ];
+
+  meta = with stdenv.lib; {
+    homepage = http://frotz.sourceforge.net/;
+    description = "A z-machine interpreter for Infocom games and other interactive fiction.";
+    platforms = platforms.unix;
+    maintainers = [ maintainers.nicknovitski ];
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 1242d99398f..22a148398c5 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -8,8 +8,8 @@
 assert x11Support -> xlibsWrapper != null;
 assert cupsSupport -> cups != null;
 let
-  version = "9.18";
-  sha256 = "18ad90za28dxybajqwf3y3dld87cgkx1ljllmcnc7ysspfxzbnl3";
+  version = "9.20";
+  sha256 = "1az0dnvgingqv78yvfhzmx1zavn5sv1xrrscz984hy3gvz2ks3rw";
 
   fonts = stdenv.mkDerivation {
     name = "ghostscript-fonts";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   name = "ghostscript-${version}";
 
   src = fetchurl {
-    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs918/${name}.tar.bz2";
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/${name}.tar.xz";
     inherit sha256;
   };
 
@@ -57,34 +57,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./urw-font-files.patch
-    # http://bugs.ghostscript.com/show_bug.cgi?id=696281
-    (fetchpatch {
-      name = "fix-check-for-using-shared-freetype-lib.patch";
-      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=8f5d285";
-      sha256 = "1f0k043rng7f0rfl9hhb89qzvvksqmkrikmm38p61yfx51l325xr";
-    })
-    # http://bugs.ghostscript.com/show_bug.cgi?id=696301
-    (fetchpatch {
-      name = "add-gserrors.h-to-the-installed-files.patch";
-      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=feafe5e5";
-      sha256 = "0s4ayzakjv809dkn7vilxwvs4dw35p3pw942ml91bk9z4kkaxyz7";
-    })
-    # http://bugs.ghostscript.com/show_bug.cgi?id=696246
-    (fetchpatch {
-      name = "guard-against-NULL-base-for-non-clist-devices.patch";
-      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=007bd77d08d800e6b07274d62e3c91be7c4a3f47";
-      sha256 = "1la53273agl92lpy7qd0qhgzynx8b90hrk8g9jsj3055ssn6rqwh";
-    })
-    (fetchpatch {
-      name = "ensure-plib-devices-always-use-the-clist.patch";
-      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1bdbe4f87dc57648821e613ebcc591b84e8b35b3";
-      sha256 = "1cq83fgyvrycapxm69v4r9f9qhzsr40ygrc3bkp8pk15wsmvq0k7";
-    })
-    (fetchpatch {
-      name = "prevent-rinkj-device-crash-when-misconfigured.patch";
-      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=5571ddfa377c5d7d98f55af40e693814ac287ae4";
-      sha256 = "08iqdlrngi6k0ml2b71dj5q136fyp1s9g0rr87ayyshn0k0lxwkv";
-    })
   ];
 
   preConfigure = ''
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 1fb1e1873d9..c3842959883 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchurl, fetchpatch, kernel }:
 
 let
   version = "6.30.223.271";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.broadcom.com/docs/linux_sta/${tarball}";
-    sha256 = hashes.${stdenv.system};
+    sha256 = hashes."${stdenv.system}";
   };
 
   hardeningDisable = [ "pic" ];
@@ -27,6 +27,11 @@ stdenv.mkDerivation {
     ./linux-4.7.patch
     ./null-pointer-fix.patch
     ./gcc.patch
+    (fetchpatch {
+      name = "linux-4.8.patch";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms";
+      sha256 = "0s8apf6l3qm9kln451g4z0pr13f4jdgyval1vfl2abg0dqc5xfhs";
+    })
   ];
 
   makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}";
diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix
new file mode 100644
index 00000000000..99cb7d264fe
--- /dev/null
+++ b/pkgs/os-specific/linux/cachefilesd/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "cachefilesd-${version}";
+  version = "0.10.9";
+
+  src = fetchurl {
+    url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2";
+    sha256 = "1jkb3qd8rcmli3g2qgcpp1f9kklil4qgy86w7pg2cpv10ikyr5y8";
+  };
+
+  installFlags = [
+    "ETCDIR=$(out)/etc"
+    "SBINDIR=$(out)/sbin"
+    "MANDIR=$(out)/share/man"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Local network file caching management daemon";
+    homepage = "https://people.redhat.com/dhowells/fscache/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix
index de726d5b42c..a9cea506c97 100644
--- a/pkgs/os-specific/linux/facetimehd/default.nix
+++ b/pkgs/os-specific/linux/facetimehd/default.nix
@@ -3,25 +3,40 @@
 # facetimehd is not supported for kernels older than 3.19";
 assert stdenv.lib.versionAtLeast kernel.version "3.19";
 
+let
+  # Note: When updating this revision:
+  # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
+  # 2. Test the module and firmware change via:
+  #    a. Give some applications a try (Skype, Hangouts, Cheese, etc.)
+  #    b. Run: journalctl -f
+  #    c. Then close the lid
+  #    d. Then open the lid (and maybe press a key to wake it up)
+  #    e. see if the module loads back (apps using the camera won't
+  #       recover and will have to be restarted) and the camera
+  #       still works.
+  srcParams = if (stdenv.lib.versionAtLeast kernel.version "4.8") then
+    { # Use mainline branch
+      version = "unstable-2016-10-09";
+      rev = "887d0f531ef7b91457be519474136c3355c5132b";
+      sha256 = "0bayahnxar1q6wvf9cb6p8gsfw98w0wqp715hs4r7apmddwk9v7n";
+    }
+  else
+    { # Use master branch (broken on 4.8)
+      version = "unstable-2016-05-02";
+      rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c";
+      sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp";
+    }
+  ;
+in
+
 stdenv.mkDerivation rec {
   name = "facetimehd-${version}-${kernel.version}";
-  version = "git-20160503";
+  version = srcParams.version;
 
   src = fetchFromGitHub {
     owner = "patjak";
     repo = "bcwc_pcie";
-    # Note: When updating this revision:
-    # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
-    # 2. Test the module and firmware change via:
-    #    a. Give some applications a try (Skype, Hangouts, Cheese, etc.)
-    #    b. Run: journalctl -f
-    #    c. Then close the lid
-    #    d. Then open the lid (and maybe press a key to wake it up)
-    #    e. see if the module loads back (apps using the camera won't
-    #       recover and will have to be restarted) and the camera
-    #       still works.
-    rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c";
-    sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp";
+    inherit (srcParams) rev sha256;
   };
 
   preConfigure = ''
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index 3402f7a7013..0e5f6208382 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pam, qrencode }:
+{ stdenv, lib, fetchurl, pam, qrencode }:
 
 stdenv.mkDerivation rec {
   name = "google-authenticator-1.0";
@@ -20,10 +20,11 @@ stdenv.mkDerivation rec {
     cp google-authenticator $out/bin
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = https://code.google.com/p/google-authenticator/;
     description = "Two-step verification, with pam module";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ aneeshusa ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index bdc243a149e..4d5fac82d93 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -180,7 +180,7 @@ with stdenv.lib;
   VGA_SWITCHEROO y # Hybrid graphics support
   DRM_GMA600 y
   DRM_GMA3600 y
-  ${optionalString (versionAtLeast version "4.5") ''
+  ${optionalString (versionAtLeast version "4.5" && (versionOlder version "4.9")) ''
     DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support
   ''}
 
@@ -210,6 +210,7 @@ with stdenv.lib;
   # ACLs for all filesystems that support them.
   FANOTIFY y
   TMPFS y
+  FS_ENCRYPTION? m
   EXT2_FS_XATTR y
   EXT2_FS_POSIX_ACL y
   EXT2_FS_SECURITY y
@@ -219,6 +220,7 @@ with stdenv.lib;
   EXT3_FS_POSIX_ACL y
   EXT3_FS_SECURITY y
   EXT4_FS_POSIX_ACL y
+  EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"}
   EXT4_FS_SECURITY y
   REISERFS_FS_XATTR? y
   REISERFS_FS_POSIX_ACL? y
@@ -231,6 +233,10 @@ with stdenv.lib;
   OCFS2_DEBUG_MASKLOG? n
   BTRFS_FS_POSIX_ACL y
   UBIFS_FS_ADVANCED_COMPR? y
+  F2FS_FS m
+  F2FS_FS_SECURITY? y
+  F2FS_FS_ENCRYPTION? y
+  UDF_FS m
   ${optionalString (versionAtLeast version "4.0" && versionOlder version "4.6") ''
     NFSD_PNFS y
   ''}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 246068f09ea..46ea98cf4b7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.24";
+  version = "4.4.26";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0yhs1742wrl0ip9wsayparjpr7vccljnhfjimgy4fjp3w6aync1k";
+    sha256 = "17h2k7imdv96pp121y4hswzqjx53vd8wx2s628pifk4vfs9kya2q";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.7.nix b/pkgs/os-specific/linux/kernel/linux-4.7.nix
index 139ae20d8c9..1d9ebee5335 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.7.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.7.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.7.7";
+  version = "4.7.9";
   extraMeta.branch = "4.7";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d";
+    sha256 = "13g2b8ap2xyx0c35ka92j9j3x7mh610ax5fq2xl75787hqmdaf06";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix
index d7164d72940..51d2d7f7455 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8.1";
+  version = "4.8.3";
   extraMeta.branch = "4.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0rcqgi91jz5iyx1nrd4qjmvh0sgqjpqj94bwjh56c21nkxxiahg6";
+    sha256 = "00s0jscqhiqlfvcxwz5gix1n185i4wj713l6l71gn7jxrw0c1mzr";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index 139ae20d8c9..1d9ebee5335 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.7.7";
+  version = "4.7.9";
   extraMeta.branch = "4.7";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d";
+    sha256 = "13g2b8ap2xyx0c35ka92j9j3x7mh610ax5fq2xl75787hqmdaf06";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 6b13b45d1ad..1a411a258dd 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8-rc6";
-  modDirVersion = "4.8.0-rc6";
-  extraMeta.branch = "4.8";
+  version = "4.9-rc1";
+  modDirVersion = "4.9.0-rc1";
+  extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "122qn2r3q85xqcb56lgpkiv06yrd5w742fcdjk1sribqcvl1xlqr";
+    sha256 = "1s123bs20zp1zzy0i12y63n6wsr9cwaad4110rl5ir49j6z6byqf";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 29d622cd3c3..578002c0f74 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -86,9 +86,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.7.7";
-      grrev  = "201610101902";
-      sha256 = "18x8grxj03bh9gqlm3sfgjl8vy5gpyrjr8nmdnrnas6ycmbvyjx4";
+    { kver   = "4.7.9";
+      grrev  = "201610200819";
+      sha256 = "1q2j819g3yidd9m7myskx2g1rzrx3cw8fwjrzbbhaxv2kxjmrrjb";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 1327a349474..c7da0fcca2a 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -19,7 +19,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libsepol pcre ]
              ++ optionals enablePython [ swig python ];
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all -std=gnu89";
+  # Avoid this false warning:
+  # avc_internal.c: In function 'avc_netlink_receive':
+  # avc_internal.c:105:25: error: cast increases required alignment of target type [-Werror=cast-align]
+  #  struct nlmsghdr *nlh = (struct nlmsghdr *)buf;
+  #                         ^
+
+  NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-error=cast-align";
 
   # Unreleased upstream patch that fixes Python package issue arising
   # from recent SWIG changes.
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index ae05e583061..229865b49a3 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -29,12 +29,12 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
+        url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
         sha256 = "1fw87nvbf8dmy7clwmm7jwp842c78mkz9bcb060wbihsywkfkm23";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run";
+        url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run";
         sha256 = "0lc87bgr29l9idhy2a4bsplkwx9r0dz9kjhcc5xq2xqkkyr5sqd1";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index e60f6173c0f..72951c168dc 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -6,11 +6,11 @@ assert enableCgiScripts -> gd != null;
 
 stdenv.mkDerivation rec {
   pname = "apcupsd";
-  name = "${pname}-3.14.13";
+  name = "${pname}-3.14.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "1y83bly5bgpjbfaxxwmdk2mndbi4cw0svq5z9n6byj043phbvv2p";
+    sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv";
   };
 
   buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index e55b3eeb18b..810fabb253f 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, libtool, perl, libxml2
+{ stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
 , libseccomp ? null }:
 
 let version = "9.10.4-P3"; in
@@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
     "--without-pkcs11"
     "--without-purify"
     "--without-python"
-    "--enable-seccomp"
-  ];
+  ] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) "--enable-seccomp";
 
   postInstall = ''
     moveToOutput bin/bind9-config $dev
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 368f95b3a18..603709b31ce 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -13,11 +13,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.12";
+  name = "nsd-4.1.13";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "fd1979dff1fba55310fd4f439dc9f3f4701d435c0ec4fb9af533e12c7f27d5de";
+    sha256 = "1bwiabj1m7h14ppsa2azw017dqkqjgdl9gmj6ghjg80146xd8p64";
   };
 
   buildInputs = [ libevent openssl ];
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 0a6bcdc72af..5a566973787 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.0.7300";
+  version = "3.0.8300";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";
-    sha256 = "0xm3jw8ll49akr4fxa5qjbsglcgb6fq6nc54zppannxdlfkqj5jk";
+    sha256 = "13hr87jrhw8kkh94rknzjmlshd2a6kbbkygikigmfyvf3g7r4jf8";
   };
 
   buildInputs = with pkgs; [
diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix
index 5d8620ed775..3e097c0ebd4 100644
--- a/pkgs/servers/fleet/default.nix
+++ b/pkgs/servers/fleet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "fleet-${version}";
-  version = "0.11.5";
+  version = "0.11.8";
 
   src = fetchFromGitHub {
     owner = "coreos";
     repo = "fleet";
     rev = "v${version}";
-    sha256 = "0dc95dpqqc2rclbvgdqjcilrkji7lrpigdrzpwm3nbgz58vkfnz3";
+    sha256 = "13kwaa4hkiic602wnvnk13pflrxqhk2vxwpk1bn52ilwxkjyvkig";
   };
 
   buildInputs = [ go ];
@@ -27,7 +27,11 @@ stdenv.mkDerivation rec {
     description = "A distributed init system";
     homepage = http://coreos.com/using-coreos/clustering/;
     license = licenses.asl20;
-    maintainers = with maintainers; [ cstrahan offline ];
+    maintainers = with maintainers; [
+      cstrahan
+      jgeerds
+      offline
+    ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index b5ea7acb9d2..7ad5f6e9ad5 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation rec {
   name = "opensmtpd-${version}";
-  version = "6.0.0p1";
+  version = "6.0.2p1";
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ libasr libevent zlib openssl db pam ];
 
   src = fetchurl {
     url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "07gq21bx62w367512d0bbp9hm3pfgqh3kksg2by7n574kxc7jzm9";
+    sha256 = "1b4h64w45hpmfq5721smhg4s0shs64gbcjqjpx3fbiw4hz8bdy9a";
   };
 
   patches = [ ./proc_path.diff ];
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 5024f00caee..bcbda0d5c09 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/
-    cp -R ./* $out/
+    cp -R . $out/
   '';
 
   meta = {
diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index b73086ca7c7..45c195c2cb2 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/pkgs/servers/quagga/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "quagga-${version}";
-  version = "1.0.20160315";
+  version = "1.0.20161017";
 
   src = fetchurl {
     url = "mirror://savannah/quagga/${name}.tar.gz";
-    sha256 = "0qrjhp6l1hw35jrvcwyl0df4zjx1kqhrsafx307i6pzgs2xbgzr1";
+    sha256 = "0629f7bkyh0a3n90kkr202g2i44id09qzkl05y8z66blvd6p49lg";
   };
 
   buildInputs =
diff --git a/pkgs/servers/samba/4.x-fix-ctdb-deps.patch b/pkgs/servers/samba/4.x-fix-ctdb-deps.patch
deleted file mode 100644
index 33886348412..00000000000
--- a/pkgs/servers/samba/4.x-fix-ctdb-deps.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ctdb/wscript b/ctdb/wscript
-index 3e2a992..3fe15cc 100755
---- a/ctdb/wscript
-+++ b/ctdb/wscript
-@@ -568,7 +568,7 @@ def build(bld):
-                          source='ib/ibwrapper_test.c',
-                          includes='include include/internal',
-                          deps='''replace talloc ctdb-client ctdb-common
--                                 ctdb-system''' +
-+                                 ctdb-system ctdb-common-util''' +
-                               ib_deps,
-                          install_path='${CTDB_TEST_LIBDIR}')
- 
diff --git a/pkgs/servers/samba/4.x-no-persistent-install.patch b/pkgs/servers/samba/4.x-no-persistent-install.patch
index c3e013f7862..efb539bfaea 100644
--- a/pkgs/servers/samba/4.x-no-persistent-install.patch
+++ b/pkgs/servers/samba/4.x-no-persistent-install.patch
@@ -1,26 +1,7 @@
-diff --git a/dynconfig/wscript b/dynconfig/wscript
-index aa4e66e..d53f433 100755
---- a/dynconfig/wscript
-+++ b/dynconfig/wscript
-@@ -379,9 +379,9 @@ def build(bld):
-                         cflags=cflags)
- 
-     # install some extra empty directories
--    bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
--    bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
--    bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
-+    #bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
-+    #bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
-+    #bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
- 
-     # these might be on non persistent storage
--    bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
-+    #bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
-diff --git a/ctdb/wscript b/ctdb/wscript
-index 3e2a992..1b93a4d 100755
---- a/ctdb/wscript
-+++ b/ctdb/wscript
-@@ -473,10 +473,10 @@ def build(bld):
+diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript
+--- samba-4.4.6/ctdb/wscript	2016-09-22 09:42:48.000000000 +0300
++++ samba-4.4.6-new/ctdb/wscript	2016-10-15 23:31:13.932088237 +0300
+@@ -581,7 +581,7 @@
      for t in etc_subdirs:
          files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir)
          for fmode in files:
@@ -28,12 +9,8 @@ index 3e2a992..1b93a4d 100755
 +            bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0],
                                destname=fmode[0], chmod=fmode[1])
  
--    bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/functions',
-+    bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/functions',
-                       destname='functions')
- 
-     etc_scripts = [
-@@ -489,18 +489,18 @@ def build(bld):
+     bld.SAMBA_GENERATOR('ctdb-functions',
+@@ -601,23 +601,19 @@
      ]
  
      for t in etc_scripts:
@@ -41,8 +18,12 @@ index 3e2a992..1b93a4d 100755
 +        bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t,
                            destname=t, chmod=0755)
  
--    bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
-+    bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
+     bld.SAMBA_GENERATOR('ctdb-sudoers',
+                         source='config/ctdb.sudoers',
+                         target='ctdb.sudoers',
+                         rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
+-    bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
++    bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
                        destname='ctdb')
  
 -    bld.INSTALL_FILES('${CTDB_ETCDIR}/notify.d', 'config/notify.d.README',
@@ -52,9 +33,22 @@ index 3e2a992..1b93a4d 100755
 -    bld.install_dir(bld.env.CTDB_LOGDIR)
 -    bld.install_dir(bld.env.CTDB_RUNDIR)
 -    bld.install_dir(bld.env.CTDB_VARDIR)
-+    #bld.install_dir(bld.env.CTDB_LOGDIR)
-+    #bld.install_dir(bld.env.CTDB_RUNDIR)
-+    #bld.install_dir(bld.env.CTDB_VARDIR)
- 
-     sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION
-     t = bld.SAMBA_GENERATOR('ctdb-pc',
+-
+     # Unit tests
+     ctdb_unit_tests = [
+         'db_hash_test',
+diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript
+--- samba-4.4.6/dynconfig/wscript	2016-01-26 14:45:46.000000000 +0300
++++ samba-4.4.6-new/dynconfig/wscript	2016-10-15 22:21:18.159705132 +0300
+@@ -416,11 +416,3 @@
+                         public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir),
+                         header_path='samba',
+                         cflags=cflags)
+-
+-    # install some extra empty directories
+-    bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
+-    bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
+-    bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
+-
+-    # these might be on non persistent storage
+-    bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index a3bb2d44216..2dfdf3709ee 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -18,18 +18,18 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "samba-4.3.11";
+  name = "samba-${version}";
+  version = "4.4.6";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "1v2grwivm6rasz1ganbybs0ikz1lydaniy65kxf1v8rl1qqngach";
+    sha256 = "1361ijz7vpgf66w3j9z7qb37rnlrydxw01ibjnfhjqqcb7fj7i1p";
   };
 
   outputs = [ "out" "dev" "man" ];
 
   patches =
     [ ./4.x-no-persistent-install.patch
-      ./4.x-fix-ctdb-deps.patch
     ];
 
   buildInputs =
diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index d9e324efd44..faee8415f4b 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.52";
+  version = "5.5.53";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
-    sha256 = "1zb2h6nmmm42qcc808bwa3sdlhyyyglv44jy4pfxmx5kwqyy283q";
+    sha256 = "1snnyz8s7dd3ypm73vbpw36pflz7wqh2bawdvp4riri44pa6va57";
   };
 
   patches = if stdenv.isCygwin then [
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index a2052eca9c2..5823cc57fba 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.15";
+  version = "5.7.16";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
-    sha256 = "0mlrxcvkn6bf869hjw9fb6m24ak26ndffnd91b4mknmz8cqkb1ch";
+    sha256 = "198qhd9bdm0fnpp307mgby2aar92yzya0937kxi7bcpdfjcvada9";
   };
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
new file mode 100644
index 00000000000..83c0a6c1034
--- /dev/null
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "shaarli-${version}";
+  version = "0.8.0";
+
+  src = fetchurl {
+    url = "https://github.com/shaarli/Shaarli/releases/download/v0.8.0/shaarli-v0.8.0-full.tar.gz";
+    sha256 = "04151fl62rs8vxsmdyq4qm8fi7fr7i6x0zhrg1zgssv8w8lfx1ww";
+  };
+
+  outputs = [ "out" "doc" ];
+
+  patchPhase = ''
+    substituteInPlace index.php \
+      --replace "new ConfigManager();" "new ConfigManager(getenv('SHAARLI_CONFIG'));"
+  '';
+
+#    Point $SHAARLI_CONFIG to your configuration file, see https://github.com/shaarli/Shaarli/wiki/Shaarli-configuration.
+#    For example:
+#      <?php /*
+#      {
+#          "credentials": {
+#              "login": "user",
+#              "hash": "(password hash)",
+#              "salt": "(password salt)"
+#          },
+#          "resource": {
+#              "data_dir": "\/var\/lib\/shaarli",
+#              "config": "\/var\/lib\/shaarli\/config.json.php",
+#              "datastore": "\/var\/lib\/shaarli\/datastore.php",
+#              "ban_file": "\/var\/lib\/shaarli\/ipbans.php",
+#              "updates": "\/var\/lib\/shaarli\/updates.txt",
+#              "log": "\/var\/lib\/shaarli\/log.txt",
+#              "update_check": "\/var\/lib\/shaarli\/lastupdatecheck.txt",
+#              "raintpl_tmp": "\/var\/lib\/shaarli\/tmp",
+#              "thumbnails_cache": "\/var\/lib\/shaarli\/cache",
+#              "page_cache": "\/var\/lib\/shaarli\/pagecache"
+#          },
+#          "updates": {
+#              "check_updates": false
+#          }
+#      }
+#      */ ?>
+
+  installPhase = ''
+    rm -r {cache,pagecache,tmp,data}/
+    mv doc/ $doc/
+    mkdir $out/
+    cp -R ./* $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The personal, minimalist, super-fast, database free, bookmarking service";
+    license = licenses.gpl3Plus;
+    homepage = https://github.com/shaarli/Shaarli;
+    maintainers = with maintainers; [ schneefux ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d892135740c..640c200e7cf 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1880,11 +1880,11 @@ let
   }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
 
   xf86videonouveau = (mkDerivation "xf86videonouveau" {
-    name = "xf86-video-nouveau-1.0.12";
+    name = "xf86-video-nouveau-1.0.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2;
-      sha256 = "07irv1zkk0rkyn1d7f2gn1icgcz2ix0pwv74sjian763gynmg80f";
+      url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2;
+      sha256 = "1js7vak68g2800f1cy5r41wl5x2j7dbmbd7zxypzfgcw2fx454kd";
     };
     buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -2353,11 +2353,11 @@ let
   }) // {inherit ;};
 
   xorgserver = (mkDerivation "xorgserver" {
-    name = "xorg-server-1.18.3";
+    name = "xorg-server-1.18.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.18.3.tar.bz2;
-      sha256 = "1ka206v4nbw6qz072gh0543aq44azq2zv9f0yysy5nvwa4i9qwza";
+      url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2;
+      sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";
     };
     buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 5e7a9e81416..b2b5f2dc236 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -131,7 +131,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2
-mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2
+mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2
 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
@@ -183,7 +183,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2
 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.18.3.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 11a52eb423e..10d2b4decdd 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -197,14 +197,49 @@ in rec {
         fi
       done
 
+      install_name_tool \
+        -id $out/lib/system/libsystem_c.dylib \
+        $out/lib/system/libsystem_c.dylib
+
+      install_name_tool \
+        -id $out/lib/system/libsystem_kernel.dylib \
+        $out/lib/system/libsystem_kernel.dylib
+
+      # TODO: this logic basically duplicates similar logic in the Libsystem expression. Deduplicate them!
+      libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }')
+
+      for i in $libs; do
+        if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then
+          args="$args -reexport_library $i"
+        fi
+      done
+
+      ld -macosx_version_min 10.7 \
+         -arch x86_64 \
+         -dylib \
+         -o $out/lib/libSystem.B.dylib \
+         -compatibility_version 1.0 \
+         -current_version 1226.10.1 \
+         -reexport_library $out/lib/system/libsystem_c.dylib \
+         -reexport_library $out/lib/system/libsystem_kernel.dylib \
+         $args
+
+      ln -s libSystem.B.dylib $out/lib/libSystem.dylib
+
+      for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do
+        ln -s libSystem.dylib $out/lib/lib$name.dylib
+      done
+
+      ln -s libresolv.9.dylib $out/lib/libresolv.dylib
+
       for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
-        if ! test -L $i; then
-          echo patching $i
+        if test ! -L "$i" -a "$i" != "$out/lib/libSystem*.dylib"; then
+          echo "Patching $i"
 
           id=$(otool -D "$i" | tail -n 1)
           install_name_tool -id "$(dirname $i)/$(basename $id)" $i
 
-          libs=$(otool -L "$i" | tail -n +2 | grep -v Libsystem | cat)
+          libs=$(otool -L "$i" | tail -n +2 | grep -v libSystem | cat)
           if [ -n "$libs" ]; then
             install_name_tool -add_rpath $out/lib $i
           fi
@@ -214,9 +249,24 @@ in rec {
       ln -s bash $out/bin/sh
       ln -s bzip2 $out/bin/bunzip2
 
+      # Provide a gunzip script.
+      cat > $out/bin/gunzip <<EOF
+      #!$out/bin/sh
+      exec $out/bin/gzip -d "\$@"
+      EOF
+      chmod +x $out/bin/gunzip
+
+      # Provide fgrep/egrep.
+      echo "#! $out/bin/sh" > $out/bin/egrep
+      echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep
+      echo "#! $out/bin/sh" > $out/bin/fgrep
+      echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep
+
       cat >$out/bin/dsymutil << EOF
       #!$out/bin/sh
       EOF
+
+      chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/dsymutil
     '';
 
     allowedReferences = [ "out" ];
diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix
new file mode 100644
index 00000000000..6bd915e7050
--- /dev/null
+++ b/pkgs/tools/admin/dehydrated/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
+let
+  pkgName = "dehydrated";
+  version = "0.3.1";
+in
+stdenv.mkDerivation rec {
+  name = pkgName + "-" + version;
+
+  src = fetchFromGitHub {
+    owner = "lukas2511";
+    repo = "dehydrated";
+    rev = "v${version}";
+    sha256 = "0prg940ykbsfb4w48bc03j5abycg8v7f9rg9x3kcva37y8ml0jsp";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a dehydrated $out/bin
+    wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}"
+    '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Letsencrypt/acme client implemented as a shell-script";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.pstn ];
+  };
+}
diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix
new file mode 100644
index 00000000000..d563f438020
--- /dev/null
+++ b/pkgs/tools/filesystems/vmfs-tools/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, pkgconfig
+, asciidoc, docbook_xml_xslt, fuse, libuuid, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "vmfs-tools";
+
+  src = fetchFromGitHub {
+    owner  = "glandium";
+    repo   = "vmfs-tools";
+    rev    = "4ab76ef5b074bdf06e4b518ff6d50439de05ae7f";
+    sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4";
+  };
+
+  nativeBuildInputs = [ asciidoc docbook_xml_xslt fuse libuuid libxslt pkgconfig ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/glandium/vmfs-tools;
+    description = "FUSE-based VMFS (vmware) mounting tools";
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index 3ca6f3ffcfe..161982ac618 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
@@ -4,24 +4,20 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-uniemoji-${version}";
-  version = "2016-09-20";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "salty-horse";
     repo = "ibus-uniemoji";
-    rev = "c8931a4807a721168e45463ecba00805adb3fe8d";
-    sha256 = "0fydxkdjsbfbrbb8238rfnshmhp11c38hsa7y2gp1ii6mkjngb1j";
+    rev = "v${version}";
+    sha256 = "121zh3q0li1k537fcvbd4ns4jgl9bbb9gm9ihy8cfxgirv38lcfa";
   };
 
   propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ];
 
   makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc"
-                "PYTHON=${python3Packages.python.interpreter}" ];
-
-  postPatch = ''
-    sed -i "s,/etc/xdg/,$out/etc/xdg/," uniemoji.py
-    sed -i "s,/usr/share/,$out/share/,g" uniemoji.xml.in
-  '';
+                "PYTHON=${python3Packages.python.interpreter}"
+              ];
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
new file mode 100644
index 00000000000..068d3e3866e
--- /dev/null
+++ b/pkgs/tools/misc/bibtex2html/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml }:
+
+stdenv.mkDerivation rec {
+  name = "bibtex2html-${version}";
+  version = "1.98";
+
+  src = fetchurl {
+    url = http://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz;
+    sha256 = "1mh6hxmc9qv05hgjc11m2zh5mk9mk0kaqp59pny18ypqgfws09g9";
+  };
+
+  buildInputs = [ ocaml ];
+
+  meta = with stdenv.lib; {
+    description = "A collection of tools for translating from BibTeX to HTML";
+    homepage = https://www.lri.fr/~filliatr/bibtex2html/;
+    licence = licenses.gpl2;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = [ maintainers.scolobb ];
+  };
+}
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix
index 1efac3b7844..6cd451264ab 100644
--- a/pkgs/tools/misc/ipxe/default.nix
+++ b/pkgs/tools/misc/ipxe/default.nix
@@ -27,8 +27,12 @@ stdenv.mkDerivation {
     ];
 
 
+  enabledOptions = [ "DOWNLOAD_PROTO_HTTPS" ];
+
   configurePhase = ''
-    echo "#define  DOWNLOAD_PROTO_HTTPS" >> src/config/general.h
+    runHook preConfigure
+    for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done
+    runHook postConfigure
   '';
 
   preBuild = "cd src";
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
new file mode 100644
index 00000000000..865c6b1e842
--- /dev/null
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -0,0 +1,42 @@
+{
+  kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
+  ecm, kdoctools,
+  baloo, kconfig, kfilemetadata, kinit, kirigami, plasma-framework
+}:
+
+let
+  pname = "peruse";
+  version = "1.1";
+  unarr = fetchFromGitHub {
+    owner  = "zeniko";
+    repo   = "unarr";
+    rev    = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7";
+    sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr";
+  };
+  unwrapped = kdeDerivation rec {
+    name = "${pname}-${version}";
+
+    src = fetchurl {
+      url = "mirror://kde/stable/${pname}/${name}.tar.xz";
+      sha256 = "1akk9hg12y6iis0rb5kdkznm3xk7hk04r9ccqyz8lr6y073n5f9j";
+    };
+
+    nativeBuildInputs = [ ecm kdoctools ];
+
+    propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami plasma-framework ];
+
+    preConfigure = ''
+      rmdir src/qtquick/karchive-rar/external/unarr
+      ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
+    '';
+
+    meta = with lib; {
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ peterhoeg ];
+    };
+
+  };
+
+in kdeWrapper unwrapped {
+  targets = [ "bin/peruse" ];
+}
diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index 972e1049278..a6891886664 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, makeWrapper
-, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop, gnugrep
+{ stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk, procps, gnused
+, findutils, xdpyinfo, xprop, gnugrep, ncurses
 }:
 
 stdenv.mkDerivation {
-  name = "screenFetch-2016-01-13";
+  name = "screenFetch-2016-10-11";
 
-  src = fetchgit {
-    url = git://github.com/KittyKatt/screenFetch.git;
-    rev = "22e5bee7647453d45ec82f543f37b8a6a062835d";
-    sha256 = "0xdiz02bqg7ajj547j496qq9adysm1f6zymcy3yyfgw3prnzvdir";
+  src = fetchFromGitHub {
+    owner = "KittyKatt";
+    repo = "screenFetch";
+    rev = "89e51f24018c89b3647deb24406a9af3a78bbe99";
+    sha256 = "0i2k261jj2s4sfhav7vbsd362pa0gghw6qhwafhmicmf8hq2a18v";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -28,7 +29,8 @@ stdenv.mkDerivation {
       --prefix PATH : "${findutils}/bin" \
       --prefix PATH : "${xdpyinfo}/bin" \
       --prefix PATH : "${xprop}/bin" \
-      --prefix PATH : "${gnugrep}/bin"
+      --prefix PATH : "${gnugrep}/bin" \
+      --prefix PATH : "${ncurses}/bin"
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 5a5d8df26ce..7eba2d2f939 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -5,13 +5,13 @@ let
   inherit (pythonPackages) python nose pycrypto requests2 mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "12r4yazsxk09sampiz9j1jqgzm3136h5fgbbdaiwg43b0y1sjg3d";
+    sha256 = "15vadnyah51pk4d0lx11bymxhfq47l5ijn72pjqr9yjx3pkgpd7w";
   };
 
   pythonPaths = [ pycrypto requests2 ];
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 3f07ed87433..6b49a8120a4 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -14,11 +14,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2016.10.07";
+  version = "2016.10.19";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "56be6107275cbdc867e89caf9d20f351d184fdc4fb06d915945fef708086dbce";
+    sha256 = "ed8d4a247c4cfffe2a1171b4f9c20be19e84d96bcf3716f46988c8503b1b7713";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 19e87d3a88b..eec84e10386 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.27.1";
+  version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "aria2";
     repo = "aria2";
     rev = "release-${version}";
-    sha256 = "003m80gdcqfxi5jjzwiszql5y8lrj7a59gjygy0ya72fa9j4l9mi";
+    sha256 = "196prs98sxwwxiszw2m1kbcra7n7fxf758y5dcj2jkddrr37hdkw";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index 08bdb052d63..91472b7c61e 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cmst-${version}";
-  version = "2016.04.03";
+  version = "2016.10.03";
 
   src = fetchFromGitHub {
     repo = "cmst";
     owner = "andrew-bibb";
     rev = name;
-    sha256 = "1334ynhq1lxcfqln3bq17hy1awyfnn3zhzpsnymlyp0z3h4ydpp9";
+    sha256 = "1pvk1jg0fiw0j4f1wrnhgirgziliwa44sxfdmcq9ans4zbig4izh";
   };
 
   nativeBuildInputs = [ makeWrapper qmakeHook ];
@@ -19,16 +19,14 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace ./cmst.pro \
-      --replace "/usr/bin" "$out/bin" \
-      --replace "/usr/share" "$out/usr/share"
+      --replace "/usr/share" "$out/share"
 
     substituteInPlace ./cmst.pri \
       --replace "/usr/lib" "$out/lib" \
       --replace "/usr/share" "$out/share"
 
     substituteInPlace ./apps/cmstapp/cmstapp.pro \
-      --replace "/usr/bin" "$out/bin" \
-      --replace "/usr/share" "$out/share"
+      --replace "/usr/bin" "$out/bin"
 
     substituteInPlace ./apps/rootapp/rootapp.pro \
       --replace "/etc" "$out/etc" \
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index a3c0d47d3e7..a5c7353905b 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "httpie-0.9.3";
+  name = "httpie-0.9.6";
   namePrefix = "";
 
   src = fetchurl {
     url = "mirror://pypi/h/httpie/${name}.tar.gz";
-    sha256 = "0jvzxr8r6cy6ipknkw95qf8rz69nqdv5nky87h1vcp5pf8mgza1h";
+    sha256 = "1cch5y0hr9qpfn9m4nw5796c2x7v3m1ni4psjm26ajsl8pw90jx6";
   };
 
   propagatedBuildInputs = with pythonPackages; [ pygments requests2 ];
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index fabcda902be..064f68947b8 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
 
       # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
       ./dont_create_privsep_path.patch
+      ./fix-CVE-2016-8858.patch
     ]
     ++ optional withGssapiPatches gssapiSrc;
 
@@ -92,7 +93,7 @@ stdenv.mkDerivation rec {
     description = "An implementation of the SSH protocol";
     license = stdenv.lib.licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ eelco ];
+    maintainers = with maintainers; [ eelco aneeshusa ];
     broken = hpnSupport; # probably after 6.7 update
   };
 }
diff --git a/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch
new file mode 100644
index 00000000000..e526161083c
--- /dev/null
+++ b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch
@@ -0,0 +1,11 @@
+diff -u -r1.126 -r1.127
+--- ssh/kex.c	2016/09/28 21:44:52	1.126
++++ ssh/kex.c	2016/10/10 19:28:48	1.127
+@@ -461,6 +461,7 @@
+ 	if (kex == NULL)
+ 		return SSH_ERR_INVALID_ARGUMENT;
+ 
++	ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
+ 	ptr = sshpkt_ptr(ssh, &dlen);
+ 	if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
+ 		return r;
diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix
index 0ac8dca770a..46fd9e54950 100644
--- a/pkgs/tools/networking/shadowsocks-libev/default.nix
+++ b/pkgs/tools/networking/shadowsocks-libev/default.nix
@@ -11,12 +11,13 @@
 , docbook_xml_dtd_45
 , docbook_xsl
 , libxslt
+, pcre
 }:
 
 let
 
-  version = "2.5.0";
-  sha256 = "6841e0efa1c01caef5a827f463ee304dc9e48fb4751cc9256316df5ab4490ae0";
+  version = "2.5.5";
+  sha256 = "46a72367b7301145906185f1e4136e39d6792d27643826e409ab708351b6d0dd";
 
 in
 
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]
+  buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt pcre ]
                 ++ optional (!withMbedTLS) openssl
                 ++ optional withMbedTLS mbedtls
                 ++ optionals enableSystemSharedLib [libev libsodium udns];
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix
new file mode 100644
index 00000000000..dcc78560fa3
--- /dev/null
+++ b/pkgs/tools/networking/ssldump/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, openssl, libpcap }:
+
+stdenv.mkDerivation rec {
+  name = "ssldump";
+  version = "0.9b3";
+
+  src = fetchFromGitHub {
+    owner = "adulau";
+    repo = "ssldump";
+    rev = "4529d03a50d39d3697c3e39a3d6f6c9b29448aa0";
+    sha256 = "0wwsamzxabfxcil5y2g4v2261vdspxlp12wz4xhji8607jbyjwr1";
+  };
+
+  buildInputs = [ libpcap openssl ];
+  prePatch = ''
+    sed -i -e 's|#include.*net/bpf.h|#include <pcap/bpf.h>|' \
+      base/pcap-snoop.c
+  '';
+  configureFlags = [ "--with-pcap-lib=${libpcap}/lib"
+                     "--with-pcap-inc=${libpcap}/include"
+                     "--with-openssl-lib=${openssl}/lib"
+                     "--with-openssl-inc=${openssl}/include" ];
+  meta = {
+    description = "ssldump is an SSLv3/TLS network protocol analyzer";
+    homepage = http://ssldump.sourceforge.net;
+    license = "BSD-style";
+    maintainers = with stdenv.lib.maintainers; [ aycanirican ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/statsd/node-packages.nix b/pkgs/tools/networking/statsd/node-packages.nix
index 6cf9e8478d7..fd196c249ae 100644
--- a/pkgs/tools/networking/statsd/node-packages.nix
+++ b/pkgs/tools/networking/statsd/node-packages.nix
@@ -8,7 +8,7 @@
     version = "1.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
+      url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
       name = "commander-1.3.1.tgz";
       sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
     };
@@ -28,7 +28,7 @@
     version = "0.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
+      url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
       name = "connection-parse-0.0.7.tgz";
       sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69";
     };
@@ -40,16 +40,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hashring"."1.0.1" =
-    self.by-version."hashring"."1.0.1";
-  by-version."hashring"."1.0.1" = self.buildNodePackage {
-    name = "hashring-1.0.1";
-    version = "1.0.1";
+  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 = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
-      name = "hashring-1.0.1.tgz";
-      sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c";
+      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";
@@ -68,7 +87,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
+      url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
       name = "keypress-0.1.0.tgz";
       sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
     };
@@ -80,16 +99,36 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-syslog"."1.1.7" =
-    self.by-version."node-syslog"."1.1.7";
-  by-version."node-syslog"."1.1.7" = self.buildNodePackage {
-    name = "node-syslog-1.1.7";
-    version = "1.1.7";
+  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 = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
-      name = "node-syslog-1.1.7.tgz";
-      sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb";
+      url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz";
+      name = "nan-2.4.0.tgz";
+      sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232";
     };
     deps = {
     };
@@ -106,7 +145,7 @@
     version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
+      url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
       name = "sequence-2.2.1.tgz";
       sha1 = "7f5617895d44351c0a047e764467690490a16b03";
     };
@@ -125,7 +164,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
+      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";
     };
@@ -144,7 +183,7 @@
     version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
+      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";
     };
@@ -158,28 +197,29 @@
   };
   "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3";
   by-spec."statsd"."*" =
-    self.by-version."statsd"."0.7.2";
-  by-version."statsd"."0.7.2" = self.buildNodePackage {
-    name = "statsd-0.7.2";
-    version = "0.7.2";
+    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 = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz";
-      name = "statsd-0.7.2.tgz";
-      sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e";
+      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 = {
-      "node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7";
-      "hashring-1.0.1" = self.by-version."hashring"."1.0.1";
+      "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.7.2";
+  "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 {
@@ -187,7 +227,7 @@
     version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz";
+      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";
     };
@@ -207,7 +247,7 @@
     version = "0.1.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz";
+      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";
     };
@@ -227,7 +267,7 @@
     version = "0.1.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
+      url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
       name = "winser-0.1.6.tgz";
       sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
     };
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index 666efaecfc9..9c4c2600fb4 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -1,9 +1,9 @@
-{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh
+{ lib, python2Packages, fetchurl, libxslt, docbook5_xsl, openssh
 # version args
 , src, version
 }:
 
-pythonPackages.buildPythonApplication {
+python2Packages.buildPythonApplication {
   name = "nixops-${version}";
   namePrefix = "";
 
@@ -11,17 +11,17 @@ pythonPackages.buildPythonApplication {
 
   buildInputs = [ libxslt ];
 
-  pythonPath =
-    [ pythonPackages.prettytable
-      pythonPackages.boto
-      pythonPackages.hetzner
-      pythonPackages.libcloud
-      pythonPackages.azure-storage
-      pythonPackages.azure-mgmt-compute
-      pythonPackages.azure-mgmt-network
-      pythonPackages.azure-mgmt-resource
-      pythonPackages.azure-mgmt-storage
-      pythonPackages.adal
+  pythonPath = with python2Packages;
+    [ prettytable
+      boto
+      hetzner
+      libcloud
+      azure-storage
+      azure-mgmt-compute
+      azure-mgmt-network
+      azure-mgmt-resource
+      azure-mgmt-storage
+      adal
     ];
 
   doCheck = false;
diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix
new file mode 100644
index 00000000000..8bb3cba15c4
--- /dev/null
+++ b/pkgs/tools/security/fpm2/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnupg, gtk2
+, libxml2, intltool
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "fpm2-${version}";
+  version = "0.79";
+
+  src = fetchurl {
+    url = "http://als.regnet.cz/fpm2/download/fpm2-${version}.tar.bz2";
+    sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7";
+  };
+
+  buildInputs = [ pkgconfig gnupg gtk2 libxml2 intltool ];
+
+  meta = {
+    description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements.";
+    homepage    = http://als.regnet.cz/fpm2/;
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ hce ];
+  };
+}
diff --git a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
new file mode 100644
index 00000000000..c9de63a320b
--- /dev/null
+++ b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 16393a8..3991d2a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -219,18 +219,18 @@ IF(NOT WIN32)
+   # Install Nitrokey udev rules
+   install(FILES
+     ${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules
+-    DESTINATION /etc/udev/rules.d
++    DESTINATION etc/udev/rules.d
+   )
+ 
+   # Install autocompletion scripts
+   install(FILES
+     ${CMAKE_SOURCE_DIR}/data//bash-autocomplete/nitrokey-app
+-    DESTINATION /etc/bash_completion.d
++    DESTINATION etc/bash_completion.d
+   )
+ 
+   install(FILES
+     ${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo
+-    DESTINATION /usr/share/locale/de_DE/LC_MESSAGES
++    DESTINATION share/locale/de_DE/LC_MESSAGES
+   )
+ 
+   install(FILES
+@@ -238,7 +238,7 @@ IF(NOT WIN32)
+     ${CMAKE_SOURCE_DIR}/images/quit.png
+     ${CMAKE_SOURCE_DIR}/images/safe_zahlenkreis.png
+     ${CMAKE_SOURCE_DIR}/images/settings.png
+-    DESTINATION /usr/share/nitrokey
++    DESTINATION share/nitrokey
+   )
+ 
+ ENDIF () # NOT WIN32
diff --git a/pkgs/tools/security/nitrokey-app/HeaderPath.patch b/pkgs/tools/security/nitrokey-app/HeaderPath.patch
new file mode 100644
index 00000000000..695b7559116
--- /dev/null
+++ b/pkgs/tools/security/nitrokey-app/HeaderPath.patch
@@ -0,0 +1,13 @@
+diff --git a/src/utils/hid_libusb.c b/src/utils/hid_libusb.c
+index bd8c14e..537292d 100644
+--- a/src/utils/hid_libusb.c
++++ b/src/utils/hid_libusb.c
+@@ -44,7 +44,7 @@
+ #include <wchar.h>
+ 
+ /* GNU / LibUSB */
+-#include "libusb.h"
++#include "libusb-1.0/libusb.h"
+ #include "iconv.h"
+ 
+ #include "hidapi.h"
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
new file mode 100644
index 00000000000..38e083ba131
--- /dev/null
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, cmake, fetchFromGitHub, libappindicator-gtk2, libnotify, libusb1, pkgconfig
+, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "nitrokey-app";
+  version = "0.4";
+
+  src = fetchFromGitHub {
+    owner = "Nitrokey";
+    repo = "nitrokey-app";
+    rev = "v${version}";
+    sha256 = "0h131847pllsr7rk7nn8vlj74byb5f14cl9h3g3pmlq5zj8ylfkx";
+  };
+
+  buildInputs = [
+    cmake
+    libappindicator-gtk2
+    libnotify
+    libusb1
+    pkgconfig
+    qt5.qtbase
+  ];
+  patches = [
+     ./FixInstallDestination.patch
+     ./HeaderPath.patch
+  ];
+  meta = {
+    description      = "Provides extra functionality for the Nitrokey Pro and Storage";
+    longDescription  = ''
+       The nitrokey-app provides a QT system tray widget with wich you can
+       access the extra functionality of a Nitrokey Storage or Nitrokey Pro.
+       See https://www.nitrokey.com/ for more information.
+    '';
+    homepage         = https://github.com/Nitrokey/nitrokey-app;
+    repositories.git = https://github.com/Nitrokey/nitrokey-app.git;
+    license          = stdenv.lib.licenses.gpl3;
+    maintainer       = stdenv.lib.maintainers.kaiha;
+  };
+}
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 0e69729a226..8fbf35caf1d 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.2.8.8";
+  name = "tor-0.2.8.9";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
-    sha256 = "1pp3h0a1cl25fv04b3j6wp8aw1sfpbd2lmag397dpp2k2b305bxi";
+    sha256 = "3f5c273bb887be4aff11f4d99b9e2e52d293b81ff4f6302b730161ff16dc5316";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8c85361f91d..c328f74729e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -50,6 +50,7 @@ doNotDisplayTwice rec {
   fuse_zip = fuse-zip; # added 2016-04-27
   gettextWithExpat = gettext; # 2016-02-19
   git-hub = gitAndTools.git-hub; # added 2016-04-29
+  googleAuthenticator = google-authenticator; # added 2016-10-16
   grantlee5 = qt5.grantlee;  # added 2015-12-19
   gupnptools = gupnp-tools;  # added 2015-12-19
   gnustep-make = gnustep.make; # added 2016-7-6
@@ -58,6 +59,7 @@ doNotDisplayTwice rec {
   inotifyTools = inotify-tools;
   joseki = apache-jena-fuseki; # added 2016-02-28
   jquery_ui = jquery-ui;  # added 2014-09-07
+  keepassx2-http = keepassx-reboot; # added 2016-10-17
   keybase-go = keybase;  # added 2016-08-24
   letsencrypt = certbot; # added 2016-05-16
   libdbusmenu_qt5 = qt5.libdbusmenu;  # added 2015-12-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4301c287bb9..2d15001186c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -395,6 +395,8 @@ in
 
   albert = qt5.callPackage ../applications/misc/albert {};
 
+  ammonite-repl = callPackage ../development/tools/ammonite {};
+
   amtterm = callPackage ../tools/system/amtterm {};
 
   analog = callPackage ../tools/admin/analog {};
@@ -562,7 +564,7 @@ in
     qt4Support = config.avahi.qt4Support or false;
   };
 
-  avro-cpp = callPackage ../development/libraries/avro-c++ { };
+  avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; };
 
   aws = callPackage ../tools/virtualization/aws { };
 
@@ -606,6 +608,8 @@ in
 
   bibutils = callPackage ../tools/misc/bibutils { };
 
+  bibtex2html = callPackage ../tools/misc/bibtex2html { };
+
   bindfs = callPackage ../tools/filesystems/bindfs { };
 
   bins = callPackage ../tools/graphics/bins { };
@@ -769,8 +773,12 @@ in
 
   ddate = callPackage ../tools/misc/ddate { };
 
+  dehydrated = callPackage ../tools/admin/dehydrated { };
+
   deis = callPackage ../development/tools/deis {};
 
+  deisctl = callPackage ../development/tools/deisctl {};
+
   diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
     inherit (haskellPackages) ghcWithPackages diagrams-builder;
   };
@@ -1872,7 +1880,7 @@ in
   # rename to upower-notify?
   go-upower-notify = callPackage ../tools/misc/upower-notify { };
 
-  googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
+  google-authenticator = callPackage ../os-specific/linux/google-authenticator { };
 
   google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
 
@@ -2067,6 +2075,8 @@ in
     inherit gfortran;
   });
 
+  hecate = callPackage ../applications/editors/hecate { };
+
   heimdall = callPackage ../tools/misc/heimdall { };
 
   hevea = callPackage ../tools/typesetting/hevea { };
@@ -2152,8 +2162,8 @@ in
   ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
     inherit (haskellPackages) ihaskell ghcWithPackages;
 
-    ipython = python.buildEnv.override {
-      extraLibs = with pythonPackages; [ ipython ipykernel jupyter_client notebook ];
+    ipython = python3.buildEnv.override {
+      extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ];
     };
 
     packages = config.ihaskell.packages or (self: []);
@@ -2294,6 +2304,8 @@ in
 
   kronometer = qt5.callPackage ../tools/misc/kronometer { };
 
+  peruse = qt5.callPackage ../tools/misc/peruse { };
+
   kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };
 
   kytea = callPackage ../tools/text/kytea { };
@@ -3666,6 +3678,8 @@ in
 
   sshuttle = callPackage ../tools/security/sshuttle { };
 
+  ssldump = callPackage ../tools/networking/ssldump { };
+
   sstp = callPackage ../tools/networking/sstp {};
 
   sudo = callPackage ../tools/security/sudo { };
@@ -3993,16 +4007,15 @@ in
     SDL = SDL_sixel;
   };
 
-  openconnect = openconnect_openssl;
+  openconnect = openconnect_gnutls;
 
   openconnect_openssl = callPackage ../tools/networking/openconnect.nix {
     gnutls = null;
   };
 
-  openconnect_gnutls = lowPrio (openconnect.override {
+  openconnect_gnutls = callPackage ../tools/networking/openconnect.nix {
     openssl = null;
-    gnutls = gnutls;
-  });
+  };
 
   vtun = callPackage ../tools/networking/vtun { };
 
@@ -4827,6 +4840,8 @@ in
 
   dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
 
+  glslang = callPackage ../development/compilers/glslang { };
+
   go_bootstrap = callPackage ../development/compilers/go/1.4.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -5084,7 +5099,9 @@ in
     stdenv = overrideCC stdenv gcc49;
   };
 
-  ponyc = callPackage ../development/compilers/ponyc { };
+  ponyc = callPackage ../development/compilers/ponyc {
+    llvm = llvm_38;
+  };
 
   pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { };
 
@@ -6331,6 +6348,8 @@ in
 
   spin = callPackage ../development/tools/analysis/spin { };
 
+  spirv-tools = callPackage ../development/tools/spirv-tools { };
+
   splint = callPackage ../development/tools/analysis/splint {
     flex = flex_2_5_35;
   };
@@ -7758,6 +7777,8 @@ in
     inherit (perlPackages) libintlperl GetoptLong SysVirt;
   };
 
+  libgumbo = callPackage ../development/libraries/libgumbo { };
+  
   libhangul = callPackage ../development/libraries/libhangul { };
 
   libharu = callPackage ../development/libraries/libharu { };
@@ -8743,6 +8764,8 @@ in
   protobufc1_1 = callPackage ../development/libraries/protobufc/1.1.nix { };
   protobufc1_0 = callPackage ../development/libraries/protobufc/1.0.nix { };
 
+  flatbuffers = callPackage ../development/libraries/flatbuffers { };
+
   pth = callPackage ../development/libraries/pth { };
 
   ptlib = callPackage ../development/libraries/ptlib {};
@@ -8828,6 +8851,8 @@ in
 
     grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };
 
+    kirigami = callPackage ../development/libraries/kirigami { };
+
     libcommuni = callPackage ../development/libraries/libcommuni { };
 
     libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
@@ -9338,6 +9363,8 @@ in
                                           CoreText IOSurface ImageIO OpenGL GLUT;
   };
 
+  vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
+
   vtkWithQt4 = vtk.override { qtLib = qt4; };
 
   vxl = callPackage ../development/libraries/vxl {
@@ -10154,6 +10181,8 @@ in
 
   cbfstool = callPackage ../applications/virtualization/cbfstool { };
 
+  vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
+
   pgpool92 = pgpool.override { postgresql = postgresql92; };
   pgpool93 = pgpool.override { postgresql = postgresql93; };
   pgpool94 = pgpool.override { postgresql = postgresql94; };
@@ -10327,6 +10356,8 @@ in
 
   selfoss = callPackage ../servers/web-apps/selfoss { };
 
+  shaarli = callPackage ../servers/web-apps/shaarli { };
+
   axis2 = callPackage ../servers/http/tomcat/axis2 { };
 
   unifi = callPackage ../servers/unifi { };
@@ -10448,6 +10479,8 @@ in
 
   busybox = callPackage ../os-specific/linux/busybox { };
 
+  cachefilesd = callPackage ../os-specific/linux/cachefilesd { };
+
   cgmanager = callPackage ../os-specific/linux/cgmanager { };
 
   checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
@@ -11002,7 +11035,6 @@ in
   linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
   linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10);
-  linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice;
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12);
   linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18);
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1);
@@ -11764,6 +11796,8 @@ in
 
   sampradaya = callPackage ../data/fonts/sampradaya { };
 
+  shaderc = callPackage ../development/compilers/shaderc { };
+
   shared_mime_info = callPackage ../data/misc/shared-mime-info { };
 
   shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { };
@@ -12129,6 +12163,8 @@ in
 
   bspwm = callPackage ../applications/window-managers/bspwm { };
 
+  bspwm-unstable = callPackage ../applications/window-managers/bspwm/unstable.nix { };
+
   bvi = callPackage ../applications/editors/bvi { };
 
   bviplus = callPackage ../applications/editors/bviplus { };
@@ -12673,7 +12709,7 @@ in
 
   keepassx = callPackage ../applications/misc/keepassx { };
   keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
-  keepassx2-http = callPackage ../applications/misc/keepassx/2.0-http.nix { };
+  keepassx-reboot = callPackage ../applications/misc/keepassx/reboot.nix { };
 
   inherit (gnome3) evince;
   evolution_data_server = gnome3.evolution_data_server;
@@ -13600,7 +13636,9 @@ in
 
   MMA = callPackage ../applications/audio/MMA { };
 
-  mmex = callPackage ../applications/office/mmex { };
+  mmex = callPackage ../applications/office/mmex {
+    wxGTK30 = wxGTK30.override { withWebKit  = true ; };
+  };
 
   moc = callPackage ../applications/audio/moc {
     ffmpeg = ffmpeg_2;
@@ -13777,6 +13815,8 @@ in
      stdenv = stdenv_32bit;
   };
 
+  scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
+
   shotcut = qt5.callPackage ../applications/video/shotcut { };
 
   smplayer = qt5.callPackage ../applications/video/smplayer { };
@@ -13806,6 +13846,8 @@ in
 
   sxhkd = callPackage ../applications/window-managers/sxhkd { };
 
+  sxhkd-unstable = callPackage ../applications/window-managers/sxhkd/unstable.nix { };
+
   mpop = callPackage ../applications/networking/mpop {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -14162,6 +14204,8 @@ in
     withKDE = false;
   };
 
+  quassel-webserver = callPackage ../applications/networking/irc/quassel-webserver { };
+
   quirc = callPackage ../tools/graphics/quirc {};
 
   quodlibet = callPackage ../applications/audio/quodlibet { };
@@ -14182,6 +14226,10 @@ in
     fltk = fltk13;
   };
 
+  inherit (callPackage ../applications/virtualization/rancher-compose {})
+    rancher-compose
+    rancher-compose_0_10;
+
   renoise = callPackage ../applications/audio/renoise {
     demo = false;
   };
@@ -14391,7 +14439,7 @@ in
   stella = callPackage ../misc/emulators/stella { };
 
   statsd = callPackage ../tools/networking/statsd {
-    nodejs = nodejs-0_10;
+    nodejs = nodejs-4_x;
   };
 
   linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
@@ -14909,6 +14957,7 @@ in
 
   weechat = callPackage ../applications/networking/irc/weechat {
     inherit (darwin) libobjc;
+    inherit (darwin) libresolv;
   };
 
   westonLite = callPackage ../applications/window-managers/weston {
@@ -15420,6 +15469,8 @@ in
 
   fairymax = callPackage ../games/fairymax {};
 
+  fava = callPackage ../applications/office/fava {};
+
   fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
 
   flightgear = qt5.callPackage ../games/flightgear { };
@@ -15437,6 +15488,8 @@ in
 
   freeorion = callPackage ../games/freeorion { };
 
+  frotz = callPackage ../games/frotz { };
+
   fsg = callPackage ../games/fsg {
     wxGTK = wxGTK28.override { unicode = false; };
   };
@@ -16338,6 +16391,10 @@ in
     cmake = cmakeCurses;
   });
 
+  ### PHYSICS
+
+  sacrifice = callPackage ../applications/science/physics/sacrifice {};
+
   ### SCIENCE/PROGRAMMING
 
   plm = callPackage ../applications/science/programming/plm { };
@@ -16661,6 +16718,8 @@ in
 
   ### SCIENCE / PHYSICS
 
+  fastjet = callPackage ../development/libraries/physics/fastjet { };
+
   geant4 = callPackage ../development/libraries/physics/geant4 {
     enableMultiThreading = true;
     enableG3toG4         = false;
@@ -16687,6 +16746,22 @@ in
 
   g4py = callPackage ../development/libraries/physics/geant4/g4py { };
 
+  hepmc = callPackage ../development/libraries/physics/hepmc { };
+
+  herwig = callPackage ../development/libraries/physics/herwig { };
+
+  lhapdf = callPackage ../development/libraries/physics/lhapdf { };
+
+  nlojet = callPackage ../development/libraries/physics/nlojet { };
+
+  pythia = callPackage ../development/libraries/physics/pythia { };
+
+  rivet = callPackage ../development/libraries/physics/rivet { };
+
+  thepeg = callPackage ../development/libraries/physics/thepeg { };
+
+  yoda = callPackage ../development/libraries/physics/yoda { };
+
   ### MISC
 
   antimicro = qt5.callPackage ../tools/misc/antimicro { };
@@ -17334,4 +17409,8 @@ in
   zoom-us = qt55.callPackage ../applications/networking/instant-messengers/zoom-us {};
 
   xulrunner = firefox-unwrapped;
+
+  nitrokey-app = callPackage ../tools/security/nitrokey-app { };
+
+  fpm2 = callPackage ../tools/security/fpm2 { };
 }
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bda35e9383f..58e9512e31c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -441,6 +441,8 @@ let
 
     typerep_p4 = callPackage ../development/ocaml-modules/typerep { };
 
+    uchar = callPackage ../development/ocaml-modules/uchar { };
+
     utop = callPackage ../development/tools/ocaml/utop { };
 
     uuidm = callPackage ../development/ocaml-modules/uuidm { };
@@ -691,6 +693,9 @@ let
     in lib.fix' (lib.extends overrides packageSet);
 in rec
 {
+
+  inherit mkOcamlPackages;
+
   ocamlPackages_3_08_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.08.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; });
 
   ocamlPackages_3_10_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.10.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; });
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d7b0108ce69..578558bb11e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2758,10 +2758,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptX = buildPerlPackage rec {
-    name = "CryptX-0.040";
+    name = "CryptX-0.041";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
-      sha256 = "0e1e44811e951fa04971912a8b03cf41de540d8cf8d464c5655aaf3bf976db50";
+      sha256 = "481f8c9285d6ce3cf330e1fa52c835a202debdac5d81e1acd20bd1d93b99790e";
     };
     propagatedBuildInputs = [ JSONMaybeXS ];
     meta = {
@@ -10083,10 +10083,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PDFAPI2 = buildPerlPackage rec {
-    name = "PDF-API2-2.028";
+    name = "PDF-API2-2.030";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SS/SSIMMS/${name}.tar.gz";
-      sha256 = "a642b41362884b7005e421ec93c7d3a54f7adef7657540331e0d4ca89d106b04";
+      sha256 = "a802c25c1f00b093778223fc7aea94ebd87a9abdb915151746b8ee5d4a358769";
     };
     propagatedBuildInputs = [ FontTTF ];
     meta = {
@@ -10753,10 +10753,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PodWeaver = buildPerlPackage rec {
-    name = "Pod-Weaver-4.014";
+    name = "Pod-Weaver-4.015";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "5ca76396710e077b91e12ce32de82514d4785c49eb1ad95b9278045d77c260f5";
+      sha256 = "5af25b29a55783e495a9df5ef6293240e2c9ab02764613d79f1ed50b12dec5ae";
     };
     buildInputs = [ PPI SoftwareLicense TestDifferences ];
     propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli MixinLinewise ModuleRuntime Moose ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5784d8cc01a..bfc68b61a52 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -875,7 +875,10 @@ in {
       homepage = "http://www.ansible.com";
       description = "A simple automation tool";
       license = with licenses; [ gpl3] ;
-      maintainers = with maintainers; [ joamaki ];
+      maintainers = with maintainers; [
+        jgeerds
+        joamaki
+      ];
       platforms = with platforms; linux ++ darwin;
     };
   };
@@ -908,7 +911,10 @@ in {
       homepage = "http://www.ansible.com";
       description = "A simple automation tool";
       license = with licenses; [ gpl3 ];
-      maintainers = with maintainers; [ copumpkin ];
+      maintainers = with maintainers; [
+        copumpkin
+        jgeerds
+      ];
       platforms = with platforms; linux ++ darwin;
     };
   };
@@ -2246,11 +2252,11 @@ in {
 
   channels = buildPythonPackage rec {
     name = "channels-${version}";
-    version = "0.17.2";
+    version = "0.17.3";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/channels/${name}.tar.gz";
-      sha256 = "1a7fzm25sm3qqgxf7j3hml2lkipvf0yapdg4rkk7x3m11zm0xgv9";
+      sha256 = "03nalz0mqjxqlgqwkmranair2c1amry2aw52dd78ihf07dfinnc9";
     };
 
     # Files are missing in the distribution
@@ -4805,6 +4811,16 @@ in {
     };
   };
 
+  pytest_30 = self.pytest_27.override rec {
+    name = "pytest-3.0.3";
+
+    propagatedBuildInputs = with self; [ hypothesis py ];
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/pytest/${name}.tar.gz";
+      sha256 = "1rxydacrdb8s312l3bn0ybrqsjp13abzyim1x21s80386l5504zj";
+    };
+  };
+
   pytestcache = buildPythonPackage rec {
     name = "pytest-cache-1.0";
     src = pkgs.fetchurl {
@@ -4895,11 +4911,11 @@ in {
 
   pytestflakes = buildPythonPackage rec {
     name = "pytest-flakes-${version}";
-    version = "1.0.0";
+    version = "1.0.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pytest-flakes/${name}.tar.gz";
-      sha256 = "0vvfprga6k4v2zq1qsr3yq1bjl22vygfsnvyn3hh80cc2386dk6h";
+      sha256 = "9c2271654294020e134624020a2144cb93b7334809d70fb3f470cd31ec788a3a";
     };
 
     propagatedBuildInputs = with self ; [ pytest pyflakes pytestcache ];
@@ -11718,14 +11734,14 @@ in {
 
   glances = buildPythonPackage rec {
     name = "glances-${version}";
-    version = "2.6.2";
+    version = "2.7.1_1";
     disabled = isPyPy;
 
     src = pkgs.fetchFromGitHub {
       owner = "nicolargo";
       repo = "glances";
       rev = "v${version}";
-      sha256 = "0gysvx1yai303gb9ks5z3jy1qk7ilnwwy30l7gp3kyfbv2cifbb1";
+      sha256 = "0gc2qgpzmy7q31z8b11ls4ifb0lwrz94xnz1kj27kc369a01gbxv";
     };
 
     doCheck = false;
@@ -14277,8 +14293,6 @@ in {
       sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a";
     };
 
-    propagatedBuildInputs = [ pkgs.mpd_clientlib ];
-
     buildInputs = with self; [ mock ];
     patchPhase = ''
       sed -i -e '/tests_require/d' \
@@ -14289,7 +14303,7 @@ in {
       description = "A Python client module for the Music Player Daemon";
       homepage = "https://github.com/Mic92/python-mpd2";
       license = licenses.lgpl3Plus;
-      maintainers = with maintainers; [ rvl ];
+      maintainers = with maintainers; [ rvl mic92 ];
     };
   };
 
@@ -21641,27 +21655,6 @@ in {
     };
   };
 
-  Whoosh = buildPythonPackage rec {
-    name = "Whoosh-${version}";
-    version = "2.7.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/W/Whoosh/Whoosh-${version}.tar.gz";
-      sha256 = "1xx8rqk1v2xs7mxvy9q4sgz2qmgvhf6ygbqjng3pl83ka4f0xz6d";
-    };
-
-    propagatedBuildInputs = with self; [
-
-    ];
-    buildInputs = with self; [
-      pytest
-    ];
-
-    meta = with stdenv.lib; {
-      homepage = "http://bitbucket.org/mchaput/whoosh";
-    };
-  };
-
   pysolr = buildPythonPackage rec {
     name = "pysolr-${version}";
     version = "3.3.3";
@@ -21697,7 +21690,7 @@ in {
 
     buildInputs = with self; [ coverage mock nose geopy ];
     propagatedBuildInputs = with self; [
-      django_1_6 dateutil_1_5 Whoosh pysolr elasticsearch
+      django_1_6 dateutil_1_5 whoosh pysolr elasticsearch
     ];
 
     patchPhase = ''
@@ -24826,7 +24819,7 @@ in {
 
   tox = buildPythonPackage rec {
     name = "tox-${version}";
-    version = "2.3.1";
+    version = "2.4.1";
 
     propagatedBuildInputs = with self; [ py virtualenv pluggy ];
 
@@ -24834,7 +24827,7 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/t/tox/${name}.tar.gz";
-      sha256 = "1vj73ar4rimq3fwy5r2z3jv4g9qbh8rmpmncsc00g0k310acqzxz";
+      sha256 = "1nwn4jz8ns53n17bm1xkzlz4zyyxbgjwrcg2cjsn25ab7hd5fwv6";
     };
   };
 
@@ -29216,6 +29209,10 @@ in {
     patches = [ ../development/python-modules/suds-0.4-CVE-2013-2217.patch ];
 
     meta = with stdenv.lib; {
+      # Broken for security issues:
+      # - https://github.com/NixOS/nixpkgs/issues/19678
+      # - https://lwn.net/Vulnerabilities/559200/
+      broken = true;
       description = "Lightweight SOAP client";
       homepage = https://fedorahosted.org/suds;
       license = licenses.lgpl3Plus;
@@ -30720,8 +30717,8 @@ in {
     postPatch = ''
       rm tests/test_reading.py
     '';
-    checkPhase = ''
-      py.test
+    checkPhase =  ''
+      py.test -k "not test_timelimit"
     '';
 
     meta = {