Merge branch 'master' into staging

519 files changed, 9188 insertions, 4772 deletions

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 298da8f9f0d..7bdbbbd903a 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -785,7 +785,20 @@ example of such a situation is when `py.test` is used.
 
 #### Common issues
 
-- Non-working tests can often be deselected. In the case of `py.test`: `py.test -k 'not function_name and not other_function'`.
+- Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`.
+  Most python modules follows the standard test protocol where the pytest runner can be used instead.
+  `py.test` supports a `-k` parameter to ignore test methods or classes: 
+  
+  ```nix
+  buildPythonPackage {
+    # ...
+    # assumes the tests are located in tests
+    checkInputs = [ pytest ];
+    checkPhase = ''
+      py.test -k 'not function_name and not other_function' tests
+    '';
+  }
+  ```
 - Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`.
 - Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`
 
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index aba9eb0e2bc..a978313c42c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -107,6 +107,7 @@
   choochootrain = "Hurshal Patel <hurshal@imap.cc>";
   chris-martin = "Chris Martin <ch.martin@gmail.com>";
   chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>";
+  chrisrosset = "Christopher Rosset <chris@rosset.org.uk>";
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
   ciil = "Simon Lackerbauer <simon@lackerbauer.com>";
   ckampka = "Christian Kampka <christian@kampka.net>";
@@ -192,12 +193,14 @@
   erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";
   ertes = "Ertugrul Söylemez <esz@posteo.de>";
   ethercrow = "Dmitry Ivanov <ethercrow@gmail.com>";
+  etu = "Elis Hirwing <elis@hirwing.se>";
   exi = "Reno Reckling <nixos@reckling.org>";
   exlevan = "Alexey Levan <exlevan@gmail.com>";
   expipiplus1 = "Joe Hermaszewski <nix@monoid.al>";
   fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
-  fare = "Francois-Rene Rideau <fahree@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
+  fare = "Francois-Rene Rideau <fahree@gmail.com>";
+  fgaz = "Francesco Gazzetta <francygazz@gmail.com>";
   florianjacob = "Florian Jacob <projects+nixos@florianjacob.de>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
@@ -289,12 +292,12 @@
   jonafato = "Jon Banafato <jon@jonafato.com>";
   jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>";
   jpotier = "Martin Potier <jpo.contributes.to.nixos@marvid.fr>";
-  jyp = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
   jtojnar = "Jan Tojnar <jtojnar@gmail.com>";
   juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
+  jyp = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jzellner = "Jeff Zellner <jeffz@eml.cc>";
   kaiha = "Kai Harries <kai.harries@gmail.com>";
   kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
@@ -334,6 +337,7 @@
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>";
   lsix = "Lancelot SIX <lsix@lancelotsix.com>";
+  ltavard = "Laure Tavard <laure.tavard@univ-grenoble-alpes.fr>";
   lucas8 = "Luc Chabassier <luc.linux@mailoo.org>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   lufia = "Kyohei Kadota <lufia@lufia.org>";
@@ -496,6 +500,7 @@
   renzo = "Renzo Carbonara <renzocarbonara@gmail.com>";
   retrry = "Tadas Barzdžius <retrry@gmail.com>";
   rht = "rht <rhtbot@protonmail.com>";
+  richardipsum = "Richard Ipsum <richardipsum@fastmail.co.uk>";
   rick68 = "Wei-Ming Yang <rick68@gmail.com>";
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
   ris = "Robert Scott <code@humanleg.org.uk>";
@@ -505,6 +510,7 @@
   robberer = "Longrin Wischnewski <robberer@freakmail.de>";
   robbinch = "Robbin C. <robbinch33@gmail.com>";
   roberth = "Robert Hensing <nixpkgs@roberthensing.nl>";
+  robertodr = "Roberto Di Remigio <roberto.diremigio@gmail.com>";
   robgssp = "Rob Glossop <robgssp@gmail.com>";
   roblabla = "Robin Lambertz <robinlambertz+dev@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
@@ -578,10 +584,9 @@
   taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>";
   tari = "Peter Marheine <peter@taricorp.net>";
   tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
-  ltavard = "Laure Tavard <laure.tavard@univ-grenoble-alpes.fr>";
   teh = "Tom Hunger <tehunger@gmail.com>";
-  teto = "Matthieu Coudron <mcoudron@hotmail.com>";
   telotortium = "Robert Irelan <rirelan@gmail.com>";
+  teto = "Matthieu Coudron <mcoudron@hotmail.com>";
   thall = "Niclas Thall <niclas.thall@gmail.com>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
@@ -610,6 +615,7 @@
   #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012
   uwap = "uwap <me@uwap.name>";
   vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>";
+  valeriangalliat = "Valérian Galliat <val@codejam.info>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";
   vanschelven = "Klaas van Schelven <klaas@vanschelven.com>";
   vanzef = "Ivan Solyankin <vanzef@gmail.com>";
@@ -626,7 +632,6 @@
   vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
   vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
   vmchale = "Vanessa McHale <tmchale@wisc.edu>";
-  valeriangalliat = "Valérian Galliat <val@codejam.info>";
   volhovm = "Mikhail Volkhov <volhovm.cs@gmail.com>";
   volth = "Jaroslavas Pocepko <jaroslavas@volth.com>";
   vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
@@ -648,6 +653,7 @@
   xvapx = "Marti Serra <marti.serra.coscollano@gmail.com>";
   xwvvvvwx = "David Terry <davidterry@posteo.de>";
   yarr = "Dmitry V. <savraz@gmail.com>";
+  yegortimoshenko = "Yegor Timoshenko <yegortimoshenko@gmail.com>";
   yochai = "Yochai <yochai@titat.info>";
   yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>";
   yuriaisaka = "Yuri Aisaka <yuri.aisaka+nix@gmail.com>";
diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh
index e5a8d606f1a..f77dc5a9e64 100755
--- a/maintainers/scripts/gnome.sh
+++ b/maintainers/scripts/gnome.sh
@@ -9,17 +9,15 @@ GNOME_FTP=ftp.gnome.org/pub/GNOME/sources
 NO_GNOME_MAJOR="ghex gtkhtml gdm"
 
 usage() {
-  echo "Usage: $0 gnome_dir <show project>|<update project>|<update-all> [major.minor]" >&2
-  echo "gnome_dir is for example pkgs/desktops/gnome-3/3.18" >&2
+  echo "Usage: $0 <show project>|<update project>|<update-all> [major.minor]" >&2
   exit 0
 }
 
-if [ "$#" -lt 2 ]; then
+if [ "$#" -lt 1 ]; then
   usage
 fi
 
-GNOME_TOP=$1
-shift
+GNOME_TOP=pkgs/desktops/gnome-3
 
 action=$1
 
diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index f82d14c3b46..5233e062445 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -13,10 +13,8 @@ from pyquery import PyQuery as pq
 
 
 maintainers_json = subprocess.check_output([
-    'nix-instantiate',
-    'lib/maintainers.nix',
-    '--eval',
-    '--json'])
+    'nix-instantiate', '-E', 'import ./lib/maintainers.nix {}', '--eval', '--json'
+])
 maintainers = json.loads(maintainers_json)
 MAINTAINERS = {v: k for k, v in maintainers.iteritems()}
 
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 55b39209f0d..c951934e623 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -45,6 +45,33 @@ has the following highlights: </para>
       even though <literal>HDMI-0</literal> is the first head in the list.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The handling of SSL in the nginx module has been cleaned up, renaming
+      the misnomed <literal>enableSSL</literal> to <literal>onlySSL</literal>
+      which reflects its original intention. This is not to be used with the
+      already existing <literal>forceSSL</literal> which creates a second
+      non-SSL virtual host redirecting to the SSL virtual host. This by
+      chance had worked earlier due to specific implementation details. In
+      case you had specified both please remove the <literal>enableSSL</literal>
+      option to keep the previous behaviour.
+    </para>
+    <para>
+      Another <literal>addSSL</literal> option has been introduced to configure
+      both a non-SSL virtual host and an SSL virtual host.
+    </para>
+    <para>
+      Options to configure <literal>resolver</literal>s and
+      <literal>upstream</literal>s have been introduced. See their information
+      for further details.
+    </para>
+    <para>
+      The <literal>port</literal> option has been replaced by a more generic
+      <literal>listen</literal> option which makes it possible to specify
+      multiple addresses, ports and SSL configs dependant on the new SSL
+      handling mentioned above.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>The following new services were added since the last release:</para>
@@ -62,12 +89,19 @@ following incompatible changes:</para>
 <itemizedlist>
   <listitem>
     <para>
-      <literal>aiccu</literal> package was removed. This is due to SixXS
+      The <literal>aiccu</literal> package was removed. This is due to SixXS
       <link xlink:href="https://www.sixxs.net/main/"> sunsetting</link> its IPv6 tunnel.
     </para>
   </listitem>
   <listitem>
     <para>
+      The <literal>fanctl</literal> package and <literal>fan</literal> module
+      have been removed due to the developers not upstreaming their iproute2
+      patches and lagging with compatibility to recent iproute2 versions.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
       Top-level <literal>idea</literal> package collection was renamed.
       All JetBrains IDEs are now at <literal>jetbrains</literal>.
     </para>
@@ -202,6 +236,59 @@ rmdir /var/lib/ipfs/.ipfs
       <command>gpgv</command>, etc.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      <literal>services.mysql</literal> now has declarative
+      configuration of databases and users with the <literal>ensureDatabases</literal> and
+      <literal>ensureUsers</literal> options.
+    </para>
+
+    <para>
+      These options will never delete existing databases and users,
+      especially not when the value of the options are changed.
+    </para>
+
+    <para>
+      The MySQL users will be identified using
+      <link xlink:href="https://mariadb.com/kb/en/library/authentication-plugin-unix-socket/">
+        Unix socket authentication</link>. This authenticates the
+        Unix user with the same name only, and that without the need
+        for a password.
+    </para>
+
+    <para>
+      If you have previously created a MySQL <literal>root</literal>
+      user <emphasis>with a password</emphasis>, you will need to add
+      <literal>root</literal> user for unix socket authentication
+      before using the new options. This can be done by running the
+      following SQL script:
+
+<programlisting language="sql">
+CREATE USER 'root'@'%' IDENTIFIED BY '';
+GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
+FLUSH PRIVILEGES;
+
+-- Optionally, delete the password-authenticated user:
+-- DROP USER 'root'@'localhost';
+</programlisting>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <literal>sha256</literal> argument value of
+      <literal>dockerTools.pullImage</literal> expression must be
+      updated since the mechanism to download the image has been
+      changed. Skopeo is now used to pull the image instead of the
+      Docker daemon.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      Templated systemd services e.g <literal>container@name</literal> are
+      now handled currectly when switching to a new configuration, resulting
+      in them being reloaded.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>Other notable improvements:</para>
@@ -257,14 +344,48 @@ rmdir /var/lib/ipfs/.ipfs
   </listitem>
   <listitem>
     <para>
-      <literal>sha256</literal> argument value of
-      <literal>dockerTools.pullImage</literal> expression must be
-      updated since the mechanism to download the image has been
-      changed. Skopeo is now used to pull the image instead of the
-      Docker daemon.
+      Definitions for <filename>/etc/hosts</filename> can now be sped
+      declaratively with <literal>networking.hosts</literal>.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      Two new options have been added to the installer loader, in addition
+      to the default having changed. The kernel log verbosity has been lowered
+      to the upstream default for the default options, in order to not spam
+      the console when e.g. joining a network.
+    </para>
+    <para>
+      This therefore leads to adding a new <literal>debug</literal> option
+      to set the log level to the previous verbose mode, to make debugging
+      easier, but still accessible easily.
+    </para>
+    <para>
+      Additionally a <literal>copytoram</literal> option has been added,
+      which makes it possible to remove the install medium after booting.
+      This allows tethering from your phone after booting from it.
+    </para>
+    <para>
+      <literal>services.gitlab-runner.configOptions</literal> has been added
+      to specify the configuration of gitlab-runners declaratively.
+    </para>
+    <para>
+      <literal>services.jenkins.plugins</literal> has been added
+      to install plugins easily, this can be generated with jenkinsPlugins2nix.
+    </para>
+    <para>
+      <literal>services.postfix.config</literal> has been added
+      to specify the main.cf with NixOS options. Additionally other options
+      have been added to the postfix module and has been improved further.
+    </para>
+    <para>
+        The GitLab package and module have been updated to the latest 9.5 release.
+    </para>
+    <para>
+      The <literal>systemd-boot</literal> boot loader now lists the NixOS
+      version, kernel version and build date of all bootable generations.
     </para>
   </listitem>
-
 </itemizedlist>
 
 </section>
diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix
index 854ecf7eac5..7be0255b35a 100644
--- a/nixos/maintainers/option-usages.nix
+++ b/nixos/maintainers/option-usages.nix
@@ -77,7 +77,6 @@ let
   excludedOptions = [
     "boot.systemd.services"
     "systemd.services"
-    "environment.gnome3.packageSet"
     "kde.extraPackages"
   ];
   excludeOptions = list:
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 5fa91ec9cfb..619f36cd515 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -9,9 +9,7 @@ let
   cfg = config.networking;
   dnsmasqResolve = config.services.dnsmasq.enable &&
                    config.services.dnsmasq.resolveLocalQueries;
-  bindResolve =    config.services.bind.enable &&
-                   config.services.bind.resolveLocalQueries;
-  hasLocalResolver = bindResolve || dnsmasqResolve;
+  hasLocalResolver = config.services.bind.enable || dnsmasqResolve;
 
   resolvconfOptions = cfg.resolvconfOptions
     ++ optional cfg.dnsSingleRequest "single-request"
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 8891ce0b666..96f7aac1d59 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -46,17 +46,24 @@ let
 
     # A variant to boot with 'nomodeset'
     LABEL boot-nomodeset
-    MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (with nomodeset)
+    MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (nomodeset)
     LINUX /boot/bzImage
     APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset
     INITRD /boot/initrd
 
     # A variant to boot with 'copytoram'
     LABEL boot-copytoram
-    MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (with copytoram)
+    MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (copytoram)
     LINUX /boot/bzImage
     APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram
     INITRD /boot/initrd
+
+    # A variant to boot with verbose logging to the console
+    LABEL boot-nomodeset
+    MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (debug)
+    LINUX /boot/bzImage
+    APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7
+    INITRD /boot/initrd
   '';
 
   isolinuxMemtest86Entry = ''
@@ -74,25 +81,43 @@ let
     cp -v ${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi
     mkdir -p $out/loader/entries
 
-    echo "title NixOS Live CD" > $out/loader/entries/nixos-livecd.conf
-    echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf
-    echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd.conf
-    echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> $out/loader/entries/nixos-livecd.conf
+    cat << EOF > $out/loader/entries/nixos-iso.conf
+    title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel}
+    linux /boot/bzImage
+    initrd /boot/initrd
+    options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
+    EOF
 
     # A variant to boot with 'nomodeset'
-    echo "title NixOS Live CD (with nomodeset)" > $out/loader/entries/nixos-livecd-nomodeset.conf
-    echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd-nomodeset.conf
-    echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd-nomodeset.conf
-    echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset" >> $out/loader/entries/nixos-livecd-nomodeset.conf
+    cat << EOF > $out/loader/entries/nixos-iso-nomodeset.conf
+    title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel}
+    version nomodeset
+    linux /boot/bzImage
+    initrd /boot/initrd
+    options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset
+    EOF
 
     # A variant to boot with 'copytoram'
-    echo "title NixOS Live CD (with copytoram)" > $out/loader/entries/nixos-livecd-copytoram.conf
-    echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd-copytoram.conf
-    echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd-copytoram.conf
-    echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram" >> $out/loader/entries/nixos-livecd-copytoram.conf
-
-    echo "default nixos-livecd" > $out/loader/loader.conf
-    echo "timeout ${builtins.toString config.boot.loader.timeout}" >> $out/loader/loader.conf
+    cat << EOF > $out/loader/entries/nixos-iso-copytoram.conf
+    title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel}
+    version copytoram
+    linux /boot/bzImage
+    initrd /boot/initrd
+    options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram
+    EOF
+
+    # A variant to boot with verbose logging to the console
+    cat << EOF > $out/loader/entries/nixos-iso-debug.conf
+    title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (debug)
+    linux /boot/bzImage
+    initrd /boot/initrd
+    options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7
+    EOF
+
+    cat << EOF > $out/loader/loader.conf
+    default nixos-iso
+    timeout ${builtins.toString config.boot.loader.timeout}
+    EOF
   '';
 
   efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools pkgs.libfaketime ]; }
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 3af76f898f9..4ec48b77335 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -583,9 +583,15 @@ $bootLoaderConfig
   # List packages installed in system profile. To search by name, run:
   # \$ nix-env -qaP | grep wget
   # environment.systemPackages = with pkgs; [
-  #   wget
+  #   wget vim
   # ];
 
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.bash.enableCompletion = true;
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
+
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 79ed18c923c..f994d5b4bde 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -102,7 +102,7 @@ fi
 extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup")
 
 # Inherit binary caches from the host
-# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not... 
+# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not...
 binary_caches="$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')"
 extraBuildFlags+=(--option "binary-caches" "$binary_caches")
 
@@ -113,8 +113,33 @@ if [[ -z "$closure" ]]; then
 fi
 unset NIXOS_CONFIG
 
-# TODO: do I need to set NIX_SUBSTITUTERS here or is the --option binary-caches above enough?
-
+# These get created in nixos-prepare-root as well, but we want to make sure they're here in case we're
+# running with --chroot. TODO: --chroot should just be split into a separate tool.
+mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/proc" "$mountPoint/sys"
+
+# Set up some bind mounts we'll want regardless of chroot or not
+mount --rbind /dev "$mountPoint/dev"
+mount --rbind /proc "$mountPoint/proc"
+mount --rbind /sys "$mountPoint/sys"
+
+# If we asked for a chroot, that means we're not actually installing anything (yeah I was confused too)
+# and we just want to run a command in the context of a $mountPoint that we're assuming has already been
+# set up by a previous nixos-install invocation. In that case we set up some remaining bind mounts and
+# exec the requested command, skipping the rest of the installation procedure.
+if [ -n "$runChroot" ]; then
+    mount -t tmpfs -o "mode=0755" none $mountPoint/run
+    rm -rf $mountPoint/var/run
+    ln -s /run $mountPoint/var/run
+    for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done
+    for f in /etc/passwd /etc/group;      do touch $mountPoint/$f; [ -f "$f" ] && mount --rbind -o ro $f $mountPoint/$f; done
+
+    if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then
+        echo "$0: installation not finished; cannot chroot into installation directory"
+        exit 1
+    fi
+    ln -s /nix/var/nix/profiles/system $mountPoint/run/current-system
+    exec chroot $mountPoint "${chrootCommand[@]}"
+fi
 
 # A place to drop temporary closures
 trap "rm -rf $tmpdir" EXIT
@@ -153,9 +178,7 @@ nix-store --export $channel_root > $channel_closure
 # nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead
 chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store
 
-mount --rbind /dev $mountPoint/dev
-mount --rbind /proc $mountPoint/proc
-mount --rbind /sys $mountPoint/sys
+
 
 # Grub needs an mtab.
 ln -sfn /proc/mounts $mountPoint/etc/mtab
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0f3b8bcab8b..508a76d3cab 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -426,7 +426,7 @@
       teamspeak = 124;
       influxdb = 125;
       nsd = 126;
-      #gitolite = 127; # unused
+      gitolite = 127;
       znc = 128;
       polipo = 129;
       mopidy = 130;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index eb478f66d40..b3477fba8ae 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -92,6 +92,7 @@
   ./programs/mosh.nix
   ./programs/mtr.nix
   ./programs/nano.nix
+  ./programs/npm.nix
   ./programs/oblogout.nix
   ./programs/qt5ct.nix
   ./programs/screen.nix
@@ -156,7 +157,9 @@
   ./services/backup/tarsnap.nix
   ./services/backup/znapzend.nix
   ./services/cluster/fleet.nix
-  ./services/cluster/kubernetes.nix
+  ./services/cluster/kubernetes/default.nix
+  ./services/cluster/kubernetes/dns.nix
+  ./services/cluster/kubernetes/dashboard.nix
   ./services/cluster/panamax.nix
   ./services/computing/boinc/client.nix
   ./services/computing/torque/server.nix
@@ -352,6 +355,7 @@
   ./services/monitoring/collectd.nix
   ./services/monitoring/das_watchdog.nix
   ./services/monitoring/dd-agent/dd-agent.nix
+  ./services/monitoring/fusion-inventory.nix
   ./services/monitoring/grafana.nix
   ./services/monitoring/graphite.nix
   ./services/monitoring/hdaps.nix
@@ -423,12 +427,12 @@
   ./services/networking/ddclient.nix
   ./services/networking/dhcpcd.nix
   ./services/networking/dhcpd.nix
+  ./services/networking/dnscache.nix
   ./services/networking/dnschain.nix
   ./services/networking/dnscrypt-proxy.nix
   ./services/networking/dnscrypt-wrapper.nix
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
-  ./services/networking/fan.nix
   ./services/networking/fakeroute.nix
   ./services/networking/ferm.nix
   ./services/networking/firefox/sync-server.nix
@@ -524,6 +528,7 @@
   ./services/networking/tcpcrypt.nix
   ./services/networking/teamspeak3.nix
   ./services/networking/tinc.nix
+  ./services/networking/tinydns.nix
   ./services/networking/tftpd.nix
   ./services/networking/tox-bootstrapd.nix
   ./services/networking/toxvpn.nix
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 8e1482f5533..506a6ee3eaa 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -77,7 +77,6 @@ with lib;
     # Show all debug messages from the kernel but don't log refused packets
     # because we have the firewall enabled. This makes installs from the
     # console less cumbersome if the machine has a public IP.
-    boot.consoleLogLevel = mkDefault 7;
     networking.firewall.logRefusedConnections = mkDefault false;
 
     environment.systemPackages = [ pkgs.vim ];
diff --git a/nixos/modules/programs/npm.nix b/nixos/modules/programs/npm.nix
new file mode 100644
index 00000000000..7ef172355c1
--- /dev/null
+++ b/nixos/modules/programs/npm.nix
@@ -0,0 +1,44 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.npm;
+in
+
+{
+  ###### interface
+
+  options = {
+    programs.npm = {
+      enable = mkEnableOption "<command>npm</command> global config";
+
+      npmrc = lib.mkOption {
+        type = lib.types.lines;
+        description = ''
+          The system-wide npm configuration.
+          See <link xlink:href="https://docs.npmjs.com/misc/config"/>.
+        '';
+        default = ''
+          prefix = ''${HOME}/.npm
+        '';
+        example = ''
+          prefix = ''${HOME}/.npm
+          https-proxy=proxy.example.com
+          init-license=MIT
+          init-author-url=http://npmjs.org
+          color=true
+        '';
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = lib.mkIf cfg.enable {
+    environment.etc."npmrc".text = cfg.npmrc;
+
+    environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";
+  };
+
+}
diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index 61545a5acba..f536d56d7c6 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -105,7 +105,8 @@ in {
         RABBITMQ_MNESIA_BASE = "${cfg.dataDir}/mnesia";
         RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress;
         RABBITMQ_NODE_PORT = toString cfg.port;
-        RABBITMQ_SERVER_START_ARGS = "-rabbit error_logger tty -rabbit sasl_error_logger false";
+        RABBITMQ_LOGS = "-";
+        RABBITMQ_SASL_LOGS = "-";
         RABBITMQ_PID_FILE = "${cfg.dataDir}/pid";
         SYS_PREFIX = "";
         RABBITMQ_ENABLED_PLUGINS_FILE = pkgs.writeText "enabled_plugins" ''
@@ -128,7 +129,7 @@ in {
       preStart = ''
         ${optionalString (cfg.cookie != "") ''
             echo -n ${cfg.cookie} > ${cfg.dataDir}/.erlang.cookie
-            chmod 400 ${cfg.dataDir}/.erlang.cookie
+            chmod 600 ${cfg.dataDir}/.erlang.cookie
         ''}
       '';
     };
diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix
new file mode 100644
index 00000000000..482cbd939cb
--- /dev/null
+++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix
@@ -0,0 +1,160 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.kubernetes.addons.dashboard;
+
+  name = "gcr.io/google_containers/kubernetes-dashboard-amd64";
+	version = "v1.6.3";
+
+  image = pkgs.dockerTools.pullImage {
+    imageName = name;
+    imageTag = version;
+    sha256 = "0b5v7xa3s91yi9yfsw2b8wijiprnicbb02f5kqa579h4yndb3gfz";
+  };
+in {
+  options.services.kubernetes.addons.dashboard = {
+    enable = mkEnableOption "kubernetes dashboard addon";
+
+    enableRBAC = mkOption {
+      description = "Whether to enable role based access control is enabled for kubernetes dashboard";
+      type = types.bool;
+      default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.kubernetes.kubelet.seedDockerImages = [image];
+
+    services.kubernetes.addonManager.addons = {
+      kubernetes-dashboard-deployment = {
+        kind = "Deployment";
+        apiVersion = "apps/v1beta1";
+        metadata = {
+          labels = {
+            k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+            k8s-app = "kubernetes-dashboard";
+            version = version;
+            "kubernetes.io/cluster-service" = "true";
+            "addonmanager.kubernetes.io/mode" = "Reconcile";
+          };
+          name = "kubernetes-dashboard";
+          namespace = "kube-system";
+        };
+        spec = {
+          replicas = 1;
+          revisionHistoryLimit = 10;
+          selector.matchLabels."k8s-app" = "kubernetes-dashboard";
+          template = {
+            metadata = {
+              labels = {
+                k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+                k8s-app = "kubernetes-dashboard";
+                version = version;
+                "kubernetes.io/cluster-service" = "true";
+              };
+              annotations = {
+                "scheduler.alpha.kubernetes.io/critical-pod" = "";
+                #"scheduler.alpha.kubernetes.io/tolerations" = ''[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'';
+              };
+            };
+            spec = {
+              containers = [{
+                name = "kubernetes-dashboard";
+                image = "${name}:${version}";
+                ports = [{
+                  containerPort = 9090;
+                  protocol = "TCP";
+                }];
+                resources = {
+                  limits = {
+                    cpu = "100m";
+                    memory = "50Mi";
+                  };
+                  requests = {
+                    cpu = "100m";
+                    memory = "50Mi";
+                  };
+                };
+                livenessProbe = {
+                  httpGet = {
+                    path = "/";
+                    port = 9090;
+                  };
+                  initialDelaySeconds = 30;
+                  timeoutSeconds = 30;
+                };
+              }];
+              serviceAccountName = "kubernetes-dashboard";
+              tolerations = [{
+                key = "node-role.kubernetes.io/master";
+                effect = "NoSchedule";
+              }];
+            };
+          };
+        };
+      };
+
+      kubernetes-dashboard-svc = {
+        apiVersion = "v1";
+        kind = "Service";
+        metadata = {
+          labels = {
+            k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+            k8s-app = "kubernetes-dashboard";
+            "kubernetes.io/cluster-service" = "true";
+            "kubernetes.io/name" = "KubeDashboard";
+            "addonmanager.kubernetes.io/mode" = "Reconcile";
+          };
+          name = "kubernetes-dashboard";
+          namespace  = "kube-system";
+        };
+        spec = {
+          ports = [{
+            port = 80;
+            targetPort = 9090;
+          }];
+          selector.k8s-app = "kubernetes-dashboard";
+        };
+      };
+
+      kubernetes-dashboard-sa = {
+        apiVersion = "v1";
+        kind = "ServiceAccount";
+        metadata = {
+          labels = {
+            k8s-app = "kubernetes-dashboard";
+            k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+						"addonmanager.kubernetes.io/mode" = "Reconcile";
+          };
+          name = "kubernetes-dashboard";
+          namespace = "kube-system";
+        };
+      };
+    } // (optionalAttrs cfg.enableRBAC {
+      kubernetes-dashboard-crb = {
+        apiVersion = "rbac.authorization.k8s.io/v1beta1";
+        kind = "ClusterRoleBinding";
+        metadata = {
+          name = "kubernetes-dashboard";
+          labels = {
+            k8s-app = "kubernetes-dashboard";
+            k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+            "addonmanager.kubernetes.io/mode" = "Reconcile";
+          };
+        };
+        roleRef = {
+          apiGroup = "rbac.authorization.k8s.io";
+          kind = "ClusterRole";
+          name = "cluster-admin";
+        };
+        subjects = [{
+          kind = "ServiceAccount";
+          name = "kubernetes-dashboard";
+          namespace = "kube-system";
+        }];
+      };
+    });
+  };
+}
diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 4c9d9aad0e2..077953e4d4f 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -15,19 +15,19 @@ let
     config.Cmd = "/bin/pause";
   };
 
-  kubeconfig = pkgs.writeText "kubeconfig" (builtins.toJSON {
+  mkKubeConfig = name: cfg: pkgs.writeText "${name}-kubeconfig" (builtins.toJSON {
     apiVersion = "v1";
     kind = "Config";
     clusters = [{
       name = "local";
-      cluster.certificate-authority = cfg.kubeconfig.caFile;
-      cluster.server = cfg.kubeconfig.server;
+      cluster.certificate-authority = cfg.caFile;
+      cluster.server = cfg.server;
     }];
     users = [{
       name = "kubelet";
       user = {
-        client-certificate = cfg.kubeconfig.certFile;
-        client-key = cfg.kubeconfig.keyFile;
+        client-certificate = cfg.certFile;
+        client-key = cfg.keyFile;
       };
     }];
     contexts = [{
@@ -39,12 +39,42 @@ let
     }];
   });
 
-  policyFile = pkgs.writeText "kube-policy"
-    (concatStringsSep "\n" (map builtins.toJSON cfg.apiserver.authorizationPolicy));
+  mkKubeConfigOptions = prefix: {
+    server = mkOption {
+      description = "${prefix} kube-apiserver server address.";
+      default = "http://${cfg.apiserver.address}:${toString cfg.apiserver.port}";
+      type = types.str;
+    };
+
+    caFile = mkOption {
+      description = "${prefix} certificate authrority file used to connect to kube-apiserver.";
+      type = types.nullOr types.path;
+      default = cfg.caFile;
+    };
+
+    certFile = mkOption {
+      description = "${prefix} client certificate file used to connect to kube-apiserver.";
+      type = types.nullOr types.path;
+      default = null;
+    };
+
+    keyFile = mkOption {
+      description = "${prefix} client key file used to connect to kube-apiserver.";
+      type = types.nullOr types.path;
+      default = null;
+    };
+  };
+
+  kubeConfigDefaults = {
+    server = mkDefault cfg.kubeconfig.server;
+    caFile = mkDefault cfg.kubeconfig.caFile;
+    certFile = mkDefault cfg.kubeconfig.certFile;
+    keyFile = mkDefault cfg.kubeconfig.keyFile;
+  };
 
   cniConfig = pkgs.buildEnv {
     name = "kubernetes-cni-config";
-    paths = imap1 (i: entry:
+    paths = imap (i: entry:
       pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry)
     ) cfg.kubelet.cni.config;
   };
@@ -56,6 +86,45 @@ let
     ) cfg.kubelet.manifests;
   };
 
+  addons = pkgs.runCommand "kubernetes-addons" { } ''
+    mkdir -p $out
+    # since we are mounting the addons to the addon manager, they need to be copied
+    ${concatMapStringsSep ";" (a: "cp -v ${a}/* $out/") (mapAttrsToList (name: addon:
+      pkgs.writeTextDir "${name}.json" (builtins.toJSON addon)
+    ) (cfg.addonManager.addons))}
+  '';
+
+  taintOptions = { name, ... }: {
+    options = {
+      key = mkOption {
+        description = "Key of taint.";
+        default = name;
+        type = types.str;
+      };
+      value = mkOption {
+        description = "Value of taint.";
+        type = types.str;
+      };
+      effect = mkOption {
+        description = "Effect of taint.";
+        example = "NoSchedule";
+        type = types.enum ["NoSchedule" "PreferNoSchedule" "NoExecute"];
+      };
+    };
+  };
+
+  taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (mapAttrsToList (n: v: v) cfg.kubelet.taints);
+
+  # needed for flannel to pass options to docker
+  mkDockerOpts = pkgs.runCommand "mk-docker-opts" {
+    buildInputs = [ pkgs.makeWrapper ];
+  } ''
+    mkdir -p $out
+    cp ${pkgs.kubernetes.src}/cluster/centos/node/bin/mk-docker-opts.sh $out/mk-docker-opts.sh
+
+    # bashInteractive needed for `compgen`
+    makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "$out/mk-docker-opts.sh"
+  '';
 in {
 
   ###### interface
@@ -80,7 +149,7 @@ in {
     };
 
     verbose = mkOption {
-      description = "Kubernetes enable verbose mode for debugging";
+      description = "Kubernetes enable verbose mode for debugging.";
       default = false;
       type = types.bool;
     };
@@ -93,48 +162,30 @@ in {
       };
 
       keyFile = mkOption {
-        description = "Etcd key file";
+        description = "Etcd key file.";
         default = null;
         type = types.nullOr types.path;
       };
 
       certFile = mkOption {
-        description = "Etcd cert file";
+        description = "Etcd cert file.";
         default = null;
         type = types.nullOr types.path;
       };
 
       caFile = mkOption {
-        description = "Etcd ca file";
-        default = null;
+        description = "Etcd ca file.";
+        default = cfg.caFile;
         type = types.nullOr types.path;
       };
     };
 
-    kubeconfig = {
-      server = mkOption {
-        description = "Kubernetes apiserver server address";
-        default = "http://${cfg.apiserver.address}:${toString cfg.apiserver.port}";
-        type = types.str;
-      };
+    kubeconfig = mkKubeConfigOptions "Default kubeconfig";
 
-      caFile = mkOption {
-        description = "Certificate authrority file to use to connect to kuberentes apiserver";
-        type = types.nullOr types.path;
-        default = null;
-      };
-
-      certFile = mkOption {
-        description = "Client certificate file to use to connect to kubernetes";
-        type = types.nullOr types.path;
-        default = null;
-      };
-
-      keyFile = mkOption {
-        description = "Client key file to use to connect to kubernetes";
-        type = types.nullOr types.path;
-        default = null;
-      };
+    caFile = mkOption {
+      description = "Default kubernetes certificate authority";
+      type = types.nullOr types.path;
+      default = null;
     };
 
     dataDir = mkOption {
@@ -143,13 +194,25 @@ in {
       type = types.path;
     };
 
+    featureGates = mkOption {
+      description = "List set of feature gates";
+      default = [];
+      type = types.listOf types.str;
+    };
+
     apiserver = {
       enable = mkOption {
-        description = "Whether to enable kubernetes apiserver.";
+        description = "Whether to enable Kubernetes apiserver.";
         default = false;
         type = types.bool;
       };
 
+      featureGates = mkOption {
+        description = "List set of feature gates";
+        default = cfg.featureGates;
+        type = types.listOf types.str;
+      };
+
       address = mkOption {
         description = "Kubernetes apiserver listening address.";
         default = "127.0.0.1";
@@ -175,6 +238,14 @@ in {
         type = types.nullOr types.str;
       };
 
+      storageBackend = mkOption {
+        description = ''
+          Kubernetes apiserver storage backend.
+        '';
+        default = "etcd3";
+        type = types.enum ["etcd2" "etcd3"];
+      };
+
       port = mkOption {
         description = "Kubernetes apiserver listening port.";
         default = 8080;
@@ -201,67 +272,69 @@ in {
 
       clientCaFile = mkOption {
         description = "Kubernetes apiserver CA file for client auth.";
-        default = null;
+        default = cfg.caFile;
         type = types.nullOr types.path;
       };
 
-      tokenAuth = mkOption {
+      tokenAuthFile = mkOption {
         description = ''
           Kubernetes apiserver token authentication file. See
           <link xlink:href="http://kubernetes.io/docs/admin/authentication.html"/>
         '';
         default = null;
-        example = ''token,user,uid,"group1,group2,group3"'';
-        type = types.nullOr types.lines;
+        type = types.nullOr types.path;
+      };
+
+      basicAuthFile = mkOption {
+        description = ''
+          Kubernetes apiserver basic authentication file. See
+          <link xlink:href="http://kubernetes.io/docs/admin/authentication.html"/>
+        '';
+        default = pkgs.writeText "users" ''
+          kubernetes,admin,0
+        '';
+        type = types.nullOr types.path;
       };
 
       authorizationMode = mkOption {
         description = ''
-          Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC). See
-          <link xlink:href="http://kubernetes.io/v1.0/docs/admin/authorization.html"/>
+          Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See
+          <link xlink:href="http://kubernetes.io/docs/admin/authorization.html"/>
         '';
-        default = "AlwaysAllow";
-        type = types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC"];
+        default = ["RBAC"];
+        type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC"]);
       };
 
       authorizationPolicy = mkOption {
         description = ''
           Kubernetes apiserver authorization policy file. See
-          <link xlink:href="http://kubernetes.io/v1.0/docs/admin/authorization.html"/>
+          <link xlink:href="http://kubernetes.io/docs/admin/authorization.html"/>
         '';
         default = [];
-        example = literalExample ''
-          [
-            {user = "admin";}
-            {user = "scheduler"; readonly = true; kind= "pods";}
-            {user = "scheduler"; kind = "bindings";}
-            {user = "kubelet";  readonly = true; kind = "bindings";}
-            {user = "kubelet"; kind = "events";}
-            {user= "alice"; ns = "projectCaribou";}
-            {user = "bob"; readonly = true; ns = "projectCaribou";}
-          ]
-        '';
         type = types.listOf types.attrs;
       };
 
       allowPrivileged = mkOption {
-        description = "Whether to allow privileged containers on kubernetes.";
+        description = "Whether to allow privileged containers on Kubernetes.";
         default = true;
         type = types.bool;
       };
 
-      portalNet = mkOption {
-        description = "Kubernetes CIDR notation IP range from which to assign portal IPs";
-        default = "10.10.10.10/24";
+      serviceClusterIpRange = mkOption {
+        description = ''
+          A CIDR notation IP range from which to assign service cluster IPs.
+          This must not overlap with any IP ranges assigned to nodes for pods.
+        '';
+        default = "10.0.0.0/24";
         type = types.str;
       };
 
       runtimeConfig = mkOption {
         description = ''
           Api runtime configuration. See
-          <link xlink:href="http://kubernetes.io/v1.0/docs/admin/cluster-management.html"/>
+          <link xlink:href="http://kubernetes.io/docs/admin/cluster-management.html"/>
         '';
-        default = "";
+        default = "authentication.k8s.io/v1beta1=true";
         example = "api/all=false,api/v1=true";
         type = types.str;
       };
@@ -271,10 +344,11 @@ in {
           Kubernetes admission control plugins to use. See
           <link xlink:href="http://kubernetes.io/docs/admin/admission-controllers/"/>
         '';
-        default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota"];
+        default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds"];
         example = [
           "NamespaceLifecycle" "NamespaceExists" "LimitRanger"
           "SecurityContextDeny" "ServiceAccount" "ResourceQuota"
+          "PodSecurityPolicy" "NodeRestriction" "DefaultStorageClass"
         ];
         type = types.listOf types.str;
       };
@@ -290,25 +364,25 @@ in {
       };
 
       kubeletClientCaFile = mkOption {
-        description = "Path to a cert file for connecting to kubelet";
-        default = null;
+        description = "Path to a cert file for connecting to kubelet.";
+        default = cfg.caFile;
         type = types.nullOr types.path;
       };
 
       kubeletClientCertFile = mkOption {
-        description = "Client certificate to use for connections to kubelet";
+        description = "Client certificate to use for connections to kubelet.";
         default = null;
         type = types.nullOr types.path;
       };
 
       kubeletClientKeyFile = mkOption {
-        description = "Key to use for connections to kubelet";
+        description = "Key to use for connections to kubelet.";
         default = null;
         type = types.nullOr types.path;
       };
 
       kubeletHttps = mkOption {
-        description = "Whether to use https for connections to kubelet";
+        description = "Whether to use https for connections to kubelet.";
         default = true;
         type = types.bool;
       };
@@ -322,11 +396,17 @@ in {
 
     scheduler = {
       enable = mkOption {
-        description = "Whether to enable kubernetes scheduler.";
+        description = "Whether to enable Kubernetes scheduler.";
         default = false;
         type = types.bool;
       };
 
+      featureGates = mkOption {
+        description = "List set of feature gates";
+        default = cfg.featureGates;
+        type = types.listOf types.str;
+      };
+
       address = mkOption {
         description = "Kubernetes scheduler listening address.";
         default = "127.0.0.1";
@@ -340,11 +420,13 @@ in {
       };
 
       leaderElect = mkOption {
-        description = "Whether to start leader election before executing main loop";
+        description = "Whether to start leader election before executing main loop.";
         type = types.bool;
-        default = false;
+        default = true;
       };
 
+      kubeconfig = mkKubeConfigOptions "Kubernetes scheduler";
+
       extraOpts = mkOption {
         description = "Kubernetes scheduler extra command line options.";
         default = "";
@@ -354,11 +436,17 @@ in {
 
     controllerManager = {
       enable = mkOption {
-        description = "Whether to enable kubernetes controller manager.";
+        description = "Whether to enable Kubernetes controller manager.";
         default = false;
         type = types.bool;
       };
 
+      featureGates = mkOption {
+        description = "List set of feature gates";
+        default = cfg.featureGates;
+        type = types.listOf types.str;
+      };
+
       address = mkOption {
         description = "Kubernetes controller manager listening address.";
         default = "127.0.0.1";
@@ -372,9 +460,9 @@ in {
       };
 
       leaderElect = mkOption {
-        description = "Whether to start leader election before executing main loop";
+        description = "Whether to start leader election before executing main loop.";
         type = types.bool;
-        default = false;
+        default = true;
       };
 
       serviceAccountKeyFile = mkOption {
@@ -391,15 +479,11 @@ in {
           Kubernetes controller manager certificate authority file included in
           service account's token secret.
         '';
-        default = null;
+        default = cfg.caFile;
         type = types.nullOr types.path;
       };
 
-      clusterCidr = mkOption {
-        description = "Kubernetes controller manager CIDR Range for Pods in cluster";
-        default = "10.10.0.0/16";
-        type = types.str;
-      };
+      kubeconfig = mkKubeConfigOptions "Kubernetes controller manager";
 
       extraOpts = mkOption {
         description = "Kubernetes controller manager extra command line options.";
@@ -410,19 +494,25 @@ in {
 
     kubelet = {
       enable = mkOption {
-        description = "Whether to enable kubernetes kubelet.";
+        description = "Whether to enable Kubernetes kubelet.";
         default = false;
         type = types.bool;
       };
 
-      registerNode = mkOption {
-        description = "Whether to auto register kubelet with API server.";
-        default = true;
-        type = types.bool;
+      featureGates = mkOption {
+        description = "List set of feature gates";
+        default = cfg.featureGates;
+        type = types.listOf types.str;
+      };
+
+      seedDockerImages = mkOption {
+        description = "List of docker images to preload on system";
+        default = [];
+        type = types.listOf types.package;
       };
 
-      registerSchedulable = mkOption {
-        description = "Register the node as schedulable. No-op if register-node is false.";
+      registerNode = mkOption {
+        description = "Whether to auto register kubelet with API server.";
         default = true;
         type = types.bool;
       };
@@ -451,6 +541,12 @@ in {
         type = types.nullOr types.path;
       };
 
+      clientCaFile = mkOption {
+        description = "Kubernetes apiserver CA file for client authentication.";
+        default = cfg.caFile;
+        type = types.nullOr types.path;
+      };
+
       healthz = {
         bind = mkOption {
           description = "Kubernetes kubelet healthz listening address.";
@@ -466,13 +562,13 @@ in {
       };
 
       hostname = mkOption {
-        description = "Kubernetes kubelet hostname override";
+        description = "Kubernetes kubelet hostname override.";
         default = config.networking.hostName;
         type = types.str;
       };
 
       allowPrivileged = mkOption {
-        description = "Whether to allow kubernetes containers to request privileged mode.";
+        description = "Whether to allow Kubernetes containers to request privileged mode.";
         default = true;
         type = types.bool;
       };
@@ -484,32 +580,32 @@ in {
       };
 
       clusterDns = mkOption {
-        description = "Use alternative dns.";
-        default = "10.10.0.1";
+        description = "Use alternative DNS.";
+        default = "10.1.0.1";
         type = types.str;
       };
 
       clusterDomain = mkOption {
         description = "Use alternative domain.";
-        default = "cluster.local";
+        default = config.services.kubernetes.addons.dns.clusterDomain;
         type = types.str;
       };
 
       networkPlugin = mkOption {
-        description = "Network plugin to use by kubernetes";
+        description = "Network plugin to use by Kubernetes.";
         type = types.nullOr (types.enum ["cni" "kubenet"]);
         default = "kubenet";
       };
 
       cni = {
         packages = mkOption {
-          description = "List of network plugin packages to install";
+          description = "List of network plugin packages to install.";
           type = types.listOf types.package;
           default = [];
         };
 
         config = mkOption {
-          description = "Kubernetes CNI configuration";
+          description = "Kubernetes CNI configuration.";
           type = types.listOf types.attrs;
           default = [];
           example = literalExample ''
@@ -536,11 +632,37 @@ in {
       };
 
       manifests = mkOption {
-        description = "List of manifests to bootstrap with kubelet";
+        description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)";
         type = types.attrsOf types.attrs;
         default = {};
       };
 
+      applyManifests = mkOption {
+        description = "Whether to apply manifests (this is true for master node).";
+        default = false;
+        type = types.bool;
+      };
+
+      unschedulable = mkOption {
+        description = "Whether to set node taint to unschedulable=true as it is the case of node that has only master role.";
+        default = false;
+        type = types.bool;
+      };
+
+      taints = mkOption {
+        description = "Node taints (https://kubernetes.io/docs/concepts/configuration/assign-pod-node/).";
+        default = {};
+        type = types.attrsOf (types.submodule [ taintOptions ]);
+      };
+
+      nodeIp = mkOption {
+        description = "IP address of the node. If set, kubelet will use this IP address for the node.";
+        default = null;
+        type = types.nullOr types.str;
+      };
+
+      kubeconfig = mkKubeConfigOptions "Kubelet";
+
       extraOpts = mkOption {
         description = "Kubernetes kubelet extra command line options.";
         default = "";
@@ -550,17 +672,25 @@ in {
 
     proxy = {
       enable = mkOption {
-        description = "Whether to enable kubernetes proxy.";
+        description = "Whether to enable Kubernetes proxy.";
         default = false;
         type = types.bool;
       };
 
+      featureGates = mkOption {
+        description = "List set of feature gates";
+        default = cfg.featureGates;
+        type = types.listOf types.str;
+      };
+
       address = mkOption {
         description = "Kubernetes proxy listening address.";
         default = "0.0.0.0";
         type = types.str;
       };
 
+      kubeconfig = mkKubeConfigOptions "Kubernetes proxy";
+
       extraOpts = mkOption {
         description = "Kubernetes proxy extra command line options.";
         default = "";
@@ -568,57 +698,109 @@ in {
       };
     };
 
-    dns = {
-      enable = mkEnableOption "kubernetes dns service.";
-
-      port = mkOption {
-        description = "Kubernetes dns listening port";
-        default = 53;
-        type = types.int;
+    addonManager = {
+      enable = mkOption {
+        description = "Whether to enable Kubernetes addon manager.";
+        default = false;
+        type = types.bool;
       };
 
-      domain = mkOption  {
-        description = "Kuberntes dns domain under which to create names.";
-        default = cfg.kubelet.clusterDomain;
-        type = types.str;
+      addons = mkOption {
+        description = "Kubernetes addons (any kind of Kubernetes resource can be an addon).";
+        default = { };
+        type = types.attrsOf (types.either types.attrs (types.listOf types.attrs));
+        example = literalExample ''
+          {
+            "my-service" = {
+              "apiVersion" = "v1";
+              "kind" = "Service";
+              "metadata" = {
+                "name" = "my-service";
+                "namespace" = "default";
+              };
+              "spec" = { ... };
+            };
+          }
+          // import <nixpkgs/nixos/modules/services/cluster/kubernetes/dashboard.nix> { cfg = config.services.kubernetes; };
+        '';
       };
+    };
 
-      extraOpts = mkOption {
-        description = "Kubernetes dns extra command line options.";
-        default = "";
-        type = types.str;
-      };
+    path = mkOption {
+      description = "Packages added to the services' PATH environment variable. Both the bin and sbin subdirectories of each package are added.";
+      type = types.listOf types.package;
+      default = [];
     };
+
+    clusterCidr = mkOption {
+      description = "Kubernetes controller manager and proxy CIDR Range for Pods in cluster.";
+      default = "10.1.0.0/16";
+      type = types.str;
+    };
+
+    flannel.enable = mkOption {
+      description = "Whether to enable flannel networking";
+      default = false;
+      type = types.bool;
+    };
+
   };
 
   ###### implementation
 
   config = mkMerge [
     (mkIf cfg.kubelet.enable {
+      services.kubernetes.kubelet.seedDockerImages = [infraContainer];
+
+      systemd.services.kubelet-bootstrap = {
+        description = "Boostrap Kubelet";
+        wantedBy = ["kubernetes.target"];
+        after = ["docker.service" "network.target"];
+        path = with pkgs; [ docker ];
+        script = ''
+          ${concatMapStrings (img: ''
+            echo "Seeding docker image: ${img}"
+            docker load <${img}
+          '') cfg.kubelet.seedDockerImages}
+
+          rm /opt/cni/bin/* || true
+          ${concatMapStrings (package: ''
+            echo "Linking cni package: ${package}"
+            ln -fs ${package.plugins}/* /opt/cni/bin
+          '') cfg.kubelet.cni.packages}
+        '';
+        serviceConfig = {
+          Slice = "kubernetes.slice";
+          Type = "oneshot";
+        };
+      };
+
       systemd.services.kubelet = {
         description = "Kubernetes Kubelet Service";
         wantedBy = [ "kubernetes.target" ];
-        after = [ "network.target" "docker.service" "kube-apiserver.service" ];
-        path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables ];
-        preStart = ''
-          docker load < ${infraContainer}
-          rm /opt/cni/bin/* || true
-          ${concatMapStringsSep "\n" (p: "ln -fs ${p.plugins}/* /opt/cni/bin") cfg.kubelet.cni.packages}
-        '';
+        after = [ "network.target" "docker.service" "kube-apiserver.service" "kubelet-bootstrap.service" ];
+        path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ cfg.path;
         serviceConfig = {
           Slice = "kubernetes.slice";
           ExecStart = ''${cfg.package}/bin/kubelet \
-            --pod-manifest-path=${manifests} \
-            --kubeconfig=${kubeconfig} \
+            ${optionalString cfg.kubelet.applyManifests
+              "--pod-manifest-path=${manifests}"} \
+            ${optionalString (taints != "")
+              "--register-with-taints=${taints}"} \
+            --kubeconfig=${mkKubeConfig "kubelet" cfg.kubelet.kubeconfig} \
             --require-kubeconfig \
             --address=${cfg.kubelet.address} \
             --port=${toString cfg.kubelet.port} \
             --register-node=${boolToString cfg.kubelet.registerNode} \
-            --register-schedulable=${boolToString cfg.kubelet.registerSchedulable} \
             ${optionalString (cfg.kubelet.tlsCertFile != null)
               "--tls-cert-file=${cfg.kubelet.tlsCertFile}"} \
             ${optionalString (cfg.kubelet.tlsKeyFile != null)
               "--tls-private-key-file=${cfg.kubelet.tlsKeyFile}"} \
+            ${optionalString (cfg.kubelet.clientCaFile != null)
+              "--client-ca-file=${cfg.kubelet.clientCaFile}"} \
+            --authentication-token-webhook \
+            --authentication-token-webhook-cache-ttl="10s" \
+            --authorization-mode=Webhook \
             --healthz-bind-address=${cfg.kubelet.healthz.bind} \
             --healthz-port=${toString cfg.kubelet.healthz.port} \
             --hostname-override=${cfg.kubelet.hostname} \
@@ -633,8 +815,11 @@ in {
             ${optionalString (cfg.kubelet.networkPlugin != null)
               "--network-plugin=${cfg.kubelet.networkPlugin}"} \
             --cni-conf-dir=${cniConfig} \
-            --reconcile-cidr \
             --hairpin-mode=hairpin-veth \
+            ${optionalString (cfg.kubelet.nodeIp != null)
+              "--node-ip=${cfg.kubelet.nodeIp}"} \
+            ${optionalString (cfg.kubelet.featureGates != [])
+              "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.kubelet.featureGates}"} \
             ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
             ${cfg.kubelet.extraOpts}
           '';
@@ -642,15 +827,28 @@ in {
         };
       };
 
+      # Allways include cni plugins
+      services.kubernetes.kubelet.cni.packages = [pkgs.cni];
+
+      boot.kernelModules = ["br_netfilter"];
+
+      services.kubernetes.kubelet.kubeconfig = kubeConfigDefaults;
+    })
+
+    (mkIf (cfg.kubelet.applyManifests && cfg.kubelet.enable) {
       environment.etc = mapAttrs' (name: manifest:
         nameValuePair "kubernetes/manifests/${name}.json" {
           text = builtins.toJSON manifest;
           mode = "0755";
         }
       ) cfg.kubelet.manifests;
+    })
 
-      # Allways include cni plugins
-      services.kubernetes.kubelet.cni.packages = [pkgs.cni];
+    (mkIf (cfg.kubelet.unschedulable && cfg.kubelet.enable) {
+      services.kubernetes.kubelet.taints.unschedulable = {
+        value = "true";
+        effect = "NoSchedule";
+      };
     })
 
     (mkIf cfg.apiserver.enable {
@@ -677,9 +875,11 @@ in {
               "--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \
             ${optionalString (cfg.apiserver.tlsKeyFile != null)
               "--tls-private-key-file=${cfg.apiserver.tlsKeyFile}"} \
-            ${optionalString (cfg.apiserver.tokenAuth != null)
-              "--token-auth-file=${cfg.apiserver.tokenAuth}"} \
-            --kubelet-https=${boolToString cfg.apiserver.kubeletHttps} \
+            ${optionalString (cfg.apiserver.tokenAuthFile != null)
+              "--token-auth-file=${cfg.apiserver.tokenAuthFile}"} \
+            ${optionalString (cfg.apiserver.basicAuthFile != null)
+              "--basic-auth-file=${cfg.apiserver.basicAuthFile}"} \
+            --kubelet-https=${if cfg.apiserver.kubeletHttps then "true" else "false"} \
             ${optionalString (cfg.apiserver.kubeletClientCaFile != null)
               "--kubelet-certificate-authority=${cfg.apiserver.kubeletClientCaFile}"} \
             ${optionalString (cfg.apiserver.kubeletClientCertFile != null)
@@ -688,11 +888,15 @@ in {
               "--kubelet-client-key=${cfg.apiserver.kubeletClientKeyFile}"} \
             ${optionalString (cfg.apiserver.clientCaFile != null)
               "--client-ca-file=${cfg.apiserver.clientCaFile}"} \
-            --authorization-mode=${cfg.apiserver.authorizationMode} \
-            ${optionalString (cfg.apiserver.authorizationMode == "ABAC")
-              "--authorization-policy-file=${policyFile}"} \
+            --authorization-mode=${concatStringsSep "," cfg.apiserver.authorizationMode} \
+            ${optionalString (elem "ABAC" cfg.apiserver.authorizationMode)
+              "--authorization-policy-file=${
+                pkgs.writeText "kube-auth-policy.jsonl"
+                (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.apiserver.authorizationPolicy)
+              }"
+            } \
             --secure-port=${toString cfg.apiserver.securePort} \
-            --service-cluster-ip-range=${cfg.apiserver.portalNet} \
+            --service-cluster-ip-range=${cfg.apiserver.serviceClusterIpRange} \
             ${optionalString (cfg.apiserver.runtimeConfig != "")
               "--runtime-config=${cfg.apiserver.runtimeConfig}"} \
             --admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \
@@ -700,6 +904,9 @@ in {
               "--service-account-key-file=${cfg.apiserver.serviceAccountKeyFile}"} \
             ${optionalString cfg.verbose "--v=6"} \
             ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
+            --storage-backend=${cfg.apiserver.storageBackend} \
+            ${optionalString (cfg.kubelet.featureGates != [])
+              "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.kubelet.featureGates}"} \
             ${cfg.apiserver.extraOpts}
           '';
           WorkingDirectory = cfg.dataDir;
@@ -723,9 +930,11 @@ in {
             --address=${cfg.scheduler.address} \
             --port=${toString cfg.scheduler.port} \
             --leader-elect=${boolToString cfg.scheduler.leaderElect} \
-            --kubeconfig=${kubeconfig} \
+            --kubeconfig=${mkKubeConfig "kube-scheduler" cfg.scheduler.kubeconfig} \
             ${optionalString cfg.verbose "--v=6"} \
             ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
+            ${optionalString (cfg.scheduler.featureGates != [])
+              "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.scheduler.featureGates}"} \
             ${cfg.scheduler.extraOpts}
           '';
           WorkingDirectory = cfg.dataDir;
@@ -733,6 +942,8 @@ in {
           Group = "kubernetes";
         };
       };
+
+      services.kubernetes.scheduler.kubeconfig = kubeConfigDefaults;
     })
 
     (mkIf cfg.controllerManager.enable {
@@ -747,16 +958,19 @@ in {
           ExecStart = ''${cfg.package}/bin/kube-controller-manager \
             --address=${cfg.controllerManager.address} \
             --port=${toString cfg.controllerManager.port} \
-            --kubeconfig=${kubeconfig} \
+            --kubeconfig=${mkKubeConfig "kube-controller-manager" cfg.controllerManager.kubeconfig} \
             --leader-elect=${boolToString cfg.controllerManager.leaderElect} \
             ${if (cfg.controllerManager.serviceAccountKeyFile!=null)
               then "--service-account-private-key-file=${cfg.controllerManager.serviceAccountKeyFile}"
               else "--service-account-private-key-file=/var/run/kubernetes/apiserver.key"} \
-            ${optionalString (cfg.controllerManager.rootCaFile!=null)
-              "--root-ca-file=${cfg.controllerManager.rootCaFile}"} \
-            ${optionalString (cfg.controllerManager.clusterCidr!=null)
-              "--cluster-cidr=${cfg.controllerManager.clusterCidr}"} \
+            ${if (cfg.controllerManager.rootCaFile!=null)
+              then "--root-ca-file=${cfg.controllerManager.rootCaFile}"
+              else "--root-ca-file=/var/run/kubernetes/apiserver.crt"} \
+            ${optionalString (cfg.clusterCidr!=null)
+              "--cluster-cidr=${cfg.clusterCidr}"} \
             --allocate-node-cidrs=true \
+            ${optionalString (cfg.controllerManager.featureGates != [])
+              "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.controllerManager.featureGates}"} \
             ${optionalString cfg.verbose "--v=6"} \
             ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
             ${cfg.controllerManager.extraOpts}
@@ -765,7 +979,10 @@ in {
           User = "kubernetes";
           Group = "kubernetes";
         };
+        path = cfg.path;
       };
+
+      services.kubernetes.controllerManager.kubeconfig = kubeConfigDefaults;
     })
 
     (mkIf cfg.proxy.enable {
@@ -773,65 +990,79 @@ in {
         description = "Kubernetes Proxy Service";
         wantedBy = [ "kubernetes.target" ];
         after = [ "kube-apiserver.service" ];
-        path = [pkgs.iptables];
+        path = [pkgs.iptables pkgs.conntrack_tools];
         serviceConfig = {
           Slice = "kubernetes.slice";
           ExecStart = ''${cfg.package}/bin/kube-proxy \
-            --kubeconfig=${kubeconfig} \
+            --kubeconfig=${mkKubeConfig "kube-proxy" cfg.proxy.kubeconfig} \
             --bind-address=${cfg.proxy.address} \
+            ${optionalString (cfg.proxy.featureGates != [])
+              "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.proxy.featureGates}"} \
             ${optionalString cfg.verbose "--v=6"} \
             ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
+            ${optionalString (cfg.clusterCidr!=null)
+              "--cluster-cidr=${cfg.clusterCidr}"} \
             ${cfg.proxy.extraOpts}
           '';
           WorkingDirectory = cfg.dataDir;
         };
       };
-    })
 
-    (mkIf cfg.dns.enable {
-      systemd.services.kube-dns = {
-        description = "Kubernetes Dns Service";
-        wantedBy = [ "kubernetes.target" ];
-        after = [ "kube-apiserver.service" ];
-        serviceConfig = {
-          Slice = "kubernetes.slice";
-          ExecStart = ''${cfg.package}/bin/kube-dns \
-            --kubecfg-file=${kubeconfig} \
-            --dns-port=${toString cfg.dns.port} \
-            --domain=${cfg.dns.domain} \
-            ${optionalString cfg.verbose "--v=6"} \
-            ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
-            ${cfg.dns.extraOpts}
-          '';
-          WorkingDirectory = cfg.dataDir;
-          User = "kubernetes";
-          Group = "kubernetes";
-          AmbientCapabilities = "cap_net_bind_service";
-          SendSIGHUP = true;
-        };
-      };
-    })
+      # kube-proxy needs iptables
+      networking.firewall.enable = mkDefault true;
 
-    (mkIf cfg.kubelet.enable {
-      boot.kernelModules = ["br_netfilter"];
+      services.kubernetes.proxy.kubeconfig = kubeConfigDefaults;
     })
 
     (mkIf (any (el: el == "master") cfg.roles) {
       virtualisation.docker.enable = mkDefault true;
       services.kubernetes.kubelet.enable = mkDefault true;
       services.kubernetes.kubelet.allowPrivileged = mkDefault true;
+      services.kubernetes.kubelet.applyManifests = mkDefault true;
       services.kubernetes.apiserver.enable = mkDefault true;
       services.kubernetes.scheduler.enable = mkDefault true;
       services.kubernetes.controllerManager.enable = mkDefault true;
       services.etcd.enable = mkDefault (cfg.etcd.servers == ["http://127.0.0.1:2379"]);
+      services.kubernetes.addonManager.enable = mkDefault true;
+      services.kubernetes.proxy.enable = mkDefault true;
+    })
+
+    # if this node is only a master make it unschedulable by default
+    (mkIf (all (el: el == "master") cfg.roles) {
+      services.kubernetes.kubelet.unschedulable = mkDefault true;
     })
 
     (mkIf (any (el: el == "node") cfg.roles) {
-      virtualisation.docker.enable = mkDefault true;
-      virtualisation.docker.logDriver = mkDefault "json-file";
+      virtualisation.docker = {
+        enable = mkDefault true;
+
+        # kubernetes needs access to logs
+        logDriver = mkDefault "json-file";
+
+        # iptables must be disabled for kubernetes
+        extraOptions = "--iptables=false --ip-masq=false";
+      };
+
       services.kubernetes.kubelet.enable = mkDefault true;
       services.kubernetes.proxy.enable = mkDefault true;
-      services.kubernetes.dns.enable = mkDefault true;
+    })
+
+    (mkIf cfg.addonManager.enable {
+      environment.etc."kubernetes/addons".source = "${addons}/";
+
+      systemd.services.kube-addon-manager = {
+        description = "Kubernetes addon manager";
+        wantedBy = [ "kubernetes.target" ];
+        after = [ "kube-apiserver.service" ];
+        environment.ADDON_PATH = "/etc/kubernetes/addons/";
+        serviceConfig = {
+          Slice = "kubernetes.slice";
+          ExecStart = "${cfg.package}/bin/kube-addons";
+          WorkingDirectory = cfg.dataDir;
+          User = "kubernetes";
+          Group = "kubernetes";
+        };
+      };
     })
 
     (mkIf (
@@ -839,8 +1070,7 @@ in {
         cfg.scheduler.enable ||
         cfg.controllerManager.enable ||
         cfg.kubelet.enable ||
-        cfg.proxy.enable ||
-        cfg.dns.enable
+        cfg.proxy.enable
     ) {
       systemd.targets.kubernetes = {
         description = "Kubernetes";
@@ -864,6 +1094,54 @@ in {
         createHome = true;
       };
       users.extraGroups.kubernetes.gid = config.ids.gids.kubernetes;
+
+			# dns addon is enabled by default
+      services.kubernetes.addons.dns.enable = mkDefault true;
+    })
+
+    (mkIf cfg.flannel.enable {
+      services.flannel = {
+        enable = mkDefault true;
+        network = mkDefault cfg.clusterCidr;
+        etcd = mkDefault {
+          endpoints = cfg.etcd.servers;
+          inherit (cfg.etcd) caFile certFile keyFile;
+        };
+      };
+
+      services.kubernetes.kubelet = {
+        networkPlugin = mkDefault "cni";
+        cni.config = mkDefault [{
+          name = "mynet";
+          type = "flannel";
+          delegate = {
+            isDefaultGateway = true;
+            bridge = "docker0";
+          };
+        }];
+      };
+
+      systemd.services."mk-docker-opts" = {
+        description = "Pre-Docker Actions";
+        wantedBy = [ "flannel.service" ];
+        before = [ "docker.service" ];
+        after = [ "flannel.service" ];
+        path = [ pkgs.gawk pkgs.gnugrep ];
+        script = ''
+          mkdir -p /run/flannel
+          ${mkDockerOpts}/mk-docker-opts -d /run/flannel/docker
+        '';
+        serviceConfig.Type = "oneshot";
+      };
+      systemd.services.docker.serviceConfig.EnvironmentFile = "/run/flannel/docker";
+
+      # read environment variables generated by mk-docker-opts
+      virtualisation.docker.extraOptions = "$DOCKER_OPTS";
+
+      networking.firewall.allowedUDPPorts = [
+        8285  # flannel udp
+        8472  # flannel vxlan
+      ];
     })
   ];
 }
diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/dns.nix
new file mode 100644
index 00000000000..d70663fa5d7
--- /dev/null
+++ b/nixos/modules/services/cluster/kubernetes/dns.nix
@@ -0,0 +1,311 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  version = "1.14.4";
+
+  k8s-dns-kube-dns = pkgs.dockerTools.pullImage {
+    imageName = "gcr.io/google_containers/k8s-dns-kube-dns-amd64";
+    imageTag = version;
+    sha256 = "0g64jc2076ng28xl4w3w9svf7hc6s9h8rq9mhvvwpfy2p6lgj6gy";
+  };
+
+  k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage {
+    imageName = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64";
+    imageTag = version;
+    sha256 = "0sdpsbj1vismihy7ass1cn96nwmav6sf3r5h6i4k2dxha0y0jsh5";
+  };
+
+  k8s-dns-sidecar = pkgs.dockerTools.pullImage {
+    imageName = "gcr.io/google_containers/k8s-dns-sidecar-amd64";
+    imageTag = version;
+    sha256 = "01zpi189hpy2z62awl38fap908s8rrhc3v5gb6m90y2pycl4ad6q";
+  };
+
+  cfg = config.services.kubernetes.addons.dns;
+in {
+  options.services.kubernetes.addons.dns = {
+    enable = mkEnableOption "kubernetes dns addon";
+
+    clusterIp = mkOption {
+      description = "Dns addon clusterIP";
+
+      # this default is also what kubernetes users
+      default = (
+        concatStringsSep "." (
+          take 3 (splitString "." config.services.kubernetes.apiserver.serviceClusterIpRange
+        ))
+      ) + ".254";
+      type = types.str;
+    };
+
+    clusterDomain = mkOption {
+      description = "Dns cluster domain";
+      default = "cluster.local";
+      type = types.str;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.kubernetes.kubelet.seedDockerImages = [
+      k8s-dns-kube-dns
+      k8s-dns-dnsmasq-nanny
+      k8s-dns-sidecar
+    ];
+
+    services.kubernetes.addonManager.addons = {
+      kubedns-deployment = {
+        apiVersion = "apps/v1beta1";
+        kind = "Deployment";
+        metadata = {
+          labels = {
+            "addonmanager.kubernetes.io/mode" = "Reconcile";
+            "k8s-app" = "kube-dns";
+            "kubernetes.io/cluster-service" = "true";
+          };
+          name = "kube-dns";
+          namespace = "kube-system";
+        };
+        spec = {
+          selector.matchLabels."k8s-app" = "kube-dns";
+          strategy = {
+            rollingUpdate = {
+              maxSurge = "10%";
+              maxUnavailable = 0;
+            };
+          };
+          template = {
+            metadata = {
+              annotations."scheduler.alpha.kubernetes.io/critical-pod" = "";
+              labels.k8s-app = "kube-dns";
+            };
+            spec = {
+              containers = [
+                {
+                  name = "kubedns";
+                  args = [
+                    "--domain=${cfg.clusterDomain}"
+                    "--dns-port=10053"
+                    "--config-dir=/kube-dns-config"
+                    "--v=2"
+                  ];
+                  env = [
+                    {
+                      name = "PROMETHEUS_PORT";
+                      value = "10055";
+                    }
+                  ];
+                  image = "gcr.io/google_containers/k8s-dns-kube-dns-amd64:${version}";
+                  livenessProbe = {
+                    failureThreshold = 5;
+                    httpGet = {
+                      path = "/healthcheck/kubedns";
+                      port = 10054;
+                      scheme = "HTTP";
+                    };
+                    initialDelaySeconds = 60;
+                    successThreshold = 1;
+                    timeoutSeconds = 5;
+                  };
+                  ports = [
+                    {
+                      containerPort = 10053;
+                      name = "dns-local";
+                      protocol = "UDP";
+                    }
+                    {
+                      containerPort = 10053;
+                      name = "dns-tcp-local";
+                      protocol = "TCP";
+                    }
+                    {
+                      containerPort = 10055;
+                      name = "metrics";
+                      protocol = "TCP";
+                    }
+                  ];
+                  readinessProbe = {
+                    httpGet = {
+                      path = "/readiness";
+                      port = 8081;
+                      scheme = "HTTP";
+                    };
+                    initialDelaySeconds = 3;
+                    timeoutSeconds = 5;
+                  };
+                  resources = {
+                    limits.memory = "170Mi";
+                    requests = {
+                      cpu = "100m";
+                      memory = "70Mi";
+                    };
+                  };
+                  volumeMounts = [
+                    {
+                      mountPath = "/kube-dns-config";
+                      name = "kube-dns-config";
+                    }
+                  ];
+                }
+                {
+                  args = [
+                    "-v=2"
+                    "-logtostderr"
+                    "-configDir=/etc/k8s/dns/dnsmasq-nanny"
+                    "-restartDnsmasq=true"
+                    "--"
+                    "-k"
+                    "--cache-size=1000"
+                    "--log-facility=-"
+                    "--server=/${cfg.clusterDomain}/127.0.0.1#10053"
+                    "--server=/in-addr.arpa/127.0.0.1#10053"
+                    "--server=/ip6.arpa/127.0.0.1#10053"
+                  ];
+                  image = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:${version}";
+                  livenessProbe = {
+                    failureThreshold = 5;
+                    httpGet = {
+                      path = "/healthcheck/dnsmasq";
+                      port = 10054;
+                      scheme = "HTTP";
+                    };
+                    initialDelaySeconds = 60;
+                    successThreshold = 1;
+                    timeoutSeconds = 5;
+                  };
+                  name = "dnsmasq";
+                  ports = [
+                    {
+                      containerPort = 53;
+                      name = "dns";
+                      protocol = "UDP";
+                    }
+                    {
+                      containerPort = 53;
+                      name = "dns-tcp";
+                      protocol = "TCP";
+                    }
+                  ];
+                  resources = {
+                    requests = {
+                      cpu = "150m";
+                      memory = "20Mi";
+                    };
+                  };
+                  volumeMounts = [
+                    {
+                      mountPath = "/etc/k8s/dns/dnsmasq-nanny";
+                      name = "kube-dns-config";
+                    }
+                  ];
+                }
+                {
+                  name = "sidecar";
+                  image = "gcr.io/google_containers/k8s-dns-sidecar-amd64:${version}";
+                  args = [
+                    "--v=2"
+                    "--logtostderr"
+                    "--probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.${cfg.clusterDomain},5,A"
+                    "--probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.${cfg.clusterDomain},5,A"
+                  ];
+                  livenessProbe = {
+                    failureThreshold = 5;
+                    httpGet = {
+                      path = "/metrics";
+                      port = 10054;
+                      scheme = "HTTP";
+                    };
+                    initialDelaySeconds = 60;
+                    successThreshold = 1;
+                    timeoutSeconds = 5;
+                  };
+                  ports = [
+                    {
+                      containerPort = 10054;
+                      name = "metrics";
+                      protocol = "TCP";
+                    }
+                  ];
+                  resources = {
+                    requests = {
+                      cpu = "10m";
+                      memory = "20Mi";
+                    };
+                  };
+                }
+              ];
+              dnsPolicy = "Default";
+              serviceAccountName = "kube-dns";
+              tolerations = [
+                {
+                  key = "CriticalAddonsOnly";
+                  operator = "Exists";
+                }
+              ];
+              volumes = [
+                {
+                  configMap = {
+                    name = "kube-dns";
+                    optional = true;
+                  };
+                  name = "kube-dns-config";
+                }
+              ];
+            };
+          };
+        };
+      };
+
+      kubedns-svc = {
+        apiVersion = "v1";
+        kind = "Service";
+        metadata = {
+          labels = {
+            "addonmanager.kubernetes.io/mode" = "Reconcile";
+            "k8s-app" = "kube-dns";
+            "kubernetes.io/cluster-service" = "true";
+            "kubernetes.io/name" = "KubeDNS";
+          };
+          name = "kube-dns";
+          namespace  = "kube-system";
+        };
+        spec = {
+          clusterIP = cfg.clusterIp;
+          ports = [
+            {name = "dns"; port = 53; protocol = "UDP";}
+            {name = "dns-tcp"; port = 53; protocol = "TCP";}
+          ];
+          selector.k8s-app = "kube-dns";
+        };
+      };
+
+      kubedns-sa = {
+        apiVersion = "v1";
+        kind = "ServiceAccount";
+        metadata = {
+          name = "kube-dns";
+          namespace = "kube-system";
+          labels = {
+            "kubernetes.io/cluster-service" = "true";
+            "addonmanager.kubernetes.io/mode" = "Reconcile";
+          };
+        };
+      };
+
+      kubedns-cm = {
+        apiVersion = "v1";
+        kind = "ConfigMap";
+        metadata = {
+          name = "kube-dns";
+          namespace = "kube-system";
+          labels = {
+            "addonmanager.kubernetes.io/mode" = "EnsureExists";
+          };
+        };
+      };
+    };
+
+    services.kubernetes.kubelet.clusterDns = mkDefault cfg.clusterIp;
+  };
+}
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index eeab33309fd..15b711f57b1 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -170,11 +170,16 @@ in
         mkdir -m 0770 -p ${cfg.dataDir}
         if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi
       '';
-      postStart = mkBefore ''
-        until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${if configOptions.http.https-enabled then "-k https" else "http"}://127.0.0.1${toString configOptions.http.bind-address}/ping; do
-          sleep 1;
-        done
-      '';
+      postStart =
+        let
+          scheme = if configOptions.http.https-enabled then "-k https" else "http";
+          bindAddr = (ba: if hasPrefix ":" ba then "127.0.0.1${ba}" else "${ba}")(toString configOptions.http.bind-address);
+        in
+        mkBefore ''
+          until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${scheme}://${bindAddr}/ping; do
+            sleep 1;
+          done
+        '';
     };
 
     users.extraUsers = optional (cfg.user == "influxdb") {
diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
index 6e4c59f4bb3..55ed2d9ee21 100644
--- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
+++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
@@ -34,6 +34,8 @@ with lib;
 
     services.dbus.packages = [ pkgs.at_spi2_core ];
 
+    systemd.packages = [ pkgs.at_spi2_core ];
+
   };
 
 }
diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index 2db2e2fe1c3..86a47488d86 100644
--- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,11 +30,11 @@ in
 
   config = mkIf config.services.gnome3.evolution-data-server.enable {
 
-    environment.systemPackages = [ gnome3.evolution_data_server ];
+    environment.systemPackages = [ pkgs.gnome3.evolution_data_server ];
 
-    services.dbus.packages = [ gnome3.evolution_data_server ];
+    services.dbus.packages = [ pkgs.gnome3.evolution_data_server ];
 
-    systemd.packages = [ gnome3.evolution_data_server ];
+    systemd.packages = [ pkgs.gnome3.evolution_data_server ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-disks.nix b/nixos/modules/services/desktops/gnome3/gnome-disks.nix
index 33c4bc49f98..139534cdb89 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-disks.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-disks.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,9 +30,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-disks.enable {
 
-    environment.systemPackages = [ gnome3.gnome-disk-utility ];
+    environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ];
 
-    services.dbus.packages = [ gnome3.gnome-disk-utility ];
+    services.dbus.packages = [ pkgs.gnome3.gnome-disk-utility ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-documents.nix b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
index 88bbdadfcbd..f6efb668424 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,9 +30,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-documents.enable {
 
-    environment.systemPackages = [ gnome3.gnome-documents ];
+    environment.systemPackages = [ pkgs.gnome3.gnome-documents ];
 
-    services.dbus.packages = [ gnome3.gnome-documents ];
+    services.dbus.packages = [ pkgs.gnome3.gnome-documents ];
 
     services.gnome3.gnome-online-accounts.enable = true;
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
index a36643a1cfb..2a68af5a7dd 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -34,9 +31,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-keyring.enable {
 
-    environment.systemPackages = [ gnome3.gnome_keyring ];
+    environment.systemPackages = [ pkgs.gnome3.gnome_keyring ];
 
-    services.dbus.packages = [ gnome3.gnome_keyring gnome3.gcr ];
+    services.dbus.packages = [ pkgs.gnome3.gnome_keyring pkgs.gnome3.gcr ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
index 82d04c62c70..0da4aca73ec 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,9 +30,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-online-accounts.enable {
 
-    environment.systemPackages = [ gnome3.gnome_online_accounts ];
+    environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ];
 
-    services.dbus.packages = [ gnome3.gnome_online_accounts ];
+    services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
index 6acd633b62c..d406bf6f5e3 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,9 +30,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-online-miners.enable {
 
-    environment.systemPackages = [ gnome3.gnome-online-miners ];
+    environment.systemPackages = [ pkgs.gnome3.gnome-online-miners ];
 
-    services.dbus.packages = [ gnome3.gnome-online-miners ];
+    services.dbus.packages = [ pkgs.gnome3.gnome-online-miners ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
index 384cede679c..3ac767bfa00 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,11 +30,11 @@ in
 
   config = mkIf config.services.gnome3.gnome-terminal-server.enable {
 
-    environment.systemPackages = [ gnome3.gnome_terminal ];
+    environment.systemPackages = [ pkgs.gnome3.gnome_terminal ];
 
-    services.dbus.packages = [ gnome3.gnome_terminal ];
+    services.dbus.packages = [ pkgs.gnome3.gnome_terminal ];
 
-    systemd.packages = [ gnome3.gnome_terminal ];
+    systemd.packages = [ pkgs.gnome3.gnome_terminal ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
index e5c94cff7c8..1f6ce2ae968 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,9 +30,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-user-share.enable {
 
-    environment.systemPackages = [ gnome3.gnome-user-share ];
+    environment.systemPackages = [ pkgs.gnome3.gnome-user-share ];
 
-    services.xserver.displayManager.sessionCommands = with gnome3; ''
+    services.xserver.displayManager.sessionCommands = with pkgs.gnome3; ''
       # Don't let gnome-control-center depend upon gnome-user-share
       export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name}
     '';
diff --git a/nixos/modules/services/desktops/gnome3/gpaste.nix b/nixos/modules/services/desktops/gnome3/gpaste.nix
index 0954cd2713a..5a8258775e0 100644
--- a/nixos/modules/services/desktops/gnome3/gpaste.nix
+++ b/nixos/modules/services/desktops/gnome3/gpaste.nix
@@ -1,11 +1,8 @@
 # GPaste daemon.
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
   ###### interface
   options = {
@@ -22,9 +19,9 @@ in
 
   ###### implementation
   config = mkIf config.services.gnome3.gpaste.enable {
-    environment.systemPackages = [ gnome3.gpaste ];
-    services.dbus.packages = [ gnome3.gpaste ];
-    services.xserver.desktopManager.gnome3.sessionPath = [ gnome3.gpaste ];
-    systemd.packages = [ gnome3.gpaste ];
+    environment.systemPackages = [ pkgs.gnome3.gpaste ];
+    services.dbus.packages = [ pkgs.gnome3.gpaste ];
+    services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ];
+    systemd.packages = [ pkgs.gnome3.gpaste ];
   };
 }
diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix
index 6bbabe8d3c5..4e99d191f18 100644
--- a/nixos/modules/services/desktops/gnome3/gvfs.nix
+++ b/nixos/modules/services/desktops/gnome3/gvfs.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,11 +30,11 @@ in
 
   config = mkIf config.services.gnome3.gvfs.enable {
 
-    environment.systemPackages = [ gnome3.gvfs ];
+    environment.systemPackages = [ pkgs.gnome3.gvfs ];
 
-    services.dbus.packages = [ gnome3.gvfs ];
+    services.dbus.packages = [ pkgs.gnome3.gvfs ];
 
-    systemd.packages = [ gnome3.gvfs ];
+    systemd.packages = [ pkgs.gnome3.gvfs ];
 
     services.udev.packages = [ pkgs.libmtp.bin ];
 
diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix
index 45925aaca9b..e9ad738269e 100644
--- a/nixos/modules/services/desktops/gnome3/seahorse.nix
+++ b/nixos/modules/services/desktops/gnome3/seahorse.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -32,9 +29,9 @@ in
 
   config = mkIf config.services.gnome3.seahorse.enable {
 
-    environment.systemPackages = [ gnome3.seahorse ];
+    environment.systemPackages = [ pkgs.gnome3.seahorse ];
 
-    services.dbus.packages = [ gnome3.seahorse ];
+    services.dbus.packages = [ pkgs.gnome3.seahorse ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixos/modules/services/desktops/gnome3/sushi.nix
index ff7f484602c..7a4389038b2 100644
--- a/nixos/modules/services/desktops/gnome3/sushi.nix
+++ b/nixos/modules/services/desktops/gnome3/sushi.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -32,9 +29,9 @@ in
 
   config = mkIf config.services.gnome3.sushi.enable {
 
-    environment.systemPackages = [ gnome3.sushi ];
+    environment.systemPackages = [ pkgs.gnome3.sushi ];
 
-    services.dbus.packages = [ gnome3.sushi ];
+    services.dbus.packages = [ pkgs.gnome3.sushi ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix
index dcaa60103a3..c061f789049 100644
--- a/nixos/modules/services/desktops/gnome3/tracker.nix
+++ b/nixos/modules/services/desktops/gnome3/tracker.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,11 +30,11 @@ in
 
   config = mkIf config.services.gnome3.tracker.enable {
 
-    environment.systemPackages = [ gnome3.tracker ];
+    environment.systemPackages = [ pkgs.gnome3.tracker ];
 
-    services.dbus.packages = [ gnome3.tracker ];
+    services.dbus.packages = [ pkgs.gnome3.tracker ];
 
-    systemd.packages = [ gnome3.tracker ];
+    systemd.packages = [ pkgs.gnome3.tracker ];
 
   };
 
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index d803a4e0bf1..f395b9558b5 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -41,6 +41,15 @@ in
         '';
       };
 
+      enableGitAnnex = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable git-annex support. Uses the <literal>extraGitoliteRc</literal> option
+          to apply the necessary configuration.
+        '';
+      };
+
       commonHooks = mkOption {
         type = types.listOf types.path;
         default = [];
@@ -75,6 +84,8 @@ in
           will need to take any customizations you may have in
           <literal>~/.gitolite.rc</literal>, convert them to appropriate Perl
           statements, add them to this option, and remove the file.
+
+          See also the <literal>enableGitAnnex</literal> option.
         '';
       };
 
@@ -85,6 +96,14 @@ in
           Gitolite user account. This is the username of the gitolite endpoint.
         '';
       };
+
+      group = mkOption {
+        type = types.str;
+        default = "gitolite";
+        description = ''
+          Primary group of the Gitolite user account.
+        '';
+      };
     };
   };
 
@@ -116,13 +135,20 @@ in
         ''} >>"$out/gitolite.rc"
       '';
   in {
+    services.gitolite.extraGitoliteRc = optionalString cfg.enableGitAnnex ''
+      # Enable git-annex support:
+      push( @{$RC{ENABLE}}, 'git-annex-shell ua');
+    '';
+
     users.extraUsers.${cfg.user} = {
       description     = "Gitolite user";
       home            = cfg.dataDir;
       createHome      = true;
       uid             = config.ids.uids.gitolite;
+      group           = cfg.group;
       useDefaultShell = true;
     };
+    users.extraGroups."${cfg.group}".gid = config.ids.gids.gitolite;
 
     systemd.services."gitolite-init" = {
       description = "Gitolite initialization";
@@ -188,6 +214,7 @@ in
         '';
     };
 
-    environment.systemPackages = [ pkgs.gitolite pkgs.git ];
+    environment.systemPackages = [ pkgs.gitolite pkgs.git ]
+        ++ optional cfg.enableGitAnnex pkgs.gitAndTools.git-annex;
   });
 }
diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix
new file mode 100644
index 00000000000..1c00f3c299e
--- /dev/null
+++ b/nixos/modules/services/monitoring/fusion-inventory.nix
@@ -0,0 +1,66 @@
+# Fusion Inventory daemon.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.fusionInventory;
+
+  configFile = pkgs.writeText "fusion_inventory.conf" ''
+    server = ${concatStringsSep ", " cfg.servers}
+
+    logger = stderr
+
+    ${cfg.extraConfig}
+  '';
+
+in {
+
+  ###### interface
+
+  options = {
+
+    services.fusionInventory = {
+
+      enable = mkEnableOption "Fusion Inventory Agent";
+
+      servers = mkOption {
+        type = types.listOf types.str;
+        description = ''
+          The urls of the OCS/GLPI servers to connect to.
+        '';
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        type = types.lines;
+        description = ''
+          Configuration that is injected verbatim into the configuration file.
+        '';
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton {
+      name = "fusion-inventory";
+      description = "FusionInventory user";
+    };
+
+    systemd.services."fusion-inventory" = {
+      description = "Fusion Inventory Agent";
+      wantedBy = [ "multi-user.target" ];
+
+      environment = {
+        OPTIONS = "--no-category=software";
+      };
+      serviceConfig = {
+        ExecStart = "${pkgs.fusionInventory}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index 7d127145101..1a78f9a76a3 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
@@ -27,6 +27,14 @@ in
           '';
         };
 
+        extraNfsdConfig = mkOption {
+          type = types.str;
+          default = "";
+          description = ''
+            Extra configuration options for the [nfsd] section of /etc/nfs.conf.
+          '';
+        };
+
         exports = mkOption {
           type = types.lines;
           default = "";
@@ -107,6 +115,7 @@ in
       [nfsd]
       threads=${toString cfg.nproc}
       ${optionalString (cfg.hostName != null) "host=${cfg.hostName}"}
+      ${cfg.extraNfsdConfig}
 
       [mountd]
       ${optionalString (cfg.mountdPort != null) "port=${toString cfg.mountdPort}"}
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 9f533eedf6e..763283dfe7a 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -151,15 +151,6 @@ in
         ";
       };
 
-      resolveLocalQueries = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether bind should resolve local queries (i.e. add 127.0.0.1 to
-          /etc/resolv.conf, overriding networking.nameserver).
-        '';
-      };
-
     };
 
   };
diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix
new file mode 100644
index 00000000000..f782be97f6f
--- /dev/null
+++ b/nixos/modules/services/networking/dnscache.nix
@@ -0,0 +1,86 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.dnscache;
+
+  dnscache-root = pkgs.runCommand "dnscache-root" {} ''
+    mkdir -p $out/{servers,ip}
+
+    ${concatMapStrings (ip: ''
+      echo > "$out/ip/"${lib.escapeShellArg ip}
+    '') cfg.clientIps}
+
+    ${concatStrings (mapAttrsToList (host: ips: ''
+      ${concatMapStrings (ip: ''
+        echo ${lib.escapeShellArg ip} > "$out/servers/"${lib.escapeShellArg host}
+      '') ips}
+    '') cfg.domainServers)}
+
+    # djbdns contains an outdated list of root servers;
+    # if one was not provided in config, provide a current list
+    if [ ! -e servers/@ ]; then
+      awk '/^.?.ROOT-SERVERS.NET/ { print $4 }' ${pkgs.dns-root-data}/root.hints > $out/servers/@
+    fi
+  '';
+
+in {
+
+  ###### interface
+
+  options = {
+    services.dnscache = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether to run the dnscache caching dns server";
+      };
+
+      ip = mkOption {
+        default = "0.0.0.0";
+        type = types.str;
+        description = "IP address on which to listen for connections";
+      };
+
+      clientIps = mkOption {
+        default = [ "127.0.0.1" ];
+        type = types.listOf types.str;
+        description = "client IP addresses (or prefixes) from which to accept connections";
+        example = ["192.168" "172.23.75.82"];
+      };
+
+      domainServers = mkOption {
+        default = { };
+        type = types.attrsOf (types.listOf types.str);
+        description = "table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts)";
+        example = {
+          "example.com" = ["8.8.8.8" "8.8.4.4"];
+        };
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf config.services.dnscache.enable {
+    environment.systemPackages = [ pkgs.djbdns ];
+    users.extraUsers.dnscache = {};
+
+    systemd.services.dnscache = {
+      description = "djbdns dnscache server";
+      wantedBy = [ "multi-user.target" ];
+      path = with pkgs; [ bash daemontools djbdns ];
+      preStart = ''
+        rm -rf /var/lib/dnscache
+        dnscache-conf dnscache dnscache /var/lib/dnscache ${config.services.dnscache.ip}
+        rm -rf /var/lib/dnscache/root
+        ln -sf ${dnscache-root} /var/lib/dnscache/root
+      '';
+      script = ''
+        cd /var/lib/dnscache/
+        exec ./run
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 3d1b931de07..fcf5aa5f175 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -42,7 +42,7 @@ in
         default = true;
         description = ''
           Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to
-          /etc/resolv.conf overriding networking.nameservers).
+          /etc/resolv.conf).
         '';
       };
 
diff --git a/nixos/modules/services/networking/fan.nix b/nixos/modules/services/networking/fan.nix
deleted file mode 100644
index 7f4e3647832..00000000000
--- a/nixos/modules/services/networking/fan.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.networking.fan;
-  modprobe = "${pkgs.kmod}/bin/modprobe";
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    networking.fan = {
-
-      enable = mkEnableOption "FAN Networking";
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    environment.systemPackages = [ pkgs.fanctl ];
-
-    systemd.services.fan = {
-      description = "FAN Networking";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network-online.target" ];
-      before = [ "docker.service" ];
-      restartIfChanged = false;
-      preStart = ''
-        if [ ! -f /proc/sys/net/fan/version ]; then
-          ${modprobe} ipip
-          if [ ! -f /proc/sys/net/fan/version ]; then
-            echo "The Fan Networking patches have not been applied to this kernel!" 1>&2
-            exit 1
-          fi
-        fi
-
-        mkdir -p /var/lib/fan-networking
-      '';
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        ExecStart = "${pkgs.fanctl}/bin/fanctl up -a";
-        ExecStop = "${pkgs.fanctl}/bin/fanctl down -a";
-      };
-    };
-
-  };
-
-}
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index 56f2e976cff..391f4bdebba 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -9,7 +9,7 @@ let
   confFile = pkgs.writeText "radicale.conf" cfg.config;
 
   # This enables us to default to version 2 while still not breaking configurations of people with version 1
-  defaultPackage = if versionAtLeast "17.09" config.system.stateVersion then {
+  defaultPackage = if versionAtLeast config.system.stateVersion "17.09" then {
     pkg = pkgs.radicale2;
     text = "pkgs.radicale2";
   } else {
diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix
new file mode 100644
index 00000000000..184888ef05d
--- /dev/null
+++ b/nixos/modules/services/networking/tinydns.nix
@@ -0,0 +1,54 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  ###### interface
+
+  options = {
+    services.tinydns = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether to run the tinydns dns server";
+      };
+
+      data = mkOption {
+        type = types.lines;
+        default = "";
+        description = "The DNS data to serve, in the format described by tinydns-data(8)";
+      };
+
+      ip = mkOption {
+        default = "0.0.0.0";
+        type = types.str;
+        description = "IP address on which to listen for connections";
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf config.services.tinydns.enable {
+    environment.systemPackages = [ pkgs.djbdns ];
+
+    users.extraUsers.tinydns = {};
+
+    systemd.services.tinydns = {
+      description = "djbdns tinydns server";
+      wantedBy = [ "multi-user.target" ];
+      path = with pkgs; [ daemontools djbdns ];
+      preStart = ''
+        rm -rf /var/lib/tinydns
+        tinydns-conf tinydns tinydns /var/lib/tinydns ${config.services.tinydns.ip}
+        cd /var/lib/tinydns/root/
+        ln -sf ${pkgs.writeText "tinydns-data" config.services.tinydns.data} data
+        tinydns-data
+      '';
+      script = ''
+        cd /var/lib/tinydns
+        exec ./run
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 4f54b45639f..eb08e7f90c0 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -95,6 +95,14 @@ let
         type = with types; listOf (submodule peerOpts);
       };
 
+      allowedIPsAsRoutes = mkOption {
+        example = false;
+        default = true;
+        type = types.bool;
+        description = ''
+          Determines whether to add allowed IPs as routes or not.
+        '';
+      };
     };
 
   };
@@ -217,11 +225,11 @@ let
 
             "${ipCommand} link set up dev ${name}"
 
-            (map (peer:
+            (optionals (values.allowedIPsAsRoutes != false) (map (peer:
             (map (allowedIP:
             "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}"
             ) peer.allowedIPs)
-            ) values.peers)
+            ) values.peers))
 
             values.postSetup
           ]);
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index aa0fe4f1479..02695c1c43a 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -83,11 +83,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.27.3";
+    name= "mediawiki-1.29.1";
 
     src = pkgs.fetchurl {
-      url = "http://download.wikimedia.org/mediawiki/1.27/${name}.tar.gz";
-      sha256 = "08x8mvc0y1gwq8rg0zm98wc6hc5j8imb6dcpx6s7392j5dc71m0i";
+      url = "http://download.wikimedia.org/mediawiki/1.29/${name}.tar.gz";
+      sha256 = "03mpazbxvb011s2nmlw5p6dc43yjgl5yrsilmj1imyykm57bwb3m";
     };
 
     skins = config.skins;
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 0abdc27bbfc..ecf0abb1efd 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
   cfg = config.services.xserver.desktopManager.gnome3;
-  gnome3 = config.environment.gnome3.packageSet;
 
   # Remove packages of ys from xs, based on their names
   removePackagesByName = xs: ys:
@@ -28,7 +27,7 @@ let
   nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {}
     ''
      mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
-     cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+     cp -rf ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
 
      ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}
 
@@ -61,7 +60,7 @@ in {
         example = literalExample "[ pkgs.gnome3.gpaste ]";
         description = "Additional list of packages to be added to the session search path.
                        Useful for gnome shell extensions or gsettings-conditionated autostart.";
-        apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ];
+        apply = list: list ++ [ pkgs.gnome3.gnome_shell pkgs.gnome3.gnome-shell-extensions ];
       };
 
       extraGSettingsOverrides = mkOption {
@@ -79,13 +78,6 @@ in {
       debug = mkEnableOption "gnome-session debug messages";
     };
 
-    environment.gnome3.packageSet = mkOption {
-      default = null;
-      example = literalExample "pkgs.gnome3_22";
-      description = "Which GNOME 3 package set to use.";
-      apply = p: if p == null then pkgs.gnome3 else p;
-    };
-
     environment.gnome3.excludePackages = mkOption {
       default = [];
       example = literalExample "[ pkgs.gnome3.totem ]";
@@ -169,26 +161,26 @@ in {
           # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
           ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
 
-          ${gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
+          ${pkgs.gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
           waitPID=$!
         '';
       };
 
     services.xserver.updateDbusEnvironment = true;
 
-    environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib gnome3.dconf}/lib/gio/modules"
-                                                "${gnome3.glib_networking.out}/lib/gio/modules"
-                                                "${gnome3.gvfs}/lib/gio/modules" ];
-    environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath
-      ++ (removePackagesByName gnome3.optionalPackages config.environment.gnome3.excludePackages);
+    environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
+                                                "${pkgs.gnome3.glib_networking.out}/lib/gio/modules"
+                                                "${pkgs.gnome3.gvfs}/lib/gio/modules" ];
+    environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath
+      ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages);
 
     # Use the correct gnome3 packageSet
     networking.networkmanager.basePackages =
       { inherit (pkgs) networkmanager modemmanager wpa_supplicant;
-        inherit (gnome3) networkmanager_openvpn networkmanager_vpnc
-                         networkmanager_openconnect networkmanager_fortisslvpn
-                         networkmanager_pptp networkmanager_iodine
-                         networkmanager_l2tp; };
+        inherit (pkgs.gnome3) networkmanager_openvpn networkmanager_vpnc
+                              networkmanager_openconnect networkmanager_fortisslvpn
+                              networkmanager_pptp networkmanager_iodine
+                              networkmanager_l2tp; };
 
     # Needed for themes and backgrounds
     environment.pathsToLink = [ "/share" ];
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index bd16f221059..b0a3ff1bb75 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -5,8 +5,7 @@ with lib;
 let
 
   cfg = config.services.xserver.displayManager;
-  gnome3 = config.environment.gnome3.packageSet;
-  gdm = gnome3.gdm;
+  gdm = pkgs.gnome3.gdm;
 
 in
 
@@ -103,7 +102,7 @@ in
             (filter (arg: arg != "-terminate") cfg.xserverArgs);
           GDM_SESSIONS_DIR = "${cfg.session.desktops}";
           # Find the mouse
-          XCURSOR_PATH = "~/.icons:${gnome3.adwaita-icon-theme}/share/icons";
+          XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons";
         };
         execCmd = "exec ${gdm}/bin/gdm";
       };
@@ -127,7 +126,7 @@ in
       StandardError = "inherit";
     };
 
-    systemd.services.display-manager.path = [ gnome3.gnome_session ];
+    systemd.services.display-manager.path = [ pkgs.gnome3.gnome_session ];
 
     services.dbus.packages = [ gdm ];
 
@@ -186,7 +185,7 @@ in
         auth     required       pam_env.so envfile=${config.system.build.pamEnvironment}
 
         auth     required       pam_succeed_if.so uid >= 1000 quiet
-        auth     optional       ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
+        auth     optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
         auth     ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
         ${optionalString config.security.pam.enableEcryptfs
           "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@@ -206,7 +205,7 @@ in
           "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
         session  required       pam_loginuid.so
         session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so
-        session  optional       ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
+        session  optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
       '';
 
       gdm-password.text = ''
@@ -214,7 +213,7 @@ in
         auth     required       pam_env.so envfile=${config.system.build.pamEnvironment}
 
         auth     required       pam_succeed_if.so uid >= 1000 quiet
-        auth     optional       ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
+        auth     optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
         auth     ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
         ${optionalString config.security.pam.enableEcryptfs
           "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@@ -233,7 +232,7 @@ in
           "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
         session  required       pam_loginuid.so
         session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so
-        session  optional       ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
+        session  optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
       '';
 
       gdm-autologin.text = ''
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d12d0a06f44..ed1f5d20afb 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -639,11 +639,7 @@ in
         Rules for creating and cleaning up temporary files
         automatically. See
         <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for the exact format. You should not use this option to create
-        files required by systemd services, since there is no
-        guarantee that <command>systemd-tmpfiles</command> runs when
-        the system is reconfigured using
-        <command>nixos-rebuild</command>.
+        for the exact format.
       '';
     };
 
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index b019ddc3a98..fa0abb43c0c 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -56,6 +56,13 @@ in
   };
 
   config = mkIf anyEncrypted {
+    assertions = map (dev: {
+      assertion = dev.label != null;
+      message = ''
+        The filesystem for ${dev.mountPoint} has encrypted.enable set to true, but no encrypted.label set
+      '';
+    }) encDevs;
+
     boot.initrd = {
       luks = {
         devices =
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 145fae432c6..7fee9911532 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -140,6 +140,17 @@ in
           this once.
         '';
       };
+
+      requestEncryptionCredentials = mkOption {
+        type = types.bool;
+        default = config.boot.zfs.enableUnstable;
+        description = ''
+          Request encryption keys or passwords for all encrypted datasets on import.
+
+          Dataset encryption is only supported in zfsUnstable at the moment.
+        '';
+      };
+
     };
 
     services.zfs.autoSnapshot = {
@@ -263,6 +274,10 @@ in
           assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot;
           message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot";
         }
+        {
+          assertion = cfgZfs.requestEncryptionCredentials -> cfgZfs.enableUnstable;
+          message = "This feature is only available for zfs unstable. Set the NixOS option boot.zfs.enableUnstable.";
+        }
       ];
 
       boot = {
@@ -306,6 +321,9 @@ in
             done
             echo
             if [[ -n "$msg" ]]; then echo "$msg"; fi
+            ${lib.optionalString cfgZfs.requestEncryptionCredentials ''
+              zfs load-key -a
+            ''}
         '') rootPools));
       };
 
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index adc048f3ca2..3512296dff4 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -9,6 +9,12 @@ let
   interfaces = attrValues cfg.interfaces;
   hasVirtuals = any (i: i.virtual) interfaces;
 
+  slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds)
+    ++ concatMap (i: i.interfaces) (attrValues cfg.bridges)
+    ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches)
+    ++ concatMap (i: [i.interface]) (attrValues cfg.macvlans)
+    ++ concatMap (i: [i.interface]) (attrValues cfg.vlans);
+
   # We must escape interfaces due to the systemd interpretation
   subsystemDevice = interface:
     "sys-subsystem-net-devices-${escapeSystemdPath interface}.device";
@@ -105,7 +111,7 @@ let
               ''
                 # Set the static DNS configuration, if given.
                 ${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <<EOF
-                ${optionalString (cfg.domain != null) ''
+                ${optionalString (cfg.nameservers != [] && cfg.domain != null) ''
                   domain ${cfg.domain}
                 ''}
                 ${optionalString (cfg.search != []) ("search " + concatStringsSep " " cfg.search)}
@@ -152,7 +158,11 @@ let
           in
           nameValuePair "network-addresses-${i.name}"
           { description = "Address configuration of ${i.name}";
-            wantedBy = [ "network-setup.service" ];
+            wantedBy = [
+              "network-setup.service"
+              "network-link-${i.name}.service"
+              "network.target"
+            ];
             # propagate stop and reload from network-setup
             partOf = [ "network-setup.service" ];
             # order before network-setup because the routes that are configured
@@ -206,7 +216,7 @@ let
             after = [ "dev-net-tun.device" "network-pre.target" ];
             wantedBy = [ "network-setup.service" (subsystemDevice i.name) ];
             partOf = [ "network-setup.service" ];
-            before = [ "network-setup.service" (subsystemDevice i.name) ];
+            before = [ "network-setup.service" ];
             path = [ pkgs.iproute ];
             serviceConfig = {
               Type = "oneshot";
@@ -232,7 +242,7 @@ let
             partOf = [ "network-setup.service" ] ++ optional v.rstp "mstpd.service";
             after = [ "network-pre.target" ] ++ deps ++ optional v.rstp "mstpd.service"
               ++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces;
-            before = [ "network-setup.service" (subsystemDevice n) ];
+            before = [ "network-setup.service" ];
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = true;
             path = [ pkgs.iproute ];
@@ -331,7 +341,7 @@ let
             partOf = [ "network-setup.service" ];
             after = [ "network-pre.target" ] ++ deps
               ++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces;
-            before = [ "network-setup.service" (subsystemDevice n) ];
+            before = [ "network-setup.service" ];
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = true;
             path = [ pkgs.iproute pkgs.gawk ];
@@ -369,7 +379,7 @@ let
             bindsTo = deps;
             partOf = [ "network-setup.service" ];
             after = [ "network-pre.target" ] ++ deps;
-            before = [ "network-setup.service" (subsystemDevice n) ];
+            before = [ "network-setup.service" ];
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = true;
             path = [ pkgs.iproute ];
@@ -394,7 +404,7 @@ let
             bindsTo = deps;
             partOf = [ "network-setup.service" ];
             after = [ "network-pre.target" ] ++ deps;
-            before = [ "network-setup.service" (subsystemDevice n) ];
+            before = [ "network-setup.service" ];
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = true;
             path = [ pkgs.iproute ];
@@ -422,7 +432,7 @@ let
             bindsTo = deps;
             partOf = [ "network-setup.service" ];
             after = [ "network-pre.target" ] ++ deps;
-            before = [ "network-setup.service" (subsystemDevice n) ];
+            before = [ "network-setup.service" ];
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = true;
             path = [ pkgs.iproute ];
@@ -465,5 +475,8 @@ in
   config = mkMerge [
     bondWarnings
     (mkIf (!cfg.useNetworkd) normalConfig)
+    { # Ensure slave interfaces are brought up
+      networking.interfaces = genAttrs slaves (i: {});
+    }
   ];
 }
diff --git a/nixos/release.nix b/nixos/release.nix
index a200535f3f4..ac7755a160f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -271,7 +271,7 @@ in rec {
   tests.kernel-latest = callTest tests/kernel-latest.nix {};
   tests.kernel-lts = callTest tests/kernel-lts.nix {};
   tests.keystone = callTest tests/keystone.nix {};
-  tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
+  tests.kubernetes = hydraJob (import tests/kubernetes/default.nix { system = "x86_64-linux"; });
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
   tests.ldap = callTest tests/ldap.nix {};
   #tests.lightdm = callTest tests/lightdm.nix {};
diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix
deleted file mode 100644
index dcd25e21197..00000000000
--- a/nixos/tests/kubernetes.nix
+++ /dev/null
@@ -1,409 +0,0 @@
-{ system ? builtins.currentSystem }:
-
-with import ../lib/testing.nix { inherit system; };
-with import ../lib/qemu-flags.nix;
-with pkgs.lib;
-
-let
-  redisPod = pkgs.writeText "redis-master-pod.json" (builtins.toJSON {
-    kind = "Pod";
-    apiVersion = "v1";
-    metadata.name = "redis";
-    metadata.labels.name = "redis";
-    spec.containers = [{
-      name = "redis";
-      image = "redis";
-      args = ["--bind" "0.0.0.0"];
-      imagePullPolicy = "Never";
-      ports = [{
-        name = "redis-server";
-        containerPort = 6379;
-      }];
-    }];
-  });
-
-  redisService = pkgs.writeText "redis-service.json" (builtins.toJSON {
-    kind = "Service";
-    apiVersion = "v1";
-    metadata.name = "redis";
-    spec = {
-      ports = [{port = 6379; targetPort = 6379;}];
-      selector = {name = "redis";};
-    };
-  });
-
-  redisImage = pkgs.dockerTools.buildImage {
-    name = "redis";
-    tag = "latest";
-    contents = pkgs.redis;
-    config.Entrypoint = "/bin/redis-server";
-  };
-
-  testSimplePod = ''
-    $kubernetes->execute("docker load < ${redisImage}");
-    $kubernetes->waitUntilSucceeds("kubectl create -f ${redisPod}");
-    $kubernetes->succeed("kubectl create -f ${redisService}");
-    $kubernetes->waitUntilSucceeds("kubectl get pod redis | grep Running");
-    $kubernetes->succeed("nc -z \$\(dig \@10.10.0.1 redis.default.svc.cluster.local +short\) 6379");
-  '';
-in {
-  # This test runs kubernetes on a single node
-  trivial = makeTest {
-    name = "kubernetes-trivial";
-
-    nodes = {
-      kubernetes =
-        { config, pkgs, lib, nodes, ... }:
-          {
-            virtualisation.memorySize = 768;
-            virtualisation.diskSize = 2048;
-
-            programs.bash.enableCompletion = true;
-            environment.systemPackages = with pkgs; [ netcat bind ];
-
-            services.kubernetes.roles = ["master" "node"];
-            virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0";
-
-            networking.bridges.cbr0.interfaces = [];
-            networking.interfaces.cbr0 = {};
-          };
-    };
-
-    testScript = ''
-      startAll;
-
-      $kubernetes->waitUntilSucceeds("kubectl get nodes | grep kubernetes | grep Ready");
-
-      ${testSimplePod}
-    '';
-  };
-
-  cluster = let
-    runWithOpenSSL = file: cmd: pkgs.runCommand file {
-      buildInputs = [ pkgs.openssl ];
-    } cmd;
-
-    ca_key = runWithOpenSSL "ca-key.pem" "openssl genrsa -out $out 2048";
-    ca_pem = runWithOpenSSL "ca.pem" ''
-      openssl req \
-        -x509 -new -nodes -key ${ca_key} \
-        -days 10000 -out $out -subj "/CN=etcd-ca"
-    '';
-    etcd_key = runWithOpenSSL "etcd-key.pem" "openssl genrsa -out $out 2048";
-    etcd_csr = runWithOpenSSL "etcd.csr" ''
-      openssl req \
-        -new -key ${etcd_key} \
-        -out $out -subj "/CN=etcd" \
-        -config ${openssl_cnf}
-    '';
-    etcd_cert = runWithOpenSSL "etcd.pem" ''
-      openssl x509 \
-        -req -in ${etcd_csr} \
-        -CA ${ca_pem} -CAkey ${ca_key} \
-        -CAcreateserial -out $out \
-        -days 365 -extensions v3_req \
-        -extfile ${openssl_cnf}
-    '';
-
-    etcd_client_key = runWithOpenSSL "etcd-client-key.pem"
-      "openssl genrsa -out $out 2048";
-
-    etcd_client_csr = runWithOpenSSL "etcd-client-key.pem" ''
-      openssl req \
-        -new -key ${etcd_client_key} \
-        -out $out -subj "/CN=etcd-client" \
-        -config ${client_openssl_cnf}
-    '';
-
-    etcd_client_cert = runWithOpenSSL "etcd-client.crt" ''
-      openssl x509 \
-        -req -in ${etcd_client_csr} \
-        -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \
-        -out $out -days 365 -extensions v3_req \
-        -extfile ${client_openssl_cnf}
-    '';
-
-    apiserver_key = runWithOpenSSL "apiserver-key.pem" "openssl genrsa -out $out 2048";
-
-    apiserver_csr = runWithOpenSSL "apiserver.csr" ''
-      openssl req \
-        -new -key ${apiserver_key} \
-        -out $out -subj "/CN=kube-apiserver" \
-        -config ${apiserver_cnf}
-    '';
-
-    apiserver_cert = runWithOpenSSL "apiserver.pem" ''
-      openssl x509 \
-        -req -in ${apiserver_csr} \
-        -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \
-        -out $out -days 365 -extensions v3_req \
-        -extfile ${apiserver_cnf}
-    '';
-
-    worker_key = runWithOpenSSL "worker-key.pem" "openssl genrsa -out $out 2048";
-
-    worker_csr = runWithOpenSSL "worker.csr" ''
-      openssl req \
-        -new -key ${worker_key} \
-        -out $out -subj "/CN=kube-worker" \
-        -config ${worker_cnf}
-    '';
-
-    worker_cert = runWithOpenSSL "worker.pem" ''
-      openssl x509 \
-        -req -in ${worker_csr} \
-        -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \
-        -out $out -days 365 -extensions v3_req \
-        -extfile ${worker_cnf}
-    '';
-
-    openssl_cnf = pkgs.writeText "openssl.cnf" ''
-      [req]
-      req_extensions = v3_req
-      distinguished_name = req_distinguished_name
-      [req_distinguished_name]
-      [ v3_req ]
-      basicConstraints = CA:FALSE
-      keyUsage = digitalSignature, keyEncipherment
-      extendedKeyUsage = serverAuth
-      subjectAltName = @alt_names
-      [alt_names]
-      DNS.1 = etcd1
-      DNS.2 = etcd2
-      DNS.3 = etcd3
-      IP.1 = 127.0.0.1
-    '';
-
-    client_openssl_cnf = pkgs.writeText "client-openssl.cnf" ''
-      [req]
-      req_extensions = v3_req
-      distinguished_name = req_distinguished_name
-      [req_distinguished_name]
-      [ v3_req ]
-      basicConstraints = CA:FALSE
-      keyUsage = digitalSignature, keyEncipherment
-      extendedKeyUsage = clientAuth
-    '';
-
-    apiserver_cnf = pkgs.writeText "apiserver-openssl.cnf" ''
-      [req]
-      req_extensions = v3_req
-      distinguished_name = req_distinguished_name
-      [req_distinguished_name]
-      [ v3_req ]
-      basicConstraints = CA:FALSE
-      keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-      subjectAltName = @alt_names
-      [alt_names]
-      DNS.1 = kubernetes
-      DNS.2 = kubernetes.default
-      DNS.3 = kubernetes.default.svc
-      DNS.4 = kubernetes.default.svc.cluster.local
-      IP.1 = 10.10.10.1
-    '';
-
-    worker_cnf = pkgs.writeText "worker-openssl.cnf" ''
-      [req]
-      req_extensions = v3_req
-      distinguished_name = req_distinguished_name
-      [req_distinguished_name]
-      [ v3_req ]
-      basicConstraints = CA:FALSE
-      keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-      subjectAltName = @alt_names
-      [alt_names]
-      DNS.1 = kubeWorker1
-      DNS.2 = kubeWorker2
-    '';
-
-    etcdNodeConfig = {
-      virtualisation.memorySize = 128;
-
-      services = {
-        etcd = {
-          enable = true;
-          keyFile = etcd_key;
-          certFile = etcd_cert;
-          trustedCaFile = ca_pem;
-          peerClientCertAuth = true;
-          listenClientUrls = ["https://0.0.0.0:2379"];
-          listenPeerUrls = ["https://0.0.0.0:2380"];
-        };
-      };
-
-      environment.variables = {
-        ETCDCTL_CERT_FILE = "${etcd_client_cert}";
-        ETCDCTL_KEY_FILE = "${etcd_client_key}";
-        ETCDCTL_CA_FILE = "${ca_pem}";
-        ETCDCTL_PEERS = "https://127.0.0.1:2379";
-      };
-
-      networking.firewall.allowedTCPPorts = [ 2379 2380 ];
-    };
-
-    kubeConfig = {
-      virtualisation.diskSize = 2048;
-      programs.bash.enableCompletion = true;
-
-      services.flannel = {
-        enable = true;
-        network = "10.10.0.0/16";
-        iface = "eth1";
-        etcd = {
-          endpoints = ["https://etcd1:2379" "https://etcd2:2379" "https://etcd3:2379"];
-          keyFile = etcd_client_key;
-          certFile = etcd_client_cert;
-          caFile = ca_pem;
-        };
-      };
-
-      # vxlan
-      networking.firewall.allowedUDPPorts = [ 8472 ];
-
-      systemd.services.docker.after = ["flannel.service"];
-      systemd.services.docker.serviceConfig.EnvironmentFile = "/run/flannel/subnet.env";
-      virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false --bip $FLANNEL_SUBNET";
-
-      services.kubernetes.verbose = true;
-      services.kubernetes.etcd = {
-        servers = ["https://etcd1:2379" "https://etcd2:2379" "https://etcd3:2379"];
-        keyFile = etcd_client_key;
-        certFile = etcd_client_cert;
-        caFile = ca_pem;
-      };
-
-      environment.systemPackages = [ pkgs.bind pkgs.tcpdump pkgs.utillinux ];
-    };
-
-    kubeMasterConfig = {pkgs, ...}: {
-      require = [kubeConfig];
-
-      # kube apiserver
-      networking.firewall.allowedTCPPorts = [ 443 ];
-
-      virtualisation.memorySize = 512;
-
-      services.kubernetes = {
-        roles = ["master"];
-        scheduler.leaderElect = true;
-        controllerManager.leaderElect = true;
-
-        apiserver = {
-          publicAddress = "0.0.0.0";
-          advertiseAddress = "192.168.1.8";
-          tlsKeyFile = apiserver_key;
-          tlsCertFile = apiserver_cert;
-          clientCaFile = ca_pem;
-          kubeletClientCaFile = ca_pem;
-          kubeletClientKeyFile = worker_key;
-          kubeletClientCertFile = worker_cert;
-        };
-      };
-    };
-
-    kubeWorkerConfig = { pkgs, ... }: {
-      require = [kubeConfig];
-
-      virtualisation.memorySize = 512;
-
-      # kubelet
-      networking.firewall.allowedTCPPorts = [ 10250 ];
-
-      services.kubernetes = {
-        roles = ["node"];
-        kubeconfig = {
-          server = "https://kubernetes:443";
-          caFile = ca_pem;
-          certFile = worker_cert;
-          keyFile = worker_key;
-        };
-        kubelet = {
-          tlsKeyFile = worker_key;
-          tlsCertFile = worker_cert;
-        };
-      };
-    };
-  in makeTest {
-    name = "kubernetes-cluster";
-
-    nodes = {
-      etcd1 = { config, pkgs, nodes, ... }: {
-        require = [etcdNodeConfig];
-        services.etcd = {
-          advertiseClientUrls = ["https://etcd1:2379"];
-          initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"];
-          initialAdvertisePeerUrls = ["https://etcd1:2380"];
-        };
-      };
-
-      etcd2 = { config, pkgs, ... }: {
-        require = [etcdNodeConfig];
-        services.etcd = {
-          advertiseClientUrls = ["https://etcd2:2379"];
-          initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"];
-          initialAdvertisePeerUrls = ["https://etcd2:2380"];
-        };
-      };
-
-      etcd3 = { config, pkgs, ... }: {
-        require = [etcdNodeConfig];
-        services.etcd = {
-          advertiseClientUrls = ["https://etcd3:2379"];
-          initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"];
-          initialAdvertisePeerUrls = ["https://etcd3:2380"];
-        };
-      };
-
-      kubeMaster1 = { config, pkgs, lib, nodes, ... }: {
-        require = [kubeMasterConfig];
-      };
-
-      kubeMaster2 = { config, pkgs, lib, nodes, ... }: {
-        require = [kubeMasterConfig];
-      };
-
-      # Kubernetes TCP load balancer
-      kubernetes = { config, pkgs, ... }: {
-        # kubernetes
-        networking.firewall.allowedTCPPorts = [ 443 ];
-
-        services.haproxy.enable = true;
-        services.haproxy.config = ''
-          global
-              log 127.0.0.1 local0 notice
-              user haproxy
-              group haproxy
-
-          defaults
-              log global
-              retries 2
-              timeout connect 3000
-              timeout server 5000
-              timeout client 5000
-
-          listen kubernetes
-              bind 0.0.0.0:443
-              mode tcp
-              option ssl-hello-chk
-              balance roundrobin
-              server kube-master-1 kubeMaster1:443 check
-              server kube-master-2 kubeMaster2:443 check
-        '';
-      };
-
-      kubeWorker1 = { config, pkgs, lib, nodes, ... }: {
-        require = [kubeWorkerConfig];
-      };
-
-      kubeWorker2 = { config, pkgs, lib, nodes, ... }: {
-        require = [kubeWorkerConfig];
-      };
-    };
-
-    testScript = ''
-      startAll;
-
-      ${testSimplePod}
-    '';
-  };
-}
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix
new file mode 100644
index 00000000000..acf2e025081
--- /dev/null
+++ b/nixos/tests/kubernetes/base.nix
@@ -0,0 +1,113 @@
+{ system ? builtins.currentSystem }:
+
+with import ../../lib/testing.nix { inherit system; };
+with import ../../lib/qemu-flags.nix;
+with pkgs.lib;
+
+let
+  mkKubernetesBaseTest =
+    { name, domain ? "my.zyx", test, machines
+    , pkgs ? import <nixpkgs> { inherit system; }
+    , certs ? import ./certs.nix { inherit pkgs; externalDomain = domain; }
+    , extraConfiguration ? null }:
+    let
+      masterName = head (filter (machineName: any (role: role == "master") machines.${machineName}.roles) (attrNames machines));
+      master = machines.${masterName};
+      extraHosts = ''
+        ${master.ip}  etcd.${domain}
+        ${master.ip}  api.${domain}
+        ${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip}  ${machineName}.${domain}") (attrNames machines)}
+      '';
+    in makeTest {
+      inherit name;
+
+      nodes = mapAttrs (machineName: machine:
+        { config, pkgs, lib, nodes, ... }:
+          mkMerge [
+            {
+              virtualisation.memorySize = mkDefault 768;
+              virtualisation.diskSize = mkDefault 4096;
+              networking = {
+                inherit domain extraHosts;
+                primaryIPAddress = mkForce machine.ip;
+
+                firewall = {
+                  allowedTCPPorts = [
+                    10250 # kubelet
+                  ];
+                  trustedInterfaces = ["docker0"];
+
+                  extraCommands = concatMapStrings  (node: ''
+                    iptables -A INPUT -s ${node.config.networking.primaryIPAddress} -j ACCEPT
+                  '') (attrValues nodes);
+                };
+              };
+              programs.bash.enableCompletion = true;
+              environment.variables = {
+                ETCDCTL_CERT_FILE = "${certs.worker}/etcd-client.pem";
+                ETCDCTL_KEY_FILE = "${certs.worker}/etcd-client-key.pem";
+                ETCDCTL_CA_FILE = "${certs.worker}/ca.pem";
+                ETCDCTL_PEERS = "https://etcd.${domain}:2379";
+              };
+              services.flannel.iface = "eth1";
+              services.kubernetes.apiserver.advertiseAddress = master.ip;
+            }
+            (optionalAttrs (any (role: role == "master") machine.roles) {
+              networking.firewall.allowedTCPPorts = [
+                2379 2380  # etcd
+                443 # kubernetes apiserver
+              ];
+              services.etcd = {
+                enable = true;
+                certFile = "${certs.master}/etcd.pem";
+                keyFile = "${certs.master}/etcd-key.pem";
+                trustedCaFile = "${certs.master}/ca.pem";
+                peerClientCertAuth = true;
+                listenClientUrls = ["https://0.0.0.0:2379"];
+                listenPeerUrls = ["https://0.0.0.0:2380"];
+                advertiseClientUrls = ["https://etcd.${config.networking.domain}:2379"];
+                initialCluster = ["${masterName}=https://etcd.${config.networking.domain}:2380"];
+                initialAdvertisePeerUrls = ["https://etcd.${config.networking.domain}:2380"];
+              };
+            })
+            (import ./kubernetes-common.nix { inherit (machine) roles; inherit pkgs config certs; })
+            (optionalAttrs (machine ? "extraConfiguration") (machine.extraConfiguration { inherit config pkgs lib nodes; }))
+            (optionalAttrs (extraConfiguration != null) (extraConfiguration { inherit config pkgs lib nodes; }))
+          ]
+      ) machines;
+
+      testScript = ''
+        startAll;
+
+        ${test}
+      '';
+    };
+
+  mkKubernetesMultiNodeTest = attrs: mkKubernetesBaseTest ({
+    machines = {
+      machine1 = {
+        roles = ["master"];
+        ip = "192.168.1.1";
+      };
+      machine2 = {
+        roles = ["node"];
+        ip = "192.168.1.2";
+      };
+    };
+  } // attrs // {
+    name = "kubernetes-${attrs.name}-multinode";
+  });
+
+  mkKubernetesSingleNodeTest = attrs: mkKubernetesBaseTest ({
+    machines = {
+      machine1 = {
+        roles = ["master" "node"];
+        ip = "192.168.1.1";
+      };
+    };
+  } // attrs // {
+    name = "kubernetes-${attrs.name}-singlenode";
+  });
+in {
+  inherit mkKubernetesBaseTest mkKubernetesSingleNodeTest mkKubernetesMultiNodeTest;
+}
diff --git a/nixos/tests/kubernetes/certs.nix b/nixos/tests/kubernetes/certs.nix
new file mode 100644
index 00000000000..f108e35b98c
--- /dev/null
+++ b/nixos/tests/kubernetes/certs.nix
@@ -0,0 +1,185 @@
+{
+  pkgs ? import <nixpkgs> {},
+  internalDomain ? "cloud.yourdomain.net",
+  externalDomain ? "myawesomecluster.cluster.yourdomain.net",
+  serviceClusterIp ? "10.0.0.1"
+}:
+let
+  runWithCFSSL = name: cmd:
+    builtins.fromJSON (builtins.readFile (
+      pkgs.runCommand "${name}-cfss.json" {
+        buildInputs = [ pkgs.cfssl ];
+      } "cfssl ${cmd} > $out"
+    ));
+
+  writeCFSSL = content:
+    pkgs.runCommand content.name {
+      buildInputs = [ pkgs.cfssl ];
+    } ''
+      mkdir -p $out
+      cd $out
+      cat ${writeFile content} | cfssljson -bare ${content.name}
+    '';
+
+  noCSR = content: pkgs.lib.filterAttrs (n: v: n != "csr") content;
+  noKey = content: pkgs.lib.filterAttrs (n: v: n != "key") content;
+
+  writeFile = content: pkgs.writeText "content" (
+    if pkgs.lib.isAttrs content then builtins.toJSON content
+    else toString content
+  );
+
+  createServingCertKey = { ca, cn, hosts? [], size ? 2048, name ? cn }:
+    noCSR (
+      (runWithCFSSL name "gencert -ca=${writeFile ca.cert} -ca-key=${writeFile ca.key} -profile=server -config=${writeFile ca.config} ${writeFile {
+        CN = cn;
+        hosts = hosts;
+        key = { algo = "rsa"; inherit size; };
+      }}") // { inherit name; }
+    );
+
+  createClientCertKey = { ca, cn, groups ? [], size ? 2048, name ? cn }:
+    noCSR (
+      (runWithCFSSL name "gencert -ca=${writeFile ca.cert} -ca-key=${writeFile ca.key} -profile=client -config=${writeFile ca.config} ${writeFile {
+        CN = cn;
+        names = map (group: {O = group;}) groups;
+        hosts = [""];
+        key = { algo = "rsa"; inherit size; };
+      }}") // { inherit name; }
+    );
+
+  createSigningCertKey = { C ? "xx", ST ? "x", L ? "x", O ? "x", OU ? "x", CN ? "ca", emailAddress ? "x", expiry ? "43800h", size ? 2048, name ? CN }:
+    (noCSR (runWithCFSSL CN "genkey -initca ${writeFile {
+      key = { algo = "rsa"; inherit size; };
+      names = [{ inherit C ST L O OU CN emailAddress; }];
+    }}")) // {
+      inherit name;
+      config.signing = {
+        default.expiry = expiry;
+        profiles = {
+          server = {
+            inherit expiry;
+            usages = [
+              "signing"
+              "key encipherment"
+              "server auth"
+            ];
+          };
+          client = {
+            inherit expiry;
+            usages = [
+              "signing"
+              "key encipherment"
+              "client auth"
+            ];
+          };
+          peer = {
+            inherit expiry;
+            usages = [
+              "signing"
+              "key encipherment"
+              "server auth"
+              "client auth"
+            ];
+          };
+        };
+      };
+    };
+
+  ca = createSigningCertKey {};
+
+  kube-apiserver = createServingCertKey {
+    inherit ca;
+    cn = "kube-apiserver";
+    hosts = ["kubernetes.default" "kubernetes.default.svc" "localhost" "api.${externalDomain}" serviceClusterIp];
+  };
+
+  kubelet = createServingCertKey {
+    inherit ca;
+    cn = "kubelet";
+    hosts = ["*.${externalDomain}"];
+  };
+
+  service-accounts = createServingCertKey {
+    inherit ca;
+    cn = "kube-service-accounts";
+  };
+
+  etcd = createServingCertKey {
+    inherit ca;
+    cn = "etcd";
+    hosts = ["etcd.${externalDomain}"];
+  };
+
+  etcd-client = createClientCertKey {
+    inherit ca;
+    cn = "etcd-client";
+  };
+
+  kubelet-client = createClientCertKey {
+    inherit ca;
+    cn = "kubelet-client";
+    groups = ["system:masters"];
+  };
+
+  apiserver-client = {
+    kubelet = createClientCertKey {
+      inherit ca;
+      cn = "apiserver-client-kubelet";
+      groups = ["system:nodes"];
+    };
+
+    kube-proxy = createClientCertKey {
+      inherit ca;
+      name = "apiserver-client-kube-proxy";
+      cn = "system:kube-proxy";
+      groups = ["system:kube-proxy" "system:nodes"];
+    };
+
+    kube-controller-manager = createClientCertKey {
+      inherit ca;
+      name = "apiserver-client-kube-controller-manager";
+      cn = "system:kube-controller-manager";
+      groups = ["system:masters"];
+    };
+
+    kube-scheduler = createClientCertKey {
+      inherit ca;
+      name = "apiserver-client-kube-scheduler";
+      cn = "system:kube-scheduler";
+      groups = ["system:kube-scheduler"];
+    };
+
+    admin = createClientCertKey {
+      inherit ca;
+      cn = "admin";
+      groups = ["system:masters"];
+    };
+  };
+in {
+  master = pkgs.buildEnv {
+    name = "master-keys";
+    paths = [
+      (writeCFSSL (noKey ca))
+      (writeCFSSL kube-apiserver)
+      (writeCFSSL kubelet-client)
+      (writeCFSSL apiserver-client.kube-controller-manager)
+      (writeCFSSL apiserver-client.kube-scheduler)
+      (writeCFSSL service-accounts)
+      (writeCFSSL etcd)
+    ];
+  };
+
+  worker = pkgs.buildEnv {
+    name = "worker-keys";
+    paths = [
+      (writeCFSSL (noKey ca))
+      (writeCFSSL kubelet)
+      (writeCFSSL apiserver-client.kubelet)
+      (writeCFSSL apiserver-client.kube-proxy)
+      (writeCFSSL etcd-client)
+    ];
+  };
+
+  admin = writeCFSSL apiserver-client.admin;
+}
diff --git a/nixos/tests/kubernetes/default.nix b/nixos/tests/kubernetes/default.nix
new file mode 100644
index 00000000000..a801759bf58
--- /dev/null
+++ b/nixos/tests/kubernetes/default.nix
@@ -0,0 +1,7 @@
+{ system ? builtins.currentSystem }:
+{
+  dns = import ./dns.nix { inherit system; };
+  # e2e = import ./e2e.nix { inherit system; };  # TODO: make it pass
+  # the following test(s) can be removed when e2e is working:
+  rbac = import ./rbac.nix { inherit system; };
+}
diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix
new file mode 100644
index 00000000000..74d98dabec8
--- /dev/null
+++ b/nixos/tests/kubernetes/dns.nix
@@ -0,0 +1,127 @@
+{ system ? builtins.currentSystem, pkgs ? import <nixpkgs> { inherit system; } }:
+with import ./base.nix { inherit system; };
+let
+  domain = "my.zyx";
+
+  certs = import ./certs.nix { externalDomain = domain; };
+
+  redisPod = pkgs.writeText "redis-pod.json" (builtins.toJSON {
+    kind = "Pod";
+    apiVersion = "v1";
+    metadata.name = "redis";
+    metadata.labels.name = "redis";
+    spec.containers = [{
+      name = "redis";
+      image = "redis";
+      args = ["--bind" "0.0.0.0"];
+      imagePullPolicy = "Never";
+      ports = [{
+        name = "redis-server";
+        containerPort = 6379;
+      }];
+    }];
+  });
+
+  redisService = pkgs.writeText "redis-service.json" (builtins.toJSON {
+    kind = "Service";
+    apiVersion = "v1";
+    metadata.name = "redis";
+    spec = {
+      ports = [{port = 6379; targetPort = 6379;}];
+      selector = {name = "redis";};
+    };
+  });
+
+  redisImage = pkgs.dockerTools.buildImage {
+    name = "redis";
+    tag = "latest";
+    contents = [ pkgs.redis pkgs.bind.host ];
+    config.Entrypoint = "/bin/redis-server";
+  };
+
+  probePod = pkgs.writeText "probe-pod.json" (builtins.toJSON {
+    kind = "Pod";
+    apiVersion = "v1";
+    metadata.name = "probe";
+    metadata.labels.name = "probe";
+    spec.containers = [{
+      name = "probe";
+      image = "probe";
+      args = [ "-f" ];
+      tty = true;
+      imagePullPolicy = "Never";
+    }];
+  });
+
+  probeImage = pkgs.dockerTools.buildImage {
+    name = "probe";
+    tag = "latest";
+    contents = [ pkgs.bind.host pkgs.busybox ];
+    config.Entrypoint = "/bin/tail";
+  };
+
+  extraConfiguration = { config, pkgs, lib, nodes, ... }: {
+    environment.systemPackages = [ pkgs.bind.host ];
+    # virtualisation.docker.extraOptions = "--dns=${config.services.kubernetes.addons.dns.clusterIp}";
+    services.dnsmasq.enable = true;
+    services.dnsmasq.servers = [
+      "/cluster.local/${config.services.kubernetes.addons.dns.clusterIp}#53"
+    ];
+  };
+
+  base = {
+    name = "dns";
+    inherit domain certs extraConfiguration;
+  };
+
+  singleNodeTest = {
+    test = ''
+      # prepare machine1 for test
+      $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready");
+      $machine1->execute("docker load < ${redisImage}");
+      $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}");
+      $machine1->waitUntilSucceeds("kubectl create -f ${redisService}");
+      $machine1->execute("docker load < ${probeImage}");
+      $machine1->waitUntilSucceeds("kubectl create -f ${probePod}");
+
+      # check if pods are running
+      $machine1->waitUntilSucceeds("kubectl get pod redis | grep Running");
+      $machine1->waitUntilSucceeds("kubectl get pod probe | grep Running");
+      $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'kube-dns.*3/3'");
+
+      # check dns on host (dnsmasq)
+      $machine1->succeed("host redis.default.svc.cluster.local");
+
+      # check dns inside the container
+      $machine1->succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local");
+    '';
+  };
+
+  multiNodeTest = {
+    test = ''
+      # prepare machines for test
+      $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready");
+      $machine1->waitUntilSucceeds("kubectl get node machine2.${domain} | grep -w Ready");
+      $machine2->execute("docker load < ${redisImage}");
+      $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}");
+      $machine1->waitUntilSucceeds("kubectl create -f ${redisService}");
+      $machine2->execute("docker load < ${probeImage}");
+      $machine1->waitUntilSucceeds("kubectl create -f ${probePod}");
+
+      # check if pods are running
+      $machine1->waitUntilSucceeds("kubectl get pod redis | grep Running");
+      $machine1->waitUntilSucceeds("kubectl get pod probe | grep Running");
+      $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'kube-dns.*3/3'");
+
+      # check dns on hosts (dnsmasq)
+      $machine1->succeed("host redis.default.svc.cluster.local");
+      $machine2->succeed("host redis.default.svc.cluster.local");
+
+      # check dns inside the container
+      $machine1->succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local");
+    '';
+  };
+in {
+  singlenode = mkKubernetesSingleNodeTest (base // singleNodeTest);
+  multinode = mkKubernetesMultiNodeTest (base // multiNodeTest);
+}
diff --git a/nixos/tests/kubernetes/e2e.nix b/nixos/tests/kubernetes/e2e.nix
new file mode 100644
index 00000000000..d9d7ba9bb2c
--- /dev/null
+++ b/nixos/tests/kubernetes/e2e.nix
@@ -0,0 +1,40 @@
+{ system ? builtins.currentSystem, pkgs ? import <nixpkgs> { inherit system; } }:
+with import ./base.nix { inherit system; };
+let
+  domain = "my.zyx";
+  certs = import ./certs.nix { externalDomain = domain; };
+  kubeconfig = pkgs.writeText "kubeconfig.json" (builtins.toJSON {
+    apiVersion = "v1";
+    kind = "Config";
+    clusters = [{
+      name = "local";
+      cluster.certificate-authority = "${certs.master}/ca.pem";
+      cluster.server = "https://api.${domain}";
+    }];
+    users = [{
+      name = "kubelet";
+      user = {
+        client-certificate = "${certs.admin}/admin.pem";
+        client-key = "${certs.admin}/admin-key.pem";
+      };
+    }];
+    contexts = [{
+      context = {
+        cluster = "local";
+        user = "kubelet";
+      };
+      current-context = "kubelet-context";
+    }];
+  });
+
+  base = {
+    name = "e2e";
+    inherit domain certs;
+    test = ''
+      $machine1->succeed("e2e.test -kubeconfig ${kubeconfig} -provider local -ginkgo.focus '\\[Conformance\\]' -ginkgo.skip '\\[Flaky\\]|\\[Serial\\]'");
+    '';
+  };
+in {
+  singlenode = mkKubernetesSingleNodeTest base;
+  multinode = mkKubernetesMultiNodeTest base;
+}
diff --git a/nixos/tests/kubernetes/kubernetes-common.nix b/nixos/tests/kubernetes/kubernetes-common.nix
new file mode 100644
index 00000000000..00a5c9aba4e
--- /dev/null
+++ b/nixos/tests/kubernetes/kubernetes-common.nix
@@ -0,0 +1,59 @@
+{ roles, config, pkgs, certs }:
+with pkgs.lib;
+let
+  base = {
+    inherit roles;
+    featureGates = ["AllAlpha"];
+    flannel.enable = true;
+    addons.dashboard.enable = true;
+    verbose = true;
+
+    caFile = "${certs.master}/ca.pem";
+    apiserver = {
+      tlsCertFile = "${certs.master}/kube-apiserver.pem";
+      tlsKeyFile = "${certs.master}/kube-apiserver-key.pem";
+      kubeletClientCertFile = "${certs.master}/kubelet-client.pem";
+      kubeletClientKeyFile = "${certs.master}/kubelet-client-key.pem";
+      serviceAccountKeyFile = "${certs.master}/kube-service-accounts.pem";
+    };
+    etcd = {
+      servers = ["https://etcd.${config.networking.domain}:2379"];
+      certFile = "${certs.worker}/etcd-client.pem";
+      keyFile = "${certs.worker}/etcd-client-key.pem";
+    };
+    kubeconfig = {
+      server = "https://api.${config.networking.domain}";
+    };
+    kubelet = {
+      tlsCertFile = "${certs.worker}/kubelet.pem";
+      tlsKeyFile = "${certs.worker}/kubelet-key.pem";
+      hostname = "${config.networking.hostName}.${config.networking.domain}";
+      kubeconfig = {
+        certFile = "${certs.worker}/apiserver-client-kubelet.pem";
+        keyFile = "${certs.worker}/apiserver-client-kubelet-key.pem";
+      };
+    };
+    controllerManager = {
+      serviceAccountKeyFile = "${certs.master}/kube-service-accounts-key.pem";
+      kubeconfig = {
+        certFile = "${certs.master}/apiserver-client-kube-controller-manager.pem";
+        keyFile = "${certs.master}/apiserver-client-kube-controller-manager-key.pem";
+      };
+    };
+    scheduler = {
+      kubeconfig = {
+        certFile = "${certs.master}/apiserver-client-kube-scheduler.pem";
+        keyFile = "${certs.master}/apiserver-client-kube-scheduler-key.pem";
+      };
+    };
+    proxy = {
+      kubeconfig = {
+        certFile = "${certs.worker}/apiserver-client-kube-proxy.pem";
+        keyFile = "${certs.worker}//apiserver-client-kube-proxy-key.pem";
+      };
+    };
+  };
+
+in {
+  services.kubernetes = base;
+}
diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix
new file mode 100644
index 00000000000..1966fed3a5f
--- /dev/null
+++ b/nixos/tests/kubernetes/rbac.nix
@@ -0,0 +1,137 @@
+{ system ? builtins.currentSystem, pkgs ? import <nixpkgs> { inherit system; } }:
+with import ./base.nix { inherit system; };
+let
+
+  roServiceAccount = pkgs.writeText "ro-service-account.json" (builtins.toJSON {
+    kind = "ServiceAccount";
+    apiVersion = "v1";
+    metadata = {
+      name = "read-only";
+      namespace = "default";
+    };
+  });
+
+  roRoleBinding = pkgs.writeText "ro-role-binding.json" (builtins.toJSON {
+    apiVersion = "rbac.authorization.k8s.io/v1beta1";
+    kind = "RoleBinding";
+    metadata = {
+      name = "read-pods";
+      namespace = "default";
+    };
+    roleRef = {
+      apiGroup = "rbac.authorization.k8s.io";
+      kind = "Role";
+      name = "pod-reader";
+    };
+    subjects = [{
+      kind = "ServiceAccount";
+      name = "read-only";
+      namespace = "default";
+    }];
+  });
+
+  roRole = pkgs.writeText "ro-role.json" (builtins.toJSON {
+    apiVersion = "rbac.authorization.k8s.io/v1beta1";
+    kind = "Role";
+    metadata = {
+      name = "pod-reader";
+      namespace = "default";
+    };
+    rules = [{
+      apiGroups = [""];
+      resources = ["pods"];
+      verbs = ["get" "list" "watch"];
+    }];
+  });
+
+  kubectlPod = pkgs.writeText "kubectl-pod.json" (builtins.toJSON {
+    kind = "Pod";
+    apiVersion = "v1";
+    metadata.name = "kubectl";
+    metadata.namespace = "default";
+    metadata.labels.name = "kubectl";
+    spec.serviceAccountName = "read-only";
+    spec.containers = [{
+      name = "kubectl";
+      image = "kubectl:latest";
+      command = ["/bin/tail" "-f"];
+      imagePullPolicy = "Never";
+      tty = true;
+    }];
+  });
+
+  kubectlPod2 = pkgs.writeTextDir "kubectl-pod-2.json" (builtins.toJSON {
+    kind = "Pod";
+    apiVersion = "v1";
+    metadata.name = "kubectl-2";
+    metadata.namespace = "default";
+    metadata.labels.name = "kubectl-2";
+    spec.serviceAccountName = "read-only";
+    spec.containers = [{
+      name = "kubectl-2";
+      image = "kubectl:latest";
+      command = ["/bin/tail" "-f"];
+      imagePullPolicy = "Never";
+      tty = true;
+    }];
+  });
+
+  kubectl = pkgs.runCommand "copy-kubectl" { buildInputs = [ pkgs.kubernetes ]; } ''
+    mkdir -p $out/bin
+    cp ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl
+  '';
+
+  kubectlImage = pkgs.dockerTools.buildImage {
+    name = "kubectl";
+    tag = "latest";
+    contents = [ kubectl pkgs.busybox kubectlPod2 ];
+    config.Entrypoint = "/bin/sh";
+  };
+
+  base = {
+    name = "rbac";
+  };
+
+  singlenode = base // {
+    test = ''
+      $machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready");
+
+      $machine1->execute("docker load < ${kubectlImage}");
+
+      $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}");
+      $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}");
+      $machine1->waitUntilSucceeds("kubectl apply -f ${roRoleBinding}");
+      $machine1->waitUntilSucceeds("kubectl create -f ${kubectlPod}");
+
+      $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running");
+
+      $machine1->succeed("kubectl exec -ti kubectl -- kubectl get pods");
+      $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json");
+      $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl");
+    '';
+  };
+
+  multinode = base // {
+    test = ''
+      $machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready");
+      $machine1->waitUntilSucceeds("kubectl get node machine2.my.zyx | grep -w Ready");
+
+      $machine2->execute("docker load < ${kubectlImage}");
+
+      $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}");
+      $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}");
+      $machine1->waitUntilSucceeds("kubectl apply -f ${roRoleBinding}");
+      $machine1->waitUntilSucceeds("kubectl create -f ${kubectlPod}");
+
+      $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running");
+
+      $machine1->succeed("kubectl exec -ti kubectl -- kubectl get pods");
+      $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json");
+      $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl");
+    '';
+  };
+
+in {
+  singlenode = mkKubernetesSingleNodeTest singlenode;
+  multinode = mkKubernetesMultiNodeTest multinode;
+}
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index 2c888469d0a..f694fc75ef7 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -43,6 +43,7 @@ in
             });
           })
         ];
+        system.stateVersion = "17.03";
       };
       radicale1_export = lib.recursiveUpdate radicale1 {
         services.radicale.extraArgs = [
diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix
new file mode 100644
index 00000000000..16d5eb69cb9
--- /dev/null
+++ b/pkgs/applications/audio/playbar2/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, cmake
+, extra-cmake-modules
+, plasma-framework
+, kwindowsystem
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  name = "playbar2-${version}";
+  version = "2.5";
+
+  src = fetchFromGitHub {
+    owner = "audoban";
+    repo = "PlayBar2";
+    rev = "v${version}";
+    sha256 = "0iv2m4flgaz2r0k7f6l0ca8p6cw8j8j2gin1gci2pg3l5g5khbch";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    plasma-framework
+    kwindowsystem
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Mpris2 Client for Plasma5";
+    homepage = https://github.com/audoban/PlayBar2;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pjones ];
+  };
+}
diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch
new file mode 100644
index 00000000000..f80efeeef70
--- /dev/null
+++ b/pkgs/applications/editors/emacs/clean-env.patch
@@ -0,0 +1,15 @@
+Dump temacs in an empty environment to prevent -dev paths from ending
+up in the dumped image.
+
+diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in
+--- emacs-25.3/src/Makefile.in	2017-04-14 17:02:47.000000000 +0200
++++ emacs-25.3-new/src/Makefile.in	2017-09-25 19:03:02.173861038 +0200
+@@ -532,7 +532,7 @@
+ ifeq ($(CANNOT_DUMP),yes)
+ 	ln -f temacs$(EXEEXT) $@
+ else
+-	LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
++	env -i LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
+   ifneq ($(PAXCTL_dumped),)
+ 	$(PAXCTL_dumped) $@
+   endif
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index a00826b9821..af3298a5883 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -34,7 +34,11 @@ stdenv.mkDerivation rec {
     sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
   };
 
-  patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch);
+  enableParallelBuilding = true;
+
+  patches =
+    [ ./clean-env.patch ]
+    ++ lib.optional stdenv.isDarwin ./at-fdcwd.patch;
 
   nativeBuildInputs = [ pkgconfig ]
     ++ lib.optionals srcRepo [ autoconf automake texinfo ]
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index b8bfd40c079..f4bdee830e1 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -1,33 +1,30 @@
-{ fetchurl, stdenv, ncurses, pkgconfig, libbsd }:
+{ stdenv, fetchurl, pkgconfig, libbsd, ncurses }:
+
 stdenv.mkDerivation rec {
   name = "mg-${version}";
-  version = "20161005";
+  version = "20170828";
 
   src = fetchurl {
     url = "http://homepage.boetes.org/software/mg/${name}.tar.gz";
-    sha256 = "0qaydk2cy765n9clghmi5gdnpwn15y2v0fj6r0jcm0v7d89vbz5p";
+    sha256 = "139nc58l5ifj3d3478nhqls0lic52skmxfxggznzxaz9camqd20z";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wno-error";
-  
-  preConfigure = ''
-    substituteInPlace GNUmakefile \
-      --replace /usr/bin/pkg-config ${pkgconfig}/bin/pkg-config
-      '';
+  enableParallelBuilding = true;
+
+  makeFlags = [ "PKG_CONFIG=${pkgconfig}/bin/pkg-config" ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp mg $out/bin
-    mkdir -p $out/share/man/man1
-    cp mg.1 $out/share/man/man1
+    install -m 555 -Dt $out/bin mg
+    install -m 444 -Dt $out/share/man/man1 mg.1
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ncurses libbsd ];
+
+  buildInputs = [ libbsd ncurses ];
 
   meta = with stdenv.lib; {
-    homepage = http://homepage.boetes.org/software/mg/;
     description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team";
+    homepage = "https://homepage.boetes.org/software/mg";
     license = licenses.publicDomain;
     platforms = platforms.all;
   };
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index cd99861ea7b..a70a67d548f 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.6-4";
-    sha256 = "0fvkx9lf8g0sa9bccd9s5qyhcy0g1mqnkbpqly55ryxyg1ywxqaz";
+    version = "7.0.7-4";
+    sha256 = "074w4jm5s98b8dxwjl8lljvdhmm3mbg1ikgjy1mw3c1sb08z3nc8";
     patches = [];
   };
 in
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 1cf08f286ef..d01bfa1d950 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "6.9.9-7";
-    sha256 = "1lwsz9b8clygdppgawv2hsry4aykgmawjlwhg3fj70rndv4a8rw4";
+    version = "6.9.9-15";
+    sha256 = "0bxgdc1qiyvag6a2iiqcbwp4ak0m1mzi9qhs51fbrvv6syy12m6c";
     patches = [];
   }
     # Freeze version on mingw so we don't need to port the patch too often.
diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix
index eb823641ae4..5580952f40a 100644
--- a/pkgs/applications/kde/dolphin-plugins.nix
+++ b/pkgs/applications/kde/dolphin-plugins.nix
@@ -14,4 +14,5 @@ mkDerivation {
   propagatedBuildInputs = [
     dolphin kdelibs4support ki18n kio kxmlgui
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
index 6eb219d8da9..a3be5be7f0a 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
@@ -14,4 +14,5 @@ mkDerivation {
   propagatedBuildInputs = [
     kio kparts kxmlgui qtscript solid
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index 085b53de0f3..8ace4562cbd 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -19,4 +19,5 @@ mkDerivation {
     kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
     kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index e10cb30d187..bd951c2a9a7 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -41,8 +41,14 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postPatch = ''
+    substituteInPlace \
+        gr-fec/include/gnuradio/fec/polar_decoder_common.h \
+        --replace BOOST_CONSTEXPR_OR_CONST const
+  '';
+
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable -std=c++11"
   '';
 
   # - Ensure we get an interactive backend for matplotlib. If not the gr_plot_*
diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix
new file mode 100644
index 00000000000..a7485c4ee68
--- /dev/null
+++ b/pkgs/applications/misc/gpx-viewer/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "gpx-viewer-${version}";
+  version = "0.4.0";
+
+  src = fetchurl {
+    url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${name}.tar.gz";
+    sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80";
+  };
+
+  patches = fetchurl {
+    url = "https://code.launchpad.net/~chkr/gpx-viewer/gtk3-bugfix/+merge/260766/+preview-diff/628965/+files/preview.diff";
+    sha256 = "1yl7jk7skkcx10nny5zdixswcymjd9s9c1zhm1i5y3aqhchvmfs7";
+  };
+  patchFlags = [ "-p0" ];
+
+  nativeBuildInputs = [
+    intltool pkgconfig
+    shared_mime_info # For update-mime-database
+    desktop_file_utils # For update-desktop-database
+    wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
+  ];
+  buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ];
+
+  meta = with stdenv.lib; {
+    homepage = https://blog.sarine.nl/tag/gpxviewer/;
+    description = "Simple tool to visualize tracks and waypoints stored in a gpx file";
+    platforms = with platforms; linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 6da16545aa7..00735624ad9 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
-  version = "4.9";
+  version = "4.14";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "0jk99yhrms1wzqpcnsjydcl2nysidv639s2j7l53yp60g0zz8174";
+    sha256 = "0yv3hcs5b8a88mp24h8r2sn69phwrahdff5pp74lz24270il3jgb";
   };
 
   nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index e013754e097..2695ac1ef7d 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub
-, extra-cmake-modules, karchive, kwindowsystem, qtx11extras }:
+, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }:
 
-let version = "0.6.0"; in
+let version = "0.7.1"; in
 
 mkDerivation {
   name = "latte-dock-${version}";
@@ -10,13 +10,13 @@ mkDerivation {
     owner = "psifidotos";
     repo = "Latte-Dock";
     rev = "v${version}";
-    sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv";
+    sha256 = "0vdmsjj1qqlzz26mznb56znv5x7akbvw65ybbzakclp4q1xrsrm2";
   };
 
-  buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ];
+  buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ];
 
   nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem
-    qtx11extras ];
+    qtx11extras kcrash ];
 
   meta = with lib; {
     description = "Dock-style app launcher based on Plasma frameworks";
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
new file mode 100644
index 00000000000..5701997fd29
--- /dev/null
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "stupidterm-2017-03-15";
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ vte gtk ];
+
+  src = fetchFromGitHub {
+    owner = "esmil";
+    repo = "stupidterm";
+    rev = "752316a783f52317ffd9f05d32e208dbcafc5ba6";
+    sha256 = "1d8fyhr9sgpxgkwzkyiws0kvhmqfwwyycvcr1qf2wjldiax222lv";
+  };
+
+  makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm";
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/applications $out/share/stupidterm
+    cp stupidterm $out/bin
+    substituteAll ${./stupidterm.desktop} $out/share/applications/stupidterm.desktop
+    substituteAll stupidterm.ini $out/share/stupidterm/stupidterm.ini
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple wrapper around the VTE terminal emulator widget for GTK+";
+    longDescription = ''
+      Simple wrapper around the VTE terminal emulator widget for GTK+
+    '';
+    homepage = https://github.com/esmil/stupidterm;
+    license = licenses.lgpl3Plus;
+    maintainers = [ maintainers.etu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/stupidterm/stupidterm.desktop b/pkgs/applications/misc/stupidterm/stupidterm.desktop
new file mode 100644
index 00000000000..c26d4606018
--- /dev/null
+++ b/pkgs/applications/misc/stupidterm/stupidterm.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=20170315
+Name=stupidterm
+Comment=VTE based terminal emulator
+Exec=stupidterm
+Icon=utilities-terminal
+Terminal=false
+Type=Application
+Categories=System;TerminalEmulator;
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 837d736d10d..cf99304473c 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, symlinkJoin
+{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin
 , configFile ? null
 }:
 
-let 
+let
   version = "12";
   termite = stdenv.mkDerivation {
     name = "termite-${version}";
@@ -17,7 +17,9 @@ let
 
     makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
 
-    buildInputs = [ pkgconfig vte gtk3 ncurses ];
+    buildInputs = [ vte gtk3 ncurses ];
+
+    nativeBuildInputs = [ wrapGAppsHook pkgconfig ];
 
     outputs = [ "out" "terminfo" ];
 
diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix
new file mode 100644
index 00000000000..01df5d32ab1
--- /dev/null
+++ b/pkgs/applications/misc/xpad/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl
+, autoreconfHook, pkgconfig, wrapGAppsHook
+, glib, intltool, gtk3, gtksourceview }:
+
+stdenv.mkDerivation rec {
+  name = "xpad-${version}";
+  version = "5.0.0";
+
+  src = fetchurl {
+    url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2";
+    sha256 = "02yikxg6z9bwla09ka001ppjlpbv5kbza3za9asazm5aiz376mkb";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
+
+  buildInputs = [ glib intltool gtk3 gtksourceview ];
+
+  autoreconfPhase = ''
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A sticky note application for jotting down things to remember";
+    homepage = https://launchpad.net/xpad;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ michalrus ];
+  };
+}
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 1e61cabb7a1..29a73beeec8 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -23,10 +23,11 @@
 , pango
 
 , audioSupport ? mediaSupport
-, pulseaudioSupport ? audioSupport
+, pulseaudioSupport ? false
 , libpulseaudio
+, apulse
 
-# Media support (implies pulseaudio support)
+# Media support (implies audio support)
 , mediaSupport ? false
 , gstreamer
 , gst-plugins-base
@@ -158,6 +159,11 @@ stdenv.mkDerivation rec {
     # and torLibPath for accuracy, but this is more convenient ...
     libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
 
+    # apulse uses a non-standard library path.  For now special-case it.
+    ${optionalString (audioSupport && !pulseaudioSupport) ''
+      libPath=${apulse}/lib/apulse:$libPath
+    ''}
+
     # Fixup paths to pluggable transports.
     sed -i TorBrowser/Data/Tor/torrc-defaults \
         -e "s,./TorBrowser,$TBB_IN_STORE/TorBrowser,g"
@@ -218,6 +224,13 @@ stdenv.mkDerivation rec {
     // toggling the pref takes effect.
     lockPref("browser.tabs.remote.autostart.2", ${if disableContentSandbox then "false" else "true"});
 
+    // Allow sandbox access to sound devices if using ALSA directly
+    ${if (audioSupport && !pulseaudioSupport) then ''
+      pref("security.sandbox.content.write_path_whitelist", "/dev/snd/");
+    '' else ''
+      clearPref("security.sandbox.content.write_path_whitelist");
+    ''}
+
     ${optionalString (extraPrefs != "") ''
       ${extraPrefs}
     ''}
@@ -336,6 +349,8 @@ stdenv.mkDerivation rec {
       PULSE_SERVER="\''${PULSE_SERVER:-}" \
       PULSE_COOKIE="\''${PULSE_COOKIE:-}" \
       \
+      APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \
+      \
       TOR_SKIP_LAUNCH="\''${TOR_SKIP_LAUNCH:-}" \
       TOR_CONTROL_PORT="\''${TOR_CONTROL_PORT:-}" \
       TOR_SOCKS_PORT="\''${TOR_SOCKS_PORT:-}" \
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
new file mode 100644
index 00000000000..048017cae5b
--- /dev/null
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -0,0 +1,209 @@
+{ stdenv
+, lib
+, fetchurl
+, fetchgit
+
+, tor
+, tor-browser-unwrapped
+
+# Extensions, common
+, zip
+
+# HTTPS Everywhere
+, git
+, libxml2 # xmllint
+, python27
+, python27Packages
+, rsync
+}:
+
+let
+  tor-browser-build_src = fetchgit {
+    url = "https://git.torproject.org/builders/tor-browser-build.git";
+    rev = "refs/tags/tbb-7.5a5-build5";
+    sha256 = "0j37mqldj33fnzghxifvy6v8vdwkcz0i4z81prww64md5s8qcsa9";
+  };
+
+  firefoxExtensions = {
+    https-everywhere = stdenv.mkDerivation rec {
+      name = "https-everywhere-${version}";
+      version = "5.2.21";
+
+      src = fetchgit {
+        url = "https://git.torproject.org/https-everywhere.git";
+        rev = "refs/tags/${version}";
+        sha256 = "0z9madihh4b4z4blvfmh6w1hsv8afyi0x7b243nciq9r4w55xgfa";
+      };
+
+      nativeBuildInputs = [
+        git
+        libxml2 # xmllint
+        python27
+        python27Packages.lxml
+        rsync
+        zip
+      ];
+
+      buildCommand = ''
+        cp -dR --no-preserve=mode "$src" src
+        cd src
+
+        sed -i makexpi.sh -e '104d' # cp -a translations/* fails because the dir is empty ...
+        $shell ./makexpi.sh ${version} --no-recurse
+        install -m 444 -Dt $out pkg"/"*.xpi
+      '';
+
+      meta = {
+        homepage = https://gitweb.torproject.org/https-everywhere.git/;
+      };
+    };
+
+    noscript = fetchurl {
+      url = https://secure.informaction.com/download/releases/noscript-5.0.10.xpi;
+      sha256 = "18k5karbaj5mhd9cyjbqgik6044bw88rjalkh6anjanxbn503j6g";
+    };
+
+    torbutton = stdenv.mkDerivation rec {
+      name = "torbutton-${version}";
+      version = "1.9.8.1";
+
+      src = fetchgit {
+        url = "https://git.torproject.org/torbutton.git";
+        rev = "refs/tags/${version}";
+        sha256 = "1amp0c9ky0a7fsa0bcbi6n6ginw7s2g3an4rj7kvc1lxmrcsm65l";
+      };
+
+      nativeBuildInputs = [ zip ];
+
+      buildCommand = ''
+        cp -dR --no-preserve=mode "$src" src
+        cd src
+
+        $shell ./makexpi.sh
+        install -m 444 -Dt $out pkg"/"*.xpi
+      '';
+    };
+
+    tor-launcher = stdenv.mkDerivation rec {
+      name = "tor-launcher-${version}";
+      version = "0.2.12.3";
+
+      src = fetchgit {
+        url = "https://git.torproject.org/tor-launcher.git";
+        rev = "refs/tags/${version}";
+        sha256 = "0126x48pjiy2zm4l8jzhk70w24hviaz560ffp4lb9x0ar615bc9q";
+      };
+
+      nativeBuildInputs = [ zip ];
+
+      buildCommand = ''
+        cp -dR --no-preserve=mode "$src" src
+        cd src
+
+        make package
+        install -m 444 -Dt $out pkg"/"*.xpi
+      '';
+    };
+  };
+in
+stdenv.mkDerivation rec {
+  name = "tor-browser-bundle-${version}";
+  version = tor-browser-unwrapped.version;
+
+  buildInputs = [ tor-browser-unwrapped tor ];
+
+  unpackPhase = ":";
+
+  buildPhase = ":";
+
+  installPhase = ''
+    TBBUILD=${tor-browser-build_src}/projects/tor-browser
+
+    self=$out/lib/tor-browser
+    mkdir -p $self && cd $self
+
+    cp -dR ${tor-browser-unwrapped}/lib"/"*"/"* .
+    chmod -R +w .
+
+    # Prepare for autoconfig
+    cat >defaults/pref/autoconfig.js <<EOF
+    pref("general.config.filename", "mozilla.cfg");
+    pref("general.config.obscure_value", 0);
+    EOF
+
+    # Hardcoded configuration
+    cat >mozilla.cfg <<EOF
+    // First line must be a comment
+
+    // Always update via Nixpkgs
+    lockPref("app.update.auto", false);
+    lockPref("app.update.enabled", false);
+    lockPref("extensions.update.autoUpdateDefault", false);
+    lockPref("extensions.update.enabled", false);
+    lockPref("extensions.torbutton.versioncheck_enabled", false);
+
+    // Where to find the Nixpkgs tor executable & config
+    lockPref("extensions.torlauncher.tor_path", "${tor}/bin/tor");
+    lockPref("extensions.torlauncher.torrc-defaults_path", "$self/torrc-defaults");
+
+    // Captures store paths
+    clearPref("extensions.xpiState");
+
+    // Insist on using IPC for communicating with Tor
+    //
+    // Defaults to $XDG_RUNTIME_DIR/Tor/{socks,control}.socket
+    lockPref("extensions.torlauncher.control_port_use_ipc", true);
+    lockPref("extensions.torlauncher.socks_port_use_ipc", true);
+    EOF
+
+    # Preload extensions
+    install -m 444 -D \
+      ${firefoxExtensions.tor-launcher}/tor-launcher-*.xpi \
+      browser/extensions/tor-launcher@torproject.org.xpi
+    install -m 444 -D \
+      ${firefoxExtensions.torbutton}/torbutton-*.xpi \
+      browser/extensions/torbutton@torproject.org.xpi
+    install -m 444 -D \
+      ${firefoxExtensions.https-everywhere}/https-everywhere-*-eff.xpi \
+      browser/extensions/https-everywhere-eff@eff.org.xpi
+    install -m 444 -D \
+      ${firefoxExtensions.noscript} \
+      browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
+
+    # Copy bundle data
+    cat \
+      $TBBUILD/Bundle-Data/linux/Data/Tor/torrc-defaults \
+      $TBBUILD/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix \
+      >> torrc-defaults
+
+    cat \
+      $TBBUILD/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js \
+      $TBBUILD/Bundle-Data/PTConfigs/bridge_prefs.js >> defaults/pref/extension-overrides.js \
+      >> defaults/pref/extension-overrides.js
+
+    # Generate a suitable wrapper
+    mkdir -p $out/bin
+    cat >$out/bin/tor-browser <<EOF
+    #! ${stdenv.shell} -e
+
+    THE_HOME=\$HOME
+    TBB_HOME=\''${TBB_HOME:-\''${XDG_DATA_HOME:-$HOME/.local/share}/tor-browser}
+    mkdir -p "\$TBB_HOME"
+
+    HOME=\$TBB_HOME
+    cd "\$HOME"
+
+    exec $self/firefox -no-remote about:tor
+    EOF
+    chmod +x $out/bin/tor-browser
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An unofficial version of the tor browser bundle, built from source";
+    homepage = https://torproject.org/;
+    license = licenses.unfreeRedistributable; # TODO: check this
+    platforms = [ "x86_64-linux" ];
+    hydraPlatforms = [ ];
+    maintainers = with maintainers; [ joachifm ];
+  };
+}
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index bdff04cb073..a7205f1bc7a 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cni-${version}";
-  version = "0.3.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = "cni";
     rev = "v${version}";
-    sha256 = "1nvixvf5slnsdrfpfs2km64x680wf83jbyp7il12bcim37q2az7m";
+    sha256 = "0n2sc5xf1h0i54am80kj7imrvawddn0kxvgi65w0194dpmyrg5al";
   };
 
   buildInputs = [ go ];
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   outputs = ["out" "plugins"];
 
   buildPhase = ''
-    patchShebangs build
-    ./build
+    patchShebangs build.sh
+    ./build.sh
   '';
 
   installPhase = ''
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 0ac872c35c9..6767a0bd724 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -4,10 +4,10 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if stdenv.isLinux
-             then "1hkr5s1c72sqf156lk6gsnbfs75jnpqs42f64a7mz046c06kv98f"
-             else "00xw0c66x58g915989fc72mwliysxi5glrkdafi3gcfmlhrnc68i";
+             then "1i22givr52kgr76dd2azcg9avgh70wiw5dcpmmyychms2ynxi42y"
+             else "0phhy3si86ilc6051zfgn8jnniy5lygf1r2gysjpcyfbrc5pw3hj";
   pname = "helm";
-  version = "2.5.1";
+  version = "2.6.1";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 69fe6a1730a..e76d3cf5d08 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -8,9 +8,9 @@
     "cmd/kube-controller-manager"
     "cmd/kube-proxy"
     "plugin/cmd/kube-scheduler"
-    "cmd/kube-dns"
     "federation/cmd/federation-apiserver"
     "federation/cmd/federation-controller-manager"
+    "test/e2e/e2e.test"
   ]
 }:
 
@@ -18,13 +18,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.5.6";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "0mkg4vgz9szgq1k5ignkdr5gmg703xlq8zsrr422a1qfqb8zp15w";
+    sha256 = "1frf2nxk45lsbkq73fj72gxgr76icqdrsdqh20f5gpwiqn23n7c3";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
@@ -55,6 +55,10 @@ stdenv.mkDerivation rec {
     cp build/pause/pause "$pause/bin/pause"
     cp -R docs/man/man1 "$man/share/man"
 
+    cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons
+    patchShebangs $out/bin/kube-addons
+    wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl"
+
     $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
   '';
 
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 6643f385074..a7d32494912 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
 
-let version = "3.27.0.1"; in
+let version = "3.27.1"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "1yis3lk23ymgqzvad7rhdcgipnh1nw98pk0kd7a01rlm7b9b6q90";
+    sha256 = "14lsplbp9fy7lk6cpwi3aj6jskz4j82h67x0fik82z1bns0zm2a3";
   };
 
   configureFlags = [
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index eff9b71daa6..80e6af9c1ef 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -2,7 +2,7 @@
 , vala, cmake, wrapGAppsHook, pkgconfig, gettext
 , gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking
 , xorg, libXdmcp, libxkbcommon
-, libnotify
+, libnotify, libsoup
 , libgcrypt
 , epoxy
 , at_spi2_core
@@ -13,13 +13,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2017-06-21";
+  name = "dino-unstable-2017-09-26";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "3f0089db86e2057293a33453361678989919147f";
-    sha256 = "011wd6qi8nagig8418hibgnsmznd76dvp3p2dzzr4wyrb7d6cgcb";
+    rev = "9d8e1e88ec61403659a8cc410d5c4414e3bd3a96";
+    sha256 = "1p8sda99n8zsb49qd6wzwb8hddlgrzr2hp7il5v7yqxjjm2vgqfl";
     fetchSubmodules = true;
   };
 
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     libnotify
     gpgme
     libgcrypt
+    libsoup
     pcre
     xorg.libxcb
     xorg.libpthreadstubs
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 964f1ab5204..db0d874c589 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.12.5";
+  version = "0.12.6";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1g30gl4b5fk1h13r2v4rspcqic9jg99717lxplk5birg3wi3b2d3";
+    sha256 = "00hxjhnsm4622hv46xm7lc81kbnzi2iz77qppwma14cbh63jbilv";
   };
 
   installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 90fc4944d80..b56a1012806 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -7,20 +7,20 @@
 
 mkDerivation rec {
   name = "telegram-desktop-${version}";
-  version = "1.1.19";
+  version = "1.1.23";
 
   # Submodules
   src = fetchgit {
     url = "git://github.com/telegramdesktop/tdesktop";
     rev = "v${version}";
-    sha256 = "1zpl71k2lq861k89yp6nzkm4jm6szxrzigmmbxx63rh4v03di3b6";
+    sha256 = "0pdjrypjg015zvg8iydrja8kzvq0jsi1wz77r2cxvyyb4rkgyv7x";
     fetchSubmodules = true;
   };
 
   tgaur = fetchgit {
     url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
-    rev = "a4ba392309116003bc2b75c1c4c12dc733168d6f";
-    sha256 = "1n0yar8pm050770x36kjr4iap773xjigfbnrk289b51i5vijwhsv";
+    rev = "885d0594d8dfa0a17c14140579a3d27ef2b9bdd0";
+    sha256 = "0cdci8d8j3czhznp7gqn16w32j428njmzxr34pdsv40gggh0lbpn";
   };
 
   buildInputs = [
@@ -93,7 +93,7 @@ mkDerivation rec {
   installPhase = ''
     install -Dm755 Telegram $out/bin/telegram-desktop
     mkdir -p $out/share/applications $out/share/kde4/services
-    sed "s,/usr/bin,$out/bin,g" $tgaur/telegramdesktop.desktop > $out/share/applications/telegramdesktop.desktop
+    sed "s,/usr/bin,$out/bin,g" $tgaur/telegram-desktop.desktop > $out/share/applications/telegram-desktop.desktop
     sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol
     for icon_size in 16 32 48 64 128 256 512; do
       install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 066338766bc..b3a68a7fcb9 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -22,11 +22,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
-  version = "1.9.0";
+  version = "1.9.1";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
-    sha256 = "1m72z5schbagd0a00fv8q0nrnkz9zrgvmdb5yplnmwm1sfapavgc";
+    sha256 = "1c8vv4anl555a03pbnwf8wnf0d8pcnd4p35y3q8f5ikkcflq76vl";
   };
 
   patchPhase = optionalString (openssl != null) ''
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index e0e8622e643..814dc1bf69a 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "owncloud-client-${version}";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchurl {
     url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
-    sha256 = "02az9wq0d1vsgcdipddipdjwj2faf7jag8hizwd0ha3sjlmrs6d1";
+    sha256 = "1r5ddln1wc9iyjizgqb104i0r6qhzsmm2wdnxfaif119cv0vphda";
   };
 
   nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index 6c8e3466ce0..d6fe0d9114c 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeWrapper, glib
-, fontconfig, patchelf, libXext, libX11
-, freetype, libXrender, zlib
+{ stdenv, fetchurl, makeWrapper, patchelf
+, fontconfig, freetype, glib, libICE, libSM
+, libX11, libXext, libXrender, zlib
 }:
 
 let
@@ -12,15 +12,16 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Spideroak client for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "88fd785647def79ee36621fa2a8a5bea73c513de03103f068dd10bc25f3cf356"
-    else if stdenv.system == "i686-linux" then "8c23271291f40aa144bbf38ceb3cc2a05bed00759c87a65bd798cf8bb289d07a"
+  sha256 = if stdenv.system == "x86_64-linux" then "0k87rn4aj0v79rz9jvwspnwzmh031ih0y74ra88nc8kl8j6b6gjm"
+    else if stdenv.system == "i686-linux" then "1wbxfikj8f7rx26asswqrfp9vpk8w5941s21y1pnaff2gcac8m3z"
     else throw "Spideroak client for: ${stdenv.system} not supported!";
 
   ldpath = stdenv.lib.makeLibraryPath [
-    glib fontconfig libXext libX11 freetype libXrender zlib
+    fontconfig freetype glib libICE libSM
+    libX11 libXext libXrender zlib
   ];
 
-  version = "6.0.1";
+  version = "6.1.9";
 
 in stdenv.mkDerivation {
   name = "spideroak-${version}";
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
new file mode 100644
index 00000000000..dc7c961856d
--- /dev/null
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, pkgs }:
+
+stdenv.mkDerivation rec {
+  version = "2.9.5-1";
+  name = "testssl.sh-${version}";
+
+  src = fetchFromGitHub {
+    owner = "drwetter";
+    repo = "testssl.sh";
+    rev = "v${version}";
+    sha256 = "0hz6g685jwl0c0jrdca746425xpwiwc8lnlc2gigga5hkcq8qzl9";
+  };
+
+  nativeBuildInputs = with pkgs; [
+    makeWrapper
+  ];
+
+  patches = [ ./testssl.patch ];
+
+  pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
+  opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
+  postPatch = ''
+    sed -i -e "s|/bin/pwd|${pwdBinPath}|g"                                     \
+           -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g"    \
+           -e "s|OPENSSL:-\"\"|OPENSSL:-\"${opensslBinPath}\"|g" \
+           testssl.sh
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/etc
+    cp -r etc/ $out/
+    cp testssl.sh $out/bin/testssl.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "CLI tool to check a server's TLS/SSL capabilities";
+    longDescription = ''
+      CLI tool which checks a server's service on any port for the support of
+      TLS/SSL ciphers, protocols as well as recent cryptographic flaws and more.
+    '';
+    homepage = https://testssl.sh/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.etu ];
+  };
+}
diff --git a/pkgs/applications/networking/testssl/testssl.patch b/pkgs/applications/networking/testssl/testssl.patch
new file mode 100644
index 00000000000..d5269c73708
--- /dev/null
+++ b/pkgs/applications/networking/testssl/testssl.patch
@@ -0,0 +1,10 @@
+--- testssl/testssl.sh	2017-09-24 16:53:29.395263437 +0200
++++ testssl-new/testssl.sh	2017-09-24 16:53:41.221154492 +0200
+@@ -165,6 +165,7 @@
+ # following variables make use of $ENV, e.g. OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <host>
+ # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help
+ declare -x OPENSSL OPENSSL_TIMEOUT
++OPENSSL=${OPENSSL:-""}
+ FAST_SOCKET=${FAST_SOCKET:-false}       # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production
+ COLOR=${COLOR:-2}                       # 2: Full color, 1: b/w+positioning, 0: no ESC at all
+ COLORBLIND=${COLORBLIND:-false}         # if true, swap blue and green in the output
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index 67183c9dd55..d2f3d0c5f33 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchgit, cmake
 , opencv, gtest, openblas, liblapack
-, cudaSupport ? false, cudatoolkit
+, cudaSupport ? false, cudatoolkit, nvidia_x11
 , cudnnSupport ? false, cudnn
 }:
 
@@ -20,11 +20,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ opencv gtest openblas liblapack ]
-              ++ lib.optional cudaSupport cudatoolkit
+              ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]
               ++ lib.optional cudnnSupport cudnn;
 
-  cmakeFlags = lib.optional (!cudaSupport) "-DUSE_CUDA=OFF"
-            ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
+  cmakeFlags = [
+    (if cudaSupport then "-DCUDA_ARCH_NAME=All" else "-DUSE_CUDA=OFF")
+  ] ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
 
   installPhase = ''
     install -Dm755 libmxnet.so $out/lib/libmxnet.so
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index b098da060e0..8cd9355a0f6 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf bison pkgconfig ];
 
   preConfigure = ''
-    find . -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';'
-    find . -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';'
+    find . -type f -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';'
+    find . -type f -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';'
     ${stdenv.lib.optionalString asLibsingular ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DLIBSINGULAR"''}
   '';
 
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 46c48fd1579..fcf35a9ca34 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "2.14.1";
+  version = "2.14.2";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1iic3wiihxp3l3k6d4z886v3869c3dzgddjxnd5124wy1rnlqwkg";
+    sha256 = "18f70gfzwqd210806hmf94blcd7yv5h9ka6xqkpd2jhijqwp5sah";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 2aadfd21fb5..03997047d3a 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre
-, SDL_image, freetype, glew, mesa, boost, glm
+{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre
+, SDL2_image, freetype, glew, mesa, boost, glm
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.44";
+  version = "0.47";
   name = "gource-${version}";
 
   src = fetchurl {
     url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
-    sha256 = "0z095zsf5pz8czh7nmlkdy29rm93w83sqyqspg2zsprh892cl116";
+    sha256 = "1llqwdnfa1pff8bxk27qsqff1fcg0a9kfdib0rn7p28vl21n1cgj";
   };
 
   buildInputs = [
-    glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa
+    glew SDL2 ftgl pkgconfig libpng libjpeg pcre SDL2_image mesa
     boost glm freetype
   ];
 
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 09cdf20ace0..5a64c36abe4 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -38,10 +38,11 @@ assert pulseSupport -> libpulseaudio != null;
 assert rtmpSupport  -> rtmpdump != null;
 
 let
+  kodi_version = "17.4";
   rel = "Krypton";
-  ffmpeg_3_1_6 = fetchurl {
-    url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz";
-    sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81";
+  ffmpeg_3_1_9 = fetchurl {
+    url = "https://github.com/xbmc/FFmpeg/archive/3.1.9-${rel}-${kodi_version}.tar.gz";
+    sha256 = "0rhjz505ljfg2jqbm3rd7qbcjq4vnp8h9a8vad8rjf84v3alglpa";
   };
   # Usage of kodi fork of libdvdnav and libdvdread is necessary for functional dvd playback:
   libdvdnav_src = fetchurl {
@@ -53,12 +54,12 @@ let
     sha256 = "e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b";
   };
 in stdenv.mkDerivation rec {
+    version = kodi_version;
     name = "kodi-${version}";
-    version = "17.3";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "189isc1jagrnq549vwpvb0x1w6p0mkjwv7phm8dzvki96wx6bs0x";
+      sha256 = "1p1lxkapynjbd85ns7m4jybl4k35kxzv7105xkh03hlz8kkqc23b";
     };
 
     buildInputs = [
@@ -101,7 +102,7 @@ in stdenv.mkDerivation rec {
         --replace 'usr/share/zoneinfo' 'etc/zoneinfo'
       substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
         --replace "/bin/bash" "${bash}/bin/bash -ex"
-      cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz
+      cp ${ffmpeg_3_1_9} tools/depends/target/ffmpeg/ffmpeg-3.1.9-${rel}-${version}.tar.gz
       ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz
       cp ${libdvdnav_src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
       cp ${libdvdread_src} tools/depends/target/libdvdread/libdvdread-master.tar.gz
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 14aaef5709a..bc280823a3c 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "open-vm-tools-${version}";
-  version = "10.1.0";
+  version = "10.1.10";
 
   src = fetchFromGitHub {
-    owner = "vmware";
-    repo = "open-vm-tools";
-    rev = "stable-${version}";
-    sha256 = "1qzk4mvw618ca4j9agsfpqch9jgwghvdc4rpkvlyz8kirvh9iniz";
+    owner  = "vmware";
+    repo   = "open-vm-tools";
+    rev    = "stable-${version}";
+    sha256 = "13ifpi53rc2463ka8xw9zx407d1fz119x8sb9k48g5mwxm6c85fm";
   };
 
   sourceRoot = "${src.name}/open-vm-tools";
@@ -52,8 +52,8 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/vmware/open-vm-tools;
     description = "Set of tools for VMWare guests to improve host-guest interaction";
     longDescription = ''
-      A set of services and modules that enable several features in VMware products for 
-      better management of, and seamless user interactions with, guests. 
+      A set of services and modules that enable several features in VMware products for
+      better management of, and seamless user interactions with, guests.
     '';
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index ac725733d64..274325b6785 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,45 +1,64 @@
-{ stdenv, fetchFromGitHub, pango, libinput
-, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
-, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap
-, xwayland, pam, gdk_pixbuf
+{ stdenv, fetchFromGitHub
+, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl
+, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs
+, pango, cairo, libinput, libcap, xwayland, pam, gdk_pixbuf, libpthreadstubs
+, libXdmcp
 }:
 
 let
   version = "0.13.0";
-in
-  stdenv.mkDerivation rec {
-    name = "sway-${version}";
+  # Temporary workaround (0.14.0 segfaults)
+  wlc_009 = stdenv.lib.overrideDerivation wlc (oldAttrs: rec {
+    name = "wlc-${version}";
+    version = "0.0.9";
 
     src = fetchFromGitHub {
-      owner = "Sircmpwn";
-      repo = "sway";
-      rev = "${version}";
-      sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q";
+      owner = "Cloudef";
+      repo = "wlc";
+      rev = "v${version}";
+      fetchSubmodules = true;
+      sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg";
     };
+  });
+in stdenv.mkDerivation rec {
+  name = "sway-${version}";
 
-    nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
+  src = fetchFromGitHub {
+    owner = "Sircmpwn";
+    repo = "sway";
+    rev = "${version}";
+    sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q";
+  };
 
-    buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland pam gdk_pixbuf ];
+  nativeBuildInputs = [
+    makeWrapper cmake pkgconfig
+    asciidoc libxslt docbook_xsl
+  ];
+  buildInputs = [
+    wayland wlc_009 libxkbcommon pixman fontconfig pcre json_c dbus_libs
+    pango cairo libinput libcap xwayland pam gdk_pixbuf libpthreadstubs
+    libXdmcp
+  ];
 
-    patchPhase = ''
-      sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
-    '';
+  patchPhase = ''
+    sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
+  '';
 
-    makeFlags = "PREFIX=$(out)";
-    cmakeFlags = "-DVERSION=${version}";
-    installPhase = "PREFIX=$out make install";
+  makeFlags = "PREFIX=$(out)";
+  cmakeFlags = "-DVERSION=${version}";
+  installPhase = "PREFIX=$out make install";
 
-    LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ];
-    preFixup = ''
-      wrapProgram $out/bin/sway \
-        --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
-    '';
+  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc_009 dbus_libs ];
+  preFixup = ''
+    wrapProgram $out/bin/sway \
+      --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
+  '';
 
-    meta = with stdenv.lib; {
-      description = "i3-compatible window manager for Wayland";
-      homepage    = "http://swaywm.org";
-      license     = licenses.mit;
-      platforms   = platforms.linux;
-      maintainers = with maintainers; [ ];
-    };
-  }
+  meta = with stdenv.lib; {
+    description = "i3-compatible window manager for Wayland";
+    homepage    = http://swaywm.org;
+    license     = licenses.mit;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date.
+  };
+}
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 267a2812a2a..843d6d6b5dd 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -137,7 +137,7 @@ rec {
         };
         inherit fromImage fromImageName fromImageTag;
 
-        buildInputs = [ utillinux e2fsprogs jshon rsync ];
+        buildInputs = [ utillinux e2fsprogs jshon rsync jq ];
       } ''
       rm -rf $out
 
@@ -146,44 +146,29 @@ rec {
       mount /dev/${vmTools.hd} disk
       cd disk
 
+      layers=""
       if [[ -n "$fromImage" ]]; then
         echo "Unpacking base image..."
         mkdir image
         tar -C image -xpf "$fromImage"
-
-        # If the image name isn't set, read it from the image repository json.
-        if [[ -z "$fromImageName" ]]; then
-          fromImageName=$(jshon -k < image/repositories | head -n 1)
-          echo "From-image name wasn't set. Read $fromImageName."
-        fi
-
-        # If the tag isn't set, use the name as an index into the json
-        # and read the first key found.
-        if [[ -z "$fromImageTag" ]]; then
-          fromImageTag=$(jshon -e $fromImageName -k < image/repositories \
-                         | head -n1)
-          echo "From-image tag wasn't set. Read $fromImageTag."
-        fi
-
-        # Use the name and tag to get the parent ID field.
-        parentID=$(jshon -e $fromImageName -e $fromImageTag -u \
-                   < image/repositories)
+        layers=$(jq -r '.[0].Layers | join(" ")' image/manifest.json)
       fi
 
-      # Unpack all of the parent layers into the image.
+      # Unpack all of the layers into the image.
+      # Layer list is ordered starting from the base image
       lowerdir=""
-      while [[ -n "$parentID" ]]; do
-        echo "Unpacking layer $parentID"
-        mkdir -p image/$parentID/layer
-        tar -C image/$parentID/layer -xpf image/$parentID/layer.tar
-        rm image/$parentID/layer.tar
+      for layer in $layers; do
+        echo "Unpacking layer $layer"
+        layerDir=image/$(echo $layer | cut -d':' -f2)"_unpacked"
+        mkdir -p $layerDir
+        tar -C $layerDir -xpf image/$layer
+        chmod a+w image/$layer
+        rm image/$layer
 
-        find image/$parentID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
+        find $layerDir -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
 
         # Get the next lower directory and continue the loop.
-        lowerdir=$lowerdir''${lowerdir:+:}image/$parentID/layer
-        parentID=$(cat image/$parentID/json \
-                  | (jshon -e parent -u 2>/dev/null || true))
+        lowerdir=$lowerdir''${lowerdir:+:}$layerDir
       done
 
       mkdir work
@@ -461,26 +446,17 @@ rec {
 
         mkdir image
         touch baseFiles
+        layers=""
         if [[ -n "$fromImage" ]]; then
           echo "Unpacking base image..."
           tar -C image -xpf "$fromImage"
-          # Do not import the base image configuration and manifest
-          chmod a+w image image/*.json
-          rm -f image/*.json
-
-          if [[ -z "$fromImageName" ]]; then
-            fromImageName=$(jshon -k < image/repositories|head -n1)
-          fi
-          if [[ -z "$fromImageTag" ]]; then
-            fromImageTag=$(jshon -e $fromImageName -k \
-                           < image/repositories|head -n1)
-          fi
-          parentID=$(jshon -e $fromImageName -e $fromImageTag -u \
-                     < image/repositories)
-
-          for l in image/*/layer.tar; do
-            ls_tar $l >> baseFiles
+          config=$(jq -r '.[0].Config' image/manifest.json)
+          layers=$(jq -r '.[0].Layers | join(" ")' image/manifest.json)
+          for l in $layers; do
+            ls_tar image/$l >> baseFiles
           done
+          chmod u+w image image/$config
+          rm image/$config
         fi
 
         chmod -R ug+rw image
@@ -507,47 +483,28 @@ rec {
         tar -rpf temp/layer.tar --mtime="@$SOURCE_DATE_EPOCH" \
           --owner=0 --group=0 --no-recursion --files-from newFiles
 
-        echo "Adding meta..."
-
-        # If we have a parentID, add it to the json metadata.
-        if [[ -n "$parentID" ]]; then
-          cat temp/json | jshon -s "$parentID" -i parent > tmpjson
-          mv tmpjson temp/json
-        fi
-
-        # Take the sha256 sum of the generated json and use it as the layer ID.
-        # Compute the size and add it to the json under the 'Size' field.
-        layerID=$(sha256sum temp/json|cut -d ' ' -f 1)
-        size=$(stat --printf="%s" temp/layer.tar)
-        cat temp/json | jshon -s "$layerID" -i id -n $size -i Size > tmpjson
-        mv tmpjson temp/json
-
-        # Use the temp folder we've been working on to create a new image.
-        mv temp image/$layerID
+        gzip temp/layer.tar
+        layerID="sha256:$(sha256sum temp/layer.tar.gz | cut -d ' ' -f 1)"
+        mv temp/layer.tar.gz image/$layerID
 
-        # Create image json and image manifest
+        echo "Generating image configuration and manifest..."
         imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
         manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
-        currentID=$layerID
-        while [[ -n "$currentID" ]]; do
-          layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1)
-          imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .")
-          imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
-          manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .")
 
-          currentID=$(cat image/$currentID/json | (jshon -e parent -u 2>/dev/null || true))
+        # The layer list is ordered starting from the base image
+        layers=$(echo $layers $layerID)
+        for i in $(echo $layers); do
+          imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .")
+          diffId=$(gzip -dc image/$i | sha256sum | cut -d" " -f1)
+          imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$diffId\"] + .")
+          manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$i\"] + .")
         done
 
         imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
-        echo "$imageJson" > "image/$imageJsonChecksum.json"
-        manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"")
+        echo "$imageJson" > "image/sha256:$imageJsonChecksum"
+        manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"sha256:$imageJsonChecksum\"")
         echo "$manifestJson" > image/manifest.json
 
-        # Store the json under the name image/repositories.
-        jshon -n object \
-          -n object -s "$layerID" -i "$imageTag" \
-          -i "$imageName" > image/repositories
-
         # Make the image read-only.
         chmod -R a-w image
 
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 1a8b9c7f8ed..498028fb088 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -107,11 +107,13 @@ rec {
   nix = buildImageWithNixDb {
     name = "nix";
     contents = [
-      # nix-store -qR uses the 'more' program which is not included in
-      # the pkgs.nix dependencies. We then have to manually get it
-      # from the 'eject' package:/
-      pkgs.eject
+      # nix-store uses cat program to display results as specified by
+      # the image env variable NIX_PAGER.
+      pkgs.coreutils
       pkgs.nix
     ];
+    config = {
+      Env = [ "NIX_PAGER=cat" ];
+    };
   };
 }
diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lm-math/default.nix
new file mode 100644
index 00000000000..348373b8927
--- /dev/null
+++ b/pkgs/data/fonts/lm-math/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "latinmodern-math-${version}";
+  version = "1.959";
+
+  src = fetchzip {
+    url = "www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
+    sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype/
+    mkdir -p $out/share/doc/${name}/
+    cp otf/*.otf $out/share/fonts/opentype/
+    cp doc/*.txt $out/share/doc/${name}/
+  '';
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";
+
+  meta = with stdenv.lib; {
+    description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth.";
+    homepage = http://www.gust.org.pl/projects/e-foundry/lm-math;
+    # "The Latin Modern Math font is licensed under the GUST Font License (GFL),
+    # which is a free license, legally equivalent to the LaTeX Project Public
+    # License (LPPL), version 1.3c or later." - GUST website
+    license = licenses.lppl13c;
+    maintainers = with maintainers; [ siddharthist ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/data/fonts/tex-gyre-termes-math/default.nix b/pkgs/data/fonts/tex-gyre-termes-math/default.nix
new file mode 100644
index 00000000000..83b157b085b
--- /dev/null
+++ b/pkgs/data/fonts/tex-gyre-termes-math/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "tex-gyre-termes-math-${version}";
+  version = "1.543";
+
+  src = fetchzip {
+    url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyretermes-math-1543.zip";
+    sha256 = "10ayqfpryfn1l35hy0vwyjzw3a6mfsnzgf78vsnccgk2gz1g9vhz";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype/
+    mkdir -p $out/share/doc/${name}/
+    cp -v opentype/*.otf $out/share/fonts/opentype/
+    cp -v doc/*.txt $out/share/doc/${name}/
+  '';
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm";
+
+  meta = with stdenv.lib; {
+    longDescription = ''
+      TeX Gyre Termes Math is a math companion for the TeX Gyre Termes family
+      of fonts (see http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in
+      the OpenType format.
+    '';
+    homepage = http://www.gust.org.pl/projects/e-foundry/tg-math;
+    # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL),
+    # which is a free license, legally equivalent to the LaTeX Project Public
+    # License (LPPL), version 1.3c or later." - GUST website
+    license = licenses.lppl13c;
+    maintainers = with maintainers; [ siddharthist ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
index efdc28aac42..a71d6eb789b 100644
--- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ];
   propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
index 961fb1c0a19..d30c38a2cfc 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs =
     [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ];
diff --git a/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index 7a5ab769cc9..7a5ab769cc9 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix b/pkgs/desktops/gnome-3/apps/accerciser/src.nix
index 20bd0083964..20bd0083964 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
index 00895f9a2bb..00895f9a2bb 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/apps/bijiben/src.nix
index ea2c063647f..ea2c063647f 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index b5f70d84e52..b5f70d84e52 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix b/pkgs/desktops/gnome-3/apps/cheese/src.nix
index e10f79e8312..e10f79e8312 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 3d152221a39..3d152221a39 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix b/pkgs/desktops/gnome-3/apps/evolution/src.nix
index 2aab7967d8a..2aab7967d8a 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 18188829377..18188829377 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/apps/file-roller/src.nix
index 10a82877bcd..10a82877bcd 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 69056e28c26..69056e28c26 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gedit/src.nix b/pkgs/desktops/gnome-3/apps/gedit/src.nix
index 3fdc6cfaa68..3fdc6cfaa68 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gedit/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix
index 1179b2fdc5c..1179b2fdc5c 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/ghex/default.nix
+++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/ghex/src.nix b/pkgs/desktops/gnome-3/apps/ghex/src.nix
index edaa51d9478..edaa51d9478 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/ghex/src.nix
+++ b/pkgs/desktops/gnome-3/apps/ghex/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index a0f8d966955..a0f8d966955 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/glade/src.nix b/pkgs/desktops/gnome-3/apps/glade/src.nix
index d32dbd94d05..d32dbd94d05 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/glade/src.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index cb8bf49254b..cb8bf49254b 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix
index dbed4617850..dbed4617850 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index fbd5d748f5e..fbd5d748f5e 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix
index 5d0eeadcc0a..5d0eeadcc0a 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 0c7adcb0319..0c7adcb0319 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix
index db14a10d65a..db14a10d65a 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index e39614e765d..e39614e765d 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix
index 2497fe83c1e..2497fe83c1e 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 4840d200cf9..4840d200cf9 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix
index c1ca08a064b..c1ca08a064b 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index 0c75ebd7c78..0c75ebd7c78 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix
index 027cbb59d88..027cbb59d88 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index 2fc27617d98..2fc27617d98 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix
index 53e303f3856..53e303f3856 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 5af407ef15c..5af407ef15c 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix
index e45d7be3fb7..e45d7be3fb7 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 4f11e7a2843..4f11e7a2843 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/apps/gnome-music/src.nix
index 615c54583f2..615c54583f2 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
index 4c152777f2c..4c152777f2c 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 6e8394950a6..6e8394950a6 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix
index 204897f6d36..204897f6d36 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index 3b5542544d5..3b5542544d5 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix
index eef77b23504..eef77b23504 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
index 093900dcb7a..093900dcb7a 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
+++ b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index fc97d1b6d6e..fc97d1b6d6e 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix b/pkgs/desktops/gnome-3/apps/polari/src.nix
index da7a37031f5..da7a37031f5 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 58d5a5b8cdc..58d5a5b8cdc 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/apps/seahorse/src.nix
index 0ae195a0a7b..0ae195a0a7b 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/seahorse/src.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index 8b8b6248642..8b8b6248642 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/apps/vinagre/src.nix
index 3d1357c4989..3d1357c4989 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/vinagre/src.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 62cc4da6ba1..62cc4da6ba1 100644
--- a/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix
index 5700cb56913..5700cb56913 100644
--- a/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index 15db270e80c..15db270e80c 100644
--- a/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix b/pkgs/desktops/gnome-3/core/baobab/src.nix
index 8a2e35d454e..8a2e35d454e 100644
--- a/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix
index e405d8edfba..e405d8edfba 100644
--- a/pkgs/desktops/gnome-3/3.24/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/core/caribou/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index cd401962c99..cd401962c99 100644
--- a/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/core/dconf-editor/src.nix
index 64e19864536..64e19864536 100644
--- a/pkgs/desktops/gnome-3/3.24/core/dconf-editor/src.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 9200c4180bd..9200c4180bd 100644
--- a/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 9a29d11f1ae..9a29d11f1ae 100644
--- a/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 23759e3bf90..23759e3bf90 100644
--- a/pkgs/desktops/gnome-3/3.24/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/eog/src.nix b/pkgs/desktops/gnome-3/core/eog/src.nix
index 72b02d0bba5..72b02d0bba5 100644
--- a/pkgs/desktops/gnome-3/3.24/core/eog/src.nix
+++ b/pkgs/desktops/gnome-3/core/eog/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index ec8cf118815..ec8cf118815 100644
--- a/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix b/pkgs/desktops/gnome-3/core/epiphany/src.nix
index 85596c07fad..85596c07fad 100644
--- a/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index aca10516a38..aca10516a38 100644
--- a/pkgs/desktops/gnome-3/3.24/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/evince/src.nix b/pkgs/desktops/gnome-3/core/evince/src.nix
index aa45a79536a..aa45a79536a 100644
--- a/pkgs/desktops/gnome-3/3.24/core/evince/src.nix
+++ b/pkgs/desktops/gnome-3/core/evince/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 9d51dc969d3..9d51dc969d3 100644
--- a/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix
index 655fffe0eb9..655fffe0eb9 100644
--- a/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
index 171ad077450..171ad077450 100644
--- a/pkgs/desktops/gnome-3/3.24/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/core/folks/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix
index 1729ec06623..1729ec06623 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/gconf/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix
index 55eebf77be5..55eebf77be5 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/core/gcr/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gcr/src.nix b/pkgs/desktops/gnome-3/core/gcr/src.nix
index d166f033266..d166f033266 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gcr/src.nix
+++ b/pkgs/desktops/gnome-3/core/gcr/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 59f0381f2e8..59f0381f2e8 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-session-worker_xserver-path.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch
index d020752fef3..d020752fef3 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-session-worker_xserver-path.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch
index 66071aa4af8..66071aa4af8 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_extra_args.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_path.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch
index 84081f4786c..84081f4786c 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_path.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
index bbc803d49c1..bbc803d49c1 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix b/pkgs/desktops/gnome-3/core/gdm/src.nix
index 0dd7680467f..0dd7680467f 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
index 4d75bdc4996..4d75bdc4996 100644
--- a/pkgs/desktops/gnome-3/3.24/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/core/geocode-glib/src.nix
index 394e3a68c35..394e3a68c35 100644
--- a/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 10d9c46123d..10d9c46123d 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix b/pkgs/desktops/gnome-3/core/gjs/src.nix
index 27162fcbfd4..27162fcbfd4 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index eb801caf565..eb801caf565 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix
index dce56f2341e..dce56f2341e 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index 7fae0b5c67f..7fae0b5c67f 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix
index 5129b87e542..5129b87e542 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 12b8af206ea..12b8af206ea 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix
index 9279cdb13af..9279cdb13af 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
index f9261e183ef..f9261e183ef 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/core/gnome-common/src.nix
index 8ffe7e20e1a..8ffe7e20e1a 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-common/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-common/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 66cc2cb24c7..66cc2cb24c7 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/core/gnome-contacts/gio_unix.patch
index f1b3d3c94ac..f1b3d3c94ac 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/gio_unix.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/gio_unix.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix
index 4409747169b..4409747169b 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index b116c2902da..b116c2902da 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix
index 85dfcd2ef31..85dfcd2ef31 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 7265f09731f..7265f09731f 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix
index 83c2979656c..83c2979656c 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index c94c178558d..c94c178558d 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix
index 3c0a188c7b2..3c0a188c7b2 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index aef58567387..aef58567387 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix
index 602b9eb340e..602b9eb340e 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 16d7151ea09..16d7151ea09 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix
index f4e37d476dd..f4e37d476dd 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index df47c1a477b..df47c1a477b 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix
index 88179fff3c7..88179fff3c7 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
index ee8c3a902d5..ee8c3a902d5 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index 29f6ae3e860..29f6ae3e860 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix
index 2c51429cd0c..2c51429cd0c 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index 90fc3a8737a..90fc3a8737a 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix
index 00558f25295..00558f25295 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 34f8cee625a..34f8cee625a 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix
index 3668417d280..3668417d280 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 2cd92ce39ca..2cd92ce39ca 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/core/gnome-session/src.nix
index d323fea7631..d323fea7631 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index ff5670935bd..ff5670935bd 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix
index 03c213f2162..03c213f2162 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index 83305f440b1..83305f440b1 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix
index cb9bf57ce4a..cb9bf57ce4a 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index a694da0844d..a694da0844d 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell/src.nix
index 7cb2bd89221..7cb2bd89221 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 2f4a1427ec0..2f4a1427ec0 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/core/gnome-software/src.nix
index 9d847b3af7d..9d847b3af7d 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
index aa6f48ac420..aa6f48ac420 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 3164e4dd74b..3164e4dd74b 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix
index aab373b9715..aab373b9715 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 073a791ac3c..073a791ac3c 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix
index 2aa084cc493..2aa084cc493 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
index 5cc3385ad84..5cc3385ad84 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix
index a5ccd23b9fc..a5ccd23b9fc 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 4f02673e036..4f02673e036 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix
index f617d41ff30..f617d41ff30 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 587165e107b..587165e107b 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix
index 2d06f9e7a7c..2d06f9e7a7c 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/src.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
index 4b8fc90adad..4b8fc90adad 100644
--- a/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
index b4a794812a5..b4a794812a5 100644
--- a/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh
index 3291e38addb..3291e38addb 100644
--- a/pkgs/desktops/gnome-3/3.24/core/grilo/setup-hook.sh
+++ b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh
diff --git a/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
index 5123cadbdaf..5123cadbdaf 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix
index 22760d2be11..22760d2be11 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix
+++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix b/pkgs/desktops/gnome-3/core/gsound/default.nix
index 95785d9ed4d..95785d9ed4d 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsound/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
index 3dfbe6fbf0b..3dfbe6fbf0b 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch
index c87350167c2..c87350167c2 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/nix_share_path.patch
+++ b/pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix
index 8648c595bb9..8648c595bb9 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
index 43e27cdb481..43e27cdb481 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix
index 21618c45e05..21618c45e05 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/src.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index 05aff866606..05aff866606 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/core/gucharmap/src.nix
index 69c0dd60025..69c0dd60025 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gucharmap/src.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix
index 4141afeb821..4141afeb821 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix
index 08f05bcaedc..08f05bcaedc 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgdata/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index d4697c99a93..d4697c99a93 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
index 67003f45164..67003f45164 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgee/fix_introspection_paths.patch
+++ b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix
index 47cb96de6c3..47cb96de6c3 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
index 689ece9ad78..689ece9ad78 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
index 2bcbefc8dbf..2bcbefc8dbf 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix
index 02fa2716987..02fa2716987 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/src.nix
+++ b/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index 9dbed05523c..9dbed05523c 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix b/pkgs/desktops/gnome-3/core/libgweather/src.nix
index 6324a27b612..6324a27b612 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix
index b39e1f6fa56..b39e1f6fa56 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix
index 9f1f3096533..9f1f3096533 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libpeas/src.nix b/pkgs/desktops/gnome-3/core/libpeas/src.nix
index cd440858946..cd440858946 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libpeas/src.nix
+++ b/pkgs/desktops/gnome-3/core/libpeas/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
index 5a8117528b6..5a8117528b6 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index ebceb4ef706..ebceb4ef706 100644
--- a/pkgs/desktops/gnome-3/3.24/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/mutter/math.patch b/pkgs/desktops/gnome-3/core/mutter/math.patch
index dbdfd93f5e1..dbdfd93f5e1 100644
--- a/pkgs/desktops/gnome-3/3.24/core/mutter/math.patch
+++ b/pkgs/desktops/gnome-3/core/mutter/math.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix b/pkgs/desktops/gnome-3/core/mutter/src.nix
index 579ee0689e8..579ee0689e8 100644
--- a/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/mutter/x86.patch b/pkgs/desktops/gnome-3/core/mutter/x86.patch
index 93df1e7f283..93df1e7f283 100644
--- a/pkgs/desktops/gnome-3/3.24/core/mutter/x86.patch
+++ b/pkgs/desktops/gnome-3/core/mutter/x86.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index d508f148359..d508f148359 100644
--- a/pkgs/desktops/gnome-3/3.24/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch
index e1313999675..e1313999675 100644
--- a/pkgs/desktops/gnome-3/3.24/core/nautilus/extension_dir.patch
+++ b/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix b/pkgs/desktops/gnome-3/core/nautilus/src.nix
index 37c81a54a31..37c81a54a31 100644
--- a/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix
index d467cad93b4..d467cad93b4 100644
--- a/pkgs/desktops/gnome-3/3.24/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/core/rest/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index fb010756f29..fb010756f29 100644
--- a/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix b/pkgs/desktops/gnome-3/core/sushi/src.nix
index a713aef6f7f..a713aef6f7f 100644
--- a/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
index 63f36004bcd..63f36004bcd 100644
--- a/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index b3e9e5dd1fe..b3e9e5dd1fe 100644
--- a/pkgs/desktops/gnome-3/3.24/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/totem/src.nix b/pkgs/desktops/gnome-3/core/totem/src.nix
index 2067945f99e..2067945f99e 100644
--- a/pkgs/desktops/gnome-3/3.24/core/totem/src.nix
+++ b/pkgs/desktops/gnome-3/core/totem/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index a60c38015c0..a60c38015c0 100644
--- a/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix b/pkgs/desktops/gnome-3/core/tracker/src.nix
index 7a9b9ce3e38..7a9b9ce3e38 100644
--- a/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index bd446623fc2..bd446623fc2 100644
--- a/pkgs/desktops/gnome-3/3.24/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vino/src.nix b/pkgs/desktops/gnome-3/core/vino/src.nix
index 8cf55272da9..8cf55272da9 100644
--- a/pkgs/desktops/gnome-3/3.24/core/vino/src.nix
+++ b/pkgs/desktops/gnome-3/core/vino/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix b/pkgs/desktops/gnome-3/core/vte/2.90.nix
index 4f56439311e..4f56439311e 100644
--- a/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
+++ b/pkgs/desktops/gnome-3/core/vte/2.90.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index 7eabe6ad9d4..7eabe6ad9d4 100644
--- a/pkgs/desktops/gnome-3/3.24/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/fix_g_test_init_calls.patch b/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch
index 4c5696d4e17..4c5696d4e17 100644
--- a/pkgs/desktops/gnome-3/3.24/core/vte/fix_g_test_init_calls.patch
+++ b/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/fix_vteseq_n_lookup_declaration.patch b/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch
index 70ef7faa782..70ef7faa782 100644
--- a/pkgs/desktops/gnome-3/3.24/core/vte/fix_vteseq_n_lookup_declaration.patch
+++ b/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix
index ad0188b0053..ad0188b0053 100644
--- a/pkgs/desktops/gnome-3/3.24/core/vte/ng.nix
+++ b/pkgs/desktops/gnome-3/core/vte/ng.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/src.nix b/pkgs/desktops/gnome-3/core/vte/src.nix
index 841798848e6..841798848e6 100644
--- a/pkgs/desktops/gnome-3/3.24/core/vte/src.nix
+++ b/pkgs/desktops/gnome-3/core/vte/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
index 9111802eb6a..9111802eb6a 100644
--- a/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/core/yelp-tools/src.nix
index f03c6d1bc31..f03c6d1bc31 100644
--- a/pkgs/desktops/gnome-3/3.24/core/yelp-tools/src.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 0a3976f35a1..0a3976f35a1 100644
--- a/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix
index de5d68d1fab..de5d68d1fab 100644
--- a/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/src.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 4ee79bbc3dc..4ee79bbc3dc 100644
--- a/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp/src.nix b/pkgs/desktops/gnome-3/core/yelp/src.nix
index 7f38bab736f..7f38bab736f 100644
--- a/pkgs/desktops/gnome-3/3.24/core/yelp/src.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index 80f2dde534e..80f2dde534e 100644
--- a/pkgs/desktops/gnome-3/3.24/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix b/pkgs/desktops/gnome-3/core/zenity/src.nix
index cb12262725a..cb12262725a 100644
--- a/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7be1f79be4c..7be1f79be4c 100644
--- a/pkgs/desktops/gnome-3/3.24/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/desktop/rarian/default.nix
index a1b38b21869..a1b38b21869 100644
--- a/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
+++ b/pkgs/desktops/gnome-3/desktop/rarian/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index 6a50834f105..6a50834f105 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/devtools/anjuta/src.nix
index bbb7696d91c..bbb7696d91c 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/anjuta/src.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index f6e67be8d53..f6e67be8d53 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix
index b13de444c7e..b13de444c7e 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
index 156d91b3eae..156d91b3eae 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/devtools/gdl/src.nix
index c8b65884e08..c8b65884e08 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/gdl/src.nix
+++ b/pkgs/desktops/gnome-3/devtools/gdl/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index 50960f41a31..50960f41a31 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix
index 7f39aabda02..7f39aabda02 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/src.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/bool_slot.patch b/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch
index 83423122110..83423122110 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/bool_slot.patch
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
index cf200cb3292..cf200cb3292 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/safe_ptr.patch b/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch
index e3413b22497..e3413b22497 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/safe_ptr.patch
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/devtools/nemiver/src.nix
index 2fcf639fe1b..2fcf639fe1b 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/src.nix
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index 9e5d256741f..9e5d256741f 100644
--- a/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/games/aisleriot/src.nix
index fbe6505b9a0..fbe6505b9a0 100644
--- a/pkgs/desktops/gnome-3/3.24/games/aisleriot/src.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index 50a7d2906a7..50a7d2906a7 100644
--- a/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/games/five-or-more/src.nix
index 597db69a5dc..597db69a5dc 100644
--- a/pkgs/desktops/gnome-3/3.24/games/five-or-more/src.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 68228750cd8..68228750cd8 100644
--- a/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix
index e0e11bc2124..e0e11bc2124 100644
--- a/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/src.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index a96dae3c12c..a96dae3c12c 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/games/gnome-chess/src.nix
index 3fb218ab602..3fb218ab602 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index dc2289daff8..dc2289daff8 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix
index 447bc1eff13..447bc1eff13 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/src.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index 43db32e8857..43db32e8857 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix
index c021136ee30..c021136ee30 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/src.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index c55650e705a..c55650e705a 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/games/gnome-mines/src.nix
index 4b0e85fdef1..4b0e85fdef1 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index cf228218878..cf228218878 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix
index 133e9651fa7..133e9651fa7 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 9eafb166eee..9eafb166eee 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/games/gnome-robots/src.nix
index 17fabe2de26..17fabe2de26 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-robots/src.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index c8ba82c7246..c8ba82c7246 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix
index 597196a5ec8..597196a5ec8 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 78eaa23e63b..78eaa23e63b 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix
index 6828e56a911..6828e56a911 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/src.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index d6feab93dba..d6feab93dba 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix
index e79b18263b9..e79b18263b9 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/src.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
index bd6be7d43c5..bd6be7d43c5 100644
--- a/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/hitori/src.nix b/pkgs/desktops/gnome-3/games/hitori/src.nix
index 47989cf2eae..47989cf2eae 100644
--- a/pkgs/desktops/gnome-3/3.24/games/hitori/src.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 1b6f08d1fd6..1b6f08d1fd6 100644
--- a/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/iagno/src.nix b/pkgs/desktops/gnome-3/games/iagno/src.nix
index 6c20a8f7844..6c20a8f7844 100644
--- a/pkgs/desktops/gnome-3/3.24/games/iagno/src.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 8ec54b48972..8ec54b48972 100644
--- a/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/games/lightsoff/src.nix
index 2a26df6615b..2a26df6615b 100644
--- a/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index f319608764d..f319608764d 100644
--- a/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/games/quadrapassel/src.nix
index 57bdb4771dd..57bdb4771dd 100644
--- a/pkgs/desktops/gnome-3/3.24/games/quadrapassel/src.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index a4cad01488d..a4cad01488d 100644
--- a/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/games/swell-foop/src.nix
index 7fa5f724de2..7fa5f724de2 100644
--- a/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index c2b1f585712..c2b1f585712 100644
--- a/pkgs/desktops/gnome-3/3.24/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/tali/src.nix b/pkgs/desktops/gnome-3/games/tali/src.nix
index 108144cc3ee..108144cc3ee 100644
--- a/pkgs/desktops/gnome-3/3.24/games/tali/src.nix
+++ b/pkgs/desktops/gnome-3/games/tali/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/installer.nix b/pkgs/desktops/gnome-3/installer.nix
index 4999e1f3343..4999e1f3343 100644
--- a/pkgs/desktops/gnome-3/3.24/installer.nix
+++ b/pkgs/desktops/gnome-3/installer.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
index c229cc96094..c229cc96094 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
+++ b/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix
index ca0450dc7f9..ca0450dc7f9 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/california/default.nix
+++ b/pkgs/desktops/gnome-3/misc/california/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index e0622b17621..e0622b17621 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
index 69d89bd5879..69d89bd5879 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
index 46fa9bc39e5..46fa9bc39e5 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index b3646abd6dd..b3646abd6dd 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix b/pkgs/desktops/gnome-3/misc/gitg/src.nix
index 9c6dd2148cc..9c6dd2148cc 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index 3a35a87ceaf..3a35a87ceaf 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix
index ee2ade83ee6..ee2ade83ee6 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index ee3dd60e59a..ee3dd60e59a 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix
index 992badf1f4f..992badf1f4f 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
index d236730282a..d236730282a 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
index 40c0969d588..40c0969d588 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
index 5082a55387a..5082a55387a 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
index 1df3c1ffdb7..1df3c1ffdb7 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch
index 3e68c04cb3a..3e68c04cb3a 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/find_gsettings.patch
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix
index 0af83053fa8..0af83053fa8 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
index c0bd2fed3f2..c0bd2fed3f2 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index a43f9206cdd..a43f9206cdd 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix
index 44573d1a5bb..44573d1a5bb 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix b/pkgs/desktops/gnome-3/misc/gspell/src.nix
index fd55e654d55..fd55e654d55 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix
+++ b/pkgs/desktops/gnome-3/misc/gspell/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
index 89703b61932..89703b61932 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix
index 21876ec9c39..21876ec9c39 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/src.nix
+++ b/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix
index 98b71c9d9c9..98b71c9d9c9 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix
index 2e5b0a4af84..2e5b0a4af84 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgda/src.nix b/pkgs/desktops/gnome-3/misc/libgda/src.nix
index 8812ccc8ccd..8812ccc8ccd 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/libgda/src.nix
+++ b/pkgs/desktops/gnome-3/misc/libgda/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
index 6915ede4ad5..6915ede4ad5 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix
index b9abde42cbd..b9abde42cbd 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/src.nix
+++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
index 9988541e0f5..9988541e0f5 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/misc/pidgin/default.nix
index a5dd1480d3d..a5dd1480d3d 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/pidgin/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pidgin/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index 37cdfc730ab..37cdfc730ab 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
index bd3e5d6e1f4..c25b3d2744b 100644
--- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix
+++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
@@ -11,4 +11,5 @@ mkDerivation {
     kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
     knotifications kwindowsystem polkit-qt
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix
index 65fb20aa260..e645ecb41bd 100644
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ autoconf ];
 
   configurePhase = ''
-    ./configure --prefix=$out --enable-single-host
+    ./configure --prefix=$out
   '';
 
   buildPhase = ''
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 58b08ebd4fb..79f57c42c50 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -1,19 +1,16 @@
 { stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs }:
 
+# TODO: distinct packages for gambit-release and gambit-devel
+
 stdenv.mkDerivation rec {
   name    = "gambit-${version}";
-  version = "4.8.8-f3ffeb6";
+  version = "4.8.8-300db59";
   bootstrap = import ./bootstrap.nix ( pkgs );
 
-#  devver  = "4_8_8";
-#  src = fetchurl {
-#    url    = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${version}-devel.tgz";
-#    sha256 = "0j3ka76cfb007rlcc3nv5p1s6vh31cwp87hwwabawf16vs1jb7bl";
-#  };
   src = fetchgit {
     url = "https://github.com/feeley/gambit.git";
-    rev = "f3ffeb695aeea80c18c1b9ef276b57898c780dca";
-    sha256 = "1lqixsrgk9z2gj6z1nkys0pfd3m5zjxrp3gvqn2wpr9h7hjb8x06";
+    rev = "300db59e1d3b66bcd597f617849df0274d2a4472";
+    sha256 = "1mhy49lasakgvdaswkxasdssik11lx3hfx4h1gs2b6881488ssdp";
   };
 
   buildInputs = [ openssl git autoconf bootstrap ];
@@ -28,6 +25,8 @@ stdenv.mkDerivation rec {
       --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it.
       --enable-poll
       --enable-openssl
+      --enable-default-runtime-options="f8,-8,t8" # Default to UTF-8 for source and all I/O
+      #--enable-debug # Nope: enables plenty of good stuff, but also the costly console.log
 
       #--enable-multiple-versions # Nope, NixOS already does version multiplexing
       #--enable-guide
@@ -49,15 +48,15 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     # Make bootstrap compiler, from release bootstrap
-    mkdir -p boot/wip-compiler &&
-    cp -rp ${bootstrap}/. boot/wip-compiler/. &&
+    mkdir -p boot &&
+    cp -rp ${bootstrap}/. boot/. &&
     chmod -R u+w boot &&
-    cd boot/wip-compiler && \
-    cp ../../gsc/makefile.in ../../gsc/*.scm gsc && \
-    (cd gsc && make bootclean ) &&
-    make bootstrap &&
-    cd ../.. &&
-    cp boot/wip-compiler/gsc/gsc gsc-boot &&
+    cd boot &&
+    cp ../gsc/makefile.in ../gsc/*.scm gsc && # */
+    ./configure &&
+    for i in lib gsi gsc ; do (cd $i ; make ) ; done &&
+    cd .. &&
+    cp boot/gsc/gsc gsc-boot &&
 
     # Now use the bootstrap compiler to build the real thing!
     make -j2 from-scratch
diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index 22047b663d0..59cafee3b3a 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -2,23 +2,27 @@
   coreutils, rsync, bash,
   openssl, zlib, sqlite, libxml2, libyaml, libmysql, lmdb, leveldb }:
 
+# TODO: distinct packages for gerbil-release and gerbil-devel
+
 stdenv.mkDerivation rec {
   name    = "gerbil-${version}";
 
-  version = "0.12-DEV";
+  version = "0.12-DEV-777-gd855915";
   src = fetchgit {
     url = "https://github.com/vyzo/gerbil.git";
-    rev = "3657b6e940ea248e0b312f276590e38ff68997e7";
-    sha256 = "11ys7082ghkm4yikz4qxmv3jpxcr42jfi0jhjw1mpzbqdg6004w2";
+    rev = "9db6187dc996eec4087f83b86339e7b17bb69bad";
+    sha256 = "1hqmsy77d62dvil3az4vdr0rmwvxhinjl1dbcxzamz2c2kcjv1jg";
   };
 
   buildInputs = [
-    gambit openssl
+    gambit
     coreutils rsync bash
-    zlib openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb
+    openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb
   ];
 
   postPatch = ''
+    echo '(define (gerbil-version-string) "v${version}")' > src/gerbil/runtime/gx-version.scm
+
     patchShebangs .
 
     find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do
diff --git a/pkgs/development/compilers/ghcjs/head_shims.nix b/pkgs/development/compilers/ghcjs/head_shims.nix
index 68b03d05739..a9a7f8d45e2 100644
--- a/pkgs/development/compilers/ghcjs/head_shims.nix
+++ b/pkgs/development/compilers/ghcjs/head_shims.nix
@@ -2,6 +2,6 @@
 fetchFromGitHub {
   owner = "ghcjs";
   repo = "shims";
-  rev = "f67394c559ac921a768b12f141499119563b8bf3";
-  sha256 = "1lz86qmkxkfch1yk9a62admw7jsd34sqcrskgpq28hbhjpgzf1lv";
+  rev = "85395dce971e23a39e5f93af4ed139ca36d4e448";
+  sha256 = "1kqgik75jx681s1kjx1s7dryigr3m940c3zb9vy0r3psxrw6sf2g";
 }
diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix
index cfeff329fb5..6b8c6599062 100644
--- a/pkgs/development/compilers/jhc/default.nix
+++ b/pkgs/development/compilers/jhc/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
     platforms = ["x86_64-linux"]; # 32 bit builds are broken
     maintainers = with stdenv.lib.maintainers; [ aforemny thoughtpolice ];
+    broken = true; # https://hydra.nixos.org/build/61700723
   };
 }
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 65c2125dfbc..bc24cdfb87e 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.4-2";
+  version = "1.1.50";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "09sikwk5xxn4b30icbq28mjs4lm9xbj0bv5yjx75r165iz65g2cv";
+    sha256 = "01y7m0r5wa2apd05c38h77060javgbj8072vd08lz4qaw6c6445m";
   };
 
   propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix
new file mode 100644
index 00000000000..7f0a5750c0e
--- /dev/null
+++ b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix
@@ -0,0 +1,175 @@
+{ swingSupport ? true
+, stdenv
+, requireFile
+, makeWrapper
+, unzip
+, file
+, xorg ? null
+, packageType ? "JDK" # JDK, JRE, or ServerJRE
+, pluginSupport ? true
+, installjce ? false
+, glib
+, libxml2
+, ffmpeg_2
+, libxslt
+, mesa_noglu
+, freetype
+, fontconfig
+, gtk2
+, pango
+, cairo
+, alsaLib
+, atk
+, gdk_pixbuf
+, zlib
+, elfutils
+, setJavaClassPath
+}:
+
+assert stdenv.system == "x86_64-linux";
+assert swingSupport -> xorg != null;
+
+let
+  version = "9";
+
+  downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
+
+  jce =
+    if installjce then
+      requireFile {
+        name = "jce_policy-8.zip";
+        url = "${downloadUrlBase}/jce8-download-2133166.html";
+        sha256 = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
+      }
+    else
+      "";
+
+  rSubPaths = [
+    "lib/jli"
+    "lib/server"
+    "lib"
+  ];
+
+in
+
+let result = stdenv.mkDerivation rec {
+  name = if packageType == "JDK"       then "oraclejdk-${version}"
+    else if packageType == "JRE"       then "oraclejre-${version}"
+    else if packageType == "ServerJRE" then "oracleserverjre-${version}"
+    else abort "unknown package Type ${packageType}";
+
+  src =
+    if packageType == "JDK" then
+      requireFile {
+        name = "jdk-${version}_linux-x64_bin.tar.gz";
+        url =  "${downloadUrlBase}/jdk9-downloads-3848520.html";
+        sha256 = "0vbgy7h9h089l3xh6sl57v57g28x1djyiigqs4z6gh7wahx7hv8w";
+      }
+    else if packageType == "JRE" then
+      requireFile {
+        name = "jre-${version}_linux-x64_bin.tar.gz";
+        url = "${downloadUrlBase}/jre9-downloads-3848532.html";
+        sha256 = "18i4jjb6sby67xg5ql6dkk3ja1nackbb23g1bnp522450nclpxdb";
+      }
+    else if packageType == "ServerJRE" then
+      requireFile {
+        name = "serverjre-${version}_linux-x64_bin.tar.gz";
+        url = "${downloadUrlBase}/server-jre9-downloads-3848530.html";
+        sha256 = "01bxi7lx13lhlpbifw93b6r7a9bayiykw8kzwlyyqi8pz3pw8c5h";
+      }
+    else abort "unknown package Type ${packageType}";
+
+  nativeBuildInputs = [ file ]
+    ++ stdenv.lib.optional installjce unzip;
+
+  buildInputs = [ makeWrapper ];
+
+  # See: https://github.com/NixOS/patchelf/issues/10
+  dontStrip = 1;
+
+  installPhase = ''
+    cd ..
+
+    # Set PaX markings
+    exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+    for file in $exes; do
+      paxmark m "$file"
+      # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
+      ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
+    done
+
+    mv $sourceRoot $out
+
+    shopt -s extglob
+    for file in $out/*
+    do
+      if test -f $file ; then
+        rm $file
+      fi
+    done
+
+    if test -n "${jce}"; then
+      unzip ${jce}
+      cp -v UnlimitedJCEPolicy*/*.jar $out/lib/security
+    fi
+
+    if test -z "$pluginSupport"; then
+      rm -f $out/bin/javaws
+    fi
+
+    mkdir $out/lib/plugins
+    ln -s $out/lib/libnpjp2.so $out/lib/plugins
+
+    # for backward compatibility
+    ln -s $out $out/jre
+
+    mkdir -p $out/nix-support
+    printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
+
+    # Set JAVA_HOME automatically.
+    cat <<EOF >> $out/nix-support/setup-hook
+    if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+    EOF
+  '';
+
+  postFixup = ''
+    rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}"
+
+    # set all the dynamic linkers
+    find $out -type f -perm -0100 \
+        -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "$rpath" {} \;
+
+    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
+
+    # Oracle Java Mission Control needs to know where libgtk-x11 and related is
+    if test -x $out/bin/jmc; then
+      wrapProgram "$out/bin/jmc" \
+          --suffix-each LD_LIBRARY_PATH ':' "$rpath"
+    fi
+  '';
+
+  /**
+   * libXt is only needed on amd64
+   */
+  libraries =
+    [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++
+    (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
+
+  rpath = stdenv.lib.strings.makeLibraryPath libraries;
+
+  passthru.mozillaPlugin = "/lib/plugins";
+
+  passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
+
+  passthru.home = result;
+
+  # for backward compatibility
+  passthru.architecture = "";
+
+  meta = with stdenv.lib; {
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
+  };
+
+}; in result
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 69a8243b666..19ebd522a4f 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.19.1";
+  version = "0.19.2";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "1zd051syn0n6ign4nnxb40xj2s5vqp0s349nkjqv7051xzvlzf1p";
+    sha256 = "04vbhkkgpjh19pv2bq4b60lgnk5ck8axqs6fgw4l44j3lvxwlwrh";
   };
 
   buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 43d10bbfb93..078cf3e36c2 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchzip, fetchgit, boost, cmake, z3 }:
 
 let
-  version = "0.4.16";
-  rev = "d7661dd97460250b4e1127b9e7ea91e116143780";
-  sha256 = "1fd69pdhkkkvbkrxipkck1icpqkpdskjzar48a1yzdsx3l8s4lil";
+  version = "0.4.17";
+  rev = "bdeb9e52a2211510644fb53df93fb98258b40a65";
+  sha256 = "1x6q2rlq6gxggidgsy6li7m4phwr1hcfi65pq9yimz64ddqfiira";
   jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   patchPhase = ''
     echo >commit_hash.txt '${rev}'
     echo >prerelease.txt
-    substituteInPlace deps/jsoncpp.cmake \
+    substituteInPlace cmake/jsoncpp.cmake \
       --replace '${jsoncppURL}' ${jsoncpp}
     substituteInPlace cmake/EthCompilerSettings.cmake \
       --replace 'add_compile_options(-Werror)' ""
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 96b22b630f4..6cc9f372b97 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -259,7 +259,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "The Swift Programming Language";
     homepage = https://github.com/apple/swift;
-    maintainers = with maintainers; [ jb55 dtzWill ];
+    maintainers = with maintainers; [ dtzWill ];
     license = licenses.asl20;
     # Swift doesn't support 32bit Linux, unknown on other platforms.
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix
index 6ba1a59d545..a41d546e9cf 100644
--- a/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/pkgs/development/guile-modules/guile-cairo/default.nix
@@ -1,7 +1,8 @@
-{ fetchurl, stdenv, guile, pkgconfig, cairo, expat, guile_lib }:
+{ stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }:
 
 stdenv.mkDerivation rec {
-  name = "guile-cairo-1.4.1";
+  name = "guile-cairo-${version}";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "http://download.gna.org/guile-cairo/${name}.tar.gz";
@@ -9,29 +10,24 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ guile pkgconfig cairo expat ]
-    ++ stdenv.lib.optional doCheck guile_lib;
+    ++ stdenv.lib.optional doCheck guile-lib;
 
   doCheck = true;
 
-  meta = {
-    description = "Guile-Cairo, Cairo bindings for GNU Guile";
-
-    longDescription =
-      '' Guile-Cairo wraps the Cairo graphics library for Guile Scheme.
-
-         Guile-Cairo is complete, wrapping almost all of the Cairo API.  It
-         is API stable, providing a firm base on which to do graphics work.
-         Finally, and importantly, it is pleasant to use.  You get a powerful
-         and well-maintained graphics library with all of the benefits of
-         Scheme: memory management, exceptions, macros, and a dynamic
-         programming environment.
-      '';
-
-    license = stdenv.lib.licenses.lgpl3Plus;
-
-    homepage = http://home.gna.org/guile-cairo/;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Cairo bindings for GNU Guile";
+    longDescription = ''
+      Guile-Cairo wraps the Cairo graphics library for Guile Scheme.
+
+      Guile-Cairo is complete, wrapping almost all of the Cairo API.  It is API
+      stable, providing a firm base on which to do graphics work.  Finally, and
+      importantly, it is pleasant to use.  You get a powerful and well
+      maintained graphics library with all of the benefits of Scheme: memory
+      management, exceptions, macros, and a dynamic programming environment.
+    '';
+    homepage = "http://home.gna.org/guile-cairo/";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix
new file mode 100644
index 00000000000..5f82a93c513
--- /dev/null
+++ b/pkgs/development/guile-modules/guile-fibers/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, guile, texinfo }:
+
+let
+  version = "1.0.0";
+  name = "guile-fibers-${version}";
+in stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchFromGitHub {
+    owner = "wingo";
+    repo = "fibers";
+    rev = "v${version}";
+    sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ guile texinfo ];
+
+  autoreconfPhase = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    description = "Concurrent ML-like concurrency for Guile";
+    homepage = https://github.com/wingo/fibers;
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index ec7723f5b7e..aae44e2f6d8 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, stdenv, guile, guile_lib, gwrap
+{ fetchurl, stdenv, guile, guile-lib, gwrap
 , pkgconfig, gconf, glib, gnome_vfs, gtk2
 , libglade, libgnome, libgnomecanvas, libgnomeui
-, pango, guileCairo, autoconf, automake, texinfo }:
+, pango, guile-cairo, autoconf, automake, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "guile-gnome-platform-2.16.4";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
     libgnomecanvas
     libgnomeui
     pango
-    guileCairo
-  ] ++ stdenv.lib.optional doCheck guile_lib;
+    guile-cairo
+  ] ++ stdenv.lib.optional doCheck guile-lib;
 
   preConfigure = ''
       ./autogen.sh
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index de456b4983a..95741e07600 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -1,38 +1,45 @@
-{stdenv, fetchurl, guile, texinfo}:
+{ stdenv, fetchurl, guile, texinfo, pkgconfig }:
 
 assert stdenv ? cc && stdenv.cc.isGNU;
 
-stdenv.mkDerivation rec {
-  name = "guile-lib-0.2.2";
+let
+  name = "guile-lib-${version}";
+  version = "0.2.2";
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "mirror://savannah/guile-lib/${name}.tar.gz";
     sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b";
   };
 
-  buildInputs = [guile texinfo];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ guile texinfo ];
+
+  # One test doesn't seem to be compatible with guile_2_2.
+  patchPhase = ''
+    sed -i -e '/sxml.ssax.scm/d' unit-tests/Makefile*
+  '';
 
   doCheck = true;
 
-  preCheck =
+  preCheck = ''
     # Make `libgcc_s.so' visible for `pthread_cancel'.
-    '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH=\
+    "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A collection of useful Guile Scheme modules";
+    longDescription = ''
+      guile-lib is intended as an accumulation place for pure-scheme Guile
+      modules, allowing for people to cooperate integrating their generic Guile
+      modules into a coherent library.  Think "a down-scaled, limited-scope CPAN
+      for Guile".
     '';
-
-  meta = {
-    description = "Guile-Library, a collection of useful Guile Scheme modules";
-
-    longDescription =
-      '' guile-lib is intended as an accumulation place for pure-scheme Guile
-         modules, allowing for people to cooperate integrating their generic
-         Guile modules into a coherent library.  Think "a down-scaled,
-         limited-scope CPAN for Guile".
-      '';
-
-    homepage = http://www.nongnu.org/guile-lib/;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    homepage = "http://www.nongnu.org/guile-lib/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.gnu;
   };
 }
diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix
index bd6d9075130..152a3488304 100644
--- a/pkgs/development/guile-modules/guile-ncurses/default.nix
+++ b/pkgs/development/guile-modules/guile-ncurses/default.nix
@@ -1,7 +1,10 @@
-{ fetchurl, stdenv, pkgconfig, guile, ncurses, libffi }:
+{ stdenv, fetchurl, pkgconfig, guile, ncurses, libffi }:
 
-stdenv.mkDerivation rec {
-  name = "guile-ncurses-1.7";
+let
+  name = "guile-ncurses-${version}";
+  version = "1.7";
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "mirror://gnu/guile-ncurses/${name}.tar.gz";
@@ -11,31 +14,31 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ guile ncurses libffi ];
 
-  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
+  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
+  '';
+
+  # XXX: 1 of 65 tests failed.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Scheme interface to the NCurses libraries";
+    longDescription = ''
+      GNU Guile-Ncurses is a library for the Guile Scheme interpreter that
+      provides functions for creating text user interfaces.  The text user
+      interface functionality is built on the ncurses libraries: curses, form,
+      panel, and menu.
     '';
-
-  doCheck = false;  # XXX: 1 of 65 tests failed
-
-  meta = {
-    description = "GNU Guile-Ncurses, Scheme interface to the NCurses libraries";
-
-    longDescription =
-      '' GNU Guile-Ncurses is a library for the Guile Scheme interpreter that
-         provides functions for creating text user interfaces.  The text user
-         interface functionality is built on the ncurses libraries: curses,
-         form, panel, and menu.
-      '';
-
-    license = stdenv.lib.licenses.lgpl3Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    homepage = "https://www.gnu.org/software/guile-ncurses/";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.gnu;
   };
 }
diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix
index c7704d87fad..f854c71c240 100644
--- a/pkgs/development/guile-modules/guile-opengl/default.nix
+++ b/pkgs/development/guile-modules/guile-opengl/default.nix
@@ -1,14 +1,10 @@
 { stdenv, fetchurl, pkgconfig, guile }:
 
-stdenv.mkDerivation rec {
-  name = "guile-opengl-0.1.0";
-
-  meta = with stdenv.lib; {
-    description = "Guile binding for the OpenGL graphics API";
-    homepage    = "http://gnu.org/s/guile-opengl";
-    license     = licenses.gpl3Plus;
-    platforms   = platforms.linux;
-  };
+let
+  name = "guile-opengl-${version}";
+  version = "0.1.0";
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "mirror://gnu/guile-opengl/${name}.tar.gz";
@@ -16,4 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig guile ];
+
+  meta = with stdenv.lib; {
+    description = "Guile bindings for the OpenGL graphics API";
+    homepage = "http://gnu.org/s/guile-opengl";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix
index e2bfe485c5b..a7f703028bb 100644
--- a/pkgs/development/guile-modules/guile-sdl/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl/default.nix
@@ -3,14 +3,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "guile-sdl-0.5.1";
-
-  meta = with stdenv.lib; {
-    description = "Guile bindings for SDL";
-    homepage    = "http://gnu.org/s/guile-sdl";
-    license     = licenses.gpl3Plus;
-    platforms   = platforms.linux;
-  };
+  name = "guile-sdl-${version}";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "mirror://gnu/guile-sdl/${name}.tar.xz";
@@ -19,9 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig guile ];
 
-  buildInputs = [
-    SDL.dev SDL_image SDL_ttf SDL_mixer
-  ];
+  buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ];
 
   GUILE_AUTO_COMPILE = 0;
 
@@ -31,4 +23,12 @@ stdenv.mkDerivation rec {
       paths = buildInputs;
     };
   in "SDLMINUSI=-I${sdl}/include/SDL";
+
+  meta = with stdenv.lib; {
+    description = "Guile bindings for SDL";
+    homepage = "http://gnu.org/s/guile-sdl";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix
index a60a10c5c04..e79a4bec805 100644
--- a/pkgs/development/guile-modules/guile-xcb/default.nix
+++ b/pkgs/development/guile-modules/guile-xcb/default.nix
@@ -1,17 +1,13 @@
 { stdenv, fetchurl, pkgconfig, guile, texinfo }:
 
-stdenv.mkDerivation {
-  name = "guile-xcb-1.3";
-
-  meta = with stdenv.lib; {
-    description = "XCB bindings for Guile";
-    homepage    = "http://www.markwitmer.com/guile-xcb/guile-xcb.html";
-    license     = licenses.gpl3Plus;
-    platforms   = platforms.linux;
-  };
+let
+  name = "guile-xcb-${version}";
+  version = "1.3";
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
-    url = "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz";
+    url = "http://www.markwitmer.com/dist/${name}.tar.gz";
     sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149";
   };
 
@@ -23,4 +19,12 @@ stdenv.mkDerivation {
       --with-guile-site-ccache-dir=$out/share/guile/site
     ";
   '';
+
+  meta = with stdenv.lib; {
+    description = "XCB bindings for Guile";
+    homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d983934e83a..9cbbe236a2f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -34,6 +34,11 @@ self: super: {
   ghcjs-base = null;
   ghcjs-prim = null;
 
+  # Some packages add this (non-existent) dependency to express that they
+  # cannot compile in a given configuration. Win32 does this, for example, when
+  # compiled on Linux. We provide the name to avoid evaluation errors.
+  unbuildable = throw "package depends on meta package 'unbuildable'";
+
   # cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with
   # Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188.
   cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; });
@@ -957,4 +962,11 @@ self: super: {
     protolude = super.protolude_0_2;
   };
 
+  # This tool needs the latest hackage-db version. Using the latest version of
+  # optparse-applicative allows us to generate completions for fish and zsh.
+  cabal2nix = super.cabal2nix.overrideScope (self: super: {
+    hackage-db = self.hackage-db_2_0;
+    optparse-applicative = self.optparse-applicative_0_14_0_0;
+  });
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 62686086c27..2f1abe68dce 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2656,6 +2656,7 @@ dont-distribute-packages:
 
   # these packages depend on software with an unfree license
   accelerate-bignum:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-blas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-cublas:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-cuda:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-cufft:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2734,27 +2735,29 @@ dont-distribute-packages:
   abstract-par-accelerate:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   abt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   AC-BuildPlatform:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-EasyRaster-GTK:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-HalfInteger:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ac-machine-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ac-machine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-MiniTest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-Terminal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-VanillaArray:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-arithmetic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fftw:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fourier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accelerate-llvm:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-llvm-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-llvm:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-random:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-typelits:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-utility:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   accentuateus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   access-time:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-EasyRaster-GTK:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-HalfInteger:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   acid-state-dist:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   acid-state-tls:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ac-machine-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ac-machine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-all-monad:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-comonad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-flipping-tables:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-hq9plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ACME:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-inator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-io:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-left-pad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2767,35 +2770,34 @@ dont-distribute-packages:
   acme-strfry:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-stringly-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-zero:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-MiniTest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-Terminal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ACME:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ActionKid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   activehs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   activitystreams-aeson:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   actor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-VanillaArray:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Adaptive-Blaisorblade:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   adaptive-containers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Adaptive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   adaptive-tuple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Adaptive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   adb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   adblock2privoxy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   adhoc-network:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   adict:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   adobe-swatch-exchange:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adp-multi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi-monadiccp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adp-multi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Advgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Basics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Net:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Real-Double:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Real:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Real-Interval:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-RnToRm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AERN-Real:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-RnToRm-Plot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AERN-RnToRm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aern2-mp:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aern2-real:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-applicative:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-bson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-flowtyped:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-native:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-quick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2804,6 +2806,7 @@ dont-distribute-packages:
   aeson-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-t:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-yak:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affection:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affine-invariant-ensemble-mcmc:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   afv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2816,29 +2819,29 @@ dont-distribute-packages:
   AGI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   AhoCorasick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  airbrake:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   air-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  airbrake:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   aivika-distributed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ajhc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlanDeniseEricLauren:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic-classes:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AlgorithmW:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   algo-s:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AlignmentAlgorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AlgorithmW:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   align-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AlignmentAlgorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   alms:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alphachar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alpha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alphachar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alpino-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-gui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-midi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-pcm-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-seq-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alternative-io:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   altfloat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   alure:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2853,8 +2856,8 @@ dont-distribute-packages:
   analyze-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   anansi-pandoc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   anatomy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  android:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   android-lint-summary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  android:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   AndroidViewHierarchyImporter:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   angel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   angle:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2871,13 +2874,14 @@ dont-distribute-packages:
   anydbm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aosd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   apelsin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  api-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-authenticate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-clientsession:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-cookie:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-eventsource:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-helics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-http-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apiary:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-logger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-memcached:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-mongoDB:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2885,25 +2889,24 @@ dont-distribute-packages:
   apiary-purescript:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-session:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-websockets:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  api-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  apiary:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   apis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   apotiki:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  appc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   app-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  appc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ApplePush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AppleScript:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-fail:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-parsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-splice:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbtt:                                        [ "x86_64-darwin" ]
   archiver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  archlinux:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  archlinux:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   arff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   arghwxhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   argon2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2914,21 +2917,21 @@ dont-distribute-packages:
   arion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   arith-encode:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   armada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arpack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   arpa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arpack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   array-forth:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   array-primops:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ArrayRef:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arrowapply-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrow-improve:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arrowp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arrowapply-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrowp-qq:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arrowp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ArrowVHDL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   artery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-flatten:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ascii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-vector-avc:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ascii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   asic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asn1-codec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2937,15 +2940,15 @@ dont-distribute-packages:
   astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-dejafu:                                 [ "x86_64-darwin" ]
-  asynchronous-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-manager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  asynchronous-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   atlassian-connect-core:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atlassian-connect-descriptor:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   atndapi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-foreign:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   attic-schedule:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoBencode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2973,16 +2976,16 @@ dont-distribute-packages:
   avatar-generator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers-api-docs:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  avers:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  avers:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   avl-static:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   AvlTree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  avro:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   avr-shake:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  avro:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesome-prelude:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesomium-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  awesomium:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesomium-raw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  awesomium:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-configuration-tools:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-dynamodb-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-dynamodb-streams:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2990,14 +2993,14 @@ dont-distribute-packages:
   aws-elastic-transcoder:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-general:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-kinesis-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-kinesis:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-kinesis-reshard:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-kinesis:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-lambda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-performance-tests:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-route53:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-sdk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk-text-converter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk-xml-unordered:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-sdk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   axiom:                                        [ "x86_64-darwin" ]
@@ -3005,19 +3008,20 @@ dont-distribute-packages:
   azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-servicebus:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   azurify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  b-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   babylon:                                      [ "x86_64-darwin" ]
   backdropper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   backtracking-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   backward-state:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Baggins:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Baggins:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ballast:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-launcher:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-plugin-highlight:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-plugin-photo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-theme-blueprint:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-theme-mini-html5:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bamboo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamse:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bang:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   banwords:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3028,21 +3032,22 @@ dont-distribute-packages:
   Barracuda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  base32-bytestring:                            [ "x86_64-darwin" ]
-  base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base32-bytestring:                            [ "x86_64-darwin" ]
+  base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   BASIC:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   baskell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   batchd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  battlenet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   battlenet-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  battlenet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   battleships:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bayes-stack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BCMtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beamable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beamable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bearriver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   beautifHOL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bed-and-breakfast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   beeminder-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3055,8 +3060,8 @@ dont-distribute-packages:
   BerlekampAlgorithm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   berp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   besout:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  betacode:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  betacode:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bgzf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bibdb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3072,12 +3077,14 @@ dont-distribute-packages:
   binary-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-file:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-indexed-tree:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-protocol:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-protocol-zmq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-protocol:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bind-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   binding-gtk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-apr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binding-wx:                                   [ "x86_64-darwin" ]
   bindings-apr-util:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-apr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-bfd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-cctools:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-codec2:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3109,22 +3116,20 @@ dont-distribute-packages:
   bindings-sc3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sipc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-wlc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binding-wx:                                   [ "x86_64-darwin" ]
-  bind-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindynamic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   binembed-example:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   binembed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Biobase:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseDotP:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseFasta:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseFR3D:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Biobase:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseInfernal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseMAF:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseTrainingData:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseTurner:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseVienna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   biohazard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bioinformatics-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biophd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biosff:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3132,15 +3137,15 @@ dont-distribute-packages:
   bird:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   BirdPP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bit-array:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bit-stream:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitcoin-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitly-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bitly:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitmaps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bits-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bits-extras:                                  [ "x86_64-darwin" ]
+  bitset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitspeak:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bit-stream:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bittorrent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bkr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3168,8 +3173,8 @@ dont-distribute-packages:
   blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloomfilter-redis:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloxorz:                                      [ "x86_64-darwin" ]
-  blubber:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   blubber-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blubber:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bluetile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bluetileutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3181,8 +3186,8 @@ dont-distribute-packages:
   bond-haskell-compiler:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bookkeeper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper-permissions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bookkeeper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolean-list:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3202,7 +3207,6 @@ dont-distribute-packages:
   bson-generic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bson-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree-concurrent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  b-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   btrfs:                                        [ "x86_64-darwin" ]
   buchhaltung:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3216,25 +3220,24 @@ dont-distribute-packages:
   burnt-explorer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   burst-detection:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster-gtk:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  buster-network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buster-network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bustle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   butcher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   butterflies:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestringparser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-read:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestringreadp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-typenats:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestringparser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestringreadp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  c-dsl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  c-io:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  c-mosquitto:                                  [ "x86_64-darwin" ]
   c2hsc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2doap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2spec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-audit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-constraints:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-db:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3242,33 +3245,37 @@ dont-distribute-packages:
   cabal-ghc-dynflags:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-graphdeps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalgraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cabal-ide-backend:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-bundle:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc72:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc74:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalmdvrpm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-mon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-nirvana:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-plan:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-progdeps:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-query:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalQuery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalrpmdeps:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CabalSearch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-sort:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal2doap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal2ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal2spec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabalgraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabalish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabalmdvrpm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabalQuery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabalrpmdeps:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CabalSearch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalvchk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabocha:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   caffegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cake3:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cakyrespa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cal3d:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-opengl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cal3d:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   calc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   calculator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   caldims:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3281,32 +3288,32 @@ dont-distribute-packages:
   canteven-parsedate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cantor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Capabilities:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Capabilities:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   capri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  car-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   caramia:                                      [ "x86_64-darwin" ]
   carboncopy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  car-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   carte:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cartesian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-control:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-core:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-internal:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-ipopt-interface:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-snopt-interface:              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casadi-bindings:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cascade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cascading:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-html:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-meta-html:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-meta:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-reports-html:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook-reports:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-reports-meta-html:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-reports-meta:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casr-logbook-reports:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-types:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casr-logbook:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassandra-cql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassandra-thrift:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassava-megaparsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3324,16 +3331,15 @@ dont-distribute-packages:
   cayley-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cblrepo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   CBOR:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CCA:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-alt:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-cxe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-exc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-ref:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-ref-tf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CC-delcont-ref:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CCA:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cci:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ccnx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cctools-workqueue:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  c-dsl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cedict:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cef3-raw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cef3-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3351,12 +3357,12 @@ dont-distribute-packages:
   cfipu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cflp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cfopu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cgi-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chalkboard:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   chalkboard-viewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chalkboard:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   charade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   chart-histogram:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chart-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3365,9 +3371,10 @@ dont-distribute-packages:
   chatty-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatwork:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cheapskate-terminal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  check-pvp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  check-pvp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  checkmate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   chell-hunit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chell-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   chevalier-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3375,11 +3382,11 @@ dont-distribute-packages:
   Chitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   chorale-geo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chorale:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp-plus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp-spec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp-transformers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ChristmasTree:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   chronograph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chronos:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3390,12 +3397,11 @@ dont-distribute-packages:
   cielo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cil:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cinvoke:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  c-io:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   circlehs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   citation-resolve:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  citeproc-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   citeproc-hs-pandoc-filter:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  citeproc-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cjk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   clac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clafer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3405,14 +3411,13 @@ dont-distribute-packages:
   clanki:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clarifai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CLASE:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-prelude-quickcheck:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-parallel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-dot-com:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-bugs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-ircbot:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-mailinglist:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3421,16 +3426,17 @@ dont-distribute-packages:
   clckwrks-theme-bootstrap:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-clckwrks:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-geo-bootstrap:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cld2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Clean:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clean-unions:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Clean:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cless:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clevercss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cli-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CLI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   click-clack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clifford:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CLI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clifford:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clingo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clippard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3441,10 +3447,10 @@ dont-distribute-packages:
   clogparse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clone-all:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   closure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloudfront-signer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloud-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloudi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloud-seeder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cloudfront-signer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cloudi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudyfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clr-bindings:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clr-inline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3458,25 +3464,24 @@ dont-distribute-packages:
   cmath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmathml3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CMCompare:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmdargs-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmd-item:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cmdargs-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmdtheline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  c-mosquitto:                                  [ "x86_64-darwin" ]
   cmph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cnc-spec-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cndict:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Coadjute:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-libevent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codecov-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-rpm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  codecov-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   codemonitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   codepad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   codeworld-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cognimeta-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coinbase-exchange:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   coin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  coinbase-exchange:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   colada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   colchis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   collada-output:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3487,31 +3492,33 @@ dont-distribute-packages:
   collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   colonnade:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   color-counter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  colour-accelerate:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   colour-space:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   columbia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinatorial-problems:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  comark:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinator-interactive:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  combinatorial-problems:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Combinatorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   combobuffer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   commander:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Commando:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  commsec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   commsec-keyexchange:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  commsec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   commutative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   comonad-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   comonad-random:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ComonadSheet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compact:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-map:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-mutable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-socket:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-string:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compact:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata-automata:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata-dags:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compdata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata-param:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compdata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   competition:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compilation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   complexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3524,17 +3531,17 @@ dont-distribute-packages:
   comptrans:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   computational-algebra:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   concraft-hr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concraft:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   concraft-pl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concraft:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-haskell-autogen:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-typerep:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Concurrential:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   concurrent-state:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Concurrential:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConcurrentUtils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  condorcet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  condorcet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   conductive-hsc3:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-algorithms:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-audio-lame:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3542,13 +3549,13 @@ dont-distribute-packages:
   conduit-find:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-network-stream:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-resumablesink:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conffmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   conf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conffmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  config-ini:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  config-select:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConfigFileTH:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Configger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   configifier:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  config-ini:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  config-select:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Configurable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   congruence-relation:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   conjure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3566,8 +3573,8 @@ dont-distribute-packages:
   container:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   containers-benchmark:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ContArrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ContextAlgebra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   context-stack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ContextAlgebra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   continue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   continuum-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   continuum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3575,8 +3582,8 @@ dont-distribute-packages:
   control-event:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-attempt:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-exception-monadsfd:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  control-monad-failure:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-failure-mtl:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  control-monad-failure:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Control-Monad-MultiPass:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Control-Monad-ST2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   contstuff-monads-tf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3586,27 +3593,28 @@ dont-distribute-packages:
   convertible-ascii:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   convertible-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-cbmc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  copilot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-language:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-libraries:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-theorem:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   copr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   COrdering:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  core-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  core:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   corebot-bliki:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreDump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreErlang:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreFoundation:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  core-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  core:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   coroutine-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Coroutine:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   coroutine-iteratee:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Coroutine:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  couch-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  couch-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   couchdb-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   couchdb-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   CouchDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couch-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couch-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   counter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  courier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   court:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   coverage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CPBrainfuck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3622,6 +3630,7 @@ dont-distribute-packages:
   cqrs-sqlite3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-test:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-testkit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   crack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Craft3e:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   craft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3633,17 +3642,16 @@ dont-distribute-packages:
   crc16:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   crc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   creatur:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  credentials-cli:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   credential-store:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  credentials-cli:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain1-constrained:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain1:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain2-generic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain2-tiers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   criterion-plus:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   criterion-to-html:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  criu-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   criu-rpc-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  criu-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   crjdt-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   crocodile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cron-compat:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3651,26 +3659,27 @@ dont-distribute-packages:
   crunghc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-cipher-benchmarks:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-classical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cryptoconditions:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-multihash:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cryptocompare:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cryptoconditions:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptsy-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   crystalfontz:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cse-ghc-plugin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   csound-catalog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   csound-expression-dynamic:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  csound-expression:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   csound-expression-opcodes:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   csound-expression-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-expression:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   csound-sampler:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cspmchecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-cspm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-FiringRules:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-Frontend:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-Interpreter:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-ToProlog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cspmchecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cspretty:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   css:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctemplate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3680,67 +3689,65 @@ dont-distribute-packages:
   cudd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   currency-convert:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CurryDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry-frontend:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CurryDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   curryrs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   curve25519:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   curves:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   custom-prelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CV:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  d-bus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   d3js:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   DAG-Tournament:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   damnpacket:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dangerous:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dapi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-benchmark:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-beta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-buildpackage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-cabalized:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcsden:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-fastconvert:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DarcsHelpers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-monitor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcsden:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DarcsHelpers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcswatch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   darkplaces-demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darkplaces-rcon:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   darkplaces-rcon-util:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darkplaces-rcon:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dash-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-accessor-monadLib:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-accessor-monads-fd:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-accessor-monads-tf:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  database-study:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-concurrent-queue:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-construction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-cycle:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-dispersal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  datadog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-easy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-embed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-filepath:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-fin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-fin-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-fin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-flagset:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-interval:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-ivar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-kiln:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-layer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-fd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  datalog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-map-multikey:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-nat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-object:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-object-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-object-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-object:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-quotientref:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-repr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-result:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3751,10 +3758,13 @@ dont-distribute-packages:
   data-spacepart:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-store:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-structure-inferrer:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DataTreeView:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  datetime:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  database-study:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  datadog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  datalog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DataTreeView:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   datetime-sb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  datetime:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dawdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbcleaner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbjava:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3763,10 +3773,9 @@ dont-distribute-packages:
   dbmigrations-postgresql:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  d-bus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DBus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-th-introspection:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DBus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dclabel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dcpu16:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3774,17 +3783,17 @@ dont-distribute-packages:
   ddc-core-babel:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-core-eval:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-core-flow:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-core-llvm:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-core-salt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-core-simpl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-core-tetra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-driver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddci-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-interface:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-source-tetra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-war:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddci-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-code-detection:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-simple-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   debug-me:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3808,12 +3817,12 @@ dont-distribute-packages:
   definitive-sound:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   deiko-config:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dejafu:                                       [ "x86_64-darwin" ]
-  deka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   deka-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   delicious:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   delta-h:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  delta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Delta-Lambda:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  delta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   demarcate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   denominate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dependent-state:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3825,8 +3834,8 @@ dont-distribute-packages:
   derive-enumerable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-gadt:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-IG:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive-storable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-storable-plugin:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derive-storable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-topdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-trie:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   derp-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3847,12 +3856,12 @@ dont-distribute-packages:
   diagrams-canvas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-contrib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-hsqml:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pandoc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pdf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-qrcode:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-tikz:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-wx:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dice-entropy-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dicom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dictparser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3864,8 +3873,8 @@ dont-distribute-packages:
   digestive-functors-blaze:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-heist:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-hsp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DigitalOcean:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   digitalocean-kzs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DigitalOcean:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dimensional-codata:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   DimensionalHash:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dimensions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3873,24 +3882,24 @@ dont-distribute-packages:
   dingo-example:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-widgets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diophantine:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diplomacy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   diplomacy-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diplomacy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   direct-binary-files:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  directed-cubical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   direct-fastcgi:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   direct-http:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   direct-plugins:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  directed-cubical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   dirfiles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   discogs-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  discordian-calendar:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-rest:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  discordian-calendar:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   DiscussionSupportSystem:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dish:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   disjoint-set:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diskhash:                                     [ "x86_64-darwin" ]
-  distance-of-time:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distance-of-time:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-async:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-azure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3899,7 +3908,6 @@ dont-distribute-packages:
   distributed-process-execution:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-extras:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-fsm:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-lifted:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-monad-control:            [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-p2p:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3911,6 +3919,7 @@ dont-distribute-packages:
   distributed-process-task:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-zookeeper:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   distribution-plot:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   dixi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   djembe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3920,11 +3929,11 @@ dont-distribute-packages:
   dnscache:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dnsrbl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dnssd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doccheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   docidx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dockercook:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   docker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dockercook:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover-configurator:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   DocTest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   docvim:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3932,12 +3941,13 @@ dont-distribute-packages:
   doi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   DOM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   domplate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dotfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dot-linker:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  download-media-content:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dotfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dow:                                          [ "x86_64-darwin" ]
+  download-media-content:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dozenal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dozens:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DP:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-lifted-base:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3946,40 +3956,39 @@ dont-distribute-packages:
   dph-prim-interface:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-prim-par:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-prim-seq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DP:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   dpkg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DPM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   drClickOn:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dresdner-verkehrsbetriebe:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrHylo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrIFT-cabalized:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  drifter-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrIFT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  drifter-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   drmaa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dropbox-sdk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dropsolve:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DSH:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dsh-sql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ds-kanren:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dsmc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dsh-sql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DSH:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dsmc-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dson:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dsmc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dson-parsec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dson:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DSTM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dstring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtab:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DTC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-types:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtw:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   duckling:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dumb-cas:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   duplo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust-crypto:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust-tools-pcap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dust-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dust:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dvda:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dvdread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dvi-processing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4014,13 +4023,13 @@ dont-distribute-packages:
   edenskel:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   edentv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   edge:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  editable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   edit-lenses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  editable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   editline:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EditTimeReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   EEConfig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effective-aspects:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   effective-aspects-mzv:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  effective-aspects:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   egison-quote:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4038,10 +4047,10 @@ dont-distribute-packages:
   elocrypt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   emacs-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  emailparse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-validator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  emailparse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock-example:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   embroidery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4063,8 +4072,8 @@ dont-distribute-packages:
   epass:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   epic:                                         [ "x86_64-darwin" ]
   epoll:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  epubname:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   epub-tools:                                   [ "x86_64-darwin" ]
+  epubname:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   EqualitySolver:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   erd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4077,8 +4086,8 @@ dont-distribute-packages:
   error-loc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   error-message:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   error-util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ersatz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ersatz-toysat:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ersatz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ert:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   escape-artist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   esotericbot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4094,22 +4103,23 @@ dont-distribute-packages:
   Etherbunny:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-analyzer-cli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-analyzer-deps:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ethereum-analyzer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-analyzer-webui:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ethereum-analyzer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-client-haskell:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-merkle-patricia-db:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   eurofxref:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Euterpea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   event-driven:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  event-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   eventful-dynamodb:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   eventful-postgresql:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   eventloop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  event-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EventSocket:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   eventsource-geteventstore-store:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   eventstore:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   every-bit-counts:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ewe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ex-pool:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exact-real:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   exception-hierarchy:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   exception-monads-fd:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4127,12 +4137,12 @@ dont-distribute-packages:
   explain:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-determinant:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-iomodes-bytestring:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  explicit-iomodes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-iomodes-text:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  explicit-iomodes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-sharing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ex-pool:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expressions-z3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   expressions:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4140,8 +4150,8 @@ dont-distribute-packages:
   extended-reals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   extensible-data:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   extensible-effects:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  extractelf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Extra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  extractelf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   extralife:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   extrapolate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ez-couch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4150,10 +4160,11 @@ dont-distribute-packages:
   factual-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fadno-braids:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fadno-xml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fadno:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   FailureT:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fake-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fallingblocks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   falling-turnip:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fallingblocks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   family-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastbayes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastedit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4166,14 +4177,14 @@ dont-distribute-packages:
   fay-dom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-geoposition:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-hsx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fay:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-jquery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-ref:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-simplejson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-uri:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fbmessenger-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fb-persistent:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fbmessenger-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fca:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fcd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fckeditor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4182,12 +4193,12 @@ dont-distribute-packages:
   fdo-trash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   feature-flipper-postgres:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fedora-packages:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed2lj:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed2twitter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-cli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-crawl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-gipeda:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-translator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feed2lj:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feed2twitter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   feldspar-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   feldspar-language:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fenfire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4204,21 +4215,21 @@ dont-distribute-packages:
   fields:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   FieldTrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fieldwise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  filecache:                                    [ "x86_64-darwin" ]
   file-collection:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   file-command-qq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  filediff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   file-location:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filecache:                                    [ "x86_64-darwin" ]
+  filediff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filepath-io-access:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   filepather:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   FilePather:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  filepath-io-access:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Files:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FileSystem:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-trees:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FileSystem:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fillit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   filtrable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Quote-Yahoo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4231,40 +4242,40 @@ dont-distribute-packages:
   fit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fitsio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fitspec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-point:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-point-vector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fix-parser-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fix-symbols-gitit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-point-vector-space:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-point-vector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-point:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-precision:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-storable-array:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-width:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixfile:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fix-parser-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixplate:                                     [ "x86_64-darwin" ]
-  fix-symbols-gitit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   flac-picture:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   flamethrower:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   flamingra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   flat-maybe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   flexible-time:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flexiwrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   flexiwrap-smallcheck:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flexiwrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   flickr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Flippi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flite:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   floating-bits:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flow-er:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   flow2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowdock-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowdock:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowdock-rest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flow-er:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flowdock:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   flower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowlocks-framework:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowsim:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fluidsynth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   FModExRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fn-extra:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-incremental:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-statistics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4273,22 +4284,22 @@ dont-distribute-packages:
   foma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   font-opengl-basic4x6:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   foo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  for-free:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   forbidden-fruit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fordo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   forecast-io:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   foreign-var:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  for-free:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   forger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   forkable-monad:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ForkableT:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FormalGrammars:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   formal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  format:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FormalGrammars:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   format-status:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  format:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   formattable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  forml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   formlets-hsp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   formlets:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  forml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   formura:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ForSyDe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   forth-hll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4310,17 +4321,17 @@ dont-distribute-packages:
   free-functors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-game:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-operational:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freesect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freesound:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems-counterexamples:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-seq:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems-seq-webui:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems-seq:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems-webui:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FreeTypeGL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freesect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freesound:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   freetype-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FreeTypeGL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fresh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-devil:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-scale-dct:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4331,6 +4342,7 @@ dont-distribute-packages:
   fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsnotify-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsutils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fswatch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fswatcher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftdi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   FTGL-bytestring:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4338,17 +4350,17 @@ dont-distribute-packages:
   FTPLine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftshell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   full-sessions:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fullstop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   full-text-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fullstop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   funbot-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   funbot-git-hook:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   funbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   funcons-tools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  functional-arrow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   function-combine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   function-instances-algebra:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  functorm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  functional-arrow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   functor-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  functorm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Fungi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   funion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   funpat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4356,15 +4368,16 @@ dont-distribute-packages:
   fusion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   futun:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   future:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fuzzytime:                                    [ "x86_64-darwin" ]
   fuzzy-timings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fuzzytime:                                    [ "x86_64-darwin" ]
   fwgl-glfw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fwgl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-javascript:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fwgl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  g-npm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   g4ip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gact:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gameclock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   game-probability:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gameclock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Gamgine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ganymede:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   garepinoh:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4374,11 +4387,12 @@ dont-distribute-packages:
   gdiff-ig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeBoP:                                        [ "x86_64-darwin" ]
-  geek:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geek:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gegl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gelatin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gemstone:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gen-passwd:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gencheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gender:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   genders:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4391,33 +4405,32 @@ dont-distribute-packages:
   generic-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-maybe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-pretty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genericserialize:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-storable:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-xml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genesis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genericserialize:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   genesis-test:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genesis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   genetics:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geniconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   geni-gui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geni-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   GenI:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geniconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   geniplate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   geniserver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geni-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gen-passwd:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   genprog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   GenSmsPdu:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gentlemark:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   GenussFold:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-hspec-hashable:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geo-resolver:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeocoderOpenCage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   geodetic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeoIp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geojson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   geojson-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geojson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   geolite-csv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   geom2d:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeomPredicates-SSE:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geo-resolver:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   getemx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   getflag:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   GGg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4428,17 +4441,7 @@ dont-distribute-packages:
   ghc-events-analyze:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-events-parallel:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-generic-instances:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-diagrams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-haskeline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-history-parser:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-imported-from:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-ng:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-dom-jsffi:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-hplay:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-promise:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-xhr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghclive:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-man-completion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-autofix:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4449,48 +4452,58 @@ dont-distribute-packages:
   ghc-syb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-usage:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-vis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghci-diagrams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghci-haskeline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghci-history-parser:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghci-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghci-ng:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-dom-jsffi:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-hplay:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-promise:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-xhr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghclive:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ght:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  giak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-cairo:                                     [ "x86_64-darwin" ]
-  Gifcurry:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gdkx11:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gdk:                                       [ "x86_64-darwin" ]
+  gi-gdkx11:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-ggit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstpbutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gsttag:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gtk-hs:                                    [ "x86_64-darwin" ]
+  gi-gtk:                                       [ "x86_64-darwin" ]
   gi-gtkosxapplication:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gtksource:                                 [ "x86_64-darwin" ]
-  gi-gtk:                                       [ "x86_64-darwin" ]
   gi-notify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-pangocairo:                                [ "x86_64-darwin" ]
-  gipeda:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-poppler:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-vte:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  giak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Gifcurry:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gipeda:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GiST:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-all:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-checklist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-date:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitdo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-fmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-freq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-gpush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-jump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-monitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-object:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-repair:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-sanity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-vogue:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitdo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-backup:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitignore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-jump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-cross:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-s3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-monitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-object:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-repair:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-sanity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-vogue:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-vte:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   glade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gladexml-accessor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   glapp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4503,10 +4516,10 @@ dont-distribute-packages:
   glirc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gll:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLMatrix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glob-posix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   global-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  global:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   global-variables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glob-posix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  global:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   glome-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeTrace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeVec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4521,7 +4534,6 @@ dont-distribute-packages:
   gnome-desktop:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnome-keyring:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnomevfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  g-npm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnss-converters:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnuidn:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   goa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4529,18 +4541,18 @@ dont-distribute-packages:
   goal-geometry:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-probability:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-simulation:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  goat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   goatee-gtk:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   goatee:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  goat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gofer-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-analytics:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-servicemanagement:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gooey:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-drive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2-for-cli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   googleplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   googlepolyline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleSB:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4570,6 +4582,10 @@ dont-distribute-packages:
   GrammarProducts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   grammatical-parsers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   grapefruit-ui-gtk:                            [ "x86_64-darwin" ]
+  graph-rewriting-cl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-trs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-visit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Graph500:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphbuilder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphene:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4579,24 +4595,21 @@ dont-distribute-packages:
   graphics-formats-collada:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicsFormats:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicstools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-cl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-trs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graphite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphtype:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-visit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   graql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   grasp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gray-extended:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graylog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  greencard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   greencard-lib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  greencard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   greg-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gremlin-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grempa:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   grenade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridbounds:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridfs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridland:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   grm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GroteTrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4610,32 +4623,32 @@ dont-distribute-packages:
   gruff:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random-fu:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gssapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gssapi-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gssapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gstreamer:                                    [ "x86_64-darwin" ]
   GTALib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-largeTreeStore:                           [ "x86_64-darwin" ]
+  gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-serialized-event:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-toy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-traymanager:                              [ "x86_64-darwin" ]
   gtk2hs-cast-glade:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-gnomevfs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gtkglext:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-gtk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk2hs-cast-gtkglext:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-gtksourceview2:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-th:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Gtk2hsGenerics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-hello:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-rpn:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Gtk2hsGenerics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk3-mac-integration:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk3:                                         [ "x86_64-darwin" ]
   gtkglext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GtkGLTV:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkimageview:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-largeTreeStore:                           [ "x86_64-darwin" ]
-  gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkrsync:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-serialized-event:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtksourceview3:                               [ "x86_64-darwin" ]
-  gtk-toy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-traymanager:                              [ "x86_64-darwin" ]
   guarded-rewriting:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   guess-combinator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   guid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4643,24 +4656,17 @@ dont-distribute-packages:
   GuiTV:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gulcii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gyah-bin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  h-booru:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  h-gpgme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  h-reversi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   h2048:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   h2c:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  H:                                            [ "x86_64-darwin" ]
   haar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   habit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hach:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-happstack-server:               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-mongrel2-http:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-snap-server:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-warp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage2twitter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-diff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-mirror:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-proxy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-whatsnew:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-contrib-press:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackernews:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-frontend-happstack:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-cgi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-epoll:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4670,11 +4676,22 @@ dont-distribute-packages:
   hack-handler-hyena:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-kibro:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-simpleserver:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HackMail:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackmanager:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-cleanpath:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-clientsession:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-jsonp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-handler-happstack-server:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-handler-mongrel2-http:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-handler-snap-server:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-handler-warp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-diff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-mirror:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-proxy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-whatsnew:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage2twitter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackernews:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HackMail:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackmanager:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactors:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haddock-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4695,8 +4712,8 @@ dont-distribute-packages:
   hakyll-contrib-csv:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib-elm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib-hyphenation:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-contrib:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib-links:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-contrib:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-ogmarkup:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-R:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-sass:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4705,8 +4722,8 @@ dont-distribute-packages:
   halipeto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   halive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  halma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma-telegram-bot:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  halma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamid:                                        [ "x86_64-darwin" ]
   HaMinitel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hampp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4717,20 +4734,22 @@ dont-distribute-packages:
   handsy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hangman:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hannahci:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hans:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hans-pcap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hans:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haphviz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   happindicator3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happindicator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   happraise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-Data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happs-hsp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   happs-hsp-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happs-hsp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-IxSet:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-Server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-State:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-authenticate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happs-tutorial:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HAppS-Util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-auth:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-authenticate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-contrib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-data:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-dlg:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4741,7 +4760,6 @@ dont-distribute-packages:
   happstack-heist:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-helpers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-hstringtemplate:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-monad-peel:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-plugins:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4749,11 +4767,10 @@ dont-distribute-packages:
   happstack-state:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-util:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-yui:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happs-tutorial:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-Util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happybara:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happybara-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   happybara-webkit-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happybara-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happybara:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hapstone:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaPy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   harchive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4767,33 +4784,33 @@ dont-distribute-packages:
   haroonga-httpd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haroonga:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   harvest-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  has-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  has:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HasCacBDD:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascat-lib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascat-setup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascat-system:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hascat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Haschoo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HasGP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashable-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashable-generics:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashed-storage:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hashell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashtables-plus:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  has:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hask-home:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hask:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskades:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskarrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskbot-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskdeep:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskeem:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskeline-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell2010:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell98:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell98libraries:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-abci:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-aliyun:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-awk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4801,39 +4818,16 @@ dont-distribute-packages:
   haskell-cnc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-coffee:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-course-preludes:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-mtl:           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-tf:            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-transformers:  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-lifted:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-dynamic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-flat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc-odbc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc-postgresql:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc-sqlite3:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-odbc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-postgresql:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-sqlite3:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-wx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-eigen-util:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-formatter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-ftp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-generate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-igraph:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-kubernetes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellLM:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-lsp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-mpfr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-names:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-neo4j-client:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellNN:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Haskelloids:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-openflow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-pdf-presenter:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-platform-test:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4842,8 +4836,6 @@ dont-distribute-packages:
   haskell-read-editor:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-reflect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-rules:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskellscrabble:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskellscript:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-observe:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-prisms:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-qq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4854,52 +4846,81 @@ dont-distribute-packages:
   haskell-tools-ast-trf:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-cli:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellTorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellTutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-type-exts:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-typescript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tyrant:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-xmpp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell2010:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell98:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell98libraries:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-catchio-mtl:           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-catchio-tf:            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-catchio-transformers:  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-lifted:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-dynamic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-flat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hdbc-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hdbc-odbc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hdbc-postgresql:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hdbc-sqlite3:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hdbc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-odbc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-postgresql:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-sqlite3:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-wx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaskellLM:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaskellNN:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Haskelloids:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskellscrabble:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskellscript:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaskellTorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaskellTutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskgame:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskheap:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskhol-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hask-home:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hask:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskmon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-crypto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-node:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-protocol:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-script:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-wallet:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoon-httpspec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoon-salvia:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskore-realtime:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskore-supercollider:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskore-synthesizer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskRel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasloGUI:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haslo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasloGUI:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasparql-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-backend:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-class:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-cursor-query:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-generic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-postgres:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-postgres-options:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasql-postgres:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haste-app:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-compiler:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-gapi:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haste:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haste-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haste-markup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-perch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  has-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haste-prim:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haste:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-qq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hats:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haverer:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaVSA:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4921,7 +4942,6 @@ dont-distribute-packages:
   hbeat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hblas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hblock:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  h-booru:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HCard:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcheat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4940,10 +4960,10 @@ dont-distribute-packages:
   hdbc-postgresql-hstore:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HDBC-postgresql-hstore:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-postgresql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdbi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hDFA:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdigest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdirect:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4964,31 +4984,31 @@ dont-distribute-packages:
   heist-aeson:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   heist-async:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   heist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helics:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   helics-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  helics:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   helium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   helix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hellage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hellage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hellnet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   help-esb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hemkay:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hemokit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  henet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hen:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  henet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hepevt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  her-lexer-parsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  her-lexer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HERA:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   herbalizer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HerbiePlugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   heredocs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  her-lexer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  her-lexer-parsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hermes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hermit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hermit-syb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hermit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone-embed:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herringbone:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone-wai:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  herringbone:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hesh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hesql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hetris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4999,8 +5019,8 @@ dont-distribute-packages:
   hexml-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-pickle-generic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexpress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexpress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexquote:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hF2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hfann:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5013,6 +5033,7 @@ dont-distribute-packages:
   hfractal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HFrequencyQueue:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hfusion:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hg-buildpackage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgalib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-API:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-Audio:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5024,7 +5045,6 @@ dont-distribute-packages:
   HGamer3D-Enet-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-Graphics3D:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-GUI:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-InputSystem:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-Network:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-Ogre-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5033,7 +5053,7 @@ dont-distribute-packages:
   HGamer3D-SFML-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-WinEvent:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-Wire:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hg-buildpackage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgdbmi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGE2D:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgearman:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5046,13 +5066,13 @@ dont-distribute-packages:
   hgithub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgopher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  h-gpgme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGraphStorage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgrev:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgrib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hharp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HHDL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hi3status:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hiccup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hichi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hid:                                          [ "x86_64-darwin" ]
@@ -5066,7 +5086,6 @@ dont-distribute-packages:
   higher-leveldb:                               [ "x86_64-darwin" ]
   higherorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   highWaterMark:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   himg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   himpy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hindley-milner:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5076,27 +5095,27 @@ dont-distribute-packages:
   hint-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinvaders:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinze-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipchat-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HipmunkPlayground:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hipmunk-Utils:                                [ "x86_64-darwin" ]
   Hipmunk:                                      [ "x86_64-darwin" ]
+  HipmunkPlayground:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hircules:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hirt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hish:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hissmetrics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  historian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl-fusion:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hist-pl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl-lexicon:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl-lmf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hist-pl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  historian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HJavaScript:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hjcase:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HJScript:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hjs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HJScript:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HJVM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlatex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlbfgsb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5107,6 +5126,7 @@ dont-distribute-packages:
   HLearn-classification:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-datastructures:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-iadd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5132,8 +5152,8 @@ dont-distribute-packages:
   hmatrix-special:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-static:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmenu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmidi:                                        [ "x86_64-darwin" ]
   hmk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5148,22 +5168,24 @@ dont-distribute-packages:
   hnix:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HNM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hnormalise:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ho-rewriting:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoauth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hobbes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hobbits:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hocilib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hodatime:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HODE:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hoed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hofix-mtl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hogg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hog:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hogg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogre-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogre:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hois:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hol:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hold-em:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hol:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Distribution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-MapReduce:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Searchengine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5175,23 +5197,22 @@ dont-distribute-packages:
   honi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   honk:                                         [ "x86_64-darwin" ]
   hoobuddy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hood-off:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-publish:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-render:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hood-off:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoogle-index:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hooks-dir:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoovie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopencc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopencl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hOpenPGP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopenpgp-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hOpenPGP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopfield:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ho-rewriting:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   horizon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   horname:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hosts-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5202,14 +5223,14 @@ dont-distribute-packages:
   hp2any-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hp2any-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hp2any-manager:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpaco:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpaco-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpaco:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpapi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpaste:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpasteit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpath:                                        [ "x86_64-darwin" ]
+  HPath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpc-tracer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpdft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5229,20 +5250,44 @@ dont-distribute-packages:
   hpylos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hquantlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hquery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hR:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hranker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HRay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  h-reversi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hR:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hricket:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hricket:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hriemann:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-graf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-hist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HROOT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-blake2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-carbon-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-cdb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-di:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-dotnet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-excelx:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-ffmpeg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-fltk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-gchart:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-gen-iface:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-gizapp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-java:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-json-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-logo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-mesos:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-multiaddr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-nombre-generator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-pgms:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-pkpass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-re:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-scrape:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-twitter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-twitterarchiver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-vcard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-watchman:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs2bf:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs2dot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hs2lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5252,7 +5297,6 @@ dont-distribute-packages:
   hsbencher-codespeed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher-fusion:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-blake2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-cairo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-data:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-forth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5267,34 +5311,24 @@ dont-distribute-packages:
   hsc3-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscaffold:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscamwire:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-carbon-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscassandra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-cdb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsclock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscope:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hScraper:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdif:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-di:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdns-cache:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-dotnet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hsed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsemail-ns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsenv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-excelx:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsfacter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsfcsh:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSFFIG:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-ffmpeg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsfilt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-fltk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-gchart:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-gen-iface:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSGEP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-gizapp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsgnutls:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsgnutls-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsgnutls:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsgsom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHaruPDF:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSHHelpers:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5302,24 +5336,18 @@ dont-distribute-packages:
   HsHyperEstraier:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsI2C:                                        [ "x86_64-darwin" ]
   hSimpleDB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-java:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-json-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsJudy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hskeleton:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslackbuilder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslibsvm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSlippyMap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslogger-reader:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-logo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslogstash:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsmagick:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSmarty:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-mesos:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hsmtlib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsmtpclient:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-multiaddr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsnock:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-nombre-generator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsns:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsnsq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsntp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5327,8 +5355,8 @@ dont-distribute-packages:
   hsoptions:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSoundFile:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsoz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsparql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsp-cgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsparql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspear:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-expectations-pretty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-experimental:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5340,24 +5368,20 @@ dont-distribute-packages:
   hspec-snap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-test-sandbox:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsPerl5:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-pgms:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspkcs11:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-pkpass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspresent:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsprocess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsql-mysql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-datamodel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-datamodel-vinyl:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml-datamodel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-demo-manic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-demo-morris:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-demo-notes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-demo-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-morris:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsreadability:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-re:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-scrape:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsseccomp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsshellscript:                                [ "x86_64-darwin" ]
   hssourceinfo:                                 [ "x86_64-darwin" ]
@@ -5370,19 +5394,15 @@ dont-distribute-packages:
   hstox:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstradeking:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HStringTemplateHelpers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-twitterarchiver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-twitter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstyle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstzaar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsubconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsudoku:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-vcard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-watchman:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hswip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsXenCtrl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsx-xhtml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsXenCtrl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsyscall:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsyslog-tcp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsyslog-udp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5406,11 +5426,12 @@ dont-distribute-packages:
   http-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-kinder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-proxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  https-everywhere-rules:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  https-everywhere-rules-raw:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-shed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  httpspec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-wget:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http2-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  https-everywhere-rules-raw:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  https-everywhere-rules:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  httpspec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   htune:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   htzaar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hubris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5436,21 +5457,20 @@ dont-distribute-packages:
   huttons-razor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   huzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hVOIDP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hwall-auth-iitk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-kafka-avro:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-kafka-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-kafka-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hworker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hwall-auth-iitk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker-ses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hworker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2-bytevector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hwsl2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2-reducers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  H:                                            [ "x86_64-darwin" ]
+  hwsl2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hXmixer:                                      [ "x86_64-darwin" ]
-  hxmppc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HXMPP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hxmppc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxournal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HXQ:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxt-binary:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5464,14 +5484,14 @@ dont-distribute-packages:
   hydrogen-cli-args:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-data:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hydrogen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-multimap:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-parsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-prelude:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-prelude-parsec:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hydrogen-prelude:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-syntax:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hydrogen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hydrogen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyena:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hylolib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hylotab:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5487,10 +5507,10 @@ dont-distribute-packages:
   ib-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   IcoGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   iconv-typed:                                  [ "x86_64-darwin" ]
-  ideas-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend-common:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ide-backend:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ide-backend:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ideas-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   idempotent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   idiii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   idna2008:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5499,8 +5519,8 @@ dont-distribute-packages:
   iException:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ifcxt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   IFS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ige-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ig:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ige-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   igraph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   igrf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-aeson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5510,7 +5530,6 @@ dont-distribute-packages:
   ihaskell-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-display:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-hatex:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-inline-r:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-juicypixels:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-magic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5518,21 +5537,22 @@ dont-distribute-packages:
   ihaskell-plot:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-rlangqq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-widgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ihaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihttp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   illuminate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   imagemagick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   imagepaste:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imapget:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   imap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imapget:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   imbib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   imgurder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   imparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imperative-edsl:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   imperative-edsl-vhdl:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imperative-edsl:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ImperativeHaskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  implicit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   implicit-logging:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   implicit-params:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  implicit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   imports:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   impossible:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   improve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5545,12 +5565,12 @@ dont-distribute-packages:
   IndexedList:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   indices:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   indieweb-algorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  infernu:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inf-interval:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   infer-upstream:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  infernu:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   infinity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inf-interval:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  InfixApplicative:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   infix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  InfixApplicative:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   inflist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   informative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   inject-function:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5568,26 +5588,27 @@ dont-distribute-packages:
   interleavableGen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableIO:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   internetmarke:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interpolatedstring-qq:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interpolatedstring-qq-mwotton:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpol:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interpolatedstring-qq-mwotton:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interpolatedstring-qq:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   interruptible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   intricacy:                                    [ "x86_64-darwin" ]
-  introduction-test:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   intro-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  introduction-test:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  introduction:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   intset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   invertible-hlist:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-capture:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ion:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-reactive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  IORefCAS:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ion:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   IOR:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  IORefCAS:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iothread:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iotransaction:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ip2location:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ip:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipatch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ip:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipopt-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iptables-helpers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   iptadmin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5598,8 +5619,8 @@ dont-distribute-packages:
   irc-fun-color:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Irc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   iridium:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ironforge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   iron-mq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ironforge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   isevaluated:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   isiz:                                         [ "x86_64-darwin" ]
   ismtp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5607,14 +5628,14 @@ dont-distribute-packages:
   iso8583-bitmaps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   isobmff-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   isohunt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iter-stats:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-compress:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iteratee:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-parsec:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-stm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iterIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iteratee:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iterio-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iter-stats:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iterIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-backend-c:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-bitdata:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5626,10 +5647,10 @@ dont-distribute-packages:
   iyql:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   j2hs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   jack-bindings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jack:                                         [ "x86_64-darwin" ]
   jack:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   jackminimix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   JackMiniMix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jack:                                         [ "x86_64-darwin" ]
   jacobi-roots:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   jail:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   jalaali:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5640,6 +5661,7 @@ dont-distribute-packages:
   java-bridge-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-reflect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  javaclass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5654,35 +5676,35 @@ dont-distribute-packages:
   joinlist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jonathanscard:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jort:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  js-good-parts:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-hello:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-warp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-wkwebview:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   JsContracts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  js-good-parts:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsmw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json2-hdbc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-ast-quickcheck:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-autotype:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-b:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JSONb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   JSON-Combinator-Examples:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   JSON-Combinator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-feed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JsonGrammar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-incremental-decoder:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-litobj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-pointer-hasql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-python:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-togo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json2-hdbc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JSONb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JsonGrammar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonresume:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonrpc-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonsql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-togo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsontsv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonxlsx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jspath:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5696,28 +5718,28 @@ dont-distribute-packages:
   JYU-Utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-glut:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kafka-device:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-joystick:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-leap:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-spacenav:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-vrpn:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kafka-device:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kaleidoscope:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kalman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Kalman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kangaroo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   kanji:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-cores:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kansas-lava:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-papilio:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-shake:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kansas-lava:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   karakuri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   karps:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   katip-elasticsearch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   katt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kawaii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kazura-queue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kdesrc-build-extra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   kd-tree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kdesrc-build-extra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-i18n:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-environment-gtk:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-model-lightmodel:             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5725,12 +5747,12 @@ dont-distribute-packages:
   keera-hails-mvc-solutions-gtk:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-fs:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-gtk:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactivelenses:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-network:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-polling:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactivevalues:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-wx:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-yampa:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-reactivelenses:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-reactivevalues:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-posture:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   keiretsu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ketchup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5744,8 +5766,8 @@ dont-distribute-packages:
   kicad-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kickass-torrents-dump-parser:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   KiCS-debugger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KiCS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   KiCS-prophecy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  KiCS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kif-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmeans-par:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5762,19 +5784,23 @@ dont-distribute-packages:
   KSP:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ktx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kure-your-boilerplate:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KyotoCabinet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kyotocabinet:                                 [ "x86_64-darwin" ]
+  KyotoCabinet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  l-bfgs-b:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  L-seed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   labeled-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   laborantin-hs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  labyrinth:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   labyrinth-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  labyrinth:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lagrangian:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   laika:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-bridge:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-canvas:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-devs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-toolbox:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda2js:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaBase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdabot-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-bridge:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-canvas:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-media:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-bullet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5784,56 +5810,55 @@ dont-distribute-packages:
   lambdacube-engine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-gl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-ir:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-devs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdacube:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaFeed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaINet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lambdajudge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaLit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaNet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaPrettyQuote:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-toolbox:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdatwit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaya-bus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lambdaya:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdiff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lame:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lame-tester:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lame:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-bash:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-boogie:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-c-comments:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-c-inline:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-conf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-eiffel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-elm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-gcl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-go:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-guess:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-java-classfile:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-kort:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-lua2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-lua-qq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-lua2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-mixal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-ninja:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-objc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-pig:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-puppet:                              [ "x86_64-darwin" ]
   language-python-colour:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-python:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-python-test:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-python:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-qux:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-sh:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-spelling:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-sqlite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   LargeCardinalHierarchy:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lastik:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   latest-npm-version:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-formulae-hakyll:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-formulae-image:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-formulae-pandoc:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-function-tables:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   LATS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   launchpad-control:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   layers-game:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5843,7 +5868,6 @@ dont-distribute-packages:
   lazyset:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lazysplines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   LazyVault:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  l-bfgs-b:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lcs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   LDAP:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ldapply:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5861,13 +5885,13 @@ dont-distribute-packages:
   legion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   leksah-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lendingclub:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lenses:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-properties:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lensref:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-text-encoding:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-time:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-tutorial:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lenses:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lensref:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lenz-template:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Level0:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   leveldb-haskell-fork:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5875,8 +5899,8 @@ dont-distribute-packages:
   levmar-chart:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   levmar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lgtk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lhae:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lha:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lhae:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lhc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   lhe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   lhs2TeX-hl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5910,8 +5934,8 @@ dont-distribute-packages:
   lifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ligature:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lightning-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lighttpd-conf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lighttpd-conf-qq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lighttpd-conf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lilypond:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Limit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   limp-cbc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5922,9 +5946,9 @@ dont-distribute-packages:
   linear-circuit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linear-vect:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linearscan-hoopl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinearSplit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-vect:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinkChecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linkchk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   linkcore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5944,60 +5968,60 @@ dont-distribute-packages:
   lio-eci11:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lio-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lipsum-gen:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  liquid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal-demo:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  liquid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  listlike-instances:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-mux:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-attoparsec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-html-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-http-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-zip-def:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  literals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  listlike-instances:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   lit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  literals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   live-sequencer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ll-picosat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   llsd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-analysis:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-base-types:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-base-util:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llvm-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-data-interop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-ffi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-general:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general-pure:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general-quote:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llvm-general:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-hs:                                      [ "x86_64-darwin" ]
   llvm-ht:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-tf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmdb-high-level:                              [ "x86_64-darwin" ]
   lmdb-simple:                                  [ "x86_64-darwin" ]
   lmdb:                                         [ "x86_64-darwin" ]
-  lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loc:                                          [ "x86_64-darwin" ]
   local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loc:                                          [ "x86_64-darwin" ]
-  log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   logentries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   logger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   logic-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LogicGrowsOnTrees:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Logic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-MPI:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-network:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-processes:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Logic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LogicGrowsOnTrees:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   logplex-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojban:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojbanParser:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojbanXiragan:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6006,11 +6030,11 @@ dont-distribute-packages:
   lol-benches:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol-calculus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol-cpp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lol:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loli:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol-repa:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol-tests:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol-typing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lol:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loli:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lookup-tables:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   loop-effin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   loop-while:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6023,10 +6047,9 @@ dont-distribute-packages:
   loup:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lowgl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ls-usb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lscabal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  L-seed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   LslPlus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ls-usb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lsystem:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ltk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   luachunk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6035,8 +6058,8 @@ dont-distribute-packages:
   lui:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   luis-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   luka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  luminance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   luminance-samples:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  luminance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lushtags:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   luthor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lvish:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6046,8 +6069,8 @@ dont-distribute-packages:
   Lykah:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lz4-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lzma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-streams:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lzma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   maam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   macbeth-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-amazonka:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6060,21 +6083,21 @@ dont-distribute-packages:
   magma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mahoro:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   maid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mailchimp-subscribe:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mailchimp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   MailchimpSimple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mailchimp-subscribe:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mailgun:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   majordomo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   majority:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  makedo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   make-hard-links:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   make-package:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  makedo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mallard:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-anything:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-curl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-editor:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-filemanager:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-imageviewer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-ircclient:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-mplayer:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6083,14 +6106,15 @@ dont-distribute-packages:
   manatee-template:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-terminal:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-welcome:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mandulia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mangopay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifold-random:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifolds:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   marionetta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markdown2svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown-kate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  markdown2svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   markov-processes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   marmalade-upload:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   marquise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6105,16 +6129,16 @@ dont-distribute-packages:
   matplotlib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   matsuri:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   matterhorn:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mattermost-api:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   mattermost-api-qc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mattermost-api:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   maude:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  maxent:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxent-learner-hw-gui:                        [ "x86_64-darwin" ]
+  maxent:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxsharing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   maybench:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MaybeT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MaybeT-monads-tf:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   MaybeT-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MaybeT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MazesOfMonad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   mbox-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   MC-Fold-DP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6131,8 +6155,8 @@ dont-distribute-packages:
   MeanShift:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Measure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mecab:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Mecha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mech:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Mecha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus-fdk-aac:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6146,26 +6170,27 @@ dont-distribute-packages:
   memcached-binary:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcached:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   memis:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  memoization-utils:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   memo-ptr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   memo-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  memoization-utils:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   merge-bash-history:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   merkle-patricia-db:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   messente:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  metadata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MetaHDBC:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   meta-misc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   meta-par-accelerate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  metadata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MetaHDBC:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   metaplug:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   metric:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  metricsd-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  metricsd-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   metronome:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mezzolens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mgeneric:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mhailist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MHask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Michelangelo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   microformats2-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   microlens-each:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6174,14 +6199,13 @@ dont-distribute-packages:
   mida:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   midair:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   midi-alsa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  midi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  midimory:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   midi-music-box:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  midisurface:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   midi-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   midi-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midimory:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midisurface:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mighttpd:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mime-string:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   minecraft-data:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   minesweeper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6201,8 +6225,8 @@ dont-distribute-packages:
   MissingPy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mixed-strategies:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mkbndl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mlist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ml-w:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mlist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6219,27 +6243,15 @@ dont-distribute-packages:
   mohws:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mollie-api-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadacme:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-atom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-atom-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-mtl-foreign:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-mtl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-transformers-foreign:            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-transformers:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-atom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-codec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCompose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-dijkstra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-exception:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-fork:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadiccp-gecode:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadiccp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-interleave:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monadius:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadLab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-levels:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-lgbt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadLib-compose:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadloc-pp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-log:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-lrs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-memo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6247,8 +6259,6 @@ dont-distribute-packages:
   monad-open:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ran:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-resumption:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monads-fd:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadStack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-state:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-statevar:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ste:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6257,18 +6267,32 @@ dont-distribute-packages:
   monad-task:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-tx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-unify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadacme:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadCatchIO-mtl-foreign:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadCatchIO-mtl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadCatchIO-transformers-foreign:            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadCatchIO-transformers:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadCompose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadiccp-gecode:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadiccp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Monadius:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadLab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadLib-compose:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadloc-pp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monads-fd:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadStack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monarch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monaris:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monatron:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monatron-IO:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Monatron:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mondo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   monetdb-mapi:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   money:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongodb-queue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongrel2-handler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   monky:                                        [ "x86_64-darwin" ]
-  Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoidplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6283,8 +6307,8 @@ dont-distribute-packages:
   mount:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   movie-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mp3decoder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mpdmate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mpdmate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpppc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpretty:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpris:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6292,12 +6316,12 @@ dont-distribute-packages:
   mps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpvguihs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mrm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ms:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   msgpack-aeson:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  msgpack:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   msgpack-idl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   msgpack-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  msgpack:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   msh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ms:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   msi-kb-backlit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   MSQueue:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   MTGBuilder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6308,20 +6332,20 @@ dont-distribute-packages:
   mtp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   MuCheck-Hspec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   MuCheck-HUnit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MuCheck:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   MuCheck-QuickCheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   MuCheck-SmallCheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mudbath:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MuCheck:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mud:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mudbath:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mulang:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   multext-east-msd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multiaddr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multi-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multiaddr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifocal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   multihash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multipass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multiplate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   multiplate-simplified:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multiplate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec-alt-deriver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec-binary:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6331,9 +6355,8 @@ dont-distribute-packages:
   Munkres-simple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   muon:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   murder:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  murmurhash3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   murmur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  musicbrainz-email:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  murmurhash3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-graphics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-parts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-pitch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6341,18 +6364,19 @@ dont-distribute-packages:
   music-score:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-sibelius:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-suite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  musicbrainz-email:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   musicxml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mustache2hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mustache-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mustache2hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mutable-iter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   MutationOrder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mute-unmute:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mvc-updates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvclient:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mvc-updates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mxnet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-nnvm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mxnet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   myo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   MyPrimes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysnapsession-example:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6365,14 +6389,15 @@ dont-distribute-packages:
   myTestlll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mzv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nagios-plugin-ekg:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nakadi-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   named-lock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   NameGenerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   namelist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nanoAgda:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-cryptr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nanocurses:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-hmac:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-md5:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nanoAgda:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nanocurses:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanomsg-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanomsg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanoparsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6380,8 +6405,8 @@ dont-distribute-packages:
   nanovg:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanq:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   narc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  native:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nat-sized-numbers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  native:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nats-queue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   natural-number:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   naver-translate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6394,12 +6419,12 @@ dont-distribute-packages:
   Neks:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nemesis-titan:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nerf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nero-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nero-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nested-routes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   NestedFunctor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nestedmap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nested-routes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   netcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   netease-fm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   netlines:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6408,9 +6433,9 @@ dont-distribute-packages:
   netspec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   netstring-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-frp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nettle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-netkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-openflow:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nettle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   netwire-input-javascript:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   netwire-vinylglfw-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-address:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6439,9 +6464,9 @@ dont-distribute-packages:
   network-uri-static:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-wai-router:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-websocket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  neural:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural-network-blashs:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural-network-hmatrix:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  neural:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   newports:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   newsynth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   newt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6449,8 +6474,8 @@ dont-distribute-packages:
   newtype-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   next-ref:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nfc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NGrams:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ngrams-loader:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NGrams:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   niagra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nibblestring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   nicovideo-translator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6458,38 +6483,38 @@ dont-distribute-packages:
   nimber:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ninjas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nitro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nixfromnpm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nix-paths:                                    [ "x86_64-darwin" ]
+  nixfromnpm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nkjp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlopt-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlp-scores-scripts:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nntp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  no-role-annots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   noether:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nofib-analyze:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   noise:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Rules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Nomyx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   NonEmptyList:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   nonlinear-optimization-ad:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nonlinear-optimization:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   noodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  no-role-annots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   NoSlow:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  notcpp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   not-gloss-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  notcpp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   np-linear:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nptools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ntrip-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   NTRU:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nullary:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   null-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nullary:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nullpipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   number-length:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   NumberSieves:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6497,22 +6522,23 @@ dont-distribute-packages:
   numerals-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   numeric-ode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   numeric-ranges:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  numhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numhask-array:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask-range:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nussinov78:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nutri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NXTDSL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   NXT:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NXTDSL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nylas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nymphaea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   oauthenticated:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  obdd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   obd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  obdd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   oberon0:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  obj:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Object:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   objectid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ObjectIO:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  obj:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   octane:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   octohat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   octopus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6523,8 +6549,8 @@ dont-distribute-packages:
   OGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ogmarkup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ohloh-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oidc-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   oi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  oidc-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ois-input-manager:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   old-version:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   olwrapper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6541,21 +6567,23 @@ dont-distribute-packages:
   onu-course:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-classy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-sqlite:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-haddock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenAL:                                       [ "x86_64-darwin" ]
   opench-meteo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCLRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCLWrappers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   opencog-atomspace:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opencv-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   opencv-raw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opencv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   opendatatable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   openexchangerates:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   openflow:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenGLCheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   opengles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenGLRaw21:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-haddock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   openpgp-crypto-api:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   openpgp-Crypto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenSCAD:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6571,14 +6599,14 @@ dont-distribute-packages:
   optimization:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimusprime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optparse-applicative-simple:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OrchestrateDB:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchestrate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OrchestrateDB:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchid-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   order-maintenance:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orders:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  order-statistics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   order-statistic-tree:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  order-statistics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  orders:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ordrea:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   organize-imports:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   orgmode:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6595,10 +6623,10 @@ dont-distribute-packages:
   ot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   otp-authenticator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   overture:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pack:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   package-vt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   packed-dawg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   packedstring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pack:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   packman:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pacman-memcache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   padKONTROL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6606,13 +6634,13 @@ dont-distribute-packages:
   PageIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Paillier:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   panda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PandocAgda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-crossref:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-include-code:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-japanese-filters:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-placetable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-plantuml-diagrams:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PandocAgda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pang-a-lambda:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   panpipe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pansite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6624,23 +6652,23 @@ dont-distribute-packages:
   parallel-tasks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   paranoia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   parco-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   parco:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   parconc-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pareto:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   parport:                                      [ "x86_64-darwin" ]
   Parry:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parse-help:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsec-parsers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   parseerror-eq:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parse-help:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsely:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parser-helper:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   parser241:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsergen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parser-helper:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsestar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   partage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  partial:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   partial-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  partial:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   partly:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   passage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PasswordGenerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6656,8 +6684,8 @@ dont-distribute-packages:
   paypal-adaptive-hoops:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   paypal-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   paypal-rest-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pbc4hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pbc4hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   PBKDF2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pcf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   PCLT-DB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6669,24 +6697,24 @@ dont-distribute-packages:
   peakachu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   PeanoWitnesses:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peggy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   peg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  peggy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny-bin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  penny:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  penny:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   penrose:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   peparser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perceptron:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   perdure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   peregrin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  perf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   perfecthash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  perf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   periodic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PermuteEffects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   permute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PermuteEffects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   persist2er:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-cereal:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-database-url:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6696,19 +6724,19 @@ dont-distribute-packages:
   persistent-protobuf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-relational-record:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-zookeeper:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persona:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   persona-idp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persona:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pesca:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   peyotls-codec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   peyotls:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pez:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pg-harness:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-harness-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pg-harness:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-recorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pgsql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-store:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-transact:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pgsql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   phasechange:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   phoityne:                                     [ "x86_64-darwin" ]
   phone-numbers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6718,20 +6746,20 @@ dont-distribute-packages:
   phraskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Phsu:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   phybin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pi-calculus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pi-forall:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pia-forward:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pianola:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pi-calculus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   picologic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   picosat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   piet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pi-forall:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   piki:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-attoparsec-streaming:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-bgzf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-binary:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-cereal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cereal-plus:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-cereal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-courier:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6752,8 +6780,8 @@ dont-distribute-packages:
   pipes-sqlite-simple:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-zlib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pisigma:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pitchtrack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pitchtrack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pivotal-tracker:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pixelated-avatar-generator:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkggraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6778,9 +6806,10 @@ dont-distribute-packages:
   pngload:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pocket-dns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pocket:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  point-octree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pointfree-fancy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-lenses:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  point-octree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokemon-go-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokitdok:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   polar-configfile:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6792,8 +6821,8 @@ dont-distribute-packages:
   polynom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   polynomial:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   polyseq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polytypeable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   polytypeable-utils:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  polytypeable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pomodoro:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ponder:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pong-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6809,24 +6838,25 @@ dont-distribute-packages:
   porter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   PortFusion:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ports:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  positron:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-pty:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-realtime:                               [ "x86_64-darwin" ]
   posix-timer:                                  [ "x86_64-darwin" ]
   posix-waitpid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   postcodes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-named:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-orm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-query:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-queue:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-sop:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed-lifted:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgrest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postmark:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmark-streams:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postmark:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   potato-tool:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   powermate:                                    [ "x86_64-darwin" ]
   powerpc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6838,8 +6868,8 @@ dont-distribute-packages:
   praglude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   preamble:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   precis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pred-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   prefork:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   prelude-generalize:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   prelude-plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6849,35 +6879,36 @@ dont-distribute-packages:
   presto-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   prettyprinter-convert-ansi-wl-pprint:         [ i686-linux, x86_64-linux, x86_64-darwin ]
   prettyprinter-vty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PrimitiveArray-Pretty:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  primesieve:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PrimitiveArray-Pretty:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-bot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   print-debugger:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Printf-TH:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PriorityChansConverger:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   priority-queue:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PriorityChansConverger:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ProbabilityMonads:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  processing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-iterio:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-listlike:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-progress:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-qq:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  processing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   procrastinating-structure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   procrastinating-variable:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   procstat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2pretty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  progressbar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   progress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  progressbar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   progression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   progressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   proj4-hs-bindings:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   project-m36:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prolog-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog-graph-lib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prolog-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   prologue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   promise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6888,11 +6919,11 @@ dont-distribute-packages:
   proplang:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prosper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   proteaaudio:                                  [ "x86_64-darwin" ]
+  proto-lens-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   protobuf-native:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-descriptor-fork:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-fork:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   protolude-lifted:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   proton-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   prove-everywhere-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6910,17 +6941,18 @@ dont-distribute-packages:
   punkt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pup-Events-Demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   puppetresources:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pure-priority-queue:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pure-priority-queue:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pure-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bundle-fast:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pure-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pursuit-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pusher-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pushme:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  push-notify-apn:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-ccs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-general:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pusher-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pushme:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   putlenses:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   puzzle-draw-cmdline:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   puzzle-draw:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6929,8 +6961,8 @@ dont-distribute-packages:
   pyfi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   python-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   qc-oi-testgenerator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qd:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   qd-vec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qd:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   qed:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   qhull-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   qif:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6938,11 +6970,11 @@ dont-distribute-packages:
   qm-interpolated-string:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   qr-imager:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   qr-repa:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-cpp-qt5:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-generator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-qt5:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuadEdge:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quadratic-irrational:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuadTree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6954,6 +6986,7 @@ dont-distribute-packages:
   quenya-verb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   querystring-pickle:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   queuelike:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quick-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickAnnotate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickbooks:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-poly:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6967,13 +7000,12 @@ dont-distribute-packages:
   quickcheck-webdriver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickPlot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickpull:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quick-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickset:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Quickson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quicktest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickwebapp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   quipper-rendering:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-groups:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-http:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6981,6 +7013,7 @@ dont-distribute-packages:
   quiver-sort:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   quoridor-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   qux:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  R-pandoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rad:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   radium-formula-parser:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   radix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6994,18 +7027,18 @@ dont-distribute-packages:
   ralist:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   rallod:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   raml:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rand-vars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   randfile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-access-list:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RandomDotOrg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-eff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-effin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-hypergeometric:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-stream:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rand-vars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RandomDotOrg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  range-space:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Range:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rangemin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  range-space:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rank2classes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-example-config:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7033,6 +7066,7 @@ dont-distribute-packages:
   rdf4h:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdioh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   react-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  react-tutorial-haskell-server:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reaction-logic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-bacon:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-balsa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7043,13 +7077,12 @@ dont-distribute-packages:
   reactive-banana-wx:                           [ "x86_64-darwin" ]
   reactive-fieldtrip:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-glut:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-jack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-jack:                                [ "x86_64-darwin" ]
+  reactive-jack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-midyim:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-thread:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  react-tutorial-haskell-server:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   read-io:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   readline-statevar:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   readme-lhs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7059,72 +7092,72 @@ dont-distribute-packages:
   reasonable-lens:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-aeson:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-gl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  record:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-preprocessor:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  records:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  record:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  records:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   recursors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   reddit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   reduce-equations:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   reenact:                                      [ "x86_64-darwin" ]
+  ref-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   refcount:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Referees:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   refh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflection-extras:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-animation:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-gloss:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-gloss-scene:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-gloss:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-orphans:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-sdl2:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ref-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   refresht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-deriv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-dfa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-genex:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-pderiv:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexpr-symbolic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexp-tries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexqq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tdfa-pipes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tdfa-quasiquoter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tdfa-utf8:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tre:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-type:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-xmlschema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexp-tries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexpr-symbolic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexqq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   regional-pointers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regions:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   regions-monadsfd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   regions-monadstf:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   regions-mtl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regions:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   register-machine-typelevel:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   regress:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   regular-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regular:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   regular-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   regular-xmlpickler:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regular:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reheat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   reified-records:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  relational-postgresql8:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   relation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  relational-postgresql8:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   relative-date:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reload:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   remark:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   remarks:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote-debugger:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  remote:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote-json-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  remote-json:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote-json-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  remote-json:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  remote:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   remotion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reorderable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-algorithms:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7144,13 +7177,13 @@ dont-distribute-packages:
   repl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   replicant:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   repo-based-blog:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   representable-functors:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   representable-tries:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   reprinter:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reqcatcher:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   req-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   req:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reqcatcher:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   request-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   resin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7161,6 +7194,7 @@ dont-distribute-packages:
   respond:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-example:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   restful-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  restless-git:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   RESTng:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   restricted-workers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   restyle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7187,9 +7221,9 @@ dont-distribute-packages:
   ripple:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   risc386:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rivers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rivet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rivet-migration:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   rivet-simple-deploy:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rivet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   RJson:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Rlang-QQ:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rlglue:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7223,13 +7257,12 @@ dont-distribute-packages:
   route-generator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   route-planning:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   rowrecord:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  R-pandoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rpc-framework:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rpc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rpm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rsagl-frp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rsagl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rsagl-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rsagl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rset:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rspp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7247,41 +7280,42 @@ dont-distribute-packages:
   rws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   RxHaskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SableCC2Hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safecopy-store:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-freeze:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-globals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safeint:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-lazy-io:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-length:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-plugins:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-printf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safecopy-store:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safeint:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safepath:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   safer-file-handles-bytestring:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safer-file-handles:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   safer-file-handles-text:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safer-file-handles:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   saferoute:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sai-shape-syb:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Salsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  saltine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   saltine-quickcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  saltine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   salvia-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   salvia-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   salvia-protocol:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   salvia-sessions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   salvia-websocket:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  salvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   samtools-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   samtools-iteratee:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   sandlib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sarasvati:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sarsi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sasl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sat-micro-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-backends:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-funsat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-minisat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-toysat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sat-micro-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   SBench:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sbvPlugin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   scalable-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7294,9 +7328,9 @@ dont-distribute-packages:
   schedevr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedyield:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-citeproc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scholdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-texmath:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scholdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants-dimensional:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   SciFlow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7315,42 +7349,43 @@ dont-distribute-packages:
   scotty-view:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   scp-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrabble-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scrape-changes:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ScratchFs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrobble:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Scurry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   scyther-proof:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-cairo-image:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-compositor:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-gfx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   SDL-gfx:                                      [ "x86_64-darwin" ]
   SDL-image:                                    [ "x86_64-darwin" ]
   SDL-mixer:                                    [ "x86_64-darwin" ]
   SDL-mpeg:                                     [ "x86_64-darwin" ]
   SDL-ttf:                                      [ "x86_64-darwin" ]
+  sdl2-cairo-image:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-compositor:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-gfx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seacat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   search:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secdh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  secdh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   seclib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   second-transfer:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   secret-santa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   secret-sharing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   secrm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sednaDBXML:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  selectors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   select:                                       [ "x86_64-darwin" ]
-  selenium:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  selectors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   selenium-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  selenium:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   selinux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Semantique:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   semdoc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semi-iso:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroupoids-syntax:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroups-actions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semi-iso:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semiring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   semiring-num:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semiring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   semver-range:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sensei:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sensenet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7363,6 +7398,8 @@ dont-distribute-packages:
   sequent-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sequor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   serpentine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  serv-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  serv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-aeson-specs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-docs:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7373,8 +7410,8 @@ dont-distribute-packages:
   servant-auth-token-leveldb:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-persistent:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-csharp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-db:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-db:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-ekg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7394,17 +7431,15 @@ dont-distribute-packages:
   servant-zeppelin-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   server-generic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-frontend-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  serv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   services:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  serv-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ses-html:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ses-html-snaplet:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ses-html:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   SessionLogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   setgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sets:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   setters:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sfml-audio:                                   [ "x86_64-darwin" ]
@@ -7413,11 +7448,12 @@ dont-distribute-packages:
   sfmt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sfnt2woff:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SFont:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SGdemo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SG:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   sgd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SGdemo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sgf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SG:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   sgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sha-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   shadower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shadowsocks:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   shady-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7434,13 +7470,12 @@ dont-distribute-packages:
   shared-buffer:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-fields:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-memory:                                [ "x86_64-darwin" ]
-  sha-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   she:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   shelduck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shellac-editline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   shell-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shellish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shell-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Shellac-editline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shellish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shelltestrunner:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   shikensu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shoap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7450,60 +7485,60 @@ dont-distribute-packages:
   shpider:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shu-thing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   si-clock:                                     [ "x86_64-darwin" ]
-  sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   signed-multiset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   simgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-atom:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-bluetooth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-c-value:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-css:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-c-value:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-firewire:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-form:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-genetic-algorithm:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SimpleGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SimpleH:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-index:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simpleirc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simpleirc-lens:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-logging:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SimpleLog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-log-syslog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-logging:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-neural-networks:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-nix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simplenote:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-pascal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-postgresql-orm:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-tabular:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SimpleGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SimpleH:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simpleirc-lens:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simpleirc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SimpleLog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simplenote:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleprelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleServer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   simplessh:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simplest-sqlite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleTableGenerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-tabular:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simseq:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sink:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   siphon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sirkel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sitemap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sixfiguregroup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sized:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized-vector:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sized:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sjsp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   skeleton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   skell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   skemmtun:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   skylark-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   skype4hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  slack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   slack-web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  slack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   slidemews:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Slides:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sloth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   slot-lambda:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sloth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallarray:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcheck-laws:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcheck-lens:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7516,13 +7551,13 @@ dont-distribute-packages:
   sme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   smerdyakov:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Smooth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smt-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtlib2-debug:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtlib2-pipe:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smt-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   SmtLib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smtp-mail-ng:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtp2mta:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   SMTPClient:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smtp-mail-ng:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snake-game:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   snake:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-auth-cli:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7531,6 +7566,12 @@ dont-distribute-packages:
   snap-cors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-error-collector:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-loader-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-predicates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-routes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-testing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-web-routes:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-acid-state:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-actionlog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7548,8 +7589,8 @@ dont-distribute-packages:
   snaplet-i18n:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-influxdb:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-mandrill:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-mongoDB:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-mongodb-minimalistic:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-mongoDB:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-mysql-simple:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-oauth:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-persistent:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7565,21 +7606,15 @@ dont-distribute-packages:
   snaplet-scoped-session:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-sedna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-ses-html:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-sqlite-simple:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-sqlite-simple-jwt-auth:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-sqlite-simple:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-stripe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-tasks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-typed-sessions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-wordpress:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-loader-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-predicates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snappy-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snappy-framing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snappy-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-routes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-testing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-web-routes:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sndfile-enumerators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sneakyterm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sneathlane-haste:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7587,16 +7622,16 @@ dont-distribute-packages:
   snm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   snmp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snorkels:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snow-white:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   snowflake-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snowflake-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snow-white:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Snusmumrik:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sock2stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketio:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sodium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   soegtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7617,9 +7652,9 @@ dont-distribute-packages:
   spaceprobe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   spanout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparkle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sparse:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparsebit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparsecheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sparse:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   spata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   special-functors:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   specialize-th:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7641,34 +7676,34 @@ dont-distribute-packages:
   Sprig:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   spritz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   spsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sqlcipher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sqlite-simple-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-mysql:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-pool:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-sqlite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sqlcipher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sqlite-simple-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlvalue-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqsd-local:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   squeal-postgresql:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   srcinst:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sscan:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sscgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sshd-lint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ssh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sshd-lint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sssp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sstable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-heap:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-bump:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack2nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stackage2nix:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-build-plan:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-cabal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stackage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-setup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stack-bump:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stackage2nix:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stackage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-derive-topdown:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-haddock:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   starling:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7676,15 +7711,16 @@ dont-distribute-packages:
   stash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Stasis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   state-bag:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stateful-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  state:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   state-record:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  state:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stateful-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   statgrab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  static-tensor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-dirichlet:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-fusion:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-hypergeometric-genvar:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  statsd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stats:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  statsd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stb-truetype:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdata:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7694,32 +7730,33 @@ dont-distribute-packages:
   stepwise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stgi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-chunked-queues:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-firehose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stochastic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Stomp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   storable-static-array:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   storablevector-streamfusion:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  str:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-ATermLib:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-Sdf2Haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   StrappedTemplates:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stratum-tool:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stratux-http:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stratux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stratux-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stratux-websockets:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stratux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream-fusion:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-cassava:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   strelka:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  str:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  StrictBench:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   strict-concurrency:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  strict-types:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  StrictBench:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   strictly:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stringlike:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   string-typelits:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stringlike:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe-http-streams:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7731,9 +7768,9 @@ dont-distribute-packages:
   stunts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stutter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stylized:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sub-state:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   subhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   subleq-toolchain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sub-state:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   suffixarray:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SuffixStructures:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   suitable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7742,12 +7779,12 @@ dont-distribute-packages:
   sunroof-compiler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunroof-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunroof-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  super-user-spark:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   supercollider-ht:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   supercollider-midi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   superconstraints:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   superdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   supero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  super-user-spark:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   supervisor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   supplemented:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   svg2q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7763,32 +7800,32 @@ dont-distribute-packages:
   SWMMoutGetMB:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   syb-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SybWidget:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   syb-with-class-instances-text:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SybWidget:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sylvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sym-plot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sym:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   symantic-lib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   symengine-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   symengine:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sym:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sym-plot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sync:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sync-mht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sync:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   syncthing-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-attoparsec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-example:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-example-json:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SyntaxMacros:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntaxnet-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntax-example:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-pretty:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-printer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-trees-fork-bairyn:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-trees:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntax:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SyntaxMacros:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntaxnet-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-alsa:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-filter:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-llvm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-midi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  synthesizer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sysinfo:                                      [ "x86_64-darwin" ]
   Sysmon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-canonicalpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7796,16 +7833,18 @@ dont-distribute-packages:
   system-lifted:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-locale:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  systemstats:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-time-monotonic:                        [ "x86_64-darwin" ]
+  systemstats:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  t-regex:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   t3-client:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   t3-server:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  table:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ta:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   table-layout:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  table-tennis:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  table:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tablestorage:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  table-tennis:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tablize:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tabloid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   taffybar:                                     [ "x86_64-darwin" ]
@@ -7813,25 +7852,25 @@ dont-distribute-packages:
   tagged-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-timers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  taggy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   taggy-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  taggy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   taglib-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagset-positional:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-ht:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-parsec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-selection:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tahin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ta:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tailfile-hinotify:                            [ "x86_64-darwin" ]
   tai:                                          [ "x86_64-darwin" ]
-  Takusen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tailfile-hinotify:                            [ "x86_64-darwin" ]
   takusen-oracle:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tamarin-prover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Takusen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover-term:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover-theory:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover-utils:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tamarin-prover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tape:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   target:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tart:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   task-distribution:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   task:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-auto:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7847,8 +7886,8 @@ dont-distribute-packages:
   tbox:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tccli:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tcod-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tcp-streams-openssl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tdd-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   TeaHS:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   teams:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7861,46 +7900,46 @@ dont-distribute-packages:
   template-default:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-haskell-util:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-hsml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  template-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   templateify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   templatepg:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  template-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tempodb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   temporal-csound:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   temporary-resourcet:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tempus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tensor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tensorflow-core-ops:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tensorflow:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tensorflow-logging:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tensorflow-opgen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   tensorflow-ops:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tensorflow-proto:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   tensorflow-records-conduit:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tensorflow-records:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tensor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tensorflow:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  term-rewriting:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   termbox-bindings:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   termination-combinators:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   termplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  term-rewriting:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tersmu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testbench:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-sandbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-skip:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-th-prime:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-pkg:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-sandbox-compose:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-sandbox-hunit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-shouldbe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  testbench:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   testloop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   testpack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   testpattern:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-pkg:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   testPkg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   testrunner:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-sandbox-compose:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-sandbox-hunit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-shouldbe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tex2txt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   TeX-my-math:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tex2txt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-and-plots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-generic-pretty:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7908,45 +7947,47 @@ dont-distribute-packages:
   text-ldap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-markup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  textmatetags:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-normal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  textocat-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-position:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-register-machine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-render:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-short:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  textual:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-xml-generic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-xml-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-zipper-monad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  textmatetags:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  textocat-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  textual:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tfp-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tftp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tga:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-build:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-context:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-fold:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-instance-reification:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-kinds-fork:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-sccs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-traced:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-typegraph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  thank-you-stars:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   thentos-cookie-session:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Theora:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   theoremquest-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   theoremquest:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-fold:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   thih:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   thimk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thingie:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-instance-reification:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-kinds-fork:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   thorn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   threadscope:                                  [ "x86_64-darwin" ]
   threepenny-gui-contextmenu:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   throttled-io-loop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-sccs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-traced:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-typegraph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tibetan-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tictactoe3d:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tic-tac-toe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tickle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tictactoe3d:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   TicTacToe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tidal-midi:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tidal-serial:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7956,21 +7997,21 @@ dont-distribute-packages:
   tightrope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tighttp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   timberc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timecalc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-exts:                                    [ "x86_64-darwin" ]
   time-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeparsers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-patterns:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TimePiece:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeseries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-w3c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timecalc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timeout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timeparsers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TimePiece:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timeprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timeseries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   timezone-unix:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   TinyLaunchbury:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tinyMesh:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7985,10 +8026,12 @@ dont-distribute-packages:
   tls-extra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tmp-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tn:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  to-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  to-string-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  to-string-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   toboggan:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   todos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tofromxml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  to-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   toilet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokenify:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   toktok:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7998,17 +8041,15 @@ dont-distribute-packages:
   Top:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   topkata:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   torch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  to-string-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  to-string-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   touched:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tournament:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   toxcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   toysolver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tpar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace-call:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  traced:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace-function-call:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  traced:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   traildb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   trajectory:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8028,12 +8069,12 @@ dont-distribute-packages:
   travis-meta-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   trawl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   traypoweroff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tree-diff:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   TreeCounter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  treemap-html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   treemap-html-tools:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  treemap-html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   treersec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   TreeStructures:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  t-regex:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Treiber:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tremulous-query:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   TrendGraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8049,20 +8090,20 @@ dont-distribute-packages:
   tsession:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tskiplist:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tslib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tsparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsp-viz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tsparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsvsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tuntap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuntap-simple:                                [ "x86_64-darwin" ]
+  tuntap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tup-functor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-hlist:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tupleinstances:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-lenses:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-morph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  turingMachine:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tupleinstances:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   turing-machines:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   turing-music:                                 [ "x86_64-darwin" ]
+  turingMachine:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweak:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twee:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweet-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8086,46 +8127,46 @@ dont-distribute-packages:
   txtblk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   TYB:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   typalyze:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typeable-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-cereal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TypeClass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-combinators-quote:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-digits:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typedquery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typed-spreadsheet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typed-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typed-wire:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typed-wire-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typehash:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TypeIlluminator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-int:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-bst:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typelevel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-induction:          [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-operations:         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typelevel-tensor:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TypeNat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-of-html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-ord:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord-spine-cereal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typeparams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-ord:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typesafe-precure:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  types-compat:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typescript-docs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-settheory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-spine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-structure:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-sub-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typeable-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TypeClass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typed-spreadsheet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typed-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typed-wire-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typed-wire:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typedquery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typehash:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TypeIlluminator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typelevel-tensor:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typelevel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TypeNat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typeparams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  types-compat:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typesafe-precure:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typescript-docs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tz:                                           [ "x86_64-darwin" ]
   u2f:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   uAgda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   uber:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   uberlast:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   uconv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  udbus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   udbus-model:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  udbus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   udp-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhc-light:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhexdump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8141,9 +8182,9 @@ dont-distribute-packages:
   unicode-symbols:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   uniform-io:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   union-map:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uniqueid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unique-logic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unique-logic-tf:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unique-logic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uniqueid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   units-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   unittyped:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   universe-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8156,8 +8197,8 @@ dont-distribute-packages:
   unsafely:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   unscramble:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   unsequential:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  update-nix-fetchgit:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   up:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  update-nix-fetchgit:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   uploadcare:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   upskirt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ureader:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8165,15 +8206,15 @@ dont-distribute-packages:
   uri-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-enumerator-file:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  url-decoders:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  url-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   urlcheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   urldecode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  url-decoders:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   urldisp-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   UrlDisp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  url-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   URLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   urxml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   usb-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   usb-hid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8184,34 +8225,36 @@ dont-distribute-packages:
   utc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   utf8-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   UTFTConverter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uu-options:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuagc-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuid-aeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uu-options:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector-algorithms:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   v4l2-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   v4l2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-cairo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-graphviz:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-ubigraph:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vacuum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  valid-names:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   validated-literals:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Validation:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  validation:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   validations:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  valid-names:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vampire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   var:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   variable-precision:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   variables:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-tool-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcache-trie:                                  [ "x86_64-darwin" ]
   vcache:                                       [ "x86_64-darwin" ]
   vcatt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcsgui:                                       [ "x86_64-darwin" ]
   Vec-Boolean:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-OpenGLRaw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Vec-Transform:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-floating-accelerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-floating:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-opengl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8226,11 +8269,10 @@ dont-distribute-packages:
   vector-read-instances:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-space-opengl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-static:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Vec-Transform:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Verba:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   verbalexpressions:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  verdict:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  verdict:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   views:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8251,8 +8293,8 @@ dont-distribute-packages:
   vowpal-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   voyeur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vrpn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vtegtk3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vtegtk3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-menu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8274,8 +8316,8 @@ dont-distribute-packages:
   wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-make-assets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-consul:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-content-type:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8308,6 +8350,16 @@ dont-distribute-packages:
   wavesurfer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wavy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   weather-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-css:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-encodings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-fpco:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-mongrel2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-output:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-routes-quasi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-routes-regular:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-routes-transformers:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-routing:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   web3:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   webapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   webapp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8316,36 +8368,26 @@ dont-distribute-packages:
   webcloud:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebCont:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcrank-dispatch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webcrank:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcrank-wai:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-css:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webcrank:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   webdriver-snoy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-encodings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WeberLogic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   webfinger-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-fpco:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webkit2gtk3-javascriptcore:                   [ "x86_64-darwin" ]
   webkit-javascriptcore:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-mongrel2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-output:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webkit2gtk3-javascriptcore:                   [ "x86_64-darwin" ]
   Webrexp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routes-quasi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routes-regular:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routes-transformers:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routing:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   webserver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   webwire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wedged:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  weighted:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   weighted-regexp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  weighted:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   welshy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  werewolf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   werewolf-slack:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Wheb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  werewolf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wheb-mongo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wheb-redis:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wheb-strapped:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Wheb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   while-lang-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   whim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   whiskers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8361,10 +8403,10 @@ dont-distribute-packages:
   Wired:                                        [ "x86_64-darwin" ]
   wires:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wkt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wl-pprint-ansiterm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPControl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPLib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wlc-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wl-pprint-ansiterm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   WMSigner:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wobsurv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8381,6 +8423,7 @@ dont-distribute-packages:
   workflow-windows:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   wp-archivebot:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wraxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wrecker-ui:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wrecker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wreq-sb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wreq-stringless:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8395,17 +8438,18 @@ dont-distribute-packages:
   wumpus-microprint:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wumpus-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   WURFL:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wx:                                           [ "x86_64-darwin" ]
   wxAsteroids:                                  [ "x86_64-darwin" ]
-  wxcore:                                       [ "x86_64-darwin" ]
   wxc:                                          [ "x86_64-darwin" ]
+  wxcore:                                       [ "x86_64-darwin" ]
   WXDiffCtrl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxFruit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   WxGeneric:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxhnotepad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxSimpleCanvas:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxturtle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wx:                                           [ "x86_64-darwin" ]
   wyvern:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  x-dsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-rm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xdamage:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8417,7 +8461,6 @@ dont-distribute-packages:
   xchat-plugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xdot:                                         [ "x86_64-darwin" ]
-  x-dsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Xec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xfconf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xhaskell-library:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8428,18 +8471,14 @@ dont-distribute-packages:
   xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkbcommon:                                    [ "x86_64-darwin" ]
   xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xlsior:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xls:                                          [ "x86_64-darwin" ]
+  xlsior:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-catalog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-conduit-decode:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-enumerator-combinators:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-html-conduit-lens:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmlhtml:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XmlHtmlWriter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-isogen:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-parsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8448,8 +8487,12 @@ dont-distribute-packages:
   xml-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-query-xml-conduit:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-query-xml-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmltv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-tydom-conduit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmlhtml:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XmlHtmlWriter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmltv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client-glib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   XMMS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8481,20 +8524,20 @@ dont-distribute-packages:
   yahoo-web-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml2owl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yamlkeysdiff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   YamlReference:                                [ "x86_64-darwin" ]
-  yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yampa2048:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glfw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glut:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa2048:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaop:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yarr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yarr-image-io:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yarr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yavie:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ycextra:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8508,9 +8551,9 @@ dont-distribute-packages:
   yesod-auth-deskcom:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-hmac-keccak:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-kerberos:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap-mediocre:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-oauth2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-oauth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-pam:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8520,8 +8563,8 @@ dont-distribute-packages:
   yesod-comments:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-content-pdf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-continuations:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-crud:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-crud-persist:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-crud:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-datatables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-fay:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8540,8 +8583,8 @@ dont-distribute-packages:
   yesod-raml-bin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml-mock:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-recaptcha:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-routes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes-typescript:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-routes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-rst:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-s3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-sass:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8554,17 +8597,17 @@ dont-distribute-packages:
   yesod-worker:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   YFrob:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yhccore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-contrib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-dynamic-configuration:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-monokai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-solarized:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-spolsky:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yjftp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjftp-libs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Yogurt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yjftp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yogurt-Standalone:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Yogurt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yoko:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   york-lava:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8577,10 +8620,10 @@ dont-distribute-packages:
   ZEBEDDE:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   zendesk-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeno:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zeromq-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq3-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq3-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq4-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeromq-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeroth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ZFS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   zifter-cabal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8588,8 +8631,8 @@ dont-distribute-packages:
   zifter-google-java-format:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   zifter-hindent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zifter-hlint:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zifter-stack:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zim-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zip-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipedit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8603,11 +8646,11 @@ dont-distribute-packages:
   zmidi-score:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zmqat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoneinfo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoom-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom-cache-pcm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom-cache-sndfile:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zoom-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom-refs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zoom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   zot:                                          [ "x86_64-darwin" ]
   zsh-battery:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zstd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 6b0eb8c7002..91e95de94af 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -227,6 +227,12 @@ self: super: builtins.intersectAttrs super {
   # /homeless-shelter. Disabled.
   purescript = dontCheck super.purescript;
 
+  # https://github.com/haskell-foundation/foundation/pull/412
+  foundation =
+    if pkgs.stdenv.isDarwin
+    then dontCheck super.foundation
+    else super.foundation;
+
   # Hardcoded include path
   poppler = overrideCabal super.poppler (drv: {
     postPatch = ''
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 82c4a033c85..3399ce8dd9b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6077,6 +6077,25 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
+  "GPipe_2_2_3" = callPackage
+    ({ mkDerivation, base, Boolean, containers, exception-transformers
+     , gl, hashtables, linear, transformers
+     }:
+     mkDerivation {
+       pname = "GPipe";
+       version = "2.2.3";
+       sha256 = "19bn3471h6p7a34l3ydgyvqn118f4wb6l3djldlx0cvrga6wmfkp";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base Boolean containers exception-transformers gl hashtables linear
+         transformers
+       ];
+       homepage = "https://github.com/tobbebex/GPipe-Core#readme";
+       description = "Typesafe functional GPU graphics programming";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GPipe-Collada" = callPackage
     ({ mkDerivation, array, base, containers, GPipe, HaXml, mtl, Vec }:
      mkDerivation {
@@ -6227,26 +6246,26 @@ self: {
      }) {};
 
   "GenI" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cabal-macosx, containers
-     , deepseq, directory, errors, filepath, hslogger, HUnit, json, mtl
-     , old-locale, ordered, parsec, process, QuickCheck, smallcheck, syb
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , directory, errors, filepath, hslogger, HUnit, json, mtl, ordered
+     , parsec, process, QuickCheck, smallcheck, syb, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
      , test-framework-smallcheck, text, time, transformers, yaml-light
      }:
      mkDerivation {
        pname = "GenI";
-       version = "0.24.3";
-       sha256 = "0gmig362ayxxqgj4m6g1r1i6q5zfg6j8bmvsd7i9kmqn12nl3l0p";
+       version = "0.25.0";
+       sha256 = "1mxx8mcrlq54gb436jyk8g9k2i56ybp3m3gzi7bmjda6qpf7b8l8";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base binary bytestring cabal-macosx containers deepseq directory
-         errors filepath hslogger json mtl old-locale ordered parsec process
-         syb text time transformers yaml-light
+         base binary bytestring containers deepseq directory filepath
+         hslogger json mtl ordered parsec process syb text time transformers
+         yaml-light
        ];
        executableHaskellDepends = [
-         base containers directory errors filepath hslogger json mtl process
+         base containers directory filepath hslogger json mtl process
          yaml-light
        ];
        testHaskellDepends = [
@@ -7347,16 +7366,17 @@ self: {
      }) {};
 
   "HGamer3D" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, clock, containers
-     , directory, filepath, fresco-binding, messagepack, text, vect
+    ({ mkDerivation, base, binary-serialise-cbor, bytestring, cereal
+     , clock, containers, directory, filepath, fresco-binding, text
+     , vect
      }:
      mkDerivation {
        pname = "HGamer3D";
-       version = "0.8.0";
-       sha256 = "1779if3g4lcgjsvq9yjrmd5fgc7m00a0p84cm87m28112xvk4kqc";
+       version = "0.9.0";
+       sha256 = "09psrdhlrxhj8459xjr3j8fwv1mxjrlsn9nkfx0srz5sf0s4sj69";
        libraryHaskellDepends = [
-         base bytestring cereal clock containers directory filepath
-         fresco-binding messagepack text vect
+         base binary-serialise-cbor bytestring cereal clock containers
+         directory filepath fresco-binding text vect
        ];
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer";
@@ -18573,15 +18593,15 @@ self: {
      }) {advapi32 = null; gdi32 = null; shell32 = null; 
          shfolder = null; user32 = null; winmm = null;};
 
-  "Win32_2_5_4_1" = callPackage
+  "Win32_2_6_0_0" = callPackage
     ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32
-     , msimg32, shell32, shfolder, shlwapi, user32, winmm
+     , msimg32, shell32, shfolder, shlwapi, unbuildable, user32, winmm
      }:
      mkDerivation {
        pname = "Win32";
-       version = "2.5.4.1";
-       sha256 = "0r1xzm0w3kg8rqq24j17405ic6yix53r9sq9wpl4zl2sajg3w66c";
-       libraryHaskellDepends = [ base bytestring filepath ];
+       version = "2.6.0.0";
+       sha256 = "1swrahwg89c6001cprzfx9fi64kndzmfvwbr34k2f00izv39fn6l";
+       libraryHaskellDepends = [ base bytestring filepath unbuildable ];
        librarySystemDepends = [
          advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm
        ];
@@ -19673,6 +19693,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "accelerate_1_1_0_0" = callPackage
+    ({ mkDerivation, base, base-orphans, containers, deepseq, directory
+     , exceptions, fclabels, filepath, ghc-prim, hashable, hashtables
+     , mtl, pretty, template-haskell, time, transformers, unique, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "accelerate";
+       version = "1.1.0.0";
+       sha256 = "02nv7h7qfayw5aggh2jhaccnrx2lq0f0h3aqacw8ml22asffbzj8";
+       libraryHaskellDepends = [
+         base base-orphans containers deepseq directory exceptions fclabels
+         filepath ghc-prim hashable hashtables mtl pretty template-haskell
+         time transformers unique unix unordered-containers
+       ];
+       homepage = "https://github.com/AccelerateHS/accelerate/";
+       description = "An embedded language for accelerated array processing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "accelerate-arithmetic" = callPackage
     ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck
      , utility-ht
@@ -19723,6 +19764,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "accelerate-blas" = callPackage
+    ({ mkDerivation, accelerate, accelerate-llvm
+     , accelerate-llvm-native, accelerate-llvm-ptx, base, blas-hs
+     , bytestring, containers, criterion, cublas, cuda, deepseq
+     , file-embed, hedgehog, hmatrix, llvm-hs-pure, mtl, mwc-random
+     , mwc-random-accelerate, storable-complex
+     }:
+     mkDerivation {
+       pname = "accelerate-blas";
+       version = "0.1.0.0";
+       sha256 = "0jxcq97z75pqdh9f18lsz4pih693n5ffcx02aa752s6y3qv2s2kb";
+       libraryHaskellDepends = [
+         accelerate accelerate-llvm accelerate-llvm-native
+         accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda
+         file-embed llvm-hs-pure mtl storable-complex
+       ];
+       testHaskellDepends = [
+         accelerate accelerate-llvm-native accelerate-llvm-ptx base hedgehog
+       ];
+       benchmarkHaskellDepends = [
+         accelerate accelerate-llvm-native accelerate-llvm-ptx base
+         criterion deepseq hmatrix mwc-random mwc-random-accelerate
+       ];
+       description = "Numeric Linear Algebra in Accelerate";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "accelerate-cublas" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
      , accelerate-io, accelerate-utility, base, cublas, cuda, hmatrix
@@ -19812,10 +19881,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-examples";
-       version = "1.0.0.0";
-       sha256 = "1s85mh1grdncxakby200awaa5h79i805ijgsxq524gd2dm4dqnd6";
-       revision = "2";
-       editedCabalFile = "0ckm9ydfdrpwvmi9hdmvfbpfgs0k24rg1xjjskxqzvx79qlph5qn";
+       version = "1.1.0.0";
+       sha256 = "0zpjmk6v314jfda7fy22xghfqlqfh8vyf938qwyp6xjf1mpq1r1x";
        configureFlags = [ "-f-opencl" ];
        isLibrary = true;
        isExecutable = true;
@@ -19848,10 +19915,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-fft";
-       version = "1.0.0.0";
-       sha256 = "1qw4ln9xamv86lvb7y5xfzs12br4jbszai17jlagffmc6rnlhjkq";
-       revision = "2";
-       editedCabalFile = "0vycxsl60rd87ypcbmfkj1sjl4bz60n5lj4bdv6p7f8qpa1hgya1";
+       version = "1.1.0.0";
+       sha256 = "0q2ihnangmm708bwdhfyc5z7s1ng11x8imgb7y06fc5n2m7sxn9l";
        libraryHaskellDepends = [
          accelerate accelerate-llvm accelerate-llvm-native
          accelerate-llvm-ptx base bytestring carray cuda cufft fft
@@ -19946,64 +20011,65 @@ self: {
      }) {};
 
   "accelerate-llvm" = callPackage
-    ({ mkDerivation, abstract-deque, accelerate, base, chaselev-deque
-     , containers, data-default-class, dlist, exceptions, fclabels
-     , llvm-hs, llvm-hs-pure, mtl, mwc-random, unordered-containers
-     , vector
+    ({ mkDerivation, abstract-deque, accelerate, base, bytestring
+     , chaselev-deque, containers, data-default-class, deepseq
+     , directory, dlist, exceptions, fclabels, filepath, llvm-hs
+     , llvm-hs-pure, mtl, mwc-random, template-haskell
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "accelerate-llvm";
-       version = "1.0.0.0";
-       sha256 = "1kwck1rc2ipcblvjpqblmycm7j4w14635iblfgczydzzyw6x9smh";
-       revision = "7";
-       editedCabalFile = "1m3v55by11q4411wgj9623wdp0i6cnprykgwmklsmxf1gvf9d43x";
+       version = "1.1.0.0";
+       sha256 = "1x42gaafdm998k3x9qfpv8qb5jn7mh5h8rim3ywaj5cm9fk280qw";
        libraryHaskellDepends = [
-         abstract-deque accelerate base chaselev-deque containers
-         data-default-class dlist exceptions fclabels llvm-hs llvm-hs-pure
-         mtl mwc-random unordered-containers vector
+         abstract-deque accelerate base bytestring chaselev-deque containers
+         data-default-class deepseq directory dlist exceptions fclabels
+         filepath llvm-hs llvm-hs-pure mtl mwc-random template-haskell
+         unordered-containers vector
        ];
-       description = "Accelerate backend generating LLVM";
+       description = "Accelerate backend component generating LLVM IR";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm-native" = callPackage
-    ({ mkDerivation, accelerate, accelerate-llvm, base, containers
-     , directory, dlist, fclabels, libffi, llvm-hs, llvm-hs-pure, mtl
-     , time
+    ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring
+     , c2hs, Cabal, cereal, containers, directory, dlist, fclabels
+     , filepath, ghc, ghc-prim, libffi, llvm-hs, llvm-hs-pure, mtl
+     , template-haskell, time, unix, vector
      }:
      mkDerivation {
        pname = "accelerate-llvm-native";
-       version = "1.0.0.0";
-       sha256 = "0m88pfx5zrr843m48yxlm2bfxl6d1ni27gsvv0qv1pcy9sviijid";
-       revision = "2";
-       editedCabalFile = "13akqlpn0vdxwpd4f4l9l71rx8nb5mkj9zklcv9rs38yay7y3an4";
+       version = "1.1.0.0";
+       sha256 = "0jg46i12vxf4fr5w0s8wwdh701ba088l4ign7yfvmzbhgcpvan5d";
        libraryHaskellDepends = [
-         accelerate accelerate-llvm base containers directory dlist fclabels
-         libffi llvm-hs llvm-hs-pure mtl time
+         accelerate accelerate-llvm base bytestring Cabal cereal containers
+         directory dlist fclabels filepath ghc ghc-prim libffi llvm-hs
+         llvm-hs-pure mtl template-haskell time unix vector
        ];
-       description = "Accelerate backend generating LLVM";
+       libraryToolDepends = [ c2hs ];
+       description = "Accelerate backend for multicore CPUs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm-ptx" = callPackage
     ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring
-     , containers, cuda, directory, dlist, fclabels, filepath, hashable
-     , llvm-hs, llvm-hs-pure, mtl, pretty, time, unordered-containers
+     , containers, cuda, deepseq, directory, dlist, fclabels, file-embed
+     , filepath, hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty
+     , process, template-haskell, time, unordered-containers
      }:
      mkDerivation {
        pname = "accelerate-llvm-ptx";
-       version = "1.0.0.1";
-       sha256 = "0s01vfqrg6kg2jkg9dkj98b7xr88m519drs73x5ffj6xdgq6b57z";
-       revision = "1";
-       editedCabalFile = "0r9j7pnhfxvx1qv3xn877mbr1pfwqh0nhm436cpqanqrj7sk876n";
+       version = "1.1.0.0";
+       sha256 = "1av0s4wgq7l2jhkmg7cmr1fivwqankqgyjikpwg1q569dapfrasw";
        libraryHaskellDepends = [
-         accelerate accelerate-llvm base bytestring containers cuda
-         directory dlist fclabels filepath hashable llvm-hs llvm-hs-pure mtl
-         pretty time unordered-containers
+         accelerate accelerate-llvm base bytestring containers cuda deepseq
+         directory dlist fclabels file-embed filepath hashable llvm-hs
+         llvm-hs-pure mtl nvvm pretty process template-haskell time
+         unordered-containers
        ];
-       description = "Accelerate backend generating LLVM";
+       description = "Accelerate backend for NVIDIA GPUs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -21077,6 +21143,7 @@ self: {
        homepage = "https://github.com/michalkonecny/aern2";
        description = "Multi-precision floats via MPFR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aern2-real" = callPackage
@@ -21101,6 +21168,7 @@ self: {
        homepage = "https://github.com/michalkonecny/aern2";
        description = "Exact real numbers via Cauchy sequences and MPFR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson_0_7_0_6" = callPackage
@@ -21195,24 +21263,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_2_1_0" = callPackage
+  "aeson_1_2_2_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
      , hashable-time, HUnit, integer-logarithms, QuickCheck
      , quickcheck-instances, scientific, tagged, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, time-locale-compat, unordered-containers, uuid-types
-     , vector
+     , text, th-abstraction, time, time-locale-compat
+     , unordered-containers, uuid-types, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.2.1.0";
-       sha256 = "0wwa2i8jy3q7i8mys8hmy1nhis2a7hbs1bbfpmbj7xcvxpdhy5wn";
+       version = "1.2.2.0";
+       sha256 = "1ziwbwy2zkms3sknrq2iz6h0hdd372qvrsjrbnyknxx2p4cfr7hg";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
-         ghc-prim hashable scientific tagged template-haskell text time
-         time-locale-compat unordered-containers uuid-types vector
+         ghc-prim hashable scientific tagged template-haskell text
+         th-abstraction time time-locale-compat unordered-containers
+         uuid-types vector
        ];
        testHaskellDepends = [
          attoparsec base base-compat base-orphans base16-bytestring
@@ -21361,7 +21430,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson-diff_1_1_0_2" = callPackage
+  "aeson-diff" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , edit-distance-vector, filepath, Glob, hashable, hlint, mtl
      , optparse-applicative, QuickCheck, quickcheck-instances
@@ -21369,8 +21438,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-diff";
-       version = "1.1.0.2";
-       sha256 = "05kpznfzsa4kvanm8nhj40lz6f8zx6vd4jacih2r05i63ph0qyrd";
+       version = "1.1.0.3";
+       sha256 = "13fbb270zaljgimy6pnyy2n8iwcxnb2pgs9b55qr94k3jnrjnl0g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21387,10 +21456,9 @@ self: {
        homepage = "https://github.com/thsutton/aeson-diff";
        description = "Extract and apply patches to JSON documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson-diff" = callPackage
+  "aeson-diff_1_1_0_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , edit-distance-vector, filepath, Glob, hashable, hlint, mtl
      , optparse-applicative, QuickCheck, quickcheck-instances
@@ -21398,8 +21466,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-diff";
-       version = "1.1.0.3";
-       sha256 = "13fbb270zaljgimy6pnyy2n8iwcxnb2pgs9b55qr94k3jnrjnl0g";
+       version = "1.1.0.4";
+       sha256 = "03lbghmivvmgj326ha3rxqldd73nyq88hyjigkb09nrd8vwy9wc7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21416,6 +21484,7 @@ self: {
        homepage = "https://github.com/thsutton/aeson-diff";
        description = "Extract and apply patches to JSON documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-extra" = callPackage
@@ -25572,6 +25641,8 @@ self: {
        pname = "ansi-wl-pprint";
        version = "0.6.8.1";
        sha256 = "0qxk0iibbyqk7fmrq5cbkr1269bd6vqbdmj2n8s5bvds0836mnnm";
+       revision = "1";
+       editedCabalFile = "0miriy5zkssjwg8zk1wzg7wx3l5ljzvrhga33m2iz7j4y0sb4fx7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
@@ -25849,10 +25920,10 @@ self: {
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.2.0.3";
-       sha256 = "0bsaxgmkcy4jpvf98frqa6dhdwzk2m59bcshb6rqx8ixllinpyvp";
+       version = "0.2.1.1";
+       sha256 = "1611vwvp5ldminjcj59s4xhvgcrla1n4zk082mh0fbpil4ww2ad9";
        libraryHaskellDepends = [ base containers mtl vector ];
-       testHaskellDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base containers QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion linear ];
        homepage = "https://github.com/jonascarpay/apecs#readme";
        description = "A fast ECS for game engine programming";
@@ -30377,6 +30448,40 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "b9_0_5_35" = callPackage
+    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
+     , bytestring, conduit, conduit-extra, ConfigFile, directory
+     , filepath, free, hashable, hspec, hspec-expectations, mtl
+     , optparse-applicative, parallel, parsec, pretty, pretty-show
+     , process, QuickCheck, random, semigroups, syb, template, text
+     , time, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "b9";
+       version = "0.5.35";
+       sha256 = "11j2mr03hn9xz7dq1p7kr448mdj1dva360xf6n7qmq3nq4vrl1av";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bifunctors binary boxes bytestring conduit
+         conduit-extra ConfigFile directory filepath free hashable mtl
+         parallel parsec pretty pretty-show process QuickCheck random
+         semigroups syb template text time transformers unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring directory optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec hspec-expectations QuickCheck
+         semigroups text unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/sheyll/b9-vm-image-builder";
+       description = "A tool and library for building virtual machine images";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "babl" = callPackage
     ({ mkDerivation, babl, base }:
      mkDerivation {
@@ -31602,6 +31707,7 @@ self: {
        homepage = "keera.co.uk";
        description = "A replacement of Yampa based on Monadic Stream Functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beautifHOL" = callPackage
@@ -32947,6 +33053,32 @@ self: {
          inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; 
          inherit (pkgs) mesa;};
 
+  "bindings-GLFW_3_1_2_3" = callPackage
+    ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor
+     , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm
+     , mesa, template-haskell, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "bindings-GLFW";
+       version = "3.1.2.3";
+       sha256 = "1xmmwxbjpxwndiacrh2mk3lih6cs8d83ax07vg5sgyp5d7qigvik";
+       libraryHaskellDepends = [ base bindings-DSL template-haskell ];
+       librarySystemDepends = [
+         libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr
+         libXxf86vm mesa
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       description = "Low-level bindings to GLFW OpenGL library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; 
+         inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; 
+         inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; 
+         inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; 
+         inherit (pkgs) mesa;};
+
   "bindings-K8055" = callPackage
     ({ mkDerivation, base, K8055D }:
      mkDerivation {
@@ -34780,8 +34912,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6";
        sha256 = "1cs81ykw1y2q1kwkdni5w9jxa8bc31b118diaqzf870bqm7mq3ia";
-       revision = "11";
-       editedCabalFile = "1n5sf249kcrk276hdj68g7v6fmhfg6wfwaaibqx2am86iz8dvr06";
+       revision = "12";
+       editedCabalFile = "011gssnsg4svv0mz58cvkmy2nr994d4v6ch29yilgh6rna0qfkd9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
@@ -37282,8 +37414,8 @@ self: {
      }:
      mkDerivation {
        pname = "butcher";
-       version = "1.1.0.1";
-       sha256 = "0j2qknsgq11nc3n0hjx9ck76014sg7if0d75vjjsw1kjlr3rykn5";
+       version = "1.1.0.2";
+       sha256 = "0pwlmz3ns4fiq1w0c0a9di0q1z9jc009si0imh7j48iswakm0la1";
        libraryHaskellDepends = [
          base bifunctors containers deque either extra free microlens
          microlens-th mtl multistate pretty transformers unsafe void
@@ -38976,8 +39108,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.5";
-       sha256 = "19ywslwarwk84anfq78y249krqnddi2yyh66l78a88xfsh002abp";
+       version = "2.6";
+       sha256 = "0zy0pf8s2flykpm7419zz393dx92lxpf04gi9d827m5dwrlr0j3z";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -38985,7 +39117,7 @@ self: {
          aeson ansi-wl-pprint base bytestring Cabal containers deepseq
          directory distribution-nixpkgs filepath hackage-db hopenssl
          language-nix lens optparse-applicative pretty process split text
-         transformers yaml
+         time transformers yaml
        ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint base bytestring Cabal containers deepseq
@@ -38998,7 +39130,7 @@ self: {
          aeson ansi-wl-pprint base bytestring Cabal containers deepseq
          directory distribution-nixpkgs doctest filepath hackage-db hopenssl
          language-nix lens optparse-applicative pretty process split text
-         transformers yaml
+         time transformers yaml
        ];
        homepage = "https://github.com/nixos/cabal2nix#readme";
        description = "Convert Cabal files into Nix build instructions";
@@ -40622,6 +40754,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cassava-embed" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, template-haskell
+     , vector
+     }:
+     mkDerivation {
+       pname = "cassava-embed";
+       version = "0.1.0.0";
+       sha256 = "11ssyv3wkw7l1hc6qa2srdj5ybv67hkclr0lcap4vilfsc4akfww";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring cassava template-haskell vector
+       ];
+       executableHaskellDepends = [ base cassava template-haskell ];
+       homepage = "https://github.com/typeable/cassava-embed#readme";
+       description = "CSV-file embedding library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cassava-megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers, hspec
      , hspec-megaparsec, megaparsec, unordered-containers, vector
@@ -42129,8 +42281,8 @@ self: {
      }:
      mkDerivation {
        pname = "checkmate";
-       version = "0.1.3";
-       sha256 = "1i0hbbgg5lh44azk5vsm6nppazgn657942rcx6h08d6925kn6l7v";
+       version = "0.2.0";
+       sha256 = "0xa420vgyykzxphzy79qlraq36kkxdj8iqx9rhhx1rl3sz3d2ndh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42149,6 +42301,7 @@ self: {
        homepage = "https://github.com/spoqa/checkmate#readme";
        description = "Generate checklists relevant to a given patch";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chell" = callPackage
@@ -44761,6 +44914,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cmdargs_0_10_18" = callPackage
+    ({ mkDerivation, base, filepath, process, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "cmdargs";
+       version = "0.10.18";
+       sha256 = "1lnmcsf6p9yrwwz1zvrw5lbc32xpff7b70yz4ylawaflnlz6wrlh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filepath process template-haskell transformers
+       ];
+       executableHaskellDepends = [
+         base filepath process template-haskell transformers
+       ];
+       homepage = "https://github.com/ndmitchell/cmdargs#readme";
+       description = "Command line argument processing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cmdargs-browser" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, directory, filepath
      , http-types, process, text, transformers, wai, wai-handler-launch
@@ -45240,8 +45415,8 @@ self: {
      }:
      mkDerivation {
        pname = "coinbase-exchange";
-       version = "0.3.0.0";
-       sha256 = "02wkqp3982y5lhzrp77b25zfq6d9did59zzpzjng2n75w9qqj2lk";
+       version = "0.4.0.0";
+       sha256 = "0592myr7z3yggbpjcanzivvdzkb06pr9il6bsgjc2fcfaggw5j4p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45543,14 +45718,23 @@ self: {
      }) {};
 
   "colorless" = callPackage
-    ({ mkDerivation, base, megaparsec, pregame }:
+    ({ mkDerivation, aeson, base, bytestring, containers, errors
+     , exceptions, hspec, lifted-async, monad-control, monad-logger, mtl
+     , random, scientific, text, unordered-containers, vector
+     }:
      mkDerivation {
        pname = "colorless";
-       version = "0.0.0";
-       sha256 = "0b72bri1nygsvgwhkrmrqvixlwiv2y256gl3a3yq2aajqkzhis0s";
-       libraryHaskellDepends = [ base megaparsec pregame ];
-       homepage = "http://github.com/jxv/colorless#readme";
-       description = "Yet another IDL for RPC";
+       version = "0.0.2";
+       sha256 = "0bmyiziqw4jsjf7wk0ckdvlmnrzqwhi78x3hknw8kzh6y8c0qyk9";
+       libraryHaskellDepends = [
+         aeson base bytestring containers errors exceptions lifted-async
+         monad-control monad-logger mtl random scientific text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base containers hspec scientific text vector
+       ];
+       description = "Colorless";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -45585,14 +45769,13 @@ self: {
     ({ mkDerivation, accelerate, base }:
      mkDerivation {
        pname = "colour-accelerate";
-       version = "0.1.0.0";
-       sha256 = "1clcn0ipcrifcxqqb72k1xnga005v1ih79q8164ycsh2hgkdm4ij";
-       revision = "2";
-       editedCabalFile = "0izp44hlzg267mi2hrf96mfzpyvk8jp0b0p6y9lb1vs624a1gy4c";
+       version = "0.2.0.0";
+       sha256 = "10176caf5j7g8z24d8wmr35p6gg6xv7ma0ibgbc7q6r71qvq0zzc";
        libraryHaskellDepends = [ accelerate base ];
        homepage = "https://github.com/tmcdonell/colour-accelerate";
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colour-space" = callPackage
@@ -45663,6 +45846,82 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "comark" = callPackage
+    ({ mkDerivation, base, comark-html, comark-parser, comark-syntax
+     , text
+     }:
+     mkDerivation {
+       pname = "comark";
+       version = "0.1.0";
+       sha256 = "0kkwjz7ycszg4dg7cpcvfv86qm61vzipy55qran9i792psa0rcd0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base comark-html comark-parser comark-syntax text
+       ];
+       executableHaskellDepends = [ base text ];
+       description = "Commonmark processing in pure haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "comark-html" = callPackage
+    ({ mkDerivation, base, cmark, comark-syntax, comark-testutils
+     , criterion, deepseq, hspec, text, transformers
+     }:
+     mkDerivation {
+       pname = "comark-html";
+       version = "0.1.0";
+       sha256 = "1ar9yagwp190b1yxbf2a2d1n62ki3algi0wfqpkn9ad8nmig2g89";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base comark-syntax text transformers ];
+       testHaskellDepends = [ base comark-testutils hspec ];
+       benchmarkHaskellDepends = [
+         base cmark comark-syntax comark-testutils criterion deepseq text
+       ];
+       description = "Commonmark (markdown) to HTML renderer";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {comark-testutils = null;};
+
+  "comark-parser" = callPackage
+    ({ mkDerivation, base, cmark, comark-syntax, comark-testutils
+     , containers, control-bool, criterion, deepseq, file-embed, hspec
+     , html5-entity, QuickCheck, syb, text, transformers
+     }:
+     mkDerivation {
+       pname = "comark-parser";
+       version = "0.1.0";
+       sha256 = "1g595nak7fpzfvipan928wd5drfa0l4axfdjwk51awb7fxvl1nhp";
+       libraryHaskellDepends = [
+         base comark-syntax containers control-bool html5-entity text
+         transformers
+       ];
+       testHaskellDepends = [
+         base cmark comark-syntax comark-testutils containers deepseq hspec
+         QuickCheck syb text
+       ];
+       benchmarkHaskellDepends = [
+         base comark-syntax comark-testutils criterion deepseq file-embed
+         text
+       ];
+       description = "Parser for Commonmark (markdown)";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {comark-testutils = null;};
+
+  "comark-syntax" = callPackage
+    ({ mkDerivation, base, containers, deepseq }:
+     mkDerivation {
+       pname = "comark-syntax";
+       version = "0.1.0";
+       sha256 = "0y1fp6griivzzxwp621cm2mrizxmrnjazhayl21aqfp7mb5i4ib2";
+       libraryHaskellDepends = [ base containers deepseq ];
+       description = "Definitions of AST that represents a Commonmark (markdown) document";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "combinat" = callPackage
     ({ mkDerivation, array, base, containers, QuickCheck, random
      , test-framework, test-framework-quickcheck2, transformers
@@ -49561,6 +49820,7 @@ self: {
        homepage = "http://github.com/hargettp/courier";
        description = "A message-passing library for simplifying network applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "court" = callPackage
@@ -49720,8 +49980,8 @@ self: {
     ({ mkDerivation, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "3.3.2";
-       sha256 = "079v1k1m61n3hrmz6lkdg400r3nn9fq8bwmy477vjjnyjvm1j38f";
+       version = "3.4.0";
+       sha256 = "01imn0nnb567m1l48bjaa6nqp0555bw5lp40d9bqz56dalh4lnlk";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -50231,15 +50491,16 @@ self: {
      }) {};
 
   "crdt" = callPackage
-    ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck, vector
+    ({ mkDerivation, base, containers, QuickCheck, tasty
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "crdt";
-       version = "0.2";
-       sha256 = "1wh0abhnc69q4mkjxzhw3j3k3xwp9bwbccy4bwz70qn39g44q8nz";
-       libraryHaskellDepends = [ base vector ];
+       version = "0.3";
+       sha256 = "12n311m8maj72hg8dvnjj1mmfas45a8iipi6sd4dq808cq5nbx7z";
+       libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
-         base QuickCheck tasty tasty-quickcheck vector
+         base containers QuickCheck tasty tasty-quickcheck
        ];
        homepage = "https://github.com/cblp/crdt#readme";
        description = "Conflict-free replicated data types";
@@ -51130,6 +51391,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptocompare" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , exceptions, hspec, hspec-expectations, http-conduit, MissingH
+     , text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "cryptocompare";
+       version = "0.1.0";
+       sha256 = "0ghdaf5m3axxzxbq3zm9klrnzh354maf82389aryskglr9l11fv4";
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory exceptions http-conduit
+         MissingH text time transformers unordered-containers
+       ];
+       testHaskellDepends = [ base hspec hspec-expectations MissingH ];
+       homepage = "https://github.com/aviaviavi/cryptocompare";
+       description = "Haskell wrapper for the cryptocompare API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cryptoconditions" = callPackage
     ({ mkDerivation, aeson, aeson-quick, asn1-encoding, asn1-parse
      , asn1-types, base, base16-bytestring, base64-bytestring
@@ -57620,6 +57901,8 @@ self: {
        pname = "diagrams-postscript";
        version = "1.4";
        sha256 = "1d4dbwd4qgrlwm0m9spwqklpg3plf0ghrnrah1k6yw900l0z0n7y";
+       revision = "1";
+       editedCabalFile = "0vmiv3b74nml0ahb7dicq0m0vz2lahzfapln9aby0jb2saa0sf58";
        libraryHaskellDepends = [
          base containers data-default-class diagrams-core diagrams-lib dlist
          filepath hashable lens monoid-extras mtl semigroups split
@@ -58658,12 +58941,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_3_1_2" = callPackage
+  "directory_1_3_1_3" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.3.1.2";
-       sha256 = "1y7dzq7naa0fmhacxwvblwqk6ljn131ggzxq104iy3xk9iknsq07";
+       version = "1.3.1.3";
+       sha256 = "1ai5qaj20f26gyg8yb34q45rlzcqziis20xlqfff18626mgl154a";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -60148,8 +60431,8 @@ self: {
      }:
      mkDerivation {
        pname = "docker";
-       version = "0.4.0.1";
-       sha256 = "1nf860admbdhrbyyj8m7ymd9c390rnrn2nqb2gr3i8dk4rcm4hsf";
+       version = "0.4.0.2";
+       sha256 = "1y2bk71zz3m6dm9b1cnkfyvi2x62v1kc08h9pbpxs43r82fz2xa0";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit conduit-combinators
          conduit-extra containers data-default-class directory exceptions
@@ -60647,15 +60930,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dotenv_0_5_0_1" = callPackage
+  "dotenv_0_5_0_2" = callPackage
     ({ mkDerivation, base, base-compat, exceptions, hspec
      , hspec-megaparsec, megaparsec, optparse-applicative, process, text
      , transformers
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.5.0.1";
-       sha256 = "1gbb1h1wzxk6szrciw81kkiljf1gpnaymksspqa955qh4qhxj1bw";
+       version = "0.5.0.2";
+       sha256 = "0jdm8ci2d1iafxiq8r27iclmgrmr9d3md3slc0wv01magsdsl0hb";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -67115,6 +67398,7 @@ self: {
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extcore" = callPackage
@@ -67181,8 +67465,8 @@ self: {
        pname = "extended-reals";
        version = "0.2.2.0";
        sha256 = "14wskq0m3sclb2c1m3aqsaj26rijbzyy021qkvxjdpzskz13higj";
-       revision = "1";
-       editedCabalFile = "1z671zda261gd55ryagpfjnjh1mxrnqfs0paqhml0nwms8f1hw0d";
+       revision = "2";
+       editedCabalFile = "1vsh115lals5sqp2rkj7gp9b1jc0rg92x5fb51p8jckqr4f43pma";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
          base deepseq HUnit QuickCheck test-framework test-framework-hunit
@@ -67509,18 +67793,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fadno" = callPackage
+    ({ mkDerivation, base, comonad, containers, data-default, Decimal
+     , deepseq, event-list, fadno-braids, fadno-xml, hspec
+     , hspec-contrib, HUnit, lens, midi, mtl, process, safe, split, text
+     , unordered-containers, vector, xml
+     }:
+     mkDerivation {
+       pname = "fadno";
+       version = "1.1.0";
+       sha256 = "02qg4gd1f1cldh6bg5nrds67vrmhcxnkn8c57gj7400l60ab3yak";
+       libraryHaskellDepends = [
+         base comonad containers data-default Decimal deepseq event-list
+         fadno-braids fadno-xml HUnit lens midi mtl process safe split text
+         unordered-containers vector xml
+       ];
+       testHaskellDepends = [
+         base containers hspec hspec-contrib HUnit lens
+       ];
+       homepage = "http://github.com/slpopejoy/fadno";
+       description = "Minimal library for music generation and notation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fadno-braids" = callPackage
     ({ mkDerivation, base, containers, data-default, diagrams
      , diagrams-lib, diagrams-rasterific, lens, random
-     , transformers-compat
      }:
      mkDerivation {
        pname = "fadno-braids";
-       version = "0.0.5";
-       sha256 = "1n1r1n4l2rgnrcpq8smkhz826ri0xrvv6dabjshcj7s8l8k9kycp";
+       version = "0.1.0";
+       sha256 = "0imf4cd8gl5hq4qrrp5jgfhv4k0vmrm2qm124nbnj65zhgxvm9lz";
        libraryHaskellDepends = [
          base containers data-default diagrams diagrams-lib
-         diagrams-rasterific lens random transformers-compat
+         diagrams-rasterific lens random
        ];
        homepage = "http://github.com/slpopejoy/";
        description = "Braid representations in Haskell";
@@ -67533,8 +67840,8 @@ self: {
      }:
      mkDerivation {
        pname = "fadno-xml";
-       version = "1.0.3";
-       sha256 = "1kycd21gln3xywla83c3brq3f3s93387rvfwizjzxi17i11hwkki";
+       version = "1.1.0";
+       sha256 = "0wm4kj544zyg2rfb0qdcc9m60l5awskcc0w0rs5bw0v5jdzk2d3j";
        libraryHaskellDepends = [
          base containers Decimal lens mtl parsec xml
        ];
@@ -68517,6 +68824,8 @@ self: {
        pname = "feed";
        version = "1.0.0.0";
        sha256 = "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck";
+       revision = "1";
+       editedCabalFile = "19sckdba9c7pz7hhmjqv4hjm16bi5d1dsnknlh3y3f5n86ybj0pr";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring old-locale old-time safe text time
@@ -71226,19 +71535,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "foldl_1_3_1" = callPackage
+  "foldl_1_3_2" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, criterion, hashable, mwc-random, primitive
-     , profunctors, text, transformers, unordered-containers, vector
-     , vector-builder
+     , profunctors, semigroups, text, transformers, unordered-containers
+     , vector, vector-builder
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.3.1";
-       sha256 = "0g9f2lzlv59bzdjkm917fpcfxrmkzhrmh3jgd2xnfwcb7sfrbmma";
+       version = "1.3.2";
+       sha256 = "1z3xjz4khs2kr3mqkbh7dz4kd6gkdk2r67wjkvrxnmp533aqh90n";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant hashable
-         mwc-random primitive profunctors text transformers
+         mwc-random primitive profunctors semigroups text transformers
          unordered-containers vector vector-builder
        ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -71625,6 +71934,26 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "forest-fire" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cli, containers
+     , pretty-tree, process, text
+     }:
+     mkDerivation {
+       pname = "forest-fire";
+       version = "0.1.1.1";
+       sha256 = "1v8lj9bx0hjkhjr4iv672x84016hsn80nhcfqdknl87vz5bk7z9s";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers pretty-tree process text
+       ];
+       executableHaskellDepends = [ base cli ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/toothbrush/forest-fire#readme";
+       description = "Recursively delete CloudFormation stacks and their dependants";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "forger" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -72336,8 +72665,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.8";
-       sha256 = "179q79l9pax6wqj5dn6i68fwskaf4kbrndpbnhp8d7ba5i3wywfy";
+       version = "0.8.1";
+       sha256 = "0l9l7292vdwsiqynh62f277ilbill3azws6rajyjrv1lp1ll9ys0";
        libraryHaskellDepends = [
          algebraic-classes base bifunctors comonad constraints contravariant
          profunctors template-haskell transformers
@@ -72714,15 +73043,15 @@ self: {
      }) {};
 
   "fresco-binding" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, messagepack
-     , text, unix
+    ({ mkDerivation, base, binary, binary-serialise-cbor, bytestring
+     , containers, text, unix
      }:
      mkDerivation {
        pname = "fresco-binding";
-       version = "0.2.0";
-       sha256 = "0xd9zh6qg82c71y7mc3j75z2b75zz5ffqhhlbj3vyqdv2al9991l";
+       version = "0.3.0";
+       sha256 = "0zndlwq9k24vvlr5b32jzq1nnmglrz6957sf801z0j4fpi836vb2";
        libraryHaskellDepends = [
-         base bytestring cereal containers messagepack text unix
+         base binary binary-serialise-cbor bytestring containers text unix
        ];
        description = "Fresco binding for Haskell";
        license = "unknown";
@@ -73129,8 +73458,8 @@ self: {
      }:
      mkDerivation {
        pname = "fswatch";
-       version = "0.1.0.1";
-       sha256 = "0vmgqcrn60dv02bqbwaypkypgbzjb2nzv56c81drpalqr21ppcry";
+       version = "0.1.0.2";
+       sha256 = "1k3592nfiy348aqg2q64k3w1vbzl7x7098jy73gp7ipzyfr9k1pp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73142,6 +73471,7 @@ self: {
        homepage = "https://github.com/kelemzol/watch";
        description = "File System watching tool with cli and slave functionalities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fswatcher" = callPackage
@@ -74965,16 +75295,19 @@ self: {
      }) {};
 
   "geni-gui" = callPackage
-    ({ mkDerivation, array, base, cabal-macosx, containers, directory
-     , filepath, GenI, graphviz, hslogger, json, mtl, process, text
-     , transformers, wx, wxcore, yaml-light
+    ({ mkDerivation, array, base, Cabal, cabal-macosx, containers
+     , directory, filepath, GenI, graphviz, hslogger, json, mtl, process
+     , text, transformers, wx, wxcore, yaml-light
      }:
      mkDerivation {
        pname = "geni-gui";
-       version = "0.24.1";
-       sha256 = "1kng7bv8amch6bswhica6xhmavc0r5phg402lg76xwz7ywrsc6y3";
+       version = "0.25.1";
+       sha256 = "1ykhliang0hknn1zrhvs9qjgi9lbl18lh5sgrrilr1a2kcqd8pkk";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [
+         base Cabal cabal-macosx directory filepath process
+       ];
        libraryHaskellDepends = [
          array base cabal-macosx containers directory filepath GenI graphviz
          hslogger json mtl process text transformers wx wxcore yaml-light
@@ -74993,8 +75326,8 @@ self: {
      }:
      mkDerivation {
        pname = "geni-util";
-       version = "0.24.1.1";
-       sha256 = "1ydxg10s6bk02i3mikb8aqjai099874gby26q50lwf9xp04csbfk";
+       version = "0.25.0";
+       sha256 = "0jpsiydbamyp3c7q61gw8c4jdcdgj7cvavli5x287krpm74s361z";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -75075,8 +75408,8 @@ self: {
      }:
      mkDerivation {
        pname = "geniserver";
-       version = "0.24.1.1";
-       sha256 = "1597ah64rqag20qx8dvjmdhhhsjzsfdq2f43y3jyy2cnzssj953c";
+       version = "0.25";
+       sha256 = "1r7p7blsrp9y4za57fvcjap12f0rbgglx5a724cn1nqhihdcpd5i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75122,10 +75455,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.3.2.0";
-       sha256 = "0nwhp429dvaf04zwb3k4h1m8dbqpdk6hir0zi4sf22cz3ld654hs";
-       revision = "1";
-       editedCabalFile = "09lgp8v5i5ys56vigq80r1vgxglk7v50v3f5488kry92r5xl7z88";
+       version = "0.4.0.0";
+       sha256 = "006kd5172vra1nyjh7lzkn2rj6jlkk1rarmzipq16fkwx5s8p5br";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -75141,8 +75472,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-aeson";
-       version = "0.0.0.0";
-       sha256 = "0pb84fg17vwmy95naaw1bl77pjvs9rzwgqnp8p0abh04qr9bxgh2";
+       version = "0.1.0.0";
+       sha256 = "141khs49k352w79p034rcfkdmyd1j4mxy0kbk3vwbwk1i48ri1sg";
        libraryHaskellDepends = [
          aeson base genvalidity genvalidity-scientific genvalidity-text
          genvalidity-unordered-containers genvalidity-vector QuickCheck
@@ -75162,8 +75493,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-bytestring";
-       version = "0.0.0.1";
-       sha256 = "0rvdh1pzj98f84j1pnvx6zwanp1mkf58wg7jz5ny7f1dj0f56kii";
+       version = "0.1.0.0";
+       sha256 = "1blwjkfcf2ah0d4nb8yaff4j6rpqa2hh5f34k7aalh1p2y5a32jb";
        libraryHaskellDepends = [
          base bytestring genvalidity QuickCheck validity validity-bytestring
        ];
@@ -75181,8 +75512,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-containers";
-       version = "0.2.0.1";
-       sha256 = "0adg1v7ylwnakcjyrybiw2ajaps3g3k4lvykgajra490fj01dylp";
+       version = "0.3.0.0";
+       sha256 = "09z0jg12kkrmrgpaykfnwc86piv94cza8kr93sn3njwpc5g5fy8c";
        libraryHaskellDepends = [
          base containers genvalidity QuickCheck validity validity-containers
        ];
@@ -75200,10 +75531,11 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.4.0.0";
-       sha256 = "1bb7f24kk5sly7vac2lvpzlprpw40f0zrfb380xbcp4lwmq56gsf";
+       version = "0.5.0.0";
+       sha256 = "1g0cicmkymw3n1k42rhicx0d91sghjf46vqcdmkahpas8bhwl3xm";
        libraryHaskellDepends = [
-         base genvalidity genvalidity-property hspec QuickCheck validity
+         base genvalidity genvalidity-property hspec hspec-core QuickCheck
+         validity
        ];
        testHaskellDepends = [
          base doctest genvalidity hspec hspec-core QuickCheck
@@ -75215,19 +75547,20 @@ self: {
 
   "genvalidity-hspec-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
-     , genvalidity, genvalidity-hspec, genvalidity-text, hspec
-     , QuickCheck, text
+     , genvalidity, genvalidity-aeson, genvalidity-hspec
+     , genvalidity-text, hspec, QuickCheck, text
      }:
      mkDerivation {
        pname = "genvalidity-hspec-aeson";
-       version = "0.0.1.1";
-       sha256 = "0drx76mxmc7fkxd1vp466hnnirjsn2i8qb8wb80942nxj2hp9j3q";
+       version = "0.1.0.0";
+       sha256 = "0kyajiqhfnq5cm0qly18sjzz7c6gdf3kp9dzxq67virgkih3hzfw";
        libraryHaskellDepends = [
          aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
          QuickCheck
        ];
        testHaskellDepends = [
-         aeson base doctest genvalidity genvalidity-text hspec text
+         aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec
+         genvalidity-text hspec text
        ];
        homepage = "http://cs-syd.eu";
        description = "Standard spec's for aeson-related instances";
@@ -75240,8 +75573,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec-binary";
-       version = "0.0.0.0";
-       sha256 = "1dip56yxpd3ilahcaxl5hdvd6agjqgyc838qv046aj1ykb81xfgx";
+       version = "0.1.0.0";
+       sha256 = "15d53hd9wyvm89c8n3l3xmr568vw810q581nzsllp8rb1rb5mxnl";
        libraryHaskellDepends = [
          base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
@@ -75257,8 +75590,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec-cereal";
-       version = "0.0.0.1";
-       sha256 = "0y7x47xlskr0z85blms1xfgpd1hwk6ql8y71y1v03c5cd781dnkj";
+       version = "0.1.0.0";
+       sha256 = "01gdk8g3ci709zzqyqb5knfq8g67qf184hz60qbgv31hd2hgqc7k";
        libraryHaskellDepends = [
          base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
@@ -75275,8 +75608,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec-hashable";
-       version = "0.0.0.0";
-       sha256 = "1smgzbjl3mc2lq5q3khk6sgym4p2zgcfin55d53c3zcsxg3hpbnc";
+       version = "0.1.0.0";
+       sha256 = "0026ms1l4f216vg80pfc3sx92yl1c72fsyygy7ya94y7p0qn33nf";
        libraryHaskellDepends = [
          base genvalidity genvalidity-hspec genvalidity-property hashable
          hspec QuickCheck validity
@@ -75297,8 +75630,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-path";
-       version = "0.1.0.2";
-       sha256 = "1gpbms3ih8zcvs9dpfhxriwyws19kppx6nwsl3qfip7yggivig9x";
+       version = "0.2.0.0";
+       sha256 = "1a4h6kgaqb4y52gdqp7baqgs18zllmrnkpk1412m4hmakqykljxm";
        libraryHaskellDepends = [ base genvalidity path validity-path ];
        testHaskellDepends = [ base genvalidity-hspec hspec path ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -75312,8 +75645,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-property";
-       version = "0.0.0.0";
-       sha256 = "044gf9fcih3d5qwr5nk5c534nh814q7p6s9l4wq8crf38n12w82x";
+       version = "0.1.0.0";
+       sha256 = "1xbai5cr5qskyjrbzsll2a74szbfyzvpj1xc6p3q5w90j3z39myz";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
@@ -75329,8 +75662,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-scientific";
-       version = "0.0.0.0";
-       sha256 = "1s4gca2nkfhs5yzp0xnjy0fbadg4bphfd533z8zachh2ycwi69kh";
+       version = "0.1.0.0";
+       sha256 = "18b66syzkh3y08mdi1jn5kr2488s2b9n17v60cc98jwf41mbncgj";
        libraryHaskellDepends = [
          base genvalidity QuickCheck scientific validity validity-scientific
        ];
@@ -75348,8 +75681,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.3.1.1";
-       sha256 = "0ymfnhqbdsgclc7l96rncn37rdj45impzbhil58v8bz8xpxa7887";
+       version = "0.4.0.0";
+       sha256 = "1vdc1x1nhn7f3jmiamr7v3hwrycfksr03ps93dap80vpv0rkd6vn";
        libraryHaskellDepends = [
          array base genvalidity QuickCheck text validity validity-text
        ];
@@ -75367,8 +75700,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-time";
-       version = "0.0.0.2";
-       sha256 = "0fck7f6ipizd05v56kgmsbkqr8nkxzb18kv1wmw9n7n6mdimjqv0";
+       version = "0.1.0.0";
+       sha256 = "0jgfrrspyawvymp2p55ba56pxggqkg352c1n2bmyyi9hs99fp0jf";
        libraryHaskellDepends = [
          base genvalidity QuickCheck time validity-time
        ];
@@ -75385,8 +75718,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-unordered-containers";
-       version = "0.0.0.0";
-       sha256 = "1yvav983wq3rff5k9fpjw6m8hsn3jxymfqklw4vc5m0g5v4al8f9";
+       version = "0.1.0.0";
+       sha256 = "12pkwy161byi04kgiirk47s4zr8j718il4m73xl22vl06q9c7yp8";
        libraryHaskellDepends = [
          base genvalidity hashable QuickCheck unordered-containers validity
          validity-unordered-containers
@@ -75399,14 +75732,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity-uuid" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
+     , QuickCheck, uuid, validity, validity-uuid
+     }:
+     mkDerivation {
+       pname = "genvalidity-uuid";
+       version = "0.0.0.0";
+       sha256 = "1dd90ym534b5dwvdvrxx1q0cfv8f3bf834df2smbyps6n2dlny5b";
+       libraryHaskellDepends = [
+         base genvalidity QuickCheck uuid validity validity-uuid
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec QuickCheck uuid
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for UUID";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "genvalidity-vector" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, validity, validity-vector, vector
      }:
      mkDerivation {
        pname = "genvalidity-vector";
-       version = "0.0.0.0";
-       sha256 = "032dkx4wzla7aap31122f0cw31h8f5j36dq7xmvd2q9ssrcr39h7";
+       version = "0.1.0.0";
+       sha256 = "1ii07ywx0j5b7dgihfi1micjcp7r8x9dp0b0yzm31ajvkpqc83lr";
        libraryHaskellDepends = [
          base genvalidity QuickCheck validity validity-vector vector
        ];
@@ -79020,6 +79372,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gjk2d" = callPackage
+    ({ mkDerivation, base, linear }:
+     mkDerivation {
+       pname = "gjk2d";
+       version = "0.1.0.0";
+       sha256 = "08fqm3may9vvifp3fvqvmv7n3i05w9w01c2dmg930fwlrw5lly9b";
+       libraryHaskellDepends = [ base linear ];
+       testHaskellDepends = [ base linear ];
+       homepage = "https://github.com/suzumiyasmith/gjk2d#readme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gl" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
      , fixed, half, hxt, mesa, transformers
@@ -82809,6 +83173,7 @@ self: {
        homepage = "https://github.com/alx741/graphite#readme";
        description = "Graphs and networks library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphmod" = callPackage
@@ -85798,8 +86163,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.5.3";
-       sha256 = "1ywmrr2frvp3pz4c6dvsp9vqwykhbwbdaykjpsyrjq0idn47akhf";
+       version = "0.5.4";
+       sha256 = "1gbn6bnlhaafycyfsfh5j4rbkd56nc65qny34ii9clr34d2cwkaq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88223,6 +88588,8 @@ self: {
        pname = "happy";
        version = "1.19.7";
        sha256 = "16vg292pp12wnkny7znsv7bichh9ghny7swl7v55qafmcfg2lcdv";
+       revision = "1";
+       editedCabalFile = "1w0sm3qn1icxiiif6355pr6cwd9bqfh56g8qc5hycagcnms8hip1";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -92275,6 +92642,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql_0_19_18_2" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
+     , bytestring-strict-builder, contravariant, contravariant-extras
+     , criterion, data-default-class, dlist, either, hashable
+     , hashtables, loch-th, mtl, placeholders, postgresql-binary
+     , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances
+     , rebase, rerebase, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.19.18.2";
+       sha256 = "064866vgiwpp39g3drw0gralra4via77rcqxri8279svm8m5vmbi";
+       libraryHaskellDepends = [
+         attoparsec base base-prelude bytestring bytestring-strict-builder
+         contravariant contravariant-extras data-default-class dlist either
+         hashable hashtables loch-th mtl placeholders postgresql-binary
+         postgresql-libpq profunctors semigroups text transformers vector
+       ];
+       testHaskellDepends = [
+         bug data-default-class QuickCheck quickcheck-instances rebase
+         rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       benchmarkHaskellDepends = [ bug criterion rerebase ];
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "An efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, either, free
      , list-t, text, transformers, vector
@@ -92409,8 +92806,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-optparse-applicative";
-       version = "0.2.1";
-       sha256 = "1snmj627l3180csnm8641ppbl6w89z89rh85bn6h8vw6489ql38p";
+       version = "0.2.2";
+       sha256 = "1ymx36v267ypjx76n9pp8rpmb99z0llpajs0i2z4fkziz7dvjjbf";
        libraryHaskellDepends = [
          base-prelude hasql hasql-pool optparse-applicative
        ];
@@ -92484,6 +92881,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasql-simple" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, contravariant, hasql
+     , text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hasql-simple";
+       version = "0.1.0.0";
+       sha256 = "15cw3mb5gzzys3n58xs74jx9v9yn55xpdp3wn8dcchpllp68xzw3";
+       libraryHaskellDepends = [
+         aeson base bytestring contravariant hasql text time
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/agrafix/hasql-simple#readme";
+       description = "A somewhat opinionated \"simpler\" API to hasql";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hasql-th" = callPackage
     ({ mkDerivation, base-prelude, bytestring, template-haskell, text
      }:
@@ -92596,6 +93010,7 @@ self: {
        homepage = "http://haste-lang.org";
        description = "Framework for type-safe, distributed web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haste-compiler" = callPackage
@@ -92660,6 +93075,7 @@ self: {
        homepage = "http://github.com/valderman/haste-compiler";
        description = "Base libraries for haste-compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haste-markup" = callPackage
@@ -92675,6 +93091,7 @@ self: {
        homepage = "http://github.com/ajnsit/haste-markup";
        description = "A port of blaze-markup and blaze-html to Haste";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haste-perch" = callPackage
@@ -92700,6 +93117,7 @@ self: {
        homepage = "http://haste-lang.org";
        description = "Low level primitives for the Haste compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hastily" = callPackage
@@ -97661,6 +98079,8 @@ self: {
        pname = "hledger";
        version = "1.3.1";
        sha256 = "0h2ljdncxg5f17llnck6136mn9dn83ql85apnm04sm9cxq7iqqxd";
+       revision = "1";
+       editedCabalFile = "165jja9hj9f949g26issn8qra7zairm3s48q5kamy6qshbhfy0km";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -97721,6 +98141,7 @@ self: {
        homepage = "http://hledger.org";
        description = "Web API server for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-chart" = callPackage
@@ -97769,6 +98190,8 @@ self: {
        pname = "hledger-iadd";
        version = "1.2.6";
        sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36";
+       revision = "1";
+       editedCabalFile = "1mr997ryvxv3aq0km3f1h2y0i79m0lb7pl8mn3way5wa82x10kbg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97841,6 +98264,8 @@ self: {
        pname = "hledger-lib";
        version = "1.3.2";
        sha256 = "1qlfzw8nh4isfjqmnq16qrfas9flhyn2b6mf9nvcg0bgm4m7hs7n";
+       revision = "1";
+       editedCabalFile = "1frcbzksnpxl6m7jn6sj9am3f65gs5zp1pzr6jb7a5kxkdkpmyv1";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
@@ -97873,6 +98298,8 @@ self: {
        pname = "hledger-ui";
        version = "1.3.1";
        sha256 = "1mnvqhp32m9xfyabzl19djy74v5nr9mwaanpnwxqp1wkifq7cmxs";
+       revision = "1";
+       editedCabalFile = "0va8jvqakgsra3za7k9j8mjmn6k39881zv0l8hh069dhk7yqd49r";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -97920,6 +98347,8 @@ self: {
        pname = "hledger-web";
        version = "1.3.2";
        sha256 = "0lcrgg6d0gpi9z855byjibzr82bbvmr6bbca5k3ivigd0yzc467d";
+       revision = "1";
+       editedCabalFile = "11imvlhh7lxml59fncmx5dw76gjfby75czfqz3ywk6zcsznjbl80";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -98734,6 +99163,8 @@ self: {
        pname = "hnix";
        version = "0.3.4";
        sha256 = "1wnvbal093c207vr68i0zyrxvmb3yyxdr8p7lbw2yy4ari2hi2gc";
+       revision = "1";
+       editedCabalFile = "01svkjznkz51742k3hcc0ssz5m0kymk53ydrdwg4a24ygvb408iw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98989,6 +99420,7 @@ self: {
        homepage = "https://github.com/jason-johnson/hodatime";
        description = "A fully featured date/time library based on Nodatime";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoe" = callPackage
@@ -100857,8 +101289,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.4.3";
-       sha256 = "1qdk5s1dv3v9pvf8hrr2cwgqsvk7pfiy1k3vvdqcv5cfnknqx0y1";
+       version = "2.4.4";
+       sha256 = "0vijl65rxir61nwx7sdgy6lcwgskyks3cdgcqd814smnavh6nhdn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106570,6 +107002,7 @@ self: {
        homepage = "https://github.com/lucasdicioccio/http2-client";
        description = "A native HTTP2 client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "httpd-shed" = callPackage
@@ -112348,6 +112781,7 @@ self: {
        homepage = "https://github.com/NorfairKing/introduction";
        description = "A prelude for safe new projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "introduction-test" = callPackage
@@ -113068,6 +113502,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-client_1_0_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, containers
+     , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
+     , network-conduit-tls, old-locale, profunctors, stm, stm-conduit
+     , text, time, tls, transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "1.0.0.1";
+       sha256 = "0qg4bvl82wwm7jlrxsmc4aw51rfdygq8qzm6x7j4121av5wbk095";
+       libraryHaskellDepends = [
+         base bytestring conduit connection containers contravariant
+         exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
+         profunctors stm stm-conduit text time tls transformers x509
+         x509-store x509-validation
+       ];
+       homepage = "https://github.com/barrucadu/irc-client";
+       description = "An IRC client library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-colors" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -114181,7 +114637,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libjack2;};
 
   "jack-bindings" = callPackage
@@ -114504,6 +114960,7 @@ self: {
        homepage = "https://github.com/NICTA/javaclass";
        description = "Java class files";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "javascript-extras" = callPackage
@@ -116309,6 +116766,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jvm-binary" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , directory, filepath, tasty, tasty-discover, tasty-hspec
+     , tasty-quickcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "jvm-binary";
+       version = "0.0.1";
+       sha256 = "0lhk31d0a369jnmyw253wkm1ymdc80a3iw67av4x3d4jajq68kys";
+       libraryHaskellDepends = [
+         base binary bytestring containers text vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers directory filepath tasty
+         tasty-discover tasty-hspec tasty-quickcheck text
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       homepage = "https://github.com/kalhauge/jvm-binary#readme";
+       description = "A library for reading Java class-files";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "jvm-parser" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-binary-ieee754, fgl, fingertree, pretty, zlib
@@ -116841,6 +117320,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "katip_0_5_0_2" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , bytestring, containers, criterion, deepseq, directory, either
+     , filepath, hostname, microlens, microlens-th, monad-control, mtl
+     , old-locale, quickcheck-instances, regex-tdfa, resourcet
+     , safe-exceptions, scientific, semigroups, stm, string-conv, tasty
+     , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell
+     , text, time, time-locale-compat, transformers, transformers-base
+     , transformers-compat, unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "katip";
+       version = "0.5.0.2";
+       sha256 = "1kiangj6l29ddchfzfp4xjnpnddyc9jzrg08b70z3jxbdv2vgvyg";
+       libraryHaskellDepends = [
+         aeson async auto-update base bytestring containers either hostname
+         microlens microlens-th monad-control mtl old-locale resourcet
+         safe-exceptions scientific semigroups stm string-conv
+         template-haskell text time transformers transformers-base
+         transformers-compat unix unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory microlens
+         quickcheck-instances regex-tdfa safe-exceptions stm tasty
+         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
+         time time-locale-compat unordered-containers
+       ];
+       benchmarkHaskellDepends = [
+         aeson async base blaze-builder criterion deepseq directory filepath
+         safe-exceptions text time transformers unix
+       ];
+       homepage = "https://github.com/Soostone/katip";
+       description = "A structured logging framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "katip-elasticsearch" = callPackage
     ({ mkDerivation, aeson, async, base, bloodhound, bytestring
      , containers, criterion, deepseq, enclosed-exceptions, exceptions
@@ -117862,15 +118378,15 @@ self: {
 
   "knead" = callPackage
     ({ mkDerivation, base, llvm-extra, llvm-tf, storable-record
-     , storable-tuple, transformers, utility-ht
+     , storable-tuple, tfp, transformers, utility-ht
      }:
      mkDerivation {
        pname = "knead";
-       version = "0.2.2";
-       sha256 = "0vkynmxm5cql7bv8m5s44a1gpwahya4hp8p6n6j20ninfcc69xkg";
+       version = "0.2.3";
+       sha256 = "14wi37i3y8hvfiwfs82mg7nanin84if4wlxi3rdg4w3fkdqm9ycl";
        libraryHaskellDepends = [
-         base llvm-extra llvm-tf storable-record storable-tuple transformers
-         utility-ht
+         base llvm-extra llvm-tf storable-record storable-tuple tfp
+         transformers utility-ht
        ];
        homepage = "http://hub.darcs.net/thielema/knead/";
        description = "Repa array processing using LLVM JIT";
@@ -118049,6 +118565,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "kraken_0_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, mtl
+     }:
+     mkDerivation {
+       pname = "kraken";
+       version = "0.1.0";
+       sha256 = "12l24z6alscbdicp11nfc8fwmlhk5mjdjyh6xdqyvlzphp5yfp1k";
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls mtl
+       ];
+       description = "Kraken.io API client";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "krapsh" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring
      , binary, bytestring, containers, cryptohash-sha256, deepseq
@@ -119515,6 +120047,7 @@ self: {
        homepage = "https://github.com/eliaslfox/language-elm#readme";
        description = "Generate elm code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-fortran" = callPackage
@@ -122830,6 +123363,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "light" = callPackage
+    ({ mkDerivation, base, containers, gjk2d, lens, linear, mtl }:
+     mkDerivation {
+       pname = "light";
+       version = "0.1.0.0";
+       sha256 = "1zzf5bi8b6in6dvfv4wfmghcvibia5c0waji9y734kp617lsjxl3";
+       libraryHaskellDepends = [ base containers gjk2d lens linear mtl ];
+       testHaskellDepends = [ base containers lens linear ];
+       homepage = "https://github.com/suzumiyasmith/light#readme";
+       description = "a simple physics engine";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lightning-haskell" = callPackage
     ({ mkDerivation, aeson, api-builder, base, blaze-html, bytestring
      , data-default-class, free, hspec, http-client, http-client-tls
@@ -127634,6 +128180,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mallard" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, cryptohash, exceptions
+     , fgl, file-embed, hashable, hasql, hasql-optparse-applicative
+     , hasql-pool, hasql-transaction, Interpolation, lens, megaparsec
+     , mtl, optparse-applicative, optparse-text, path, path-io, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "mallard";
+       version = "0.6.1.1";
+       sha256 = "02miq5kv3348316h8sxggwk8f8ijr51s8yws1cnliy2wqxfsg50m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base byteable bytestring cryptohash exceptions fgl file-embed
+         hashable hasql hasql-pool hasql-transaction Interpolation lens
+         megaparsec mtl path path-io text unordered-containers
+       ];
+       executableHaskellDepends = [
+         base exceptions fgl hasql hasql-optparse-applicative hasql-pool
+         lens mtl optparse-applicative optparse-text path path-io text
+         unordered-containers
+       ];
+       homepage = "https://github.com/AndrewRademacher/mallard";
+       description = "Database migration and testing as a library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "managed" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -128569,6 +129144,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "marvin_0_2_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, configurator
+     , deepseq, directory, filepath, hashable, haskeline, hspec
+     , http-client, http-client-tls, http-types, irc-conduit, lens
+     , lifted-async, lifted-base, marvin-interpolate, monad-control
+     , monad-logger, monad-loops, mtl, mustache, network-uri
+     , optparse-applicative, random, stm, text, text-icu, time
+     , transformers, transformers-base, unordered-containers, vector
+     , wai, warp, warp-tls, websockets, wreq, wuss
+     }:
+     mkDerivation {
+       pname = "marvin";
+       version = "0.2.5";
+       sha256 = "0lgmw8gs7alahv9n36fkxzc6fk0485f566vyyjshqfnh019vpgah";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring conduit configurator deepseq hashable
+         haskeline http-client http-client-tls http-types irc-conduit lens
+         lifted-async lifted-base marvin-interpolate monad-control
+         monad-logger monad-loops mtl network-uri optparse-applicative
+         random stm text text-icu time transformers transformers-base
+         unordered-containers vector wai warp warp-tls websockets wreq wuss
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring configurator directory filepath mustache
+         optparse-applicative text
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://marvin.readthedocs.io";
+       description = "A framework for modular, portable chat bots";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "marvin-interpolate" = callPackage
     ({ mkDerivation, base, haskell-src-meta, hspec, mtl, parsec
      , template-haskell, text
@@ -129816,7 +130427,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_6_1_1" = callPackage
+  "megaparsec_6_2_0" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-expectations, mtl
      , parser-combinators, QuickCheck, scientific, text, transformers
@@ -129824,8 +130435,8 @@ self: {
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "6.1.1";
-       sha256 = "08vwcxh3538bsgcmghssg87p7nvyi49vmr3zf8mqh52wxh65ygl4";
+       version = "6.2.0";
+       sha256 = "1kyn7fcyckbjngpyxd2d4mny95sy71rk2s22yrkwyjgkza0fvslg";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -131798,14 +132409,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "miso_0_7_5_0" = callPackage
+  "miso_0_7_8_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, lucid
      , servant, servant-lucid, text, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.7.5.0";
-       sha256 = "1nfnsmhiqncahasm21y3m5626ra9glq2nvwjv15a5i6h3qw5m328";
+       version = "0.7.8.0";
+       sha256 = "1rzfdd2wcmmc2vmrh5v0blqkjszbpmvx5yhq99c5zss8ir7x4a9w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132413,22 +133024,20 @@ self: {
     ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
      , containers, cryptohash, css-syntax, directory, filemanip
      , filepath, fsnotify, hspec, hspec-smallcheck, kraken, mtl
-     , network-uri, optparse-applicative, process, smallcheck, snap
+     , network-uri, optparse-applicative, process, smallcheck, snap-core
      , snap-server, stm, tagsoup, text, time, transformers, unix
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "mole";
-       version = "0.0.5";
-       sha256 = "14vqa4mszb37rlpimlqir4g39lv66bfvg9jp4hcqzj5gsny3a1qb";
-       revision = "4";
-       editedCabalFile = "1565y432g3xy8q9db5sg4nsrb4pn25sxjlb0d6psgfhajb0qlh3l";
+       version = "0.0.6";
+       sha256 = "0shsx1sc6rc5jxijvrc4bzqpjw4xdjq5ghlj8jnmm7gp8b6h6y5b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          attoparsec base base64-bytestring bytestring containers cryptohash
          css-syntax directory filemanip filepath fsnotify kraken mtl
-         network-uri optparse-applicative process snap snap-server stm
+         network-uri optparse-applicative process snap-core snap-server stm
          tagsoup text time transformers unix
        ];
        testHaskellDepends = [
@@ -135270,6 +135879,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "multi-instance" = callPackage
+    ({ mkDerivation, base, doctest }:
+     mkDerivation {
+       pname = "multi-instance";
+       version = "0.0.0.1";
+       sha256 = "09kqgh966z2n54mkrm1hbllfl8cws6s8caqlld1p8z502axmy5sk";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/chris-martin/multi-instance#readme";
+       description = "Typeclasses augmented with a phantom type parameter";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "multi-trie" = callPackage
     ({ mkDerivation, base, composition, containers, HTF }:
      mkDerivation {
@@ -136615,6 +137237,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mysql-simple_0_4_3" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+     , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light
+     , text, time
+     }:
+     mkDerivation {
+       pname = "mysql-simple";
+       version = "0.4.3";
+       sha256 = "12zryyrjkrglp0r8ra3kcmyksq8g864c5nfxa5d7w3rn9532lzjj";
+       libraryHaskellDepends = [
+         attoparsec base base16-bytestring blaze-builder blaze-textual
+         bytestring mysql old-locale pcre-light text time
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/paul-rouse/mysql-simple";
+       description = "A mid-level MySQL client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mysql-simple-quasi" = callPackage
     ({ mkDerivation, base, haskell-src-meta, mysql-simple
      , template-haskell
@@ -136822,6 +137464,7 @@ self: {
        homepage = "https://github.com/mtesseract/nakadi-haskell#readme";
        description = "Client library for the Nakadi Event Broker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "namecoin-update" = callPackage
@@ -139459,15 +140102,15 @@ self: {
      }) {};
 
   "ngx-export" = callPackage
-    ({ mkDerivation, async, base, binary, bytestring, template-haskell
-     , unix
+    ({ mkDerivation, async, base, binary, bytestring, monad-loops
+     , template-haskell, unix
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.7.0.1";
-       sha256 = "1c1wp2wjbi36yf3m2zpvijyi0yy3mvi4zhgkijilyfc4i34arh7n";
+       version = "0.8.0.0";
+       sha256 = "0l4g7nxa2lhf804q17my3fz7hblzidn1rp2si0b9nnbl9h7264sq";
        libraryHaskellDepends = [
-         async base binary bytestring template-haskell unix
+         async base binary bytestring monad-loops template-haskell unix
        ];
        homepage = "http://github.com/lyokha/nginx-haskell-module";
        description = "Helper module for Nginx haskell module";
@@ -140968,6 +141611,7 @@ self: {
        homepage = "https://github.com/tonyday567/numhask-array";
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numhask-range" = callPackage
@@ -141777,6 +142421,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ombra" = callPackage
+    ({ mkDerivation, base, Boolean, gl, hashable, hashtables, MemoTrie
+     , monad-control, transformers, transformers-base
+     , unordered-containers, vector-space
+     }:
+     mkDerivation {
+       pname = "ombra";
+       version = "1.0.0.0";
+       sha256 = "1mksrvidrl3nxfx5xy915sma23csw1iw959l5xl78r683kf4bkj7";
+       libraryHaskellDepends = [
+         base Boolean gl hashable hashtables MemoTrie monad-control
+         transformers transformers-base unordered-containers vector-space
+       ];
+       homepage = "https://github.com/ziocroc/Ombra";
+       description = "Render engine";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "omega" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath
      , pretty, time
@@ -142325,6 +142987,7 @@ self: {
        homepage = "https://github.com/LumiGuide/haskell-opencv";
        description = "Haskell binding to OpenCV-3.x";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) opencv3;};
 
   "opencv-extra" = callPackage
@@ -142352,6 +143015,7 @@ self: {
        homepage = "https://github.com/LumiGuide/haskell-opencv";
        description = "Haskell binding to OpenCV-3.x extra modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opencv-raw" = callPackage
@@ -144302,6 +144966,8 @@ self: {
        pname = "palette";
        version = "0.1.0.5";
        sha256 = "04lqmd0c02fp3x57gbga9qf05f4a6hr8p2ywlasm0dkr740m6d3l";
+       revision = "1";
+       editedCabalFile = "1a5qsbd43wmw1f3dj6vnmzd9imh9gsnz29jc47ivbgj4x6mdmsq1";
        libraryHaskellDepends = [ array base colour containers ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Utilities for choosing and creating color schemes";
@@ -144739,22 +145405,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-types_1_17_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
+  "pandoc-types_1_17_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , transformers
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.17.1";
-       sha256 = "0sqk4sjpyl9k54kaxrk52in2sqhy62cakhca9k5i9c6gjhqh0rrb";
+       version = "1.17.2";
+       sha256 = "0wgd83xjpkc73xiig1n7wpfaa67widka7q1kx83pz8liswdqxq73";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
+         transformers
        ];
        testHaskellDepends = [
          aeson base bytestring containers HUnit QuickCheck string-qq syb
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
@@ -144841,8 +145510,8 @@ self: {
      }:
      mkDerivation {
        pname = "panhandle";
-       version = "0.2.0.0";
-       sha256 = "1xkpivyw3r83hrksbq4vyf1ahqp86ck7m2ijgynbb962ifvwqrg0";
+       version = "0.3.0.0";
+       sha256 = "0bnqfxp451b935gsmaqc5j7cgs061bjsmz66g8sw00ycnjrvdk0a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base pandoc pandoc-types syb ];
@@ -146879,8 +147548,8 @@ self: {
      }:
      mkDerivation {
        pname = "pcf-font";
-       version = "0.2.1.1";
-       sha256 = "0746y3kqkh13cps9swgf9pp2kbrybxjbhs5wh38aqgpj64dwgcdc";
+       version = "0.2.2.0";
+       sha256 = "1vwqy2zkj0yb0b7hx3hrcfdcg46j67sv9l8ljik8wrm7811d0rwa";
        libraryHaskellDepends = [
          base binary bytestring containers vector zlib
        ];
@@ -146895,8 +147564,8 @@ self: {
      }:
      mkDerivation {
        pname = "pcf-font-embed";
-       version = "0.1.0.0";
-       sha256 = "0qbbsphl39k90j0cg45g9rzv3pnk6kzkjibkaa7qq70xb7i4didy";
+       version = "0.1.1.0";
+       sha256 = "0mp4kwx77vx6l2cl7kzqw4pa4wdwdm58g8imph814waygxkbrj4g";
        libraryHaskellDepends = [
          base bytestring pcf-font template-haskell vector
        ];
@@ -151301,6 +151970,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "pointfree-fancy" = callPackage
+    ({ mkDerivation, array, base, containers, haskell-src-exts, HUnit
+     , QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "pointfree-fancy";
+       version = "1.1.1.4";
+       sha256 = "1llqlxcgafbgzb84gzgwldb0lsa9nnqsn3irbrlljralx2zfhxk3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers haskell-src-exts transformers
+       ];
+       executableHaskellDepends = [
+         array base containers haskell-src-exts transformers
+       ];
+       testHaskellDepends = [
+         array base containers haskell-src-exts HUnit QuickCheck
+         transformers
+       ];
+       description = "Tool for refactoring expressions into pointfree form";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pointful" = callPackage
     ({ mkDerivation, base, containers, haskell-src-exts-simple, mtl
      , syb, transformers
@@ -152129,6 +152823,7 @@ self: {
        homepage = "https://github.com/xtendo-org/positron#readme";
        description = "Experiment";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "posix-acl" = callPackage
@@ -153213,6 +153908,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pragmatic-show" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck
+     , vector-space
+     }:
+     mkDerivation {
+       pname = "pragmatic-show";
+       version = "0.1.0.2";
+       sha256 = "0wyn4rdhv8flhcaa41bv7yabs2l5sm5fp7znsdjr137g3v190xpl";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base tasty tasty-hunit tasty-quickcheck vector-space
+       ];
+       homepage = "https://github.com/leftaroundabout/pragmatic-show";
+       description = "Alternative Show class that gives shorter view if possible";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "preamble" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, exceptions
      , fast-logger, lens, monad-control, monad-logger, MonadRandom, mtl
@@ -154091,6 +154803,7 @@ self: {
        homepage = "https://github.com/sighingnow/computations/tree/master/primesieve#readme";
        description = "FFI bindings for the primesieve library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {primesieve = null;};
 
   "primitive_0_5_1_0" = callPackage
@@ -155680,6 +156393,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers_2_4_4" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , directory, filepath, mtl, parsec, syb, utf8-string
+     }:
+     mkDerivation {
+       pname = "protocol-buffers";
+       version = "2.4.4";
+       sha256 = "1qlkilnxfx5grim0hxf7drg2m48z76f88d4r61sy71npybf3mqnv";
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath mtl
+         parsec syb utf8-string
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Parse Google Protocol Buffer specifications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
@@ -155695,6 +156426,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers-descriptor_2_4_4" = callPackage
+    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
+     mkDerivation {
+       pname = "protocol-buffers-descriptor";
+       version = "2.4.4";
+       sha256 = "0jr1clff6vn8lpx2rbc72angn0glc2v18ji5lqgzijri8zya9nqj";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers protocol-buffers
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor-fork" = callPackage
     ({ mkDerivation, base, bytestring, containers
      , protocol-buffers-fork
@@ -156648,6 +157395,7 @@ self: {
        homepage = "https://github.com/memrange/apn#readme";
        description = "Send push notifications to mobile iOS devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "push-notify-ccs" = callPackage
@@ -160435,7 +161183,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana and JACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-midyim" = callPackage
@@ -164353,6 +165101,7 @@ self: {
        homepage = "https://github.com/lessrest/restless-git";
        description = "Easy Git repository serialization";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "restricted-workers" = callPackage
@@ -166952,6 +167701,7 @@ self: {
        homepage = "https://github.com/githubuser/safepath#readme";
        description = "Safe Paths in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safer-file-handles" = callPackage
@@ -168722,6 +169472,7 @@ self: {
        ];
        description = "Scrape websites for changes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scrobble" = callPackage
@@ -169865,8 +170616,8 @@ self: {
      }:
      mkDerivation {
        pname = "sensei";
-       version = "0.2.0";
-       sha256 = "1c7lghr05r5ny4xx2jwngxx1n97yf78lr9m4m1p2bfrc16mwyf5a";
+       version = "0.3.0";
+       sha256 = "0ya5pb7plr3qgh2vh8yqffwcb6alk2k581wv3yfp0zwxpflwppvh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -170888,6 +171639,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-checked-exceptions_0_4_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
+     , hspec-wai, http-api-data, http-client, http-media
+     , natural-transformation, optparse-applicative, profunctors
+     , servant, servant-client, servant-docs, servant-server, tagged
+     , tasty, tasty-hspec, tasty-hunit, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-checked-exceptions";
+       version = "0.4.1.0";
+       sha256 = "19h0vywlh6b41mdjpka4b7rz4l6gxmjlvji8nzbgkllsjgr81g3g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring deepseq http-media profunctors servant
+         servant-client servant-docs servant-server tagged text
+       ];
+       executableHaskellDepends = [
+         aeson base http-api-data http-client natural-transformation
+         optparse-applicative servant servant-client servant-docs
+         servant-server text wai warp
+       ];
+       testHaskellDepends = [
+         base bytestring doctest Glob hspec-wai servant servant-server tasty
+         tasty-hspec tasty-hunit wai
+       ];
+       homepage = "https://github.com/cdepillabout/servant-checked-exceptions";
+       description = "Checked exceptions for Servant APIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-client" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
      , base64-bytestring, bytestring, deepseq, exceptions, generics-sop
@@ -171708,14 +172491,14 @@ self: {
      , directory, either, errors, exceptions, filepath, heist, hspec
      , hspec-core, hspec-snap, http-api-data, http-types, HUnit
      , io-streams, lens, map-syntax, mmorph, mtl, network, network-uri
-     , parsec, process, QuickCheck, servant, snap, snap-core
+     , parsec, process, QuickCheck, servant, snap, snap-core, snap-cors
      , snap-server, string-conversions, temporary, text, time
      , transformers, word8
      }:
      mkDerivation {
        pname = "servant-snap";
-       version = "0.8";
-       sha256 = "00wc6kzk01jj1kfapqijffbws9x7cwvddxir0b5yy9dpbz56zfg8";
+       version = "0.8.0.1";
+       sha256 = "06n9zvz18hwizi5iqldlhgwr1m83fg5l3dzlaarl2rgvr1dnkh2i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -171732,8 +172515,8 @@ self: {
          aeson base base64-bytestring bytestring case-insensitive containers
          digestive-functors directory either exceptions hspec hspec-core
          hspec-snap http-types HUnit lens mtl network parsec process
-         QuickCheck servant snap snap-core snap-server string-conversions
-         temporary text time transformers
+         QuickCheck servant snap snap-core snap-cors snap-server
+         string-conversions temporary text time transformers
        ];
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
@@ -172839,6 +173622,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shake_0_16" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, directory
+     , extra, filepath, hashable, js-flot, js-jquery, primitive, process
+     , QuickCheck, random, time, transformers, unix
+     , unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "shake";
+       version = "0.16";
+       sha256 = "039b8yrp7nskya30fahzcf8w2rl8jj277hddrcfx3zwbxlcfldcg";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery primitive process random time transformers unix
+         unordered-containers utf8-string
+       ];
+       executableHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery primitive process random time transformers unix
+         unordered-containers utf8-string
+       ];
+       testHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery primitive process QuickCheck random time
+         transformers unix unordered-containers utf8-string
+       ];
+       homepage = "http://shakebuild.com";
+       description = "Build system library, like Make, but more accurate dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shake-cabal-build" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, process }:
      mkDerivation {
@@ -176789,6 +177606,55 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "snap-server_1_0_3_3" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, clock
+     , containers, criterion, deepseq, directory, filepath, HsOpenSSL
+     , http-common, http-streams, HUnit, io-streams, io-streams-haproxy
+     , lifted-base, monad-control, mtl, network, old-locale
+     , openssl-streams, parallel, QuickCheck, random, snap-core
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, threads, time, transformers, unix, unix-compat, vector
+     }:
+     mkDerivation {
+       pname = "snap-server";
+       version = "1.0.3.3";
+       sha256 = "1vjfpgcl09l974mdsvgxdlqcl68xmn33z1scx3sfyvcnz32xnnkl";
+       configureFlags = [ "-fopenssl" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         case-insensitive clock containers filepath HsOpenSSL io-streams
+         io-streams-haproxy lifted-base mtl network old-locale
+         openssl-streams snap-core text time unix unix-compat vector
+       ];
+       executableHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         case-insensitive clock containers directory HsOpenSSL io-streams
+         io-streams-haproxy lifted-base mtl network old-locale
+         openssl-streams snap-core text time transformers unix unix-compat
+         vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base16-bytestring blaze-builder bytestring
+         bytestring-builder case-insensitive clock containers deepseq
+         directory filepath HsOpenSSL http-common http-streams HUnit
+         io-streams io-streams-haproxy lifted-base monad-control mtl network
+         old-locale openssl-streams parallel QuickCheck random snap-core
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         threads time transformers unix unix-compat vector
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         criterion io-streams io-streams-haproxy snap-core vector
+       ];
+       homepage = "http://snapframework.com/";
+       description = "A web server for the Snap Framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "snap-templates" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , directory-tree, filepath, hashable, old-time, template-haskell
@@ -181430,6 +182296,7 @@ self: {
        homepage = "https://github.com/vagarenko/static-tensor";
        description = "Tensors of statically known size";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "staticanalysis" = callPackage
@@ -183278,6 +184145,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "strict-types" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , foundation, hashable, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "strict-types";
+       version = "0.1.0.6";
+       sha256 = "0dp0179g20g62vn6c5wv2d7d9kwwix40rxzwfig6f0pi8rm16jxj";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq foundation hashable text
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/pepeiborra/strict-types";
+       description = "A type level predicate ranging over strict types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "strict-writer" = callPackage
     ({ mkDerivation, base, doctest, mtl }:
      mkDerivation {
@@ -184105,6 +184990,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "submark" = callPackage
+    ({ mkDerivation, base, cmark, hlint, hspec, optparse-applicative
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "submark";
+       version = "0.1.0";
+       sha256 = "0ywan4j2b6zyrsgk2s25mhc3cwx5nxg93hq4gkfcmaxlhp6rmbrq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base cmark text ];
+       executableHaskellDepends = [
+         base cmark optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base cmark hlint hspec template-haskell text
+       ];
+       homepage = "https://github.com/dahlia/submark#readme";
+       description = "Extract a part from CommonMark/Markdown docs";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "subnet" = callPackage
     ({ mkDerivation, base, split }:
      mkDerivation {
@@ -184879,6 +185786,8 @@ self: {
        pname = "swagger2";
        version = "2.1.5";
        sha256 = "1sxv03fgafr21824wcz68l4nvazk6j31z74xa7njg7d3mc5w66pw";
+       revision = "1";
+       editedCabalFile = "1jv3jbnz0hsfvqnvv6diq4yav85jsqs9b5k1rx7b96nvh1ik3p4q";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base base-compat bytestring containers generics-sop hashable
@@ -184896,6 +185805,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "swagger2_2_1_6" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
+     , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
+     , hashable, hspec, http-media, HUnit, insert-ordered-containers
+     , lens, mtl, network, QuickCheck, scientific, template-haskell
+     , text, time, transformers, transformers-compat
+     , unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "swagger2";
+       version = "2.1.6";
+       sha256 = "01a29h56vfyw0ilij1pn6qwy50ca90kyj884vs1q52vvh572758j";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson base base-compat bytestring containers generics-sop hashable
+         http-media insert-ordered-containers lens mtl network scientific
+         template-haskell text time transformers transformers-compat
+         unordered-containers uuid-types vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat bytestring containers doctest Glob
+         hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
+         text time unordered-containers vector
+       ];
+       homepage = "https://github.com/GetShopTV/swagger2";
+       description = "Swagger 2.0 data model";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "swapper" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data
      , happstack-state, parallel, tokyocabinet
@@ -185061,8 +186000,8 @@ self: {
      }:
      mkDerivation {
        pname = "syb-with-class";
-       version = "0.6.1.7";
-       sha256 = "1fvawrlipr3rybbrmldcdlsw46vyi695a0c30jxxlcy5v1q1hljw";
+       version = "0.6.1.8";
+       sha256 = "01b187jhhfp77l4zgks5gszkn9jmgjc44mw9yympw1fsfskljiz3";
        libraryHaskellDepends = [
          array base bytestring containers template-haskell
        ];
@@ -187281,6 +188220,7 @@ self: {
        homepage = "https://github.com/jtdaugherty/tart/";
        description = "Terminal Art";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "task" = callPackage
@@ -188259,25 +189199,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "teardown_0_2_0_0" = callPackage
+  "teardown_0_3_0_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, criterion, deepseq, doctest
-     , Glob, protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit
-     , tasty-rerun, tasty-smallcheck, text, time
+     , exceptions, Glob, protolude, QuickCheck, safe-exceptions, tasty
+     , tasty-hspec, tasty-hunit, tasty-rerun, tasty-smallcheck, text
+     , time
      }:
      mkDerivation {
        pname = "teardown";
-       version = "0.2.0.0";
-       sha256 = "1ir84hm9z5n4dv1qvfs5f3qzmhdymcaak2whbvdz189kkziwhqsf";
+       version = "0.3.0.0";
+       sha256 = "0v47863md56nbkq0dwq4v7fw6krjjnz9m6fgag6qcbd3yx4lydc2";
        libraryHaskellDepends = [
-         ansi-wl-pprint base deepseq protolude text time
+         ansi-wl-pprint base deepseq exceptions protolude safe-exceptions
+         text time
        ];
        testHaskellDepends = [
-         base doctest Glob protolude QuickCheck tasty tasty-hspec
-         tasty-hunit tasty-rerun tasty-smallcheck text time
+         base doctest Glob protolude QuickCheck safe-exceptions tasty
+         tasty-hspec tasty-hunit tasty-rerun tasty-smallcheck text time
+       ];
+       benchmarkHaskellDepends = [
+         base criterion protolude safe-exceptions text time
        ];
-       benchmarkHaskellDepends = [ base criterion protolude text time ];
        homepage = "https://github.com/roman/Haskell-teardown#readme";
-       description = "Build composable, idempotent & transparent application cleanup sub-routines";
+       description = "Build composable components for your application with clear teardown semantics";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -189592,6 +190536,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "testCom" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, template-haskell }:
+     mkDerivation {
+       pname = "testCom";
+       version = "0.1.0";
+       sha256 = "0wwh32sn5vgsm1yy741mp57ng17dwsailkz6isa37r71lcvaqj98";
+       libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
+       testHaskellDepends = [ base haskell-src-meta template-haskell ];
+       description = "Write your tests in comments";
+       license = "GPL";
+     }) {};
+
   "testPkg" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -191208,6 +192164,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "th-strict-compat" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "th-strict-compat";
+       version = "0.1.0.1";
+       sha256 = "0jmajcnw832df503jbg2fmrmnskc43i07214vpc4fw359cgd7yn3";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "https://gitlab.com/igrep/th-strict-compat";
+       description = "Compatibility shim for Bang and Strict in Template Haskell";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "th-to-exp" = callPackage
     ({ mkDerivation, base, hspec, template-haskell }:
      mkDerivation {
@@ -191295,6 +192263,7 @@ self: {
        homepage = "https://github.com/y-taka-23/thank-you-stars#readme";
        description = "Give your dependencies stars on GitHub!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "themoviedb" = callPackage
@@ -192106,6 +193075,7 @@ self: {
        homepage = "https://github.com/NICTA/tickle";
        description = "A port of @Data.Binary@";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tictactoe3d" = callPackage
@@ -193555,6 +194525,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tmp-postgres_0_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover
+     , network, postgresql-simple, process, temporary, unix
+     }:
+     mkDerivation {
+       pname = "tmp-postgres";
+       version = "0.1.1.0";
+       sha256 = "1afmj859c1yl2lfvjqzvwx24hdrp8lf3v9zp7n56p9n6q74mknr0";
+       libraryHaskellDepends = [
+         base directory network process temporary unix
+       ];
+       testHaskellDepends = [
+         base bytestring directory hspec hspec-discover postgresql-simple
+         process temporary
+       ];
+       homepage = "https://github.com/jfischoff/tmp-postgres#readme";
+       description = "Start and stop a temporary postgres for testing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tmpl" = callPackage
     ({ mkDerivation, base, bytestring, directory, template, text }:
      mkDerivation {
@@ -194916,6 +195907,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tree-diff" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
+     , base-compat, bytestring, Cabal, cabal-doctest, containers
+     , doctest, generics-sop, hashable, MemoTrie, parsec, parsers
+     , pretty, QuickCheck, scientific, tagged, tasty, tasty-golden
+     , tasty-quickcheck, template-haskell, text, time, trifecta
+     , unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "tree-diff";
+       version = "0";
+       sha256 = "1xiwnq1rrbkzarz5ylnq0p8xk3ldjg7cj7cbmdalr1507qg7wdn7";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
+         containers generics-sop hashable MemoTrie parsec parsers pretty
+         QuickCheck scientific tagged text time unordered-containers
+         uuid-types vector
+       ];
+       testHaskellDepends = [
+         ansi-terminal ansi-wl-pprint base base-compat doctest parsec
+         QuickCheck tasty tasty-golden tasty-quickcheck template-haskell
+         trifecta
+       ];
+       homepage = "https://github.com/phadej/tree-diff";
+       description = "Diffing of (expression) trees";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tree-fun" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -195972,8 +196993,8 @@ self: {
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.7";
-       sha256 = "026hmzrc80mc2jpvd0cnxa6kj4lfirh7ygdh1xaw51svrql8320j";
+       version = "1.0.1.9";
+       sha256 = "1s9gg1247xa2rl30s9i4rza04107s7awrx7pbmd4vc436mv4624z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -196472,10 +197493,12 @@ self: {
        pname = "twitter-types-lens";
        version = "0.7.2";
        sha256 = "04mjrwd5f960kd7v5xq4wlyzksw06d3qj52ql1lhjki3f3papzjg";
+       revision = "1";
+       editedCabalFile = "0rag7vz1irirnqxh18xwvp8rg7ysx4lwrb9ysv5wcfjdggp6b6gs";
        libraryHaskellDepends = [
          base lens template-haskell text time twitter-types
        ];
-       homepage = "https://github.com/himura/twitter-types-lens";
+       homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200188,8 +201211,8 @@ self: {
      }:
      mkDerivation {
        pname = "userid";
-       version = "0.1.3";
-       sha256 = "02vcgm7n4s5lljp93q6a3b7xgw6vm6m0hm8qz9qfzgllb2d8b353";
+       version = "0.1.3.1";
+       sha256 = "12alrvzh1z15md5gbvci58xffw35g4626qr30v7cz6sz4pplfnb9";
        libraryHaskellDepends = [
          aeson base boomerang cereal safecopy web-routes web-routes-th
        ];
@@ -200964,6 +201987,7 @@ self: {
        homepage = "https://github.com/qfpl/validation";
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validations" = callPackage
@@ -201011,8 +202035,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "validity";
-       version = "0.3.3.0";
-       sha256 = "1cayhhycmfj9ri2k8j4ndbqxv67w9ibf9v44w8lfkwp2zm8my5zz";
+       version = "0.4.0.0";
+       sha256 = "0ngivfphp468bp6djj8r76rwv2pcwgmawx04pnaw89m0wa5n27vw";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity typeclass";
@@ -201025,8 +202049,8 @@ self: {
      }:
      mkDerivation {
        pname = "validity-aeson";
-       version = "0.0.0.0";
-       sha256 = "1a7yh87vlngd4f6j5al7zrfy5pkgfgpbjr00fbpaqk56z87328nh";
+       version = "0.1.0.0";
+       sha256 = "1bzqy6c85r3nsqmmvb06fmll7m7qjzgwk6mq25ivs5vqmfhv6kig";
        libraryHaskellDepends = [
          aeson base validity validity-scientific validity-text
          validity-unordered-containers validity-vector
@@ -201040,8 +202064,8 @@ self: {
     ({ mkDerivation, base, bytestring, validity }:
      mkDerivation {
        pname = "validity-bytestring";
-       version = "0.1.0.1";
-       sha256 = "1kz998gjia77xqkgp5xisn0gp7wrp9c1s8wvhnmmajn5i4nxakmw";
+       version = "0.2.0.0";
+       sha256 = "118g7as13kvfbwid1qy461vswzgl7bbdclapi6hr2majmwvrlgl7";
        libraryHaskellDepends = [ base bytestring validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for bytestring";
@@ -201052,8 +202076,8 @@ self: {
     ({ mkDerivation, base, containers, validity }:
      mkDerivation {
        pname = "validity-containers";
-       version = "0.1.0.3";
-       sha256 = "13s595d67mdv0238v0zr2ar2r379fdxsibyc05vxnz54km108wdd";
+       version = "0.2.0.0";
+       sha256 = "02kzrz78ikp3hx5szvflixmyddh30iipbapfrc8ypp5k5qar3sgh";
        libraryHaskellDepends = [ base containers validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for containers";
@@ -201064,8 +202088,8 @@ self: {
     ({ mkDerivation, base, filepath, path, validity }:
      mkDerivation {
        pname = "validity-path";
-       version = "0.1.0.1";
-       sha256 = "0mqfcy28fwawnz85k29h47xr660q8q6h48lp5likx5dxw42p5l0z";
+       version = "0.2.0.0";
+       sha256 = "1n84mnvyi1zf3888xvy2vvmca5fq594g0gqql5nisd3w1mrczw1f";
        libraryHaskellDepends = [ base filepath path validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for Path";
@@ -201076,8 +202100,8 @@ self: {
     ({ mkDerivation, base, scientific, validity }:
      mkDerivation {
        pname = "validity-scientific";
-       version = "0.0.0.0";
-       sha256 = "1k68lp33z0w1ari6i2wdcgypv9viynya5bi8bqs7ybic7h7cs3i5";
+       version = "0.1.0.0";
+       sha256 = "0pd5kjdb8nwj8rwvqa3wr377fmcs6wad7zmdv7r41bxzch1qf5zc";
        libraryHaskellDepends = [ base scientific validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for scientific";
@@ -201088,8 +202112,8 @@ self: {
     ({ mkDerivation, base, bytestring, text, validity }:
      mkDerivation {
        pname = "validity-text";
-       version = "0.1.2.1";
-       sha256 = "06wxqf283fy9i89pk0gg7b8bf89q0lvac8qys0wc9lygr4hqbmar";
+       version = "0.2.0.0";
+       sha256 = "1h123s8hbsimd3l05s217lncimfhzvy4xmwqafl4qw9dbmcxnsah";
        libraryHaskellDepends = [ base bytestring text validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for text";
@@ -201100,10 +202124,8 @@ self: {
     ({ mkDerivation, base, time, validity }:
      mkDerivation {
        pname = "validity-time";
-       version = "0.0.0.1";
-       sha256 = "0sdvqplgp57f04d54njyabp20fmrpa23jkx1mx3k0cj1aywpap8p";
-       revision = "1";
-       editedCabalFile = "1w7sjxsrjf3mfnssnvfvn2qbhg9j520cfxcn2m9gawrb4h20rwm9";
+       version = "0.1.0.0";
+       sha256 = "1mwyh92vfjq5s2p54vqfyawvvwqvpl2g4f6bqmnk149qqqgxv32z";
        libraryHaskellDepends = [ base time validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for time";
@@ -201114,8 +202136,8 @@ self: {
     ({ mkDerivation, base, hashable, unordered-containers, validity }:
      mkDerivation {
        pname = "validity-unordered-containers";
-       version = "0.0.0.0";
-       sha256 = "162xv4mip8awj214gdybhp2m3skjs0pg10gf9abj3h017wf046vd";
+       version = "0.1.0.0";
+       sha256 = "1cz5xk427rl8x2nm7xbsspcjnx6w6cib0f5qjs18m912qxyh1g9d";
        libraryHaskellDepends = [
          base hashable unordered-containers validity
        ];
@@ -201124,12 +202146,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-uuid" = callPackage
+    ({ mkDerivation, base, uuid, validity }:
+     mkDerivation {
+       pname = "validity-uuid";
+       version = "0.0.0.0";
+       sha256 = "12v1r92skk4acnd8s3kqj1la24anvs5w1h9cjxzgs2j0pqmzdrbf";
+       libraryHaskellDepends = [ base uuid validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for uuid";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "validity-vector" = callPackage
     ({ mkDerivation, base, hashable, validity, vector }:
      mkDerivation {
        pname = "validity-vector";
-       version = "0.0.0.0";
-       sha256 = "0iz3qxk73k4ci337h4y9n94vahs9pfl060pdkx4bkg9wpar6fqr1";
+       version = "0.1.0.0";
+       sha256 = "0z74m1arw92f96156zxgpbkv1x6fll22hysn2iwrk4i3642127h1";
        libraryHaskellDepends = [ base hashable validity vector ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for vector";
@@ -201680,17 +202714,20 @@ self: {
      }) {};
 
   "vector-builder" = callPackage
-    ({ mkDerivation, base, base-prelude, quickcheck-instances, rebase
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck, vector
+    ({ mkDerivation, base, base-prelude, bug, criterion, foldl
+     , quickcheck-instances, rebase, rerebase, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "vector-builder";
-       version = "0.3.1";
-       sha256 = "1l6sfgd2s107zkp1qd1w6jdjcbznp31769qf99pxar087f697wvp";
+       version = "0.3.3.1";
+       sha256 = "03z461123b59z0r2fzhjpb4jxv4wkjkaqbsci526brkazl4qk0x8";
        libraryHaskellDepends = [ base base-prelude semigroups vector ];
        testHaskellDepends = [
-         quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck
+         bug criterion foldl quickcheck-instances rebase rerebase tasty
+         tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ criterion foldl rerebase ];
        homepage = "https://github.com/nikita-volkov/vector-builder";
        description = "Vector builder";
        license = stdenv.lib.licenses.mit;
@@ -203991,8 +205028,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-json-errors";
-       version = "0.1.1";
-       sha256 = "0704hyfzc8jqvdny9wz3j0b204vq7b07c1wwcin9ir9d6hha7aih";
+       version = "0.1.2";
+       sha256 = "0zid8by1d4rqnbigvj6wbikfnq5gc0k3k75is46zf66y8i3bcd4l";
        libraryHaskellDepends = [
          aeson base binary bytestring http-types text wai
        ];
@@ -206285,8 +207322,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "1.5.1.1";
-       sha256 = "0s2b8dqbmcx6yc9z68n2s7yb2iyvg9azw1pb5da15lkdhalnd0bh";
+       version = "1.5.2.0";
+       sha256 = "19gkbnj8abfh79vyaa9j2ca90g386npfwqkdi4wrl240v8x8as78";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -207161,19 +208198,20 @@ self: {
      }) {};
 
   "wordchoice" = callPackage
-    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams
-     , containers, criterion, Glob, lens, optparse-applicative, pandoc
-     , system-filepath, text
+    ({ mkDerivation, base, binary, bytestring, Chart, Chart-diagrams
+     , composition-prelude, containers, criterion, directory, Glob, lens
+     , optparse-applicative, pandoc, system-filepath, text
      }:
      mkDerivation {
        pname = "wordchoice";
-       version = "0.1.1.1";
-       sha256 = "1n1frb1c3fv808sb5w7j8gv86pva7fryq6f3j2c7z1p32v9xcnza";
+       version = "0.1.2.0";
+       sha256 = "01zmgxs09dplk8hf41cfqjcm6w9mjnd6szn22kz2ycjxxdd7kncv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring Chart Chart-diagrams containers Glob lens
-         optparse-applicative pandoc system-filepath text
+         base binary bytestring Chart Chart-diagrams composition-prelude
+         containers directory Glob lens optparse-applicative pandoc
+         system-filepath text
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
@@ -207517,8 +208555,8 @@ self: {
      }:
      mkDerivation {
        pname = "wrecker-ui";
-       version = "2.4.0.0";
-       sha256 = "1229wwbp9ml5l36n9z0cmhx4fx70mhgf01jw26w0m66q1g3gxb1n";
+       version = "2.4.1.0";
+       sha256 = "07agqw6pwhly4qhkyiij9zlxisls1lhsblld4bjswaziicab2p3m";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -207534,6 +208572,7 @@ self: {
        ];
        description = "A web interface for Wrecker, the HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wreq" = callPackage
@@ -213959,8 +214998,8 @@ self: {
      }:
      mkDerivation {
        pname = "yst";
-       version = "0.5.1.1";
-       sha256 = "1b33q6k76bwg5614b670mvls0iwyp2yqfdqc9r86m95x7ar7brq8";
+       version = "0.5.1.2";
+       sha256 = "0q185phadgi8m45ii90x5k7mpw2xqf021q55q00nqyw8l7yai8pr";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -214375,8 +215414,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter";
-       version = "0.0.1.2";
-       sha256 = "0yrcyzcjszcqj54n8k3jp6glz4nsn5vr61a0wmdaz5sxdjsrsnqy";
+       version = "0.0.1.3";
+       sha256 = "0hams2ayxm73p2m032vjxnrdpg7d8iz293sx29h011siv1xjyaab";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions filepath
          optparse-applicative path path-io process safe stm validity
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 8c724577359..ed2c4db20f7 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -20,10 +20,10 @@ stdenv.mkDerivation {
     makeWrapper ${jdk.jre}/bin/java $out/bin/clojure --add-flags "-cp $out/share/java/clojure.jar clojure.main"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Lisp dialect for the JVM";
     homepage = https://clojure.org/;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.epl10;
     longDescription = ''
       Clojure is a dynamic programming language that targets the Java
       Virtual Machine. It is designed to be a general-purpose language,
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
       offers a software transactional memory system and reactive Agent
       system that ensure clean, correct, multithreaded designs.
     '';
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with maintainers; [ the-kenny ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index ed018a94227..7b832fa6eed 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -99,12 +99,12 @@ let
         };
 
         postgresql = {
-          configureFlags = ["--with-pgsql=${postgresql}"];
+          configureFlags = ["--with-pgsql=${postgresql.dev}"];
           buildInputs = [ postgresql ];
         };
 
         pdo_pgsql = {
-          configureFlags = ["--with-pdo-pgsql=${postgresql}"];
+          configureFlags = ["--with-pdo-pgsql=${postgresql.dev}"];
           buildInputs = [ postgresql ];
         };
 
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 9f355ddefda..f42caf92c17 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -1,5 +1,6 @@
 { stdenv, python, buildEnv, makeWrapper
 , extraLibs ? []
+, extraOutputsToInstall ? []
 , postBuild ? ""
 , ignoreCollisions ? false }:
 
@@ -12,7 +13,7 @@ let
     name = "${python.name}-env";
 
     inherit paths;
-    inherit ignoreCollisions;
+    inherit ignoreCollisions extraOutputsToInstall;
 
     postBuild = ''
       . "${makeWrapper}/nix-support/setup-hook"
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 984d3da8119..600e9314cd4 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     "--with-png=${libpng.dev}"      # optional
     "--with-poppler=${poppler.dev}" # optional
     "--with-libz=${zlib.dev}"       # optional
-    "--with-pg=${postgresql}/bin/pg_config"
+    "--with-pg=${postgresql.dev}/bin/pg_config"
     "--with-mysql=${mysql.lib.dev}/bin/mysql_config"
     "--with-geotiff=${libgeotiff}"
     "--with-sqlite3=${sqlite.dev}"
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 548772ea650..d6877e72a1f 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
-  propagatedBuildInputs = [ glib zlib gpgme libidn ];
+  buildInputs = [ gobjectIntrospection zlib gpgme libidn ];
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib ];
   configureFlags = [ "--enable-introspection=yes" ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index f106bbe6ebc..c3e80fe87f4 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -2,7 +2,6 @@
 
 let
   version = "1.7R2";
-  options = "-Dbuild.compiler=gcj";   # FIXME: We assume GCJ here.
 
   xbeans  = fetchurl {
     url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip";
@@ -33,7 +32,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ unzip ant javac jvm ];
 
-  buildPhase = "ant ${options} jar";
+  buildPhase = "ant jar";
   doCheck    = false;
 
   # FIXME: Install javadoc as well.
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 55d719e8d8c..661e89e3078 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
@@ -14,9 +14,6 @@ mkDerivation {
   propagatedBuildInputs = [ qtbase ];
   outputs = [ "out" "dev" ];
   patches = [ ./kdoctools-no-find-docbook-xml.patch ];
-  preConfigure = ''
-    outputBin=dev
-  '';
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 679f6ba7902..3981f94a47d 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchurl {
     url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "10ik96s4r8kbgc5z4z5mqk8w1p3plakqavf6j86a48gl8in1f45x";
+    sha256 = "1yi9db0hpxh3giyjhkbz7ajmf95qw27xdvh3xvw208zri5k575x0";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index c493dd678ad..614890e929f 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,28 +1,30 @@
 { stdenv, lib, fetchFromGitHub, pkgconfig, cmake
-, dbus, networkmanager, webkitgtk216x, pcre, python2 }:
+, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 }:
 
 stdenv.mkDerivation rec {
   name = "libproxy-${version}";
-  version = "0.4.13";
+  version = "0.4.15";
 
   src = fetchFromGitHub {
     owner = "libproxy";
     repo = "libproxy";
     rev = version;
-    sha256 = "0yg4wr44ync6x3p107ic00m1l04xqhni9jn1vzvkw3nfjd0k6f92";
+    sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs";
   };
 
   outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
 
   nativeBuildInputs = [ pkgconfig cmake ];
 
-  buildInputs = [ dbus networkmanager webkitgtk216x pcre ];
+  buildInputs = [ dbus networkmanager spidermonkey_38 pcre python2 python3 ];
 
-  cmakeFlags = [
-    "-DWITH_WEBKIT3=ON"
-    "-DWITH_MOZJS=OFF"
-    "-DPYTHON_SITEPKG_DIR=$(out)/${python2.sitePackages}"
-  ];
+  preConfigure = ''
+    cmakeFlagsArray+=(
+      "-DWITH_MOZJS=ON"
+      "-DPYTHON2_SITEPKG_DIR=$out/${python2.sitePackages}"
+      "-DPYTHON3_SITEPKG_DIR=$out/${python3.sitePackages}"
+    )
+  '';
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 4ce1b664725..4818a720a30 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -33,7 +33,7 @@ in {
   };
 
   libressl_2_6 = generic {
-    version = "2.6.0";
-    sha256 = "0lwapvfda4zj4r0kxn9ys43l5wyfgpljmhq0j1lr45spfis5b3g4";
+    version = "2.6.2";
+    sha256 = "0y64grb2zx98rjp2lbwihyhbml4z5ih3v7ydbxdvmabj5d4x4adh";
   };
 }
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index a625399cc63..86e858e569c 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -4,7 +4,7 @@
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
-, curl, libiconv, gmp, xen, zfs, parted
+, curl, libiconv, gmp, xen, zfs, parted, qemu
 }:
 
 with stdenv.lib;
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
     rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
     wrapProgram $out/sbin/libvirtd \
-      --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]}
+      --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl qemu ]}
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-cf.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-cf.patch
new file mode 100644
index 00000000000..3e6e0e5101a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-cf.patch
@@ -0,0 +1,36 @@
+diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
+index 341d3bc..3368234 100644
+--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
++++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
+@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations()
+     QMacAutoReleasePool pool;
+     userProfiles.clear();
+ 
+-    NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
++    NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
+     for (NSString *ifName in wifiInterfaces) {
+ 
+         CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];
+@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate()
+ 
+     QMacAutoReleasePool pool;
+ 
+-    NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
++    NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
+     for (NSString *ifName in wifiInterfaces) {
+             scanThread->interfaceName = QString::fromNSString(ifName);
+             scanThread->start();
+ QString TableGenerator::findComposeFile()
+diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
+index 59b7637..b91139d 100644
+--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
+@@ -320,7 +320,7 @@ static void qt_closePopups()
+ + (void)applicationActivationChanged:(NSNotification*)notification
+ {
+     const id sender = self;
+-    NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
++    NSEnumerator *windowEnumerator = nullptr;
+     NSApplication *application = [NSApplication sharedApplication];
+ 
+ #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
index a4451a486ce..23dab52b80c 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
       AGL AppKit ApplicationServices Carbon Cocoa
       CoreAudio CoreBluetooth CoreLocation CoreServices
       DiskArbitration Foundation OpenGL
-      darwin.cf-private darwin.libobjc libiconv
+      darwin.libobjc libiconv
     ]);
 
   buildInputs = [ ]
@@ -79,7 +79,8 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" "bin" ];
 
   patches =
-    copyPathsToStore (lib.readPathsFromFile ./. ./series);
+    copyPathsToStore (lib.readPathsFromFile ./. ./series)
+    ++ stdenv.lib.optional stdenv.isDarwin ./darwin-cf.patch;
 
   postPatch =
     ''
@@ -110,7 +111,7 @@ stdenv.mkDerivation {
           -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \
           ./configure
       sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf
-      sed -i '26,$d' ./mkspecs/features/mac/default_post.prf
+      sed -i '27,$d' ./mkspecs/features/mac/default_post.prf
       sed -i '1,$d' ./mkspecs/features/mac/sdk.prf
       sed -i 's/QMAKE_LFLAGS_RPATH      = -Wl,-rpath,/QMAKE_LFLAGS_RPATH      =/' ./mkspecs/common/mac.conf
      '';
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index e7c25435994..4455a9488c0 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, gfortran }:
-let
-  version = "3.5.0";
-in
+
 stdenv.mkDerivation rec {
   name = "blas-${version}";
+  version = "3.7.1";
+
   src = fetchurl {
     url = "http://www.netlib.org/blas/${name}.tgz";
-    sha256 = "096a3apnh899abjymjjg8m34hncagkzp9qxw08cms98g71fpfzgg";
+    sha256 = "1hvmwp488hd6sdxdbmhjhmyrrd4s1ds1cjzh5d86l10b3wsm99n5";
   };
 
-  buildInputs = [gfortran];
+  buildInputs = [ gfortran ];
 
   configurePhase = ''
     echo >make.inc  "SHELL = ${stdenv.shell}"
diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix
index 7d7424d914d..094c3596d4b 100644
--- a/pkgs/development/libraries/webkitgtk/2.16.nix
+++ b/pkgs/development/libraries/webkitgtk/2.16.nix
@@ -101,4 +101,6 @@ stdenv.mkDerivation rec {
   ];
 
   enableParallelBuilding = true;
+
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/webkitgtk/2.17.nix b/pkgs/development/libraries/webkitgtk/2.17.nix
index 53718f696cb..fc0e13436bc 100644
--- a/pkgs/development/libraries/webkitgtk/2.17.nix
+++ b/pkgs/development/libraries/webkitgtk/2.17.nix
@@ -103,4 +103,6 @@ stdenv.mkDerivation rec {
   ];
 
   enableParallelBuilding = true;
+
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix
index 832600fed87..936c88034aa 100644
--- a/pkgs/development/libraries/wlc/default.nix
+++ b/pkgs/development/libraries/wlc/default.nix
@@ -1,36 +1,37 @@
-{ lib, stdenv, fetchgit, cmake, pkgconfig
-, glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs
-, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm
-, wayland-protocols
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa
+, libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols
+, libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm
 }:
 
 stdenv.mkDerivation rec {
   name = "wlc-${version}";
-  version = "0.0.9";
+  version = "0.0.10";
 
-  src = fetchgit {
-    url = "https://github.com/Cloudef/wlc";
-    rev = "refs/tags/v${version}";
-    sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg";
+  src = fetchFromGitHub {
+    owner = "Cloudef";
+    repo = "wlc";
+    rev = "v${version}";
     fetchSubmodules = true;
-   };
+    sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k";
+  };
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev
-    libX11 libXdamage systemd dbus_libs wayland-protocols
+    wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa
+    libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols
+    libpthreadstubs libXau libXdmcp libXext libXxf86vm
   ];
 
-
   doCheck = true;
   checkTarget = "test";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library for making a simple Wayland compositor";
     homepage    = https://github.com/Cloudef/wlc;
-    license     = lib.licenses.mit;
-    platforms   = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    license     = licenses.mit;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date.
   };
 }
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index c64970f8f86..c55a3020b44 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n";
   };
 
+  outputs = [ "out" "dev" ];
+
   buildInputs = [ makeWrapper libxml2 gnutls libxslt pkgconfig libgcrypt libtool openssl nss ];
+
   enableParallelBuilding = true;
   doCheck = true;
 
@@ -23,6 +26,11 @@ stdenv.mkDerivation rec {
   # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909
   NIX_LDFLAGS = [ "-lgcrypt" ];
 
+  postInstall = ''
+    moveToOutput "bin/xmlsec1-config" "$dev"
+    moveToOutput "lib/xmlsec1Conf.sh" "$dev"
+  '';
+
   postFixup = ''
     wrapProgram "$out/bin/xmlsec1" --prefix LD_LIBRARY_PATH ":" "$out/lib"
   '';
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index a015c3b4553..88a3d669b37 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -2074,13 +2074,13 @@ let
         sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
       };
     };
-    "tough-cookie-2.3.2" = {
+    "tough-cookie-2.3.3" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "2.3.2";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz";
-        sha1 = "f081f76e4c85720e6c37a5faced737150d84072a";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
+        sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
       };
     };
     "tunnel-agent-0.6.0" = {
@@ -2389,13 +2389,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "debug-2.6.8" = {
+    "debug-2.6.9" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.8";
+      version = "2.6.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz";
-        sha1 = "e731531ca2ede27d188222427da17821d68ff4fc";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
+        sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc";
       };
     };
     "express-4.15.4" = {
@@ -3019,6 +3019,15 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
+    "debug-2.6.8" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz";
+        sha1 = "e731531ca2ede27d188222427da17821d68ff4fc";
+      };
+    };
     "depd-1.1.1" = {
       name = "depd";
       packageName = "depd";
@@ -3055,13 +3064,13 @@ let
         sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
       };
     };
-    "finalhandler-1.0.5" = {
+    "finalhandler-1.0.6" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.5.tgz";
-        sha1 = "a701303d257a1bc82fea547a33e5ae89531723df";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz";
+        sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f";
       };
     };
     "fresh-0.5.0" = {
@@ -3334,13 +3343,13 @@ let
         sha1 = "d95bf721ec877e08db276ed3fc6eb78f9083ad46";
       };
     };
-    "node-pre-gyp-0.6.37" = {
+    "node-pre-gyp-0.6.38" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.37";
+      version = "0.6.38";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.37.tgz";
-        sha1 = "3c872b236b2e266e4140578fe1ee88f693323a05";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz";
+        sha1 = "e92a20f83416415bb4086f6d1fb78b3da73d113d";
       };
     };
     "nopt-4.0.1" = {
@@ -3352,6 +3361,24 @@ let
         sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
       };
     };
+    "request-2.81.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.81.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
+      };
+    };
+    "hawk-3.1.3" = {
+      name = "hawk";
+      packageName = "hawk";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
+      };
+    };
     "semver-5.4.1" = {
       name = "semver";
       packageName = "semver";
@@ -3361,15 +3388,6 @@ let
         sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
       };
     };
-    "tape-4.8.0" = {
-      name = "tape";
-      packageName = "tape";
-      version = "4.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tape/-/tape-4.8.0.tgz";
-        sha512 = "026x60jpvkdwfvbd6gls76zjj3yiqfz4cg9imi80r25zdziaiy87jkpw9mwbrbg9k2xc4nsn9yzk90pgkgybdspk0yb4fzg95y0nqjd";
-      };
-    };
     "tar-pack-3.4.0" = {
       name = "tar-pack";
       packageName = "tar-pack";
@@ -3379,175 +3397,121 @@ let
         sha1 = "23be2d7f671a8339376cbdb0b8fe3fdebf317984";
       };
     };
-    "deep-equal-1.0.1" = {
-      name = "deep-equal";
-      packageName = "deep-equal";
-      version = "1.0.1";
+    "aws-sign2-0.6.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz";
-        sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
       };
     };
-    "defined-1.0.0" = {
-      name = "defined";
-      packageName = "defined";
-      version = "1.0.0";
+    "form-data-2.1.4" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz";
-        sha1 = "c98d9bcef75674188e110969151199e39b1fa693";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
+        sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
       };
     };
-    "for-each-0.3.2" = {
-      name = "for-each";
-      packageName = "for-each";
-      version = "0.3.2";
+    "har-validator-4.2.1" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz";
-        sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
+        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
       };
     };
-    "function-bind-1.1.1" = {
-      name = "function-bind";
-      packageName = "function-bind";
+    "http-signature-1.1.1" = {
+      name = "http-signature";
+      packageName = "http-signature";
       version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8";
-      };
-    };
-    "has-1.0.1" = {
-      name = "has";
-      packageName = "has";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz";
-        sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28";
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
       };
     };
-    "object-inspect-1.3.0" = {
-      name = "object-inspect";
-      packageName = "object-inspect";
-      version = "1.3.0";
+    "performance-now-0.2.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.3.0.tgz";
-        sha512 = "1302hkgbynr48i0h4n5psz3ln624f8516qh68kpah1ziczyg8vpyfxws5x6iazncaw5jgg9bp19pgbfl4n4gjb9z0z96pnd08pffw9q";
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
+        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
       };
     };
-    "resumer-0.0.0" = {
-      name = "resumer";
-      packageName = "resumer";
-      version = "0.0.0";
+    "qs-6.4.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
-        sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
+        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
+        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
       };
     };
-    "string.prototype.trim-1.1.2" = {
-      name = "string.prototype.trim";
-      packageName = "string.prototype.trim";
-      version = "1.1.2";
+    "ajv-4.11.8" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "4.11.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz";
-        sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
+        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
       };
     };
-    "through-2.3.8" = {
-      name = "through";
-      packageName = "through";
-      version = "2.3.8";
+    "har-schema-1.0.5" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
-        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
+        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
       };
     };
-    "is-function-1.0.1" = {
-      name = "is-function";
-      packageName = "is-function";
-      version = "1.0.1";
+    "assert-plus-0.2.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz";
-        sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5";
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
       };
     };
-    "define-properties-1.1.2" = {
-      name = "define-properties";
-      packageName = "define-properties";
-      version = "1.1.2";
+    "hoek-2.16.3" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "2.16.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
-        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
+        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
       };
     };
-    "es-abstract-1.8.2" = {
-      name = "es-abstract";
-      packageName = "es-abstract";
-      version = "1.8.2";
+    "boom-2.10.1" = {
+      name = "boom";
+      packageName = "boom";
+      version = "2.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.8.2.tgz";
-        sha512 = "0cz5pzkb9xh1askig7mrv990raaa1pym6a8acyyjw405bnzdznck7q9qg2rcybwjq866i6226nq6mijn6kwg5n36r6hr3gjpla71y3n";
+        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
       };
     };
-    "foreach-2.0.5" = {
-      name = "foreach";
-      packageName = "foreach";
+    "cryptiles-2.0.5" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
       version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz";
-        sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99";
-      };
-    };
-    "object-keys-1.0.11" = {
-      name = "object-keys";
-      packageName = "object-keys";
-      version = "1.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz";
-        sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d";
-      };
-    };
-    "es-to-primitive-1.1.1" = {
-      name = "es-to-primitive";
-      packageName = "es-to-primitive";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz";
-        sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d";
-      };
-    };
-    "is-callable-1.1.3" = {
-      name = "is-callable";
-      packageName = "is-callable";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz";
-        sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2";
-      };
-    };
-    "is-regex-1.0.4" = {
-      name = "is-regex";
-      packageName = "is-regex";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
-        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
-      };
-    };
-    "is-date-object-1.0.1" = {
-      name = "is-date-object";
-      packageName = "is-date-object";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
-        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
       };
     };
-    "is-symbol-1.0.1" = {
-      name = "is-symbol";
-      packageName = "is-symbol";
-      version = "1.0.1";
+    "sntp-1.0.9" = {
+      name = "sntp";
+      packageName = "sntp";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz";
-        sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572";
+        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
       };
     };
     "fstream-ignore-1.0.5" = {
@@ -4081,15 +4045,6 @@ let
         sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l";
       };
     };
-    "request-2.81.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.81.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
-        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
-      };
-    };
     "retry-0.10.1" = {
       name = "retry";
       packageName = "retry";
@@ -4297,6 +4252,15 @@ let
         sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
       };
     };
+    "through-2.3.8" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    };
     "wcwidth-1.0.1" = {
       name = "wcwidth";
       packageName = "wcwidth";
@@ -5026,132 +4990,6 @@ let
         sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
       };
     };
-    "aws-sign2-0.6.0" = {
-      name = "aws-sign2";
-      packageName = "aws-sign2";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
-        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
-      };
-    };
-    "form-data-2.1.4" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
-        sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
-      };
-    };
-    "har-validator-4.2.1" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
-        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
-      };
-    };
-    "hawk-3.1.3" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
-        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
-      };
-    };
-    "http-signature-1.1.1" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
-        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
-      };
-    };
-    "performance-now-0.2.0" = {
-      name = "performance-now";
-      packageName = "performance-now";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
-        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
-      };
-    };
-    "qs-6.4.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
-        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
-      };
-    };
-    "ajv-4.11.8" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "4.11.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
-        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
-      };
-    };
-    "har-schema-1.0.5" = {
-      name = "har-schema";
-      packageName = "har-schema";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
-        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
-      };
-    };
-    "hoek-2.16.3" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "2.16.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
-        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
-      };
-    };
-    "boom-2.10.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "2.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
-        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
-      };
-    };
-    "cryptiles-2.0.5" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
-        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
-      };
-    };
-    "sntp-1.0.9" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
-        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
-      };
-    };
-    "assert-plus-0.2.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
-        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
-      };
-    };
     "from2-1.3.0" = {
       name = "from2";
       packageName = "from2";
@@ -6810,7 +6648,7 @@ in
           sources."qs-6.5.1"
           sources."safe-buffer-5.1.1"
           sources."stringstream-0.0.5"
-          (sources."tough-cookie-2.3.2" // {
+          (sources."tough-cookie-2.3.3" // {
             dependencies = [
               sources."punycode-1.4.1"
             ];
@@ -7031,7 +6869,7 @@ in
           })
         ];
       })
-      (sources."debug-2.6.8" // {
+      (sources."debug-2.6.9" // {
         dependencies = [
           sources."ms-2.0.0"
         ];
@@ -7053,12 +6891,22 @@ in
           sources."content-type-1.0.4"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
+          (sources."debug-2.6.8" // {
+            dependencies = [
+              sources."ms-2.0.0"
+            ];
+          })
           sources."depd-1.1.1"
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."etag-1.8.1"
-          (sources."finalhandler-1.0.5" // {
+          (sources."finalhandler-1.0.6" // {
             dependencies = [
+              (sources."debug-2.6.9" // {
+                dependencies = [
+                  sources."ms-2.0.0"
+                ];
+              })
               sources."unpipe-1.0.0"
             ];
           })
@@ -7161,7 +7009,7 @@ in
       (sources."v8-debug-1.0.1" // {
         dependencies = [
           sources."nan-2.7.0"
-          (sources."node-pre-gyp-0.6.37" // {
+          (sources."node-pre-gyp-0.6.38" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -7225,9 +7073,9 @@ in
                   sources."set-blocking-2.0.0"
                 ];
               })
-              (sources."request-2.82.0" // {
+              (sources."request-2.81.0" // {
                 dependencies = [
-                  sources."aws-sign2-0.7.0"
+                  sources."aws-sign2-0.6.0"
                   sources."aws4-1.6.0"
                   sources."caseless-0.12.0"
                   (sources."combined-stream-1.0.5" // {
@@ -7237,18 +7085,16 @@ in
                   })
                   sources."extend-3.0.1"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.3.1" // {
+                  (sources."form-data-2.1.4" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
                   })
-                  (sources."har-validator-5.0.3" // {
+                  (sources."har-validator-4.2.1" // {
                     dependencies = [
-                      (sources."ajv-5.2.2" // {
+                      (sources."ajv-4.11.8" // {
                         dependencies = [
                           sources."co-4.6.0"
-                          sources."fast-deep-equal-1.0.0"
-                          sources."json-schema-traverse-0.3.1"
                           (sources."json-stable-stringify-1.0.1" // {
                             dependencies = [
                               sources."jsonify-0.0.0"
@@ -7256,26 +7102,15 @@ in
                           })
                         ];
                       })
-                      sources."har-schema-2.0.0"
-                    ];
-                  })
-                  (sources."hawk-6.0.2" // {
-                    dependencies = [
-                      sources."hoek-4.2.0"
-                      sources."boom-4.3.1"
-                      (sources."cryptiles-3.1.2" // {
-                        dependencies = [
-                          sources."boom-5.2.0"
-                        ];
-                      })
-                      sources."sntp-2.0.2"
+                      sources."har-schema-1.0.5"
                     ];
                   })
-                  (sources."http-signature-1.2.0" // {
+                  (sources."http-signature-1.1.1" // {
                     dependencies = [
-                      sources."assert-plus-1.0.0"
+                      sources."assert-plus-0.2.0"
                       (sources."jsprim-1.4.1" // {
                         dependencies = [
+                          sources."assert-plus-1.0.0"
                           sources."extsprintf-1.3.0"
                           sources."json-schema-0.2.3"
                           (sources."verror-1.10.0" // {
@@ -7288,6 +7123,7 @@ in
                       (sources."sshpk-1.13.1" // {
                         dependencies = [
                           sources."asn1-0.2.3"
+                          sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.7"
                           sources."jsbn-0.1.1"
@@ -7307,11 +7143,11 @@ in
                     ];
                   })
                   sources."oauth-sign-0.8.2"
-                  sources."performance-now-2.1.0"
-                  sources."qs-6.5.1"
+                  sources."performance-now-0.2.0"
+                  sources."qs-6.4.0"
                   sources."safe-buffer-5.1.1"
                   sources."stringstream-0.0.5"
-                  (sources."tough-cookie-2.3.2" // {
+                  (sources."tough-cookie-2.3.3" // {
                     dependencies = [
                       sources."punycode-1.4.1"
                     ];
@@ -7320,47 +7156,16 @@ in
                   sources."uuid-3.1.0"
                 ];
               })
-              (sources."rimraf-2.6.2" // {
+              (sources."hawk-3.1.3" // {
                 dependencies = [
-                  (sources."glob-7.1.2" // {
-                    dependencies = [
-                      sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.6" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                      sources."inherits-2.0.3"
-                      (sources."minimatch-3.0.4" // {
-                        dependencies = [
-                          (sources."brace-expansion-1.1.8" // {
-                            dependencies = [
-                              sources."balanced-match-1.0.0"
-                              sources."concat-map-0.0.1"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."once-1.4.0" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                    ];
-                  })
+                  sources."hoek-2.16.3"
+                  sources."boom-2.10.1"
+                  sources."cryptiles-2.0.5"
+                  sources."sntp-1.0.9"
                 ];
               })
-              sources."semver-5.4.1"
-              (sources."tape-4.8.0" // {
+              (sources."rimraf-2.6.2" // {
                 dependencies = [
-                  sources."deep-equal-1.0.1"
-                  sources."defined-1.0.0"
-                  (sources."for-each-0.3.2" // {
-                    dependencies = [
-                      sources."is-function-1.0.1"
-                    ];
-                  })
-                  sources."function-bind-1.1.1"
                   (sources."glob-7.1.2" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
@@ -7369,6 +7174,7 @@ in
                           sources."wrappy-1.0.2"
                         ];
                       })
+                      sources."inherits-2.0.3"
                       (sources."minimatch-3.0.4" // {
                         dependencies = [
                           (sources."brace-expansion-1.1.8" // {
@@ -7386,41 +7192,9 @@ in
                       })
                     ];
                   })
-                  sources."has-1.0.1"
-                  sources."inherits-2.0.3"
-                  sources."minimist-1.2.0"
-                  sources."object-inspect-1.3.0"
-                  (sources."resolve-1.4.0" // {
-                    dependencies = [
-                      sources."path-parse-1.0.5"
-                    ];
-                  })
-                  sources."resumer-0.0.0"
-                  (sources."string.prototype.trim-1.1.2" // {
-                    dependencies = [
-                      (sources."define-properties-1.1.2" // {
-                        dependencies = [
-                          sources."foreach-2.0.5"
-                          sources."object-keys-1.0.11"
-                        ];
-                      })
-                      (sources."es-abstract-1.8.2" // {
-                        dependencies = [
-                          (sources."es-to-primitive-1.1.1" // {
-                            dependencies = [
-                              sources."is-date-object-1.0.1"
-                              sources."is-symbol-1.0.1"
-                            ];
-                          })
-                          sources."is-callable-1.1.3"
-                          sources."is-regex-1.0.4"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."through-2.3.8"
                 ];
               })
+              sources."semver-5.4.1"
               (sources."tar-2.2.1" // {
                 dependencies = [
                   sources."block-stream-0.0.9"
@@ -7481,7 +7255,7 @@ in
       (sources."v8-profiler-5.7.0" // {
         dependencies = [
           sources."nan-2.7.0"
-          (sources."node-pre-gyp-0.6.37" // {
+          (sources."node-pre-gyp-0.6.38" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -7545,9 +7319,9 @@ in
                   sources."set-blocking-2.0.0"
                 ];
               })
-              (sources."request-2.82.0" // {
+              (sources."request-2.81.0" // {
                 dependencies = [
-                  sources."aws-sign2-0.7.0"
+                  sources."aws-sign2-0.6.0"
                   sources."aws4-1.6.0"
                   sources."caseless-0.12.0"
                   (sources."combined-stream-1.0.5" // {
@@ -7557,18 +7331,16 @@ in
                   })
                   sources."extend-3.0.1"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.3.1" // {
+                  (sources."form-data-2.1.4" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
                   })
-                  (sources."har-validator-5.0.3" // {
+                  (sources."har-validator-4.2.1" // {
                     dependencies = [
-                      (sources."ajv-5.2.2" // {
+                      (sources."ajv-4.11.8" // {
                         dependencies = [
                           sources."co-4.6.0"
-                          sources."fast-deep-equal-1.0.0"
-                          sources."json-schema-traverse-0.3.1"
                           (sources."json-stable-stringify-1.0.1" // {
                             dependencies = [
                               sources."jsonify-0.0.0"
@@ -7576,26 +7348,15 @@ in
                           })
                         ];
                       })
-                      sources."har-schema-2.0.0"
-                    ];
-                  })
-                  (sources."hawk-6.0.2" // {
-                    dependencies = [
-                      sources."hoek-4.2.0"
-                      sources."boom-4.3.1"
-                      (sources."cryptiles-3.1.2" // {
-                        dependencies = [
-                          sources."boom-5.2.0"
-                        ];
-                      })
-                      sources."sntp-2.0.2"
+                      sources."har-schema-1.0.5"
                     ];
                   })
-                  (sources."http-signature-1.2.0" // {
+                  (sources."http-signature-1.1.1" // {
                     dependencies = [
-                      sources."assert-plus-1.0.0"
+                      sources."assert-plus-0.2.0"
                       (sources."jsprim-1.4.1" // {
                         dependencies = [
+                          sources."assert-plus-1.0.0"
                           sources."extsprintf-1.3.0"
                           sources."json-schema-0.2.3"
                           (sources."verror-1.10.0" // {
@@ -7608,6 +7369,7 @@ in
                       (sources."sshpk-1.13.1" // {
                         dependencies = [
                           sources."asn1-0.2.3"
+                          sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.7"
                           sources."jsbn-0.1.1"
@@ -7627,11 +7389,11 @@ in
                     ];
                   })
                   sources."oauth-sign-0.8.2"
-                  sources."performance-now-2.1.0"
-                  sources."qs-6.5.1"
+                  sources."performance-now-0.2.0"
+                  sources."qs-6.4.0"
                   sources."safe-buffer-5.1.1"
                   sources."stringstream-0.0.5"
-                  (sources."tough-cookie-2.3.2" // {
+                  (sources."tough-cookie-2.3.3" // {
                     dependencies = [
                       sources."punycode-1.4.1"
                     ];
@@ -7640,47 +7402,16 @@ in
                   sources."uuid-3.1.0"
                 ];
               })
-              (sources."rimraf-2.6.2" // {
+              (sources."hawk-3.1.3" // {
                 dependencies = [
-                  (sources."glob-7.1.2" // {
-                    dependencies = [
-                      sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.6" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                      sources."inherits-2.0.3"
-                      (sources."minimatch-3.0.4" // {
-                        dependencies = [
-                          (sources."brace-expansion-1.1.8" // {
-                            dependencies = [
-                              sources."balanced-match-1.0.0"
-                              sources."concat-map-0.0.1"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."once-1.4.0" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                    ];
-                  })
+                  sources."hoek-2.16.3"
+                  sources."boom-2.10.1"
+                  sources."cryptiles-2.0.5"
+                  sources."sntp-1.0.9"
                 ];
               })
-              sources."semver-5.4.1"
-              (sources."tape-4.8.0" // {
+              (sources."rimraf-2.6.2" // {
                 dependencies = [
-                  sources."deep-equal-1.0.1"
-                  sources."defined-1.0.0"
-                  (sources."for-each-0.3.2" // {
-                    dependencies = [
-                      sources."is-function-1.0.1"
-                    ];
-                  })
-                  sources."function-bind-1.1.1"
                   (sources."glob-7.1.2" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
@@ -7689,6 +7420,7 @@ in
                           sources."wrappy-1.0.2"
                         ];
                       })
+                      sources."inherits-2.0.3"
                       (sources."minimatch-3.0.4" // {
                         dependencies = [
                           (sources."brace-expansion-1.1.8" // {
@@ -7706,41 +7438,9 @@ in
                       })
                     ];
                   })
-                  sources."has-1.0.1"
-                  sources."inherits-2.0.3"
-                  sources."minimist-1.2.0"
-                  sources."object-inspect-1.3.0"
-                  (sources."resolve-1.4.0" // {
-                    dependencies = [
-                      sources."path-parse-1.0.5"
-                    ];
-                  })
-                  sources."resumer-0.0.0"
-                  (sources."string.prototype.trim-1.1.2" // {
-                    dependencies = [
-                      (sources."define-properties-1.1.2" // {
-                        dependencies = [
-                          sources."foreach-2.0.5"
-                          sources."object-keys-1.0.11"
-                        ];
-                      })
-                      (sources."es-abstract-1.8.2" // {
-                        dependencies = [
-                          (sources."es-to-primitive-1.1.1" // {
-                            dependencies = [
-                              sources."is-date-object-1.0.1"
-                              sources."is-symbol-1.0.1"
-                            ];
-                          })
-                          sources."is-callable-1.1.3"
-                          sources."is-regex-1.0.4"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."through-2.3.8"
                 ];
               })
+              sources."semver-5.4.1"
               (sources."tar-2.2.1" // {
                 dependencies = [
                   sources."block-stream-0.0.9"
@@ -7862,10 +7562,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.37";
+    version = "0.6.38";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.37.tgz";
-      sha1 = "3c872b236b2e266e4140578fe1ee88f693323a05";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz";
+      sha1 = "e92a20f83416415bb4086f6d1fb78b3da73d113d";
     };
     dependencies = [
       (sources."mkdirp-0.5.1" // {
@@ -7938,9 +7638,9 @@ in
           sources."strip-json-comments-2.0.1"
         ];
       })
-      (sources."request-2.82.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
-          sources."aws-sign2-0.7.0"
+          sources."aws-sign2-0.6.0"
           sources."aws4-1.6.0"
           sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
@@ -7950,18 +7650,16 @@ in
           })
           sources."extend-3.0.1"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.3.1" // {
+          (sources."form-data-2.1.4" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-5.0.3" // {
+          (sources."har-validator-4.2.1" // {
             dependencies = [
-              (sources."ajv-5.2.2" // {
+              (sources."ajv-4.11.8" // {
                 dependencies = [
                   sources."co-4.6.0"
-                  sources."fast-deep-equal-1.0.0"
-                  sources."json-schema-traverse-0.3.1"
                   (sources."json-stable-stringify-1.0.1" // {
                     dependencies = [
                       sources."jsonify-0.0.0"
@@ -7969,26 +7667,15 @@ in
                   })
                 ];
               })
-              sources."har-schema-2.0.0"
-            ];
-          })
-          (sources."hawk-6.0.2" // {
-            dependencies = [
-              sources."hoek-4.2.0"
-              sources."boom-4.3.1"
-              (sources."cryptiles-3.1.2" // {
-                dependencies = [
-                  sources."boom-5.2.0"
-                ];
-              })
-              sources."sntp-2.0.2"
+              sources."har-schema-1.0.5"
             ];
           })
-          (sources."http-signature-1.2.0" // {
+          (sources."http-signature-1.1.1" // {
             dependencies = [
-              sources."assert-plus-1.0.0"
+              sources."assert-plus-0.2.0"
               (sources."jsprim-1.4.1" // {
                 dependencies = [
+                  sources."assert-plus-1.0.0"
                   sources."extsprintf-1.3.0"
                   sources."json-schema-0.2.3"
                   (sources."verror-1.10.0" // {
@@ -8001,6 +7688,7 @@ in
               (sources."sshpk-1.13.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
+                  sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.7"
                   sources."jsbn-0.1.1"
@@ -8020,11 +7708,11 @@ in
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."performance-now-2.1.0"
-          sources."qs-6.5.1"
+          sources."performance-now-0.2.0"
+          sources."qs-6.4.0"
           sources."safe-buffer-5.1.1"
           sources."stringstream-0.0.5"
-          (sources."tough-cookie-2.3.2" // {
+          (sources."tough-cookie-2.3.3" // {
             dependencies = [
               sources."punycode-1.4.1"
             ];
@@ -8033,48 +7721,16 @@ in
           sources."uuid-3.1.0"
         ];
       })
-      (sources."rimraf-2.6.2" // {
+      (sources."hawk-3.1.3" // {
         dependencies = [
-          (sources."glob-7.1.2" // {
-            dependencies = [
-              sources."fs.realpath-1.0.0"
-              (sources."inflight-1.0.6" // {
-                dependencies = [
-                  sources."wrappy-1.0.2"
-                ];
-              })
-              sources."inherits-2.0.3"
-              (sources."minimatch-3.0.4" // {
-                dependencies = [
-                  (sources."brace-expansion-1.1.8" // {
-                    dependencies = [
-                      sources."balanced-match-1.0.0"
-                      sources."concat-map-0.0.1"
-                    ];
-                  })
-                ];
-              })
-              (sources."once-1.4.0" // {
-                dependencies = [
-                  sources."wrappy-1.0.2"
-                ];
-              })
-              sources."path-is-absolute-1.0.1"
-            ];
-          })
+          sources."hoek-2.16.3"
+          sources."boom-2.10.1"
+          sources."cryptiles-2.0.5"
+          sources."sntp-1.0.9"
         ];
       })
-      sources."semver-5.4.1"
-      (sources."tape-4.8.0" // {
+      (sources."rimraf-2.6.2" // {
         dependencies = [
-          sources."deep-equal-1.0.1"
-          sources."defined-1.0.0"
-          (sources."for-each-0.3.2" // {
-            dependencies = [
-              sources."is-function-1.0.1"
-            ];
-          })
-          sources."function-bind-1.1.1"
           (sources."glob-7.1.2" // {
             dependencies = [
               sources."fs.realpath-1.0.0"
@@ -8083,6 +7739,7 @@ in
                   sources."wrappy-1.0.2"
                 ];
               })
+              sources."inherits-2.0.3"
               (sources."minimatch-3.0.4" // {
                 dependencies = [
                   (sources."brace-expansion-1.1.8" // {
@@ -8101,41 +7758,9 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          sources."has-1.0.1"
-          sources."inherits-2.0.3"
-          sources."minimist-1.2.0"
-          sources."object-inspect-1.3.0"
-          (sources."resolve-1.4.0" // {
-            dependencies = [
-              sources."path-parse-1.0.5"
-            ];
-          })
-          sources."resumer-0.0.0"
-          (sources."string.prototype.trim-1.1.2" // {
-            dependencies = [
-              (sources."define-properties-1.1.2" // {
-                dependencies = [
-                  sources."foreach-2.0.5"
-                  sources."object-keys-1.0.11"
-                ];
-              })
-              (sources."es-abstract-1.8.2" // {
-                dependencies = [
-                  (sources."es-to-primitive-1.1.1" // {
-                    dependencies = [
-                      sources."is-date-object-1.0.1"
-                      sources."is-symbol-1.0.1"
-                    ];
-                  })
-                  sources."is-callable-1.1.3"
-                  sources."is-regex-1.0.4"
-                ];
-              })
-            ];
-          })
-          sources."through-2.3.8"
         ];
       })
+      sources."semver-5.4.1"
       (sources."tar-2.2.1" // {
         dependencies = [
           sources."block-stream-0.0.9"
@@ -8149,7 +7774,7 @@ in
       })
       (sources."tar-pack-3.4.0" // {
         dependencies = [
-          (sources."debug-2.6.8" // {
+          (sources."debug-2.6.9" // {
             dependencies = [
               sources."ms-2.0.0"
             ];
@@ -8610,7 +8235,7 @@ in
                       })
                     ];
                   })
-                  (sources."debug-2.6.8" // {
+                  (sources."debug-2.6.9" // {
                     dependencies = [
                       sources."ms-2.0.0"
                     ];
@@ -8628,7 +8253,7 @@ in
                       })
                     ];
                   })
-                  (sources."debug-2.6.8" // {
+                  (sources."debug-2.6.9" // {
                     dependencies = [
                       sources."ms-2.0.0"
                     ];
@@ -8799,7 +8424,7 @@ in
           sources."performance-now-0.2.0"
           sources."qs-6.4.0"
           sources."stringstream-0.0.5"
-          (sources."tough-cookie-2.3.2" // {
+          (sources."tough-cookie-2.3.3" // {
             dependencies = [
               sources."punycode-1.4.1"
             ];
@@ -9286,7 +8911,7 @@ in
           sources."oauth-sign-0.8.2"
           sources."qs-6.3.2"
           sources."stringstream-0.0.5"
-          (sources."tough-cookie-2.3.2" // {
+          (sources."tough-cookie-2.3.3" // {
             dependencies = [
               sources."punycode-1.4.1"
             ];
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index b9373b82edf..192df9f87fc 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -77,6 +77,7 @@
 , "svgo"
 , "tern"
 , "typescript"
+, "typings"
 , "uglify-js"
 , "ungit"
 , "webdrvr"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 1bdde35c226..ba2a6c77ce2 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -274,13 +274,13 @@ let
         sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5";
       };
     };
-    "debug-2.6.8" = {
+    "debug-2.6.9" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.8";
+      version = "2.6.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz";
-        sha1 = "e731531ca2ede27d188222427da17821d68ff4fc";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
+        sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc";
       };
     };
     "json5-0.5.1" = {
@@ -1003,13 +1003,13 @@ let
         sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47";
       };
     };
-    "azure-arm-network-2.0.0" = {
+    "azure-arm-network-3.0.0" = {
       name = "azure-arm-network";
       packageName = "azure-arm-network";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-2.0.0.tgz";
-        sha1 = "95e3d2658a68ecb0a2f90f611966f9852877f625";
+        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-3.0.0.tgz";
+        sha1 = "66ec5b195a1af805a5b1727f65feac2bb7cd7951";
       };
     };
     "azure-arm-powerbiembedded-0.1.0" = {
@@ -1408,13 +1408,13 @@ let
         sha1 = "be191c4fbdff2e208bda440933436af80e7425b9";
       };
     };
-    "ms-rest-azure-2.3.1" = {
+    "ms-rest-azure-2.3.3" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "2.3.1";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.3.1.tgz";
-        sha1 = "25f2c6bdc721ec41187606b8d71a7b6090dc708e";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.3.3.tgz";
+        sha1 = "99016e430fb70a4e936191d3b35fc8b91327b337";
       };
     };
     "node-forge-0.6.23" = {
@@ -2020,13 +2020,13 @@ let
         sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
       };
     };
-    "@types/node-8.0.28" = {
+    "@types/node-8.0.30" = {
       name = "@types/node";
       packageName = "@types/node";
-      version = "8.0.28";
+      version = "8.0.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.0.28.tgz";
-        sha512 = "2wlavwh38262crr2wm0zhzgp1ibkd2wy2hpmby0xr218k36vls3gdbya0848wx6r51hs1mbly8k8f3aby4xsarp9g5fvp1gf4an9shy";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.0.30.tgz";
+        sha512 = "0y4jg8faga3jb33fjpyyriyg7r1cpp1cjm0nc6pjixm96naqmxnhq7bkxfm8489rdcifw6mc265a933cyihwdb9n88xhyynf0djv911";
       };
     };
     "@types/request-2.0.3" = {
@@ -2416,13 +2416,13 @@ let
         sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
       };
     };
-    "tough-cookie-2.3.2" = {
+    "tough-cookie-2.3.3" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "2.3.2";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz";
-        sha1 = "f081f76e4c85720e6c37a5faced737150d84072a";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
+        sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
       };
     };
     "tunnel-agent-0.4.3" = {
@@ -6538,6 +6538,15 @@ let
         sha1 = "16718a75de283ed8e604041625a2064586797d8a";
       };
     };
+    "debug-2.6.8" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz";
+        sha1 = "e731531ca2ede27d188222427da17821d68ff4fc";
+      };
+    };
     "on-headers-1.0.1" = {
       name = "on-headers";
       packageName = "on-headers";
@@ -6646,13 +6655,13 @@ let
         sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
       };
     };
-    "finalhandler-1.0.5" = {
+    "finalhandler-1.0.6" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.5.tgz";
-        sha1 = "a701303d257a1bc82fea547a33e5ae89531723df";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz";
+        sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f";
       };
     };
     "fresh-0.5.0" = {
@@ -8456,13 +8465,13 @@ let
         sha1 = "0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb";
       };
     };
-    "http-parser-js-0.4.7" = {
+    "http-parser-js-0.4.8" = {
       name = "http-parser-js";
       packageName = "http-parser-js";
-      version = "0.4.7";
+      version = "0.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.7.tgz";
-        sha1 = "1cecc9c4ce845c0288224d8844854c1ef08c9ad7";
+        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.8.tgz";
+        sha512 = "26g8b2fsa644qxadhgjjwlmzmik345a543f8rlg842j8l7g0sz8vhbf7vsxz047hk6qw0c7a1rfq222xjn2ckclsbqz5z9sv3vyjqcf";
       };
     };
     "websocket-extensions-0.1.2" = {
@@ -9107,13 +9116,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.120.0" = {
+    "aws-sdk-2.122.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.120.0";
+      version = "2.122.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.120.0.tgz";
-        sha1 = "44857ecb476936fce891850ff27a502210814fb6";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.122.0.tgz";
+        sha1 = "d40980fdb24a07db166de91cb8813f0dc640d7c6";
       };
     };
     "request-2.82.0" = {
@@ -10700,13 +10709,13 @@ let
         sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf";
       };
     };
-    "cli-spinners-1.0.0" = {
+    "cli-spinners-1.0.1" = {
       name = "cli-spinners";
       packageName = "cli-spinners";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.0.tgz";
-        sha1 = "ef987ed3d48391ac3dab9180b406a742180d6e6a";
+        url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.1.tgz";
+        sha1 = "2675321c100f195b02877ac499e9911fa34b9783";
       };
     };
     "log-symbols-1.0.2" = {
@@ -11438,13 +11447,13 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.37" = {
+    "node-pre-gyp-0.6.38" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.37";
+      version = "0.6.38";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.37.tgz";
-        sha1 = "3c872b236b2e266e4140578fe1ee88f693323a05";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz";
+        sha1 = "e92a20f83416415bb4086f6d1fb78b3da73d113d";
       };
     };
     "npmlog-4.1.2" = {
@@ -11456,15 +11465,6 @@ let
         sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
       };
     };
-    "tape-4.8.0" = {
-      name = "tape";
-      packageName = "tape";
-      version = "4.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tape/-/tape-4.8.0.tgz";
-        sha512 = "026x60jpvkdwfvbd6gls76zjj3yiqfz4cg9imi80r25zdziaiy87jkpw9mwbrbg9k2xc4nsn9yzk90pgkgybdspk0yb4fzg95y0nqjd";
-      };
-    };
     "tar-pack-3.4.0" = {
       name = "tar-pack";
       packageName = "tar-pack";
@@ -11528,114 +11528,6 @@ let
         sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
       };
     };
-    "for-each-0.3.2" = {
-      name = "for-each";
-      packageName = "for-each";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz";
-        sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4";
-      };
-    };
-    "object-inspect-1.3.0" = {
-      name = "object-inspect";
-      packageName = "object-inspect";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.3.0.tgz";
-        sha512 = "1302hkgbynr48i0h4n5psz3ln624f8516qh68kpah1ziczyg8vpyfxws5x6iazncaw5jgg9bp19pgbfl4n4gjb9z0z96pnd08pffw9q";
-      };
-    };
-    "resumer-0.0.0" = {
-      name = "resumer";
-      packageName = "resumer";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
-        sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
-      };
-    };
-    "string.prototype.trim-1.1.2" = {
-      name = "string.prototype.trim";
-      packageName = "string.prototype.trim";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz";
-        sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea";
-      };
-    };
-    "is-function-1.0.1" = {
-      name = "is-function";
-      packageName = "is-function";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz";
-        sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5";
-      };
-    };
-    "define-properties-1.1.2" = {
-      name = "define-properties";
-      packageName = "define-properties";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
-        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
-      };
-    };
-    "es-abstract-1.8.2" = {
-      name = "es-abstract";
-      packageName = "es-abstract";
-      version = "1.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.8.2.tgz";
-        sha512 = "0cz5pzkb9xh1askig7mrv990raaa1pym6a8acyyjw405bnzdznck7q9qg2rcybwjq866i6226nq6mijn6kwg5n36r6hr3gjpla71y3n";
-      };
-    };
-    "es-to-primitive-1.1.1" = {
-      name = "es-to-primitive";
-      packageName = "es-to-primitive";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz";
-        sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d";
-      };
-    };
-    "is-callable-1.1.3" = {
-      name = "is-callable";
-      packageName = "is-callable";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz";
-        sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2";
-      };
-    };
-    "is-regex-1.0.4" = {
-      name = "is-regex";
-      packageName = "is-regex";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
-        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
-      };
-    };
-    "is-date-object-1.0.1" = {
-      name = "is-date-object";
-      packageName = "is-date-object";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
-        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
-      };
-    };
-    "is-symbol-1.0.1" = {
-      name = "is-symbol";
-      packageName = "is-symbol";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz";
-        sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572";
-      };
-    };
     "event-stream-0.5.3" = {
       name = "event-stream";
       packageName = "event-stream";
@@ -11708,6 +11600,15 @@ let
         sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e";
       };
     };
+    "resumer-0.0.0" = {
+      name = "resumer";
+      packageName = "resumer";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
+        sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
+      };
+    };
     "lodash.groupby-4.6.0" = {
       name = "lodash.groupby";
       packageName = "lodash.groupby";
@@ -13086,13 +12987,13 @@ let
         sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
       };
     };
-    "@ionic/cli-utils-1.10.2" = {
+    "@ionic/cli-utils-1.12.0" = {
       name = "@ionic/cli-utils";
       packageName = "@ionic/cli-utils";
-      version = "1.10.2";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.10.2.tgz";
-        sha512 = "3nnaaxpbcfqhp3hdi5gqjllw11li8pmbcpbwixyfxly5sy6m7izid84a80azmd1hh2f3pv68n07qm3prznzvx495vnvw3qyaxg0hi6x";
+        url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.12.0.tgz";
+        sha512 = "15fk5kfp3wsi3yjpdj2hybb45g6i4i8xjadianbjlcfy8jh3zn4riavafawy76jwbn7i72yzd2yq9mwzimzqgypgpnyi254mwlykgrp";
       };
     };
     "@ionic/discover-0.3.1" = {
@@ -13140,13 +13041,13 @@ let
         sha1 = "b4360bb584af1437991942716f21d7c523d1dbbd";
       };
     };
-    "body-parser-1.18.1" = {
+    "body-parser-1.18.2" = {
       name = "body-parser";
       packageName = "body-parser";
-      version = "1.18.1";
+      version = "1.18.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.1.tgz";
-        sha512 = "1i2fmb5q1gy3zand1lmqbyamdg1iapbmy1wk9fr181fwcwjnsay1fvqkzbf9lx98mghlc061bhg15ymq4wm663qciparjxgj5kakg98";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz";
+        sha1 = "87678a19d84b47d859b83199bd59bce222b10454";
       };
     };
     "ci-info-1.1.1" = {
@@ -13221,13 +13122,13 @@ let
         sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw";
       };
     };
-    "ssh-config-1.1.1" = {
+    "ssh-config-1.1.2" = {
       name = "ssh-config";
       packageName = "ssh-config";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.1.tgz";
-        sha512 = "34a8bmib45cxms67cjfwwwfaay3amvzj61ay7k7qj9lajxqb8qjp5m4ivn89pzcy1siiqxs47mmh63dsq2lrypjci2w9b4lp9cqpak4";
+        url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.2.tgz";
+        sha1 = "ae65590f276b8e259ec814551f7667c141f817e9";
       };
     };
     "superagent-3.6.0" = {
@@ -13707,13 +13608,13 @@ let
         sha1 = "aa95ac583bf31d80f725d57c27c09f4c2cfe9fa9";
       };
     };
-    "vscode-languageserver-3.4.2" = {
+    "vscode-languageserver-3.4.3" = {
       name = "vscode-languageserver";
       packageName = "vscode-languageserver";
-      version = "3.4.2";
+      version = "3.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.4.2.tgz";
-        sha1 = "08cbe50ee26901d37dd4b5dc52c25b909363c1f1";
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.4.3.tgz";
+        sha1 = "83fea96bc5e094549a0a5ce3ef76b53d7ad40508";
       };
     };
     "vscode-languageserver-types-3.4.0" = {
@@ -14382,13 +14283,13 @@ let
         sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6";
       };
     };
-    "connect-3.6.4" = {
+    "connect-3.6.5" = {
       name = "connect";
       packageName = "connect";
-      version = "3.6.4";
+      version = "3.6.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-3.6.4.tgz";
-        sha1 = "52ea19c38607318784269297b0218ed074a01687";
+        url = "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz";
+        sha1 = "fb8dde7ba0763877d0ec9df9dac0b4b40e72c7da";
       };
     };
     "di-0.0.1" = {
@@ -16335,13 +16236,13 @@ let
         sha1 = "945cfadd66521eaf8f7c84913d377d7b15f24e31";
       };
     };
-    "send-0.15.5" = {
+    "send-0.15.6" = {
       name = "send";
       packageName = "send";
-      version = "0.15.5";
+      version = "0.15.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.15.5.tgz";
-        sha1 = "32ef6c8d820c9756597c3174b8c9dd51e3319be2";
+        url = "https://registry.npmjs.org/send/-/send-0.15.6.tgz";
+        sha1 = "20f23a9c925b762ab82705fe2f9db252ace47e34";
       };
     };
     "serve-index-1.9.0" = {
@@ -19386,13 +19287,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.41.0" = {
+    "snyk-1.41.1" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.41.0";
+      version = "1.41.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.41.0.tgz";
-        sha1 = "6c7a9a94f788181a21575f1b4ee59e6d80f6a059";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.41.1.tgz";
+        sha1 = "34ac2239337f4fbfa4192b10f2d4d67bf6d117cf";
       };
     };
     "spawn-please-0.3.0" = {
@@ -20073,6 +19974,15 @@ let
         sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
       };
     };
+    "define-properties-1.1.2" = {
+      name = "define-properties";
+      packageName = "define-properties";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
+        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
+      };
+    };
     "bunyan-1.8.12" = {
       name = "bunyan";
       packageName = "bunyan";
@@ -21605,13 +21515,13 @@ let
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "csv-parse-1.2.2" = {
+    "csv-parse-1.2.3" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.2.tgz";
-        sha512 = "0f3kdjcfncknijsn256frrcdmpw52wkimylhbds095kmkva57dhhnrlqzlzsxvf60d1qzfzqlhhc0wj25b9rg1w6rwxfixx2q9a6bx7";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.3.tgz";
+        sha512 = "2gjf255jzzbvfv1ib97ahsjqcw53i1w42725cbynvkvdqvfkvfimrjbf3c1bdzbrxp1mad9znzb3d63a29b2adlrz7jkjsx43i5z3nq";
       };
     };
     "stream-transform-0.1.2" = {
@@ -21866,6 +21776,204 @@ let
         sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
       };
     };
+    "cli-truncate-1.1.0" = {
+      name = "cli-truncate";
+      packageName = "cli-truncate";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz";
+        sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc";
+      };
+    };
+    "elegant-spinner-1.0.1" = {
+      name = "elegant-spinner";
+      packageName = "elegant-spinner";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz";
+        sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e";
+      };
+    };
+    "listify-1.0.0" = {
+      name = "listify";
+      packageName = "listify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/listify/-/listify-1.0.0.tgz";
+        sha1 = "03ca7ba2d150d4267773f74e57558d1053d2bee3";
+      };
+    };
+    "promise-finally-3.0.0" = {
+      name = "promise-finally";
+      packageName = "promise-finally";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-finally/-/promise-finally-3.0.0.tgz";
+        sha1 = "ddd5d0f895432b1206ceb8da1275064d18e7aa23";
+      };
+    };
+    "typings-core-2.3.3" = {
+      name = "typings-core";
+      packageName = "typings-core";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typings-core/-/typings-core-2.3.3.tgz";
+        sha1 = "09ec54cd5b11dd5f1ef2fc0ab31d37002ca2b5ad";
+      };
+    };
+    "jspm-config-0.3.4" = {
+      name = "jspm-config";
+      packageName = "jspm-config";
+      version = "0.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jspm-config/-/jspm-config-0.3.4.tgz";
+        sha1 = "44c26902e4ae8ece2366cedc9ff16b10a5f391c6";
+      };
+    };
+    "make-error-cause-1.2.2" = {
+      name = "make-error-cause";
+      packageName = "make-error-cause";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz";
+        sha1 = "df0388fcd0b37816dff0a5fb8108939777dcbc9d";
+      };
+    };
+    "popsicle-9.1.0" = {
+      name = "popsicle";
+      packageName = "popsicle";
+      version = "9.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/popsicle/-/popsicle-9.1.0.tgz";
+        sha1 = "4f900f38d57a574ec170eda40496e364082bff66";
+      };
+    };
+    "popsicle-proxy-agent-3.0.0" = {
+      name = "popsicle-proxy-agent";
+      packageName = "popsicle-proxy-agent";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/popsicle-proxy-agent/-/popsicle-proxy-agent-3.0.0.tgz";
+        sha1 = "b9133c55d945759ab7ee61b7711364620d3aeadc";
+      };
+    };
+    "popsicle-retry-3.2.1" = {
+      name = "popsicle-retry";
+      packageName = "popsicle-retry";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/popsicle-retry/-/popsicle-retry-3.2.1.tgz";
+        sha1 = "e06e866533b42a7a123eb330cbe63a7cebcba10c";
+      };
+    };
+    "popsicle-rewrite-1.0.0" = {
+      name = "popsicle-rewrite";
+      packageName = "popsicle-rewrite";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/popsicle-rewrite/-/popsicle-rewrite-1.0.0.tgz";
+        sha1 = "1dd4e8ea9c3182351fb820f87934d992f7fb9007";
+      };
+    };
+    "popsicle-status-2.0.1" = {
+      name = "popsicle-status";
+      packageName = "popsicle-status";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/popsicle-status/-/popsicle-status-2.0.1.tgz";
+        sha1 = "8dd70c4fe7c694109add784ffe80eacac1e7b28d";
+      };
+    };
+    "string-template-1.0.0" = {
+      name = "string-template";
+      packageName = "string-template";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-template/-/string-template-1.0.0.tgz";
+        sha1 = "9e9f2233dc00f218718ec379a28a5673ecca8b96";
+      };
+    };
+    "throat-3.2.0" = {
+      name = "throat";
+      packageName = "throat";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/throat/-/throat-3.2.0.tgz";
+        sha512 = "3rnpjw8qfw0qbydd9s4pbp0qzahz1f4phbj4cc9mvz6851nrq9h1whwslsjjfrzl0qgsnjf0n8ppygh3kl7ikyj2sn9za75kdb3qipw";
+      };
+    };
+    "touch-1.0.0" = {
+      name = "touch";
+      packageName = "touch";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz";
+        sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de";
+      };
+    };
+    "typescript-2.5.2" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "2.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz";
+        sha1 = "038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34";
+      };
+    };
+    "zip-object-0.1.0" = {
+      name = "zip-object";
+      packageName = "zip-object";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/zip-object/-/zip-object-0.1.0.tgz";
+        sha1 = "c1a0da04c88c837756e248680a03ff902ec3f53a";
+      };
+    };
+    "make-error-1.3.0" = {
+      name = "make-error";
+      packageName = "make-error";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz";
+        sha1 = "52ad3a339ccf10ce62b4040b708fe707244b8b96";
+      };
+    };
+    "http-proxy-agent-1.0.0" = {
+      name = "http-proxy-agent";
+      packageName = "http-proxy-agent";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz";
+        sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a";
+      };
+    };
+    "https-proxy-agent-1.0.0" = {
+      name = "https-proxy-agent";
+      packageName = "https-proxy-agent";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz";
+        sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6";
+      };
+    };
+    "agent-base-2.1.1" = {
+      name = "agent-base";
+      packageName = "agent-base";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz";
+        sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7";
+      };
+    };
+    "semver-5.0.3" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
+        sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
+      };
+    };
     "blueimp-md5-2.8.0" = {
       name = "blueimp-md5";
       packageName = "blueimp-md5";
@@ -22010,6 +22118,15 @@ let
         sha512 = "136ylazswrblh2b1kc29xsmzk3i3bhm6vcirl1zb60fv9h0nf3hipz7qm91vs6my1lry00xrzpy1x96y51siciwwq7k3fs0ynl2j6m4";
       };
     };
+    "serve-static-1.12.6" = {
+      name = "serve-static";
+      packageName = "serve-static";
+      version = "1.12.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.6.tgz";
+        sha1 = "b973773f63449934da54e5beba5e31d9f4211577";
+      };
+    };
     "signals-1.0.0" = {
       name = "signals";
       packageName = "signals";
@@ -22997,10 +23114,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.10.4";
+    version = "1.10.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.10.4.tgz";
-      sha1 = "8df4818788ba3735122383f99c61cc6ce50626fa";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.10.5.tgz";
+      sha1 = "60d75b6b4d9094846ada57d18892a50b8c140b8c";
     };
     dependencies = [
       sources."async-2.5.0"
@@ -23041,7 +23158,7 @@ in
       sources."babel-runtime-6.26.0"
       sources."babel-template-6.26.0"
       sources."convert-source-map-1.5.0"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."json5-0.5.1"
       sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
@@ -23133,10 +23250,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.15";
+    version = "0.10.16";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.15.tgz";
-      sha1 = "15386d528bcd2521147934e3f183b53897a18c2c";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.16.tgz";
+      sha512 = "0l8acam1ykyb31ww0xspzvv9na18l1w7r9hjg7vz3nbb9zhbs2615gyjjj7va0r8czr221nwyrggdx65vhxdpwvzi7mzjmbmgr85a36";
     };
     dependencies = [
       sources."adal-node-0.1.21"
@@ -23188,7 +23305,7 @@ in
           sources."async-0.2.7"
         ];
       })
-      sources."azure-arm-network-2.0.0"
+      sources."azure-arm-network-3.0.0"
       (sources."azure-arm-powerbiembedded-0.1.0" // {
         dependencies = [
           sources."ms-rest-1.15.7"
@@ -23318,7 +23435,7 @@ in
       })
       sources."moment-2.18.1"
       sources."ms-rest-2.2.2"
-      (sources."ms-rest-azure-2.3.1" // {
+      (sources."ms-rest-azure-2.3.3" // {
         dependencies = [
           sources."async-0.2.7"
         ];
@@ -23418,7 +23535,7 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
-      sources."@types/node-8.0.28"
+      sources."@types/node-8.0.30"
       sources."@types/request-2.0.3"
       sources."@types/uuid-3.4.2"
       sources."is-buffer-1.1.5"
@@ -23482,7 +23599,7 @@ in
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.3"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."lodash-4.17.4"
@@ -23696,7 +23813,7 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."q-1.5.0"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -23895,7 +24012,7 @@ in
       sources."chalk-1.0.0"
       sources."chromecast-player-0.2.3"
       sources."debounced-seeker-1.0.0"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."diveSync-0.3.0"
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
@@ -24620,7 +24737,11 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."finalhandler-1.0.5"
+      (sources."finalhandler-1.0.6" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -24764,7 +24885,7 @@ in
       sources."node-uuid-1.4.8"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       (sources."async-2.5.0" // {
@@ -25032,7 +25153,7 @@ in
       sources."eventemitter3-0.1.6"
       sources."better-curry-1.6.0"
       sources."websocket-driver-0.7.0"
-      sources."http-parser-js-0.4.7"
+      sources."http-parser-js-0.4.8"
       sources."websocket-extensions-0.1.2"
       (sources."native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" // {
         dependencies = [
@@ -25240,7 +25361,7 @@ in
       sources."JSONStream-1.3.1"
       sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.120.0"
+      sources."aws-sdk-2.122.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       (sources."request-2.82.0" // {
@@ -25285,7 +25406,7 @@ in
       sources."qs-6.5.1"
       sources."safe-buffer-5.1.1"
       sources."stringstream-0.0.5"
-      (sources."tough-cookie-2.3.2" // {
+      (sources."tough-cookie-2.3.3" // {
         dependencies = [
           sources."punycode-1.4.1"
         ];
@@ -25429,7 +25550,7 @@ in
       sources."babel-types-6.26.0"
       sources."babylon-6.18.0"
       sources."convert-source-map-1.5.0"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."json5-0.5.1"
       sources."lodash-4.17.4"
       sources."minimatch-3.0.4"
@@ -26022,7 +26143,7 @@ in
       sources."is-finite-1.0.2"
       sources."number-is-nan-1.0.1"
       sources."get-stdin-4.0.1"
-      sources."cli-spinners-1.0.0"
+      sources."cli-spinners-1.0.1"
       sources."log-symbols-1.0.2"
       sources."mimic-fn-1.1.0"
       sources."es6-promise-4.0.5"
@@ -26075,7 +26196,7 @@ in
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
@@ -26292,7 +26413,7 @@ in
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.37"
+      sources."node-pre-gyp-0.6.38"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -26305,14 +26426,10 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.82.0"
+      sources."request-2.81.0"
+      sources."hawk-3.1.3"
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
-      (sources."tape-4.8.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."abbrev-1.1.0"
@@ -26341,88 +26458,80 @@ in
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.17"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
-      sources."qs-6.5.1"
+      sources."performance-now-0.2.0"
+      sources."qs-6.4.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
-      sources."har-schema-2.0.0"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
       sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.30.0"
       sources."punycode-1.4.1"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."deep-equal-1.0.1"
-      sources."defined-1.0.0"
-      sources."for-each-0.3.2"
-      sources."function-bind-1.1.1"
-      sources."has-1.0.1"
-      sources."object-inspect-1.3.0"
-      sources."resolve-1.4.0"
-      sources."resumer-0.0.0"
-      sources."string.prototype.trim-1.1.2"
-      sources."through-2.3.8"
-      sources."is-function-1.0.1"
-      sources."path-parse-1.0.5"
-      sources."define-properties-1.1.2"
-      sources."es-abstract-1.8.2"
-      sources."foreach-2.0.5"
-      sources."object-keys-1.0.11"
-      sources."es-to-primitive-1.1.1"
-      sources."is-callable-1.1.3"
-      sources."is-regex-1.0.4"
-      sources."is-date-object-1.0.1"
-      sources."is-symbol-1.0.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-2.0.0"
@@ -26435,13 +26544,12 @@ in
         ];
       })
       sources."lazy-1.0.11"
-      (sources."caller-0.0.1" // {
-        dependencies = [
-          sources."tape-2.3.3"
-          sources."deep-equal-0.1.2"
-          sources."defined-0.0.0"
-        ];
-      })
+      sources."caller-0.0.1"
+      sources."tape-2.3.3"
+      sources."deep-equal-0.1.2"
+      sources."defined-0.0.0"
+      sources."through-2.3.8"
+      sources."resumer-0.0.0"
       sources."i-0.3.5"
       sources."ncp-0.4.2"
     ];
@@ -26469,7 +26577,7 @@ in
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
       sources."lodash-4.17.4"
       sources."microee-0.0.2"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."ms-2.0.0"
     ];
     buildInputs = globalBuildInputs;
@@ -26961,13 +27069,13 @@ in
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
-    version = "3.10.3";
+    version = "3.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ionic/-/ionic-3.10.3.tgz";
-      sha512 = "2n96j5a5fpy6pjgmgsnkx5d2asxha7yvlmlj77fpg31qg7nij0p9y4sq00zjrdzhzq2avsc9r25pjgy3i8cb16il9w9rrd210rlzc15";
+      url = "https://registry.npmjs.org/ionic/-/ionic-3.12.0.tgz";
+      sha512 = "0x1177vl5qkcwx2fw8nbg227ymhzx80pfjxpiw4xdhfrmqdzrlfz38kk8z1x6ifvg9mij2m8ws6wvjczpp2shqdqmgjibg3xkabsrbb";
     };
     dependencies = [
-      sources."@ionic/cli-utils-1.10.2"
+      sources."@ionic/cli-utils-1.12.0"
       sources."@ionic/discover-0.3.1"
       sources."chalk-2.1.0"
       sources."opn-5.1.0"
@@ -26977,7 +27085,7 @@ in
       sources."tslib-1.7.1"
       sources."archiver-2.0.3"
       sources."basic-auth-1.1.0"
-      sources."body-parser-1.18.1"
+      sources."body-parser-1.18.2"
       sources."chokidar-1.7.0"
       sources."ci-info-1.1.1"
       sources."cross-spawn-5.1.0"
@@ -26986,6 +27094,7 @@ in
       sources."elementtree-0.1.7"
       (sources."express-4.15.4" // {
         dependencies = [
+          sources."debug-2.6.8"
           sources."qs-6.5.0"
         ];
       })
@@ -27000,7 +27109,7 @@ in
           sources."is-fullwidth-code-point-2.0.0"
         ];
       })
-      sources."ssh-config-1.1.1"
+      sources."ssh-config-1.1.2"
       (sources."string-width-2.1.1" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
@@ -27057,7 +27166,7 @@ in
       sources."crc-3.4.4"
       sources."bytes-3.0.0"
       sources."content-type-1.0.4"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."depd-1.1.1"
       sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
@@ -27122,7 +27231,7 @@ in
       sources."binary-extensions-1.10.0"
       sources."set-immediate-shim-1.0.1"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.37"
+      sources."node-pre-gyp-0.6.38"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -27131,8 +27240,12 @@ in
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
       sources."rc-1.2.1"
-      sources."request-2.82.0"
-      sources."tape-4.8.0"
+      (sources."request-2.81.0" // {
+        dependencies = [
+          sources."qs-6.4.0"
+        ];
+      })
+      sources."hawk-3.1.3"
       sources."tar-pack-3.4.0"
       sources."abbrev-1.1.0"
       sources."osenv-0.1.4"
@@ -27165,76 +27278,68 @@ in
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
+      sources."performance-now-0.2.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
-      sources."har-schema-2.0.0"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
       sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
-      sources."deep-equal-1.0.1"
-      sources."defined-1.0.0"
-      sources."for-each-0.3.2"
-      sources."function-bind-1.1.1"
-      sources."has-1.0.1"
-      sources."object-inspect-1.3.0"
-      sources."resolve-1.4.0"
-      sources."resumer-0.0.0"
-      sources."string.prototype.trim-1.1.2"
-      sources."through-2.3.8"
-      sources."is-function-1.0.1"
-      sources."path-parse-1.0.5"
-      sources."define-properties-1.1.2"
-      sources."es-abstract-1.8.2"
-      sources."foreach-2.0.5"
-      sources."object-keys-1.0.11"
-      sources."es-to-primitive-1.1.1"
-      sources."is-callable-1.1.3"
-      sources."is-regex-1.0.4"
-      sources."is-date-object-1.0.1"
-      sources."is-symbol-1.0.1"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
       sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
@@ -27254,7 +27359,7 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."finalhandler-1.0.5"
+      sources."finalhandler-1.0.6"
       sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -27262,7 +27367,11 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
-      sources."send-0.15.4"
+      (sources."send-0.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."serve-static-1.12.4"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.1"
@@ -27280,6 +27389,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
+      sources."through-2.3.8"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."mimic-fn-1.1.0"
@@ -27317,7 +27427,7 @@ in
       sources."safe-json-parse-1.0.1"
       sources."string-template-0.2.1"
       sources."websocket-driver-0.7.0"
-      sources."http-parser-js-0.4.7"
+      sources."http-parser-js-0.4.8"
       sources."websocket-extensions-0.1.2"
       sources."async-limiter-1.0.0"
       sources."ultron-1.1.0"
@@ -27480,7 +27590,7 @@ in
       sources."string-similarity-1.2.0"
       sources."typescript-2.3.4"
       sources."vscode-jsonrpc-3.4.0"
-      sources."vscode-languageserver-3.4.2"
+      sources."vscode-languageserver-3.4.3"
       sources."vscode-languageserver-types-3.4.0"
       sources."symbol-observable-1.0.4"
       sources."assertion-error-1.0.2"
@@ -27709,7 +27819,7 @@ in
       sources."superagent-3.6.0"
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.1"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."extend-3.0.1"
       sources."form-data-2.3.1"
       sources."formidable-1.1.1"
@@ -27749,11 +27859,12 @@ in
       sha512 = "2iqk65hy94j010zlqsl4rzfkz4f9ic1pqbvsf5w1lrgmda9wmhxl5kmvnmwikjilmn6kz9kniqzl7rpq3xv3cmpx8rppb7ipk5ddhzj";
     };
     dependencies = [
-      sources."body-parser-1.18.1"
+      sources."body-parser-1.18.2"
       sources."chalk-1.1.3"
       (sources."compression-1.7.0" // {
         dependencies = [
           sources."bytes-2.5.0"
+          sources."debug-2.6.8"
         ];
       })
       sources."connect-pause-0.1.1"
@@ -27761,6 +27872,7 @@ in
       sources."errorhandler-1.5.0"
       (sources."express-4.15.4" // {
         dependencies = [
+          sources."debug-2.6.8"
           sources."qs-6.5.0"
         ];
       })
@@ -27773,8 +27885,16 @@ in
       sources."lodash-4.17.4"
       sources."lodash-id-0.13.0"
       sources."lowdb-0.15.5"
-      sources."method-override-2.3.9"
-      sources."morgan-1.8.2"
+      (sources."method-override-2.3.9" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
+      (sources."morgan-1.8.2" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."object-assign-4.1.1"
       sources."please-upgrade-node-3.0.1"
       sources."pluralize-3.1.0"
@@ -27789,7 +27909,7 @@ in
       })
       sources."bytes-3.0.0"
       sources."content-type-1.0.4"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."depd-1.1.1"
       sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
@@ -27825,7 +27945,7 @@ in
       sources."cookie-signature-1.0.6"
       sources."encodeurl-1.0.1"
       sources."etag-1.8.1"
-      sources."finalhandler-1.0.5"
+      sources."finalhandler-1.0.6"
       sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -27833,7 +27953,11 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
-      sources."send-0.15.4"
+      (sources."send-0.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."serve-static-1.12.4"
       sources."utils-merge-1.0.0"
       sources."forwarded-0.1.2"
@@ -27862,7 +27986,7 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-2.1.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
@@ -28042,7 +28166,7 @@ in
     };
     dependencies = [
       sources."bluebird-3.5.0"
-      sources."body-parser-1.18.1"
+      sources."body-parser-1.18.2"
       sources."chokidar-1.7.0"
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
@@ -28050,7 +28174,7 @@ in
           sources."lodash-4.17.4"
         ];
       })
-      sources."connect-3.6.4"
+      sources."connect-3.6.5"
       sources."core-js-2.5.1"
       sources."di-0.0.1"
       sources."dom-serialize-2.2.1"
@@ -28094,7 +28218,7 @@ in
       sources."useragent-2.2.1"
       sources."bytes-3.0.0"
       sources."content-type-1.0.4"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."depd-1.1.1"
       sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
@@ -28169,7 +28293,7 @@ in
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.37"
+      sources."node-pre-gyp-0.6.38"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
@@ -28178,13 +28302,13 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.82.0"
-      sources."semver-5.4.1"
-      (sources."tape-4.8.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."qs-6.4.0"
         ];
       })
+      sources."hawk-3.1.3"
+      sources."semver-5.4.1"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
@@ -28211,84 +28335,76 @@ in
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
+      sources."performance-now-0.2.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
-      sources."har-schema-2.0.0"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
       sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
-      sources."deep-equal-1.0.1"
-      sources."defined-1.0.0"
-      sources."for-each-0.3.2"
-      sources."function-bind-1.1.1"
-      sources."has-1.0.1"
-      sources."object-inspect-1.3.0"
-      sources."resolve-1.4.0"
-      sources."resumer-0.0.0"
-      sources."string.prototype.trim-1.1.2"
-      sources."through-2.3.8"
-      sources."is-function-1.0.1"
-      sources."path-parse-1.0.5"
-      sources."define-properties-1.1.2"
-      sources."es-abstract-1.8.2"
-      sources."foreach-2.0.5"
-      sources."object-keys-1.0.11"
-      sources."es-to-primitive-1.1.1"
-      sources."is-callable-1.1.3"
-      sources."is-regex-1.0.4"
-      sources."is-date-object-1.0.1"
-      sources."is-symbol-1.0.1"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
       sources."once-1.4.0"
       sources."uid-number-0.0.6"
       sources."wrappy-1.0.2"
-      sources."finalhandler-1.0.5"
+      sources."finalhandler-1.0.6"
       sources."parseurl-1.3.2"
       sources."utils-merge-1.0.1"
       sources."encodeurl-1.0.1"
@@ -29039,10 +29155,11 @@ in
       sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b";
     };
     dependencies = [
-      sources."body-parser-1.18.1"
+      sources."body-parser-1.18.2"
       sources."chokidar-1.7.0"
       (sources."express-4.15.4" // {
         dependencies = [
+          sources."debug-2.6.8"
           sources."qs-6.5.0"
         ];
       })
@@ -29052,11 +29169,31 @@ in
       sources."markdown-it-task-checkbox-1.0.4"
       sources."minimist-1.2.0"
       sources."opn-5.1.0"
-      sources."request-2.82.0"
+      (sources."request-2.82.0" // {
+        dependencies = [
+          sources."aws-sign2-0.7.0"
+          sources."form-data-2.3.1"
+          sources."har-validator-5.0.3"
+          sources."hawk-6.0.2"
+          sources."http-signature-1.2.0"
+          sources."performance-now-2.1.0"
+          sources."ajv-5.2.2"
+          sources."har-schema-2.0.0"
+          sources."hoek-4.2.0"
+          sources."boom-4.3.1"
+          (sources."cryptiles-3.1.2" // {
+            dependencies = [
+              sources."boom-5.2.0"
+            ];
+          })
+          sources."sntp-2.0.2"
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."socket.io-2.0.3"
       sources."bytes-3.0.0"
       sources."content-type-1.0.4"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."depd-1.1.1"
       sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
@@ -29137,7 +29274,12 @@ in
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.37"
+      (sources."node-pre-gyp-0.6.38" // {
+        dependencies = [
+          sources."request-2.81.0"
+          sources."qs-6.4.0"
+        ];
+      })
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -29146,9 +29288,9 @@ in
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
       sources."rc-1.2.1"
+      sources."hawk-3.1.3"
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
-      sources."tape-4.8.0"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."abbrev-1.1.0"
@@ -29174,32 +29316,74 @@ in
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.6.0"
+      sources."caseless-0.12.0"
+      sources."combined-stream-1.0.5"
+      sources."extend-3.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."http-signature-1.1.1"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."json-stringify-safe-5.0.1"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.3"
+      sources."tunnel-agent-0.6.0"
+      sources."uuid-3.1.0"
+      sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."extsprintf-1.3.0"
+      sources."json-schema-0.2.3"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."asn1-0.2.3"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."jsbn-0.1.1"
+      sources."tweetnacl-0.14.5"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."punycode-1.4.1"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."deep-equal-1.0.1"
-      sources."defined-1.0.0"
-      sources."for-each-0.3.2"
-      sources."function-bind-1.1.1"
-      sources."has-1.0.1"
-      sources."object-inspect-1.3.0"
-      sources."resolve-1.4.0"
-      sources."resumer-0.0.0"
-      sources."string.prototype.trim-1.1.2"
-      sources."through-2.3.8"
-      sources."is-function-1.0.1"
-      sources."path-parse-1.0.5"
-      sources."define-properties-1.1.2"
-      sources."es-abstract-1.8.2"
-      sources."foreach-2.0.5"
-      sources."object-keys-1.0.11"
-      sources."es-to-primitive-1.1.1"
-      sources."is-callable-1.1.3"
-      sources."is-regex-1.0.4"
-      sources."is-date-object-1.0.1"
-      sources."is-symbol-1.0.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
@@ -29212,7 +29396,7 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."finalhandler-1.0.5"
+      sources."finalhandler-1.0.6"
       sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -29220,7 +29404,11 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
-      sources."send-0.15.4"
+      (sources."send-0.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."serve-static-1.12.4"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.1"
@@ -29240,56 +29428,8 @@ in
       sources."emoji-regex-6.1.1"
       sources."html-entities-1.2.1"
       sources."is-wsl-1.1.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
-      sources."is-typedarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."json-stringify-safe-5.0.1"
-      sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
-      sources."har-schema-2.0.0"
-      sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
-      sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."punycode-1.4.1"
       (sources."engine.io-3.1.1" // {
         dependencies = [
           sources."accepts-1.3.3"
@@ -29366,12 +29506,20 @@ in
       sources."event-stream-3.3.4"
       sources."faye-websocket-0.11.1"
       sources."http-auth-3.1.3"
-      sources."morgan-1.8.2"
+      (sources."morgan-1.8.2" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."object-assign-4.1.1"
       sources."opn-5.1.0"
       sources."proxy-middleware-0.15.0"
-      sources."send-0.15.5"
-      sources."serve-index-1.9.0"
+      sources."send-0.15.6"
+      (sources."serve-index-1.9.0" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."anymatch-1.3.2"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
@@ -29437,7 +29585,7 @@ in
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.37"
+      sources."node-pre-gyp-0.6.38"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
@@ -29446,14 +29594,10 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.82.0"
+      sources."request-2.81.0"
+      sources."hawk-3.1.3"
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
-      (sources."tape-4.8.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
@@ -29479,88 +29623,80 @@ in
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.17"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
-      sources."qs-6.5.1"
+      sources."performance-now-0.2.0"
+      sources."qs-6.4.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
-      sources."har-schema-2.0.0"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
       sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.30.0"
       sources."punycode-1.4.1"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."deep-equal-1.0.1"
-      sources."defined-1.0.0"
-      sources."for-each-0.3.2"
-      sources."function-bind-1.1.1"
-      sources."has-1.0.1"
-      sources."object-inspect-1.3.0"
-      sources."resolve-1.4.0"
-      sources."resumer-0.0.0"
-      sources."string.prototype.trim-1.1.2"
-      sources."through-2.3.8"
-      sources."is-function-1.0.1"
-      sources."path-parse-1.0.5"
-      sources."define-properties-1.1.2"
-      sources."es-abstract-1.8.2"
-      sources."foreach-2.0.5"
-      sources."object-keys-1.0.11"
-      sources."es-to-primitive-1.1.1"
-      sources."is-callable-1.1.3"
-      sources."is-regex-1.0.4"
-      sources."is-date-object-1.0.1"
-      sources."is-symbol-1.0.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-2.0.0"
@@ -29578,6 +29714,7 @@ in
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."vary-1.1.1"
+      sources."through-2.3.8"
       sources."duplexer-0.1.1"
       sources."from-0.1.7"
       sources."map-stream-0.1.0"
@@ -29585,7 +29722,7 @@ in
       sources."split-0.3.3"
       sources."stream-combiner-0.0.4"
       sources."websocket-driver-0.7.0"
-      sources."http-parser-js-0.4.7"
+      sources."http-parser-js-0.4.8"
       sources."websocket-extensions-0.1.2"
       sources."apache-crypt-1.2.1"
       sources."apache-md5-1.1.2"
@@ -29726,7 +29863,7 @@ in
       sources."superagent-3.6.0"
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.1"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."extend-3.0.1"
       sources."form-data-2.3.1"
       sources."formidable-1.1.1"
@@ -29855,7 +29992,7 @@ in
       sources."performance-now-2.1.0"
       sources."qs-6.5.1"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
@@ -30012,7 +30149,7 @@ in
       sources."performance-now-2.1.0"
       sources."qs-6.5.1"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
@@ -30069,8 +30206,12 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
-      sources."debug-2.6.8"
-      sources."express-4.15.4"
+      sources."debug-2.6.9"
+      (sources."express-4.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."glob-5.0.15"
       sources."path-is-absolute-1.0.1"
       sources."rc-1.2.1"
@@ -30173,7 +30314,7 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."finalhandler-1.0.5"
+      sources."finalhandler-1.0.6"
       sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -30183,7 +30324,11 @@ in
       sources."proxy-addr-1.1.5"
       sources."qs-6.5.0"
       sources."range-parser-1.2.0"
-      sources."send-0.15.4"
+      (sources."send-0.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."serve-static-1.12.4"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
@@ -30215,7 +30360,7 @@ in
       sources."safe-buffer-5.1.1"
       sources."truncate-1.0.5"
       sources."nan-2.7.0"
-      (sources."node-pre-gyp-0.6.37" // {
+      (sources."node-pre-gyp-0.6.38" // {
         dependencies = [
           sources."rimraf-2.6.2"
           sources."semver-5.4.1"
@@ -30224,16 +30369,12 @@ in
       })
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      (sources."request-2.82.0" // {
-        dependencies = [
-          sources."qs-6.5.1"
-        ];
-      })
-      (sources."tape-4.8.0" // {
+      (sources."request-2.81.0" // {
         dependencies = [
-          sources."glob-7.1.2"
+          sources."qs-6.4.0"
         ];
       })
+      sources."hawk-3.1.3"
       sources."tar-2.2.1"
       (sources."tar-pack-3.4.0" // {
         dependencies = [
@@ -30260,78 +30401,70 @@ in
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."ansi-regex-2.1.1"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
+      sources."performance-now-0.2.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
-      sources."har-schema-2.0.0"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
       sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
       sources."fs.realpath-1.0.0"
-      sources."deep-equal-1.0.1"
-      sources."defined-1.0.0"
-      sources."for-each-0.3.2"
-      sources."function-bind-1.1.1"
-      sources."has-1.0.1"
-      sources."object-inspect-1.3.0"
-      sources."resolve-1.4.0"
-      sources."resumer-0.0.0"
-      sources."string.prototype.trim-1.1.2"
-      sources."through-2.3.8"
-      sources."is-function-1.0.1"
-      sources."path-parse-1.0.5"
-      sources."define-properties-1.1.2"
-      sources."es-abstract-1.8.2"
-      sources."foreach-2.0.5"
-      sources."object-keys-1.0.11"
-      sources."es-to-primitive-1.1.1"
-      sources."is-callable-1.1.3"
-      sources."is-regex-1.0.4"
-      sources."is-date-object-1.0.1"
-      sources."is-symbol-1.0.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
@@ -30357,10 +30490,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.37";
+    version = "0.6.38";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.37.tgz";
-      sha1 = "3c872b236b2e266e4140578fe1ee88f693323a05";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz";
+      sha1 = "e92a20f83416415bb4086f6d1fb78b3da73d113d";
     };
     dependencies = [
       sources."mkdirp-0.5.1"
@@ -30371,14 +30504,10 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.82.0"
+      sources."request-2.81.0"
+      sources."hawk-3.1.3"
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
-      (sources."tape-4.8.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
@@ -30413,59 +30542,72 @@ in
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.17"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
-      sources."qs-6.5.1"
+      sources."performance-now-0.2.0"
+      sources."qs-6.4.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
-      sources."har-schema-2.0.0"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
       sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.30.0"
       sources."punycode-1.4.1"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -30476,31 +30618,10 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."deep-equal-1.0.1"
-      sources."defined-1.0.0"
-      sources."for-each-0.3.2"
-      sources."function-bind-1.1.1"
-      sources."has-1.0.1"
-      sources."object-inspect-1.3.0"
-      sources."resolve-1.4.0"
-      sources."resumer-0.0.0"
-      sources."string.prototype.trim-1.1.2"
-      sources."through-2.3.8"
-      sources."is-function-1.0.1"
-      sources."path-parse-1.0.5"
-      sources."define-properties-1.1.2"
-      sources."es-abstract-1.8.2"
-      sources."foreach-2.0.5"
-      sources."object-keys-1.0.11"
-      sources."es-to-primitive-1.1.1"
-      sources."is-callable-1.1.3"
-      sources."is-regex-1.0.4"
-      sources."is-date-object-1.0.1"
-      sources."is-symbol-1.0.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
       sources."graceful-fs-4.1.11"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-2.0.0"
@@ -30523,7 +30644,7 @@ in
     };
     dependencies = [
       sources."chokidar-1.7.0"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."es6-promise-3.3.1"
       sources."ignore-by-default-1.0.1"
       sources."lodash.defaults-3.1.2"
@@ -30597,7 +30718,7 @@ in
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.37"
+      sources."node-pre-gyp-0.6.38"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
@@ -30606,14 +30727,10 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.82.0"
+      sources."request-2.81.0"
+      sources."hawk-3.1.3"
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
-      (sources."tape-4.8.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
@@ -30640,85 +30757,77 @@ in
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.17"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
-      sources."qs-6.5.1"
+      sources."performance-now-0.2.0"
+      sources."qs-6.4.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
-      sources."har-schema-2.0.0"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
       sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.30.0"
       sources."punycode-1.4.1"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."deep-equal-1.0.1"
-      sources."defined-1.0.0"
-      sources."for-each-0.3.2"
-      sources."function-bind-1.1.1"
-      sources."has-1.0.1"
-      sources."object-inspect-1.3.0"
-      sources."resolve-1.4.0"
-      sources."resumer-0.0.0"
-      sources."string.prototype.trim-1.1.2"
-      sources."through-2.3.8"
-      sources."is-function-1.0.1"
-      sources."path-parse-1.0.5"
-      sources."define-properties-1.1.2"
-      sources."es-abstract-1.8.2"
-      sources."foreach-2.0.5"
-      sources."object-keys-1.0.11"
-      sources."es-to-primitive-1.1.1"
-      sources."is-callable-1.1.3"
-      sources."is-regex-1.0.4"
-      sources."is-date-object-1.0.1"
-      sources."is-symbol-1.0.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
@@ -30739,6 +30848,7 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."event-stream-3.3.4"
+      sources."through-2.3.8"
       sources."duplexer-0.1.1"
       sources."from-0.1.7"
       sources."map-stream-0.1.0"
@@ -30976,9 +31086,9 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      (sources."finalhandler-1.0.5" // {
+      (sources."finalhandler-1.0.6" // {
         dependencies = [
-          sources."debug-2.6.8"
+          sources."debug-2.6.9"
         ];
       })
       sources."fresh-0.5.0"
@@ -31136,7 +31246,7 @@ in
       sources."node-uuid-1.4.8"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
@@ -31697,7 +31807,7 @@ in
       sources."humanize-ms-1.2.1"
       sources."ms-2.0.0"
       sources."agent-base-4.1.1"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."es6-promisify-5.0.0"
       sources."es6-promise-4.1.1"
       sources."encoding-0.1.12"
@@ -31734,7 +31844,7 @@ in
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
@@ -31940,7 +32050,7 @@ in
       sources."qs-6.5.1"
       sources."safe-buffer-5.1.1"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
@@ -32077,7 +32187,7 @@ in
       sources."require-dir-0.3.2"
       sources."semver-5.4.1"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.41.0" // {
+      (sources."snyk-1.41.1" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -32259,7 +32369,7 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."es6-symbol-3.1.1"
       sources."ms-2.0.0"
       sources."d-1.0.0"
@@ -32310,7 +32420,7 @@ in
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.3"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
@@ -32643,7 +32753,7 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."babybird-0.0.1"
-      (sources."body-parser-1.18.1" // {
+      (sources."body-parser-1.18.2" // {
         dependencies = [
           sources."content-type-1.0.4"
         ];
@@ -32651,6 +32761,7 @@ in
       (sources."compression-1.7.0" // {
         dependencies = [
           sources."bytes-2.5.0"
+          sources."debug-2.6.8"
         ];
       })
       sources."connect-busboy-0.0.2"
@@ -32662,7 +32773,12 @@ in
       (sources."express-4.15.4" // {
         dependencies = [
           sources."content-type-1.0.4"
-          sources."finalhandler-1.0.5"
+          sources."debug-2.6.8"
+          (sources."finalhandler-1.0.6" // {
+            dependencies = [
+              sources."debug-2.6.9"
+            ];
+          })
           sources."qs-6.5.0"
         ];
       })
@@ -32705,7 +32821,7 @@ in
       sources."asap-2.0.6"
       sources."is-arguments-1.0.2"
       sources."bytes-3.0.0"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."depd-1.1.1"
       sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
@@ -32748,7 +32864,11 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
-      sources."send-0.15.4"
+      (sources."send-0.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."serve-static-1.12.4"
       sources."utils-merge-1.0.0"
       sources."forwarded-0.1.2"
@@ -32823,7 +32943,7 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-2.1.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
@@ -33184,7 +33304,7 @@ in
       sources."randombytes-2.0.5"
       sources."run-parallel-1.1.6"
       sources."buffer-alloc-unsafe-1.0.0"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."ms-2.0.0"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
@@ -33535,7 +33655,7 @@ in
       sources."torrent-piece-1.1.1"
       (sources."random-access-file-1.8.1" // {
         dependencies = [
-          sources."debug-2.6.8"
+          sources."debug-2.6.9"
           sources."ms-2.0.0"
         ];
       })
@@ -34040,7 +34160,7 @@ in
       sources."binary-extensions-1.10.0"
       sources."set-immediate-shim-1.0.1"
       sources."nan-2.7.0"
-      (sources."node-pre-gyp-0.6.37" // {
+      (sources."node-pre-gyp-0.6.38" // {
         dependencies = [
           sources."rimraf-2.6.2"
         ];
@@ -34053,9 +34173,9 @@ in
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
       sources."rc-1.2.1"
-      sources."request-2.82.0"
+      sources."request-2.81.0"
+      sources."hawk-3.1.3"
       sources."semver-5.4.1"
-      sources."tape-4.8.0"
       sources."tar-2.2.1"
       (sources."tar-pack-3.4.0" // {
         dependencies = [
@@ -34084,78 +34204,76 @@ in
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.17"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
-      sources."qs-6.5.1"
+      sources."performance-now-0.2.0"
+      sources."qs-6.4.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."ajv-5.2.2" // {
+      (sources."ajv-4.11.8" // {
         dependencies = [
           sources."json-stable-stringify-1.0.1"
         ];
       })
-      sources."har-schema-2.0.0"
+      sources."har-schema-1.0.5"
       sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."json-schema-traverse-0.3.1"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.30.0"
-      sources."deep-equal-1.0.1"
-      sources."for-each-0.3.2"
-      sources."object-inspect-1.3.0"
-      sources."resumer-0.0.0"
-      sources."string.prototype.trim-1.1.2"
-      sources."is-function-1.0.1"
-      sources."define-properties-1.1.2"
-      sources."es-abstract-1.8.2"
-      sources."foreach-2.0.5"
-      sources."object-keys-1.0.11"
-      sources."es-to-primitive-1.1.1"
-      sources."is-callable-1.1.3"
-      sources."is-regex-1.0.4"
-      sources."is-date-object-1.0.1"
-      sources."is-symbol-1.0.1"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-2.0.0"
@@ -34317,7 +34435,7 @@ in
       sources."performance-now-2.1.0"
       sources."safe-buffer-5.1.1"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
@@ -34410,7 +34528,11 @@ in
       sources."node-version-1.1.0"
       sources."opn-5.1.0"
       sources."path-type-3.0.0"
-      sources."send-0.15.4"
+      (sources."send-0.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       (sources."update-notifier-2.2.0" // {
         dependencies = [
           sources."chalk-1.1.3"
@@ -34466,7 +34588,7 @@ in
       sources."code-point-at-1.1.0"
       sources."number-is-nan-1.0.1"
       sources."address-1.0.3"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."ms-2.0.0"
       sources."graceful-fs-4.1.11"
       sources."jsonfile-4.0.0"
@@ -34520,6 +34642,7 @@ in
       (sources."compression-1.7.0" // {
         dependencies = [
           sources."bytes-2.5.0"
+          sources."debug-2.6.8"
         ];
       })
       sources."accepts-1.3.4"
@@ -34600,10 +34723,10 @@ in
     dependencies = [
       sources."express-5.0.0-alpha.5"
       sources."express-json5-0.1.0"
-      (sources."body-parser-1.18.1" // {
+      (sources."body-parser-1.18.2" // {
         dependencies = [
           sources."bytes-3.0.0"
-          sources."debug-2.6.8"
+          sources."debug-2.6.9"
           sources."iconv-lite-0.4.19"
           sources."qs-6.5.1"
           sources."raw-body-2.3.2"
@@ -34658,9 +34781,9 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      (sources."finalhandler-1.0.5" // {
+      (sources."finalhandler-1.0.6" // {
         dependencies = [
-          sources."debug-2.6.8"
+          sources."debug-2.6.9"
           sources."ms-2.0.0"
         ];
       })
@@ -34724,7 +34847,7 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-2.1.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
@@ -34948,7 +35071,7 @@ in
       sources."dtrace-provider-0.6.0"
       sources."precond-0.2.3"
       sources."csv-generate-0.0.6"
-      sources."csv-parse-1.2.2"
+      sources."csv-parse-1.2.3"
       sources."stream-transform-0.1.2"
       sources."csv-stringify-0.0.8"
       sources."asn1-0.1.11"
@@ -35145,6 +35268,215 @@ in
     };
     production = true;
   };
+  typings = nodeEnv.buildNodePackage {
+    name = "typings";
+    packageName = "typings";
+    version = "2.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/typings/-/typings-2.1.1.tgz";
+      sha1 = "bacc69d255970a478e09f76c7f689975d535a78a";
+    };
+    dependencies = [
+      sources."archy-1.0.0"
+      sources."bluebird-3.5.0"
+      sources."chalk-1.1.3"
+      sources."cli-truncate-1.1.0"
+      sources."columnify-1.5.4"
+      sources."elegant-spinner-1.0.1"
+      sources."has-unicode-2.0.1"
+      sources."listify-1.0.0"
+      sources."log-update-1.0.2"
+      sources."minimist-1.2.0"
+      sources."promise-finally-3.0.0"
+      sources."typings-core-2.3.3"
+      sources."update-notifier-2.2.0"
+      sources."wordwrap-1.0.0"
+      sources."xtend-4.0.1"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."ansi-regex-2.1.1"
+      sources."slice-ansi-1.0.0"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."wcwidth-1.0.1"
+      sources."defaults-1.0.3"
+      sources."clone-1.0.2"
+      sources."ansi-escapes-1.4.0"
+      sources."cli-cursor-1.0.2"
+      sources."restore-cursor-1.0.1"
+      sources."exit-hook-1.1.1"
+      sources."onetime-1.1.0"
+      sources."array-uniq-1.0.3"
+      sources."configstore-3.1.1"
+      sources."debug-2.6.9"
+      sources."detect-indent-5.0.0"
+      sources."graceful-fs-4.1.11"
+      sources."has-1.0.1"
+      sources."invariant-2.2.2"
+      sources."is-absolute-0.2.6"
+      sources."jspm-config-0.3.4"
+      sources."lockfile-1.0.3"
+      sources."make-error-cause-1.2.2"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."object.pick-1.3.0"
+      sources."parse-json-2.2.0"
+      sources."popsicle-9.1.0"
+      sources."popsicle-proxy-agent-3.0.0"
+      sources."popsicle-retry-3.2.1"
+      sources."popsicle-rewrite-1.0.0"
+      sources."popsicle-status-2.0.1"
+      sources."rc-1.2.1"
+      sources."rimraf-2.6.2"
+      sources."sort-keys-1.1.2"
+      sources."string-template-1.0.0"
+      sources."strip-bom-3.0.0"
+      sources."thenify-3.3.0"
+      sources."throat-3.2.0"
+      sources."touch-1.0.0"
+      sources."typescript-2.5.2"
+      sources."zip-object-0.1.0"
+      sources."dot-prop-4.2.0"
+      sources."make-dir-1.0.0"
+      sources."unique-string-1.0.0"
+      sources."write-file-atomic-2.3.0"
+      sources."xdg-basedir-3.0.0"
+      sources."is-obj-1.0.1"
+      sources."pify-2.3.0"
+      sources."crypto-random-string-1.0.0"
+      sources."imurmurhash-0.1.4"
+      sources."signal-exit-3.0.2"
+      sources."ms-2.0.0"
+      sources."function-bind-1.1.1"
+      sources."loose-envify-1.3.1"
+      sources."js-tokens-3.0.2"
+      sources."is-relative-0.2.1"
+      sources."is-windows-0.2.0"
+      sources."is-unc-path-0.1.2"
+      sources."unc-path-regex-0.1.2"
+      sources."any-promise-1.3.0"
+      sources."make-error-1.3.0"
+      sources."isobject-3.0.1"
+      sources."error-ex-1.3.1"
+      sources."is-arrayish-0.2.1"
+      sources."concat-stream-1.6.0"
+      sources."form-data-2.3.1"
+      sources."tough-cookie-2.3.3"
+      sources."inherits-2.0.3"
+      sources."typedarray-0.0.6"
+      sources."readable-stream-2.3.3"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
+      sources."util-deprecate-1.0.2"
+      sources."asynckit-0.4.0"
+      sources."combined-stream-1.0.5"
+      sources."mime-types-2.1.17"
+      sources."delayed-stream-1.0.0"
+      sources."mime-db-1.30.0"
+      sources."punycode-1.4.1"
+      sources."http-proxy-agent-1.0.0"
+      sources."https-proxy-agent-1.0.0"
+      sources."agent-base-2.1.1"
+      sources."extend-3.0.1"
+      sources."semver-5.0.3"
+      sources."deep-extend-0.4.2"
+      sources."ini-1.3.4"
+      sources."strip-json-comments-2.0.1"
+      sources."glob-7.1.2"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."minimatch-3.0.4"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
+      sources."is-plain-obj-1.1.0"
+      sources."nopt-1.0.10"
+      sources."abbrev-1.1.0"
+      (sources."boxen-1.2.1" // {
+        dependencies = [
+          sources."chalk-2.1.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.4.0"
+        ];
+      })
+      sources."import-lazy-2.1.0"
+      sources."is-npm-1.0.0"
+      sources."latest-version-3.1.0"
+      sources."semver-diff-2.1.0"
+      sources."ansi-align-2.0.0"
+      sources."camelcase-4.1.0"
+      sources."cli-boxes-1.0.0"
+      sources."term-size-1.2.0"
+      (sources."widest-line-1.0.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."is-fullwidth-code-point-1.0.0"
+        ];
+      })
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
+      sources."execa-0.7.0"
+      sources."cross-spawn-5.1.0"
+      sources."get-stream-3.0.0"
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
+      sources."strip-eof-1.0.0"
+      sources."lru-cache-4.1.1"
+      sources."shebang-command-1.2.0"
+      sources."which-1.3.0"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."shebang-regex-1.0.0"
+      sources."isexe-2.0.0"
+      sources."path-key-2.0.1"
+      sources."code-point-at-1.1.0"
+      sources."number-is-nan-1.0.1"
+      (sources."package-json-4.0.1" // {
+        dependencies = [
+          sources."semver-5.4.1"
+        ];
+      })
+      sources."got-6.7.1"
+      sources."registry-auth-token-3.3.1"
+      sources."registry-url-3.1.0"
+      sources."create-error-class-3.0.2"
+      sources."duplexer3-0.1.4"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."lowercase-keys-1.0.0"
+      sources."timed-out-4.0.1"
+      sources."unzip-response-2.0.1"
+      sources."url-parse-lax-1.0.0"
+      sources."capture-stack-trace-1.0.0"
+      sources."prepend-http-1.0.4"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The TypeScript Definition Manager";
+      homepage = https://github.com/typings/typings;
+      license = "MIT";
+    };
+    production = true;
+  };
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
@@ -35186,6 +35518,7 @@ in
         dependencies = [
           sources."debug-2.6.8"
           sources."qs-6.5.0"
+          sources."serve-static-1.12.4"
         ];
       })
       (sources."express-session-1.15.5" // {
@@ -35296,7 +35629,13 @@ in
       })
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
-      sources."serve-static-1.12.4"
+      (sources."serve-static-1.12.6" // {
+        dependencies = [
+          sources."send-0.15.6"
+          sources."debug-2.6.9"
+          sources."fresh-0.5.2"
+        ];
+      })
       sources."signals-1.0.0"
       sources."snapsvg-0.5.1"
       sources."socket.io-2.0.3"
@@ -35374,9 +35713,9 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      (sources."finalhandler-1.0.5" // {
+      (sources."finalhandler-1.0.6" // {
         dependencies = [
-          sources."debug-2.6.8"
+          sources."debug-2.6.9"
         ];
       })
       sources."fresh-0.5.0"
@@ -35707,7 +36046,7 @@ in
       sources."isstream-0.1.2"
       sources."performance-now-0.2.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
       sources."har-schema-1.0.5"
@@ -36333,7 +36672,7 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."nan-2.7.0"
-      sources."node-pre-gyp-0.6.37"
+      sources."node-pre-gyp-0.6.38"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
       (sources."rc-1.2.1" // {
@@ -36341,14 +36680,10 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.82.0"
+      sources."request-2.81.0"
+      sources."hawk-3.1.3"
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
-      (sources."tape-4.8.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."abbrev-1.1.0"
@@ -36373,81 +36708,79 @@ in
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
+      sources."form-data-2.1.4"
+      (sources."har-validator-4.2.1" // {
+        dependencies = [
+          sources."ajv-4.11.8"
+        ];
+      })
+      sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.17"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
-      sources."qs-6.5.1"
+      sources."performance-now-0.2.0"
+      sources."qs-6.4.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."har-schema-2.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
+      sources."har-schema-1.0.5"
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.30.0"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."deep-equal-1.0.1"
-      sources."defined-1.0.0"
-      sources."for-each-0.3.2"
-      sources."function-bind-1.1.1"
-      sources."has-1.0.1"
-      sources."object-inspect-1.3.0"
-      sources."resolve-1.4.0"
-      sources."resumer-0.0.0"
-      sources."string.prototype.trim-1.1.2"
-      sources."through-2.3.8"
-      sources."is-function-1.0.1"
-      sources."path-parse-1.0.5"
-      sources."define-properties-1.1.2"
-      sources."es-abstract-1.8.2"
-      sources."foreach-2.0.5"
-      sources."object-keys-1.0.11"
-      sources."es-to-primitive-1.1.1"
-      sources."is-callable-1.1.3"
-      sources."is-regex-1.0.4"
-      sources."is-date-object-1.0.1"
-      sources."is-symbol-1.0.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-2.0.0"
@@ -36755,7 +37088,7 @@ in
       sources."lodash.debounce-3.1.1"
       sources."os-name-1.0.3"
       sources."request-2.82.0"
-      sources."tough-cookie-2.3.2"
+      sources."tough-cookie-2.3.3"
       sources."uuid-3.1.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -36896,7 +37229,7 @@ in
       sources."is-root-1.0.0"
       sources."is-docker-1.1.0"
       sources."arrify-1.0.1"
-      sources."debug-2.6.8"
+      sources."debug-2.6.9"
       sources."npmlog-2.0.4"
       sources."ms-2.0.0"
       sources."rx-4.1.0"
diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix
index 082a8c88c61..9bb65d042b9 100644
--- a/pkgs/development/pure-modules/gen/default.nix
+++ b/pkgs/development/pure-modules/gen/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     homepage = http://puredocs.bitbucket.org/pure-gen.html;
     license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
     maintainers = with stdenv.lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index 4dfe83f6758..e5c92ffcde2 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, buildPythonPackage, fetchurl,
+{ stdenv, buildPythonPackage, fetchPypi,
   asgiref, django, daphne
 }:
 buildPythonPackage rec {
   pname = "channels";
   name = "${pname}-${version}";
-  version = "1.1.6";
+  version = "1.1.8";
 
-  src = fetchurl {
-    url = "mirror://pypi/c/channels/${name}.tar.gz";
-    sha256 = "44ab9a1f610ecc9ac25d5f90e7a44f49b18de28a05a26fe34e935af257f1eefe";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0gsy3hwn1vd709jkw8ay44qrm6aw7qggr312z8xwzq0x4ihjda02";
   };
 
   # Files are missing in the distribution
diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix
new file mode 100644
index 00000000000..231a52c9d7a
--- /dev/null
+++ b/pkgs/development/python-modules/ephem/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, glibcLocales, pytest }:
+
+buildPythonPackage rec {
+  pname = "ephem";
+  name = "${pname}-${version}";
+  version = "3.7.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7a4c82b1def2893e02aec0394f108d24adb17bd7b0ca6f4bc78eb7120c0212ac";
+  };
+
+  patchFlags = "-p0";
+  checkInputs = [ pytest glibcLocales ];
+  # JPLTest uses assets not distributed in package
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" py.test --pyargs ephem.tests -k "not JPLTest"
+  '';
+
+  # Unfortunately, the tests are broken for Python 3 in 3.7.6.0. They have been
+  # fixed in https://github.com/brandon-rhodes/pyephem/commit/c8633854e2d251a198b0f701d0528b508baa2411
+  # but there has not been a new release since then.
+  doCheck = !isPy3k;
+
+  meta = with stdenv.lib; {
+    description = "Compute positions of the planets and stars";
+    homepage = https://pypi.python.org/pypi/ephem/;
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ chrisrosset ];
+  };
+}
diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix
new file mode 100644
index 00000000000..3a8426e201f
--- /dev/null
+++ b/pkgs/development/python-modules/hupper/default.nix
@@ -0,0 +1,20 @@
+{ buildPythonPackage, fetchPypi, python
+, pytest, pytestcov, watchdog, mock
+}:
+
+buildPythonPackage rec {
+  pname = "hupper";
+  version = "1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02lj6kgaf9xpr0binxwac3gpdhljglyj9fr78s165jc7qd7mifdg";
+  };
+
+  checkPhase = ''
+    py.test
+  '';
+
+  checkInputs = [ pytest pytestcov watchdog mock ];
+}
diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
index 17792723e4a..7405f7f74cd 100644
--- a/pkgs/development/python-modules/keystoneauth1/default.nix
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@@ -2,24 +2,34 @@
 , pbr, testtools, testresources, testrepository, mock
 , pep8, fixtures, mox3, requests-mock
 , iso8601, requests, six, stevedore, webob, oslo-config
+, pyyaml, betamax, oauthlib
 }:
 
 buildPythonPackage rec {
   pname = "keystoneauth1";
-  version = "3.1.0";
+  version = "3.2.0";
   name = "${pname}-${version}";
   disabled = isPyPy; # a test fails
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e5abfa8bbe866d52ca56afbe528d15214a60033cc1dc9804478cae7424f0f8fb";
+    sha256 = "0rg3harfyvai34lrjiqnl1crmvswjvj8nsviasnz4b9pcvp3d03n";
   };
 
-  buildInputs = [ pbr testtools testresources testrepository mock
-                  pep8 fixtures mox3 requests-mock ];
-  propagatedBuildInputs = [ iso8601 requests six stevedore
-                            webob oslo-config ];
+  buildInputs = [ pbr  ];
+  checkInputs = [ pyyaml betamax oauthlib testtools testresources
+                  testrepository mock pep8 fixtures mox3 requests-mock ];
+  propagatedBuildInputs = [ iso8601 requests six stevedore webob ];
 
+  doCheck = true;
+  # 1. oslo-config
+  # 2. oslo-utils
+  # 3. requests-kerberos
+  preCheck = ''
+    rm keystoneauth1/tests/unit/loading/test_{session,conf,adapter}.py
+    rm keystoneauth1/tests/unit/access/test_v{2,3}_access.py
+    rm keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py
+  '';
   postPatch = ''
     sed -i 's@python@${python.interpreter}@' .testr.conf
     substituteInPlace requirements.txt --replace "argparse" ""
diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix
index 51b2f0df75d..fce8c21284c 100644
--- a/pkgs/development/python-modules/oslo-config/default.nix
+++ b/pkgs/development/python-modules/oslo-config/default.nix
@@ -1,16 +1,17 @@
-{ buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock }:
+{ lib, buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock,
+debtcollector, rfc3986, pyyaml, oslo-i18n }:
 
 buildPythonPackage rec {
   pname = "oslo.config";
-  version = "4.11.0";
+  version = "4.12.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1be8aaba466a3449fdb21ee8f7025b0d3d252c8c7568b8d5d05ceff58617cd05";
+    sha256 = "1pa9lajsadyq47bmxx12dxlcmnqsqlgnb55hwqas26lgnb2073dx";
   };
 
-  propagatedBuildInputs = [ pbr six netaddr stevedore ];
+  propagatedBuildInputs = [ pbr six netaddr stevedore debtcollector rfc3986 pyyaml oslo-i18n ];
   buildInputs = [ mock ];
 
   # TODO: circular import on oslo-i18n
@@ -20,6 +21,12 @@ buildPythonPackage rec {
     substituteInPlace requirements.txt --replace "argparse" ""
   '';
 
-  # Requires a bunch of new packages
-  meta.broken = true;
+  meta = with lib; {
+    description = "Oslo Configuration API";
+    homepage = "https://docs.openstack.org/oslo.config/latest/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ makefu ];
+  };
+
+
 }
diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
new file mode 100644
index 00000000000..330ecfc7c67
--- /dev/null
+++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
@@ -0,0 +1,22 @@
+{ buildPythonPackage, fetchPypi, python
+, plaster, PasteDeploy
+, pytest, pytestcov
+}:
+
+buildPythonPackage rec {
+  pname = "plaster_pastedeploy";
+  version = "0.4.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lrbkya5birfmg9gnfcnsa9id28klmjcqbm33rcg69pv9sfld4jv";
+  };
+
+  checkPhase = ''
+    py.test
+  '';
+
+  propagatedBuildInputs = [ plaster PasteDeploy ];
+  checkInputs = [ pytest pytestcov ];
+}
diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix
new file mode 100644
index 00000000000..9f370a9c0fb
--- /dev/null
+++ b/pkgs/development/python-modules/plaster/default.nix
@@ -0,0 +1,20 @@
+{ buildPythonPackage, fetchPypi, python
+, pytest, pytestcov
+}:
+
+buildPythonPackage rec {
+  pname = "plaster";
+  version = "0.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0z48pis4qyhyqj3ia82r04diaa153dw66wrpbly06hdzvhw8j0ia";
+  };
+
+  checkPhase = ''
+    py.test
+  '';
+
+  checkInputs = [ pytest pytestcov ];
+}
diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix
index 28870d3db85..9d29e109db4 100644
--- a/pkgs/development/python-modules/python-gnupg/default.nix
+++ b/pkgs/development/python-modules/python-gnupg/default.nix
@@ -17,7 +17,8 @@ buildPythonPackage rec {
     substituteInPlace gnupg.py \
     --replace "gpgbinary='gpg'" "gpgbinary='${gnupg1}/bin/gpg'"
     substituteInPlace test_gnupg.py \
-    --replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg1}/bin/gpg'"
+    --replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg1}/bin/gpg'" \
+    --replace "test_search_keys" "disabled__test_search_keys"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix
index b728d4f6b94..8e10fbb2258 100644
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/pkgs/development/python-modules/pywbem/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2
+{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, libxml2
 , m2crypto, ply, pyyaml, six
 , httpretty, lxml, mock, pytest, requests
 }:
@@ -14,6 +14,12 @@ buildPythonPackage rec {
     sha256 = "0jcwklip03xcni0dvsk9va8ilqz21g4fxwqd5kzvv91slaadfcym";
   };
 
+  patches = [
+    # fix timezone handling so the tests pass again. Can go when 0.10.1 is released
+    # https://github.com/pywbem/pywbem/issues/755#issuecomment-327508681
+    ./make_cimdatetime_timezone_aware.patch
+  ];
+
   propagatedBuildInputs = [ m2crypto ply pyyaml six ];
 
   checkInputs = [ httpretty lxml mock pytest requests ];
diff --git a/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch b/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch
new file mode 100644
index 00000000000..55fb9bbb12d
--- /dev/null
+++ b/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch
@@ -0,0 +1,491 @@
+From bb7fa19d636d999bf844d80939e155b8f212ef3e Mon Sep 17 00:00:00 2001
+From: Andreas Maier <maiera@de.ibm.com>
+Date: Fri, 23 Jun 2017 19:13:51 +0200
+Subject: [PATCH] Made CIMDateTime always timezone-aware, re-enabled
+ test_cim_types.py
+
+Details:
+- Ensured that 'CIMDateTime' objects for point in time values are
+  timezone-aware when supplied with a timezone-naive 'datetime'
+  object. This does not change the behavior, but increases code
+  clarity.
+- Clarified that in the documentation of 'CIMDateTime'.
+- Added testcases for CIMDateTime.
+- Re-enabled the testing of test_cim_types.py. Since its change
+  to using pytest it was not run because the test methods were
+  all static methods which apparently does not work. Not sure
+  this ever worked.
+
+Signed-off-by: Andreas Maier <maiera@de.ibm.com>
+---
+ docs/changes.rst            |   5 +
+ pywbem/cim_types.py         |  22 +--
+ testsuite/test_cim_types.py | 369 +++++++++++++++++++++++---------------------
+ 3 files changed, 207 insertions(+), 189 deletions(-)
+
+diff --git a/docs/changes.rst b/docs/changes.rst
+index 272ed30d..6fdfbcf4 100644
+--- a/docs/changes.rst
++++ b/docs/changes.rst
+@@ -72,6 +72,11 @@ Enhancements
+
+ * Added unit test for recorder. See issue #676
+
++* Ensured that `CIMDateTime` objects for point in time values are
++  timezone-aware when supplied with a timezone-naive `datetime` object.
++  This does not change the behavior, but increases code clarity.
++  Clarified that in the documentation of  `CIMDateTime`. See issue #698.
++
+ Bug fixes
+ ^^^^^^^^^
+
+diff --git a/pywbem/cim_types.py b/pywbem/cim_types.py
+index 6d1f140c..5ecc7707 100644
+--- a/pywbem/cim_types.py
++++ b/pywbem/cim_types.py
+@@ -74,6 +74,7 @@
+ import re
+ import warnings
+ import six
++import copy
+
+ from . import config
+
+@@ -294,9 +295,11 @@ def __init__(self, dtarg):
+             * A :term:`string` object will be
+               interpreted as CIM datetime format (see :term:`DSP0004`) and
+               will result in a point in time or a time interval.
+-            * A :class:`py:datetime.datetime` object must be timezone-aware
+-              (see :class:`~pywbem.MinutesFromUTC`) and will result in a point
+-              in time.
++            * A :class:`py:datetime.datetime` object will result in a point
++              in time. If the :class:`py:datetime.datetime` object is
++              timezone-aware (see :class:`~pywbem.MinutesFromUTC`), the
++              specified timezone will be used. Otherwise, a default timezone
++              of UTC will be assumed.
+             * A :class:`py:datetime.timedelta` object will result in a time
+               interval.
+             * Another :class:`~pywbem.CIMDateTime` object will be copied.
+@@ -342,14 +345,15 @@ def __init__(self, dtarg):
+                     raise ValueError('dtarg argument "%s" has an invalid CIM '
+                                      'datetime format' % dtarg)
+         elif isinstance(dtarg, datetime):
+-            self.__datetime = dtarg
++            if dtarg.tzinfo is None:
++                self.__datetime = dtarg.replace(tzinfo=MinutesFromUTC(0))
++            else:
++                self.__datetime = copy.copy(dtarg)
+         elif isinstance(dtarg, timedelta):
+-            self.__timedelta = dtarg
++            self.__timedelta = copy.copy(dtarg)
+         elif isinstance(dtarg, CIMDateTime):
+-            # pylint: disable=protected-access
+-            self.__datetime = dtarg.__datetime
+-            # pylint: disable=protected-access
+-            self.__timedelta = dtarg.__timedelta
++            self.__datetime = copy.copy(dtarg.datetime)
++            self.__timedelta = copy.copy(dtarg.timedelta)
+         else:
+             raise TypeError('dtarg argument "%s" has an invalid type: %s '
+                             '(expected datetime, timedelta, string, or '
+diff --git a/testsuite/test_cim_types.py b/testsuite/test_cim_types.py
+index 4ae354d3..b1f54d06 100755
+--- a/testsuite/test_cim_types.py
++++ b/testsuite/test_cim_types.py
+@@ -43,105 +43,99 @@ def integer_tuple(request):
+     return request.param
+
+
+-class TestIntegers:
+-    """
+-    Test CIM integer data type classes.
+-    """
+-
+-    @staticmethod
+-    def test_class_attrs_class(integer_tuple):
+-        """Test class attrs via class level"""
+-        obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
+-        assert obj_type.cimtype == exp_cimtype
+-        assert obj_type.minvalue == exp_minvalue
+-        assert obj_type.maxvalue == exp_maxvalue
+-
+-    @staticmethod
+-    def test_class_attrs_inst(integer_tuple):
+-        """Test class attrs via instance level"""
+-        obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
+-        obj = obj_type(42)
+-        assert obj.cimtype == exp_cimtype
+-        assert obj.minvalue == exp_minvalue
+-        assert obj.maxvalue == exp_maxvalue
+-
+-    @staticmethod
+-    def test_inheritance(integer_tuple):
+-        """Test inheritance"""
+-        obj_type = integer_tuple[0]
+-        obj = obj_type(42)
+-        assert isinstance(obj, obj_type)
+-        assert isinstance(obj, CIMType)
+-        assert isinstance(obj, CIMInt)
+-        assert not isinstance(obj, CIMFloat)
+-
+-    @staticmethod
+-    def test_init_int(integer_tuple):
+-        """Test initialization from integer value"""
+-        obj_type = integer_tuple[0]
+-        obj = obj_type(42)
+-        assert obj == 42
+-
+-    @staticmethod
+-    def test_init_str(integer_tuple):
+-        """Test initialization from string value"""
+-        obj_type = integer_tuple[0]
+-        obj = obj_type('42')
+-        assert obj == 42
+-
+-    @staticmethod
+-    def test_init_str_base10(integer_tuple):
+-        """Test initialization from string value with base 10"""
+-        obj_type = integer_tuple[0]
+-        obj = obj_type('42', 10)
+-        assert obj == 42
+-
+-    @staticmethod
+-    def test_init_str_base16(integer_tuple):
+-        """Test initialization from string value with base 16"""
+-        obj_type = integer_tuple[0]
+-        obj = obj_type('2A', 16)
+-        assert obj == 42
+-
+-    @staticmethod
+-    def test_init_minimum(integer_tuple):
+-        """Test initialization from integer value at minimum"""
+-        obj_type = integer_tuple[0]
+-        exp_minvalue = integer_tuple[2]
+-        obj = obj_type(exp_minvalue)
+-        assert obj == exp_minvalue
+-
+-    @staticmethod
+-    def test_init_maximum(integer_tuple):
+-        """Test initialization from integer value at maximum"""
+-        obj_type = integer_tuple[0]
+-        exp_maxvalue = integer_tuple[3]
+-        obj = obj_type(exp_maxvalue)
+-        assert obj == exp_maxvalue
+-
+-    @staticmethod
+-    def test_init_too_low(integer_tuple):
+-        """Test initialization from integer value below minimum"""
+-        obj_type = integer_tuple[0]
+-        exp_minvalue = integer_tuple[2]
+-        try:
+-            obj_type(exp_minvalue - 1)
+-        except ValueError:
+-            pass
+-        else:
+-            raise AssertionError("ValueError was not raised.")
+-
+-    @staticmethod
+-    def test_init_too_high(integer_tuple):
+-        """Test initialization from integer value above maximum"""
+-        obj_type = integer_tuple[0]
+-        exp_maxvalue = integer_tuple[3]
+-        try:
+-            obj_type(exp_maxvalue + 1)
+-        except ValueError:
+-            pass
+-        else:
+-            raise AssertionError("ValueError was not raised.")
++def test_integer_class_attrs_class(integer_tuple):
++    """Test class attrs via class level"""
++    obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
++    assert obj_type.cimtype == exp_cimtype
++    assert obj_type.minvalue == exp_minvalue
++    assert obj_type.maxvalue == exp_maxvalue
++
++
++def test_integer_class_attrs_inst(integer_tuple):
++    """Test class attrs via instance level"""
++    obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
++    obj = obj_type(42)
++    assert obj.cimtype == exp_cimtype
++    assert obj.minvalue == exp_minvalue
++    assert obj.maxvalue == exp_maxvalue
++
++
++def test_integer_inheritance(integer_tuple):
++    """Test inheritance"""
++    obj_type = integer_tuple[0]
++    obj = obj_type(42)
++    assert isinstance(obj, obj_type)
++    assert isinstance(obj, CIMType)
++    assert isinstance(obj, CIMInt)
++    assert not isinstance(obj, CIMFloat)
++
++
++def test_integer_init_int(integer_tuple):
++    """Test initialization from integer value"""
++    obj_type = integer_tuple[0]
++    obj = obj_type(42)
++    assert obj == 42
++
++
++def test_integer_init_str(integer_tuple):
++    """Test initialization from string value"""
++    obj_type = integer_tuple[0]
++    obj = obj_type('42')
++    assert obj == 42
++
++
++def test_integer_init_str_base10(integer_tuple):
++    """Test initialization from string value with base 10"""
++    obj_type = integer_tuple[0]
++    obj = obj_type('42', 10)
++    assert obj == 42
++
++
++def test_integer_init_str_base16(integer_tuple):
++    """Test initialization from string value with base 16"""
++    obj_type = integer_tuple[0]
++    obj = obj_type('2A', 16)
++    assert obj == 42
++
++
++def test_integer_init_minimum(integer_tuple):
++    """Test initialization from integer value at minimum"""
++    obj_type = integer_tuple[0]
++    exp_minvalue = integer_tuple[2]
++    obj = obj_type(exp_minvalue)
++    assert obj == exp_minvalue
++
++
++def test_integer_init_maximum(integer_tuple):
++    """Test initialization from integer value at maximum"""
++    obj_type = integer_tuple[0]
++    exp_maxvalue = integer_tuple[3]
++    obj = obj_type(exp_maxvalue)
++    assert obj == exp_maxvalue
++
++
++def test_integer_init_too_low(integer_tuple):
++    """Test initialization from integer value below minimum"""
++    obj_type = integer_tuple[0]
++    exp_minvalue = integer_tuple[2]
++    try:
++        obj_type(exp_minvalue - 1)
++    except ValueError:
++        pass
++    else:
++        raise AssertionError("ValueError was not raised.")
++
++
++def test_integer_init_too_high(integer_tuple):
++    """Test initialization from integer value above maximum"""
++    obj_type = integer_tuple[0]
++    exp_maxvalue = integer_tuple[3]
++    try:
++        obj_type(exp_maxvalue + 1)
++    except ValueError:
++        pass
++    else:
++        raise AssertionError("ValueError was not raised.")
+
+
+ #
+@@ -164,47 +158,41 @@ def real_tuple(request):
+     return request.param
+
+
+-class TestReals:
+-    """
+-    Test CIM real data type classes.
+-    """
+-
+-    @staticmethod
+-    def test_class_attrs_class(real_tuple):
+-        """Test class attrs via class level"""
+-        obj_type, exp_cimtype = real_tuple
+-        assert obj_type.cimtype == exp_cimtype
+-
+-    @staticmethod
+-    def test_class_attrs_inst(real_tuple):
+-        """Test class attrs via instance level"""
+-        obj_type, exp_cimtype = real_tuple
+-        obj = obj_type(42)
+-        assert obj.cimtype == exp_cimtype
+-
+-    @staticmethod
+-    def test_inheritance(real_tuple):
+-        """Test inheritance"""
+-        obj_type = real_tuple[0]
+-        obj = obj_type(42)
+-        assert isinstance(obj, obj_type)
+-        assert isinstance(obj, CIMType)
+-        assert isinstance(obj, CIMFloat)
+-        assert not isinstance(obj, CIMInt)
+-
+-    @staticmethod
+-    def test_init_float(real_tuple):
+-        """Test initialization from floating point value"""
+-        obj_type = real_tuple[0]
+-        obj = obj_type(42.0)
+-        assert obj == 42.0
+-
+-    @staticmethod
+-    def test_init_str(real_tuple):
+-        """Test initialization from string value"""
+-        obj_type = real_tuple[0]
+-        obj = obj_type('42.0')
+-        assert obj == 42.0
++def test_real_class_attrs_class(real_tuple):
++    """Test class attrs via class level"""
++    obj_type, exp_cimtype = real_tuple
++    assert obj_type.cimtype == exp_cimtype
++
++
++def test_real_class_attrs_inst(real_tuple):
++    """Test class attrs via instance level"""
++    obj_type, exp_cimtype = real_tuple
++    obj = obj_type(42)
++    assert obj.cimtype == exp_cimtype
++
++
++def test_real_inheritance(real_tuple):
++    """Test inheritance"""
++    obj_type = real_tuple[0]
++    obj = obj_type(42)
++    assert isinstance(obj, obj_type)
++    assert isinstance(obj, CIMType)
++    assert isinstance(obj, CIMFloat)
++    assert not isinstance(obj, CIMInt)
++
++
++def test_real_init_float(real_tuple):
++    """Test initialization from floating point value"""
++    obj_type = real_tuple[0]
++    obj = obj_type(42.0)
++    assert obj == 42.0
++
++
++def test_real_init_str(real_tuple):
++    """Test initialization from string value"""
++    obj_type = real_tuple[0]
++    obj = obj_type('42.0')
++    assert obj == 42.0
+
+
+ #
+@@ -271,6 +259,26 @@ def test_init_str(real_tuple):
+         '20140924193040.654321+120'
+     ),
+     (
++        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
++                 microsecond=654321, tzinfo=MinutesFromUTC(0)),
++        'timestamp',
++        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
++                 microsecond=654321, tzinfo=MinutesFromUTC(0)),
++        None,
++        0,
++        '20140924193040.654321+000'
++    ),
++    (
++        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
++                 microsecond=654321),
++        'timestamp',
++        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
++                 microsecond=654321, tzinfo=MinutesFromUTC(0)),
++        None,
++        0,
++        '20140924193040.654321+000'
++    ),
++    (
+         '20140924193040.654321+120',
+         'timestamp',
+         datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
+@@ -325,46 +333,47 @@ def datetime_init_tuple(request):
+     return request.param
+
+
+-class TestDatetime:
+-    """
+-    Test CIM real data type classes.
+-    """
+-
+-    @staticmethod
+-    def test_class_attrs_class():
+-        """Test class attrs via class level"""
+-        assert CIMDateTime.cimtype == 'datetime'
+-
+-    @staticmethod
+-    def test_class_attrs_inst():
+-        """Test class attrs via instance level"""
+-        obj = CIMDateTime('00000000000000.000000:000')
+-        assert obj.cimtype == 'datetime'
+-
+-    @staticmethod
+-    def test_inheritance():
+-        """Test inheritance"""
+-        obj = CIMDateTime('00000000000000.000000:000')
+-        assert isinstance(obj, CIMDateTime)
+-        assert isinstance(obj, CIMType)
+-        assert not isinstance(obj, CIMFloat)
+-        assert not isinstance(obj, CIMInt)
+-
+-    @staticmethod
+-    def test_init(datetime_init_tuple):
+-        """Test initialization from all input types"""
+-        (dtarg, exp_kind, exp_datetime, exp_timedelta, exp_minutesfromutc,
+-         exp_str) = datetime_init_tuple
+-        try:
+-            obj = CIMDateTime(dtarg)
+-        except Exception as exc:
+-            assert isinstance(exc, exp_kind)
+-        else:
+-            assert obj.is_interval == (exp_kind == 'interval')
+-            assert obj.datetime == exp_datetime
+-            assert obj.timedelta == exp_timedelta
+-            assert obj.minutes_from_utc == exp_minutesfromutc
+-            assert str(obj) == exp_str
++def test_datetime_class_attrs_class():
++    """Test class attrs via class level"""
++    assert CIMDateTime.cimtype == 'datetime'
++
++
++def test_datetime_class_attrs_inst():
++    """Test class attrs via instance level"""
++    obj = CIMDateTime('00000000000000.000000:000')
++    assert obj.cimtype == 'datetime'
++
++
++def test_datetime_inheritance():
++    """Test inheritance"""
++    obj = CIMDateTime('00000000000000.000000:000')
++    assert isinstance(obj, CIMDateTime)
++    assert isinstance(obj, CIMType)
++    assert not isinstance(obj, CIMFloat)
++    assert not isinstance(obj, CIMInt)
++
++
++def test_datetime_init(datetime_init_tuple):
++    """Test initialization from all input types"""
++    (dtarg, exp_kind, exp_datetime, exp_timedelta, exp_minutesfromutc,
++     exp_str) = datetime_init_tuple
++    try:
++        obj = CIMDateTime(dtarg)
++    except Exception as exc:
++        assert isinstance(exc, exp_kind)
++    else:
++        assert obj.is_interval == (exp_kind == 'interval')
++        assert obj.datetime == exp_datetime
++        if obj.datetime is not None:
++            assert isinstance(obj.datetime, datetime)
++            # We ensure that the datetime is always timezone-aware:
++            assert obj.datetime.tzinfo is not None
++        assert obj.timedelta == exp_timedelta
++        if obj.timedelta is not None:
++            assert isinstance(obj.timedelta, timedelta)
++        assert obj.minutes_from_utc == exp_minutesfromutc
++        assert str(obj) == exp_str
++
+
+ # TODO: Add testcases for get_local_utcoffset()
+ # TODO: Add testcases for now()
diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix
new file mode 100644
index 00000000000..35d723836c9
--- /dev/null
+++ b/pkgs/development/python-modules/requestsexceptions/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, pbr }:
+
+buildPythonPackage rec {
+  pname = "requestsexceptions";
+  version = "1.3.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0gim00vi7vfq16y8b9m1vpy01grqvrdrbh88jb98qx6n6sk1n54g";
+  };
+
+  propagatedBuildInputs = [ pbr ];
+
+  # upstream hacking package is not required for functional testing
+  patchPhase = ''
+    sed -i '/^hacking/d' test-requirements.txt
+  '';
+
+  meta = with lib; {
+    description = "Import exceptions from potentially bundled packages in requests.";
+    homepage = "https://pypi.python.org/pypi/requestsexceptions";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ makefu ];
+    patforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix
new file mode 100644
index 00000000000..e3f65b6660c
--- /dev/null
+++ b/pkgs/development/python-modules/simanneal/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
+
+buildPythonPackage rec {
+  pname = "simanneal";
+  version = "0.4.1";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "perrygeo";
+    repo = "simanneal";
+    rev = version;
+    sha256 = "12499wvf7ii7cy8z2f1d472p7q9napg1lj0h9xx8l1mbr1hjlp3q";
+  };
+
+  checkInputs = [ pytest ];
+  checkPhase = "pytest tests";
+
+  meta = with stdenv.lib; {
+    description = "A python implementation of the simulated annealing optimization technique";
+    homepage = https://github.com/perrygeo/simanneal;
+    license = licenses.isc;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
index 9b431f29acb..258f84e8c72 100644
--- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6";
   };
 
-  checkInputs = [ unittest2 scripttest pytz pylint  mock testtools ];
+  checkInputs = [ unittest2 scripttest pytz pylint mock testtools tempest-lib ];
   propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ];
 
   checkPhase = ''
@@ -27,12 +27,12 @@ buildPythonPackage rec {
     ${python.interpreter} setup.py test
   '';
 
-  # Tests require tempest-lib which requires the broken oslo-config
-  doCheck = false;
+  doCheck = true;
 
   meta = with stdenv.lib; {
     homepage = http://code.google.com/p/sqlalchemy-migrate/;
     description = "Schema migration tools for SQLAlchemy";
     license = licenses.asl20;
+    maintainers = with maintainers; [ makefu ];
   };
 }
diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
new file mode 100644
index 00000000000..9f48b8fb971
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, isPy3k
+, bleach_1_5_0
+, numpy
+, werkzeug
+, protobuf
+, markdown
+}:
+
+# tensorflow is built from a downloaded wheel, because the upstream
+# project's build system is an arcane beast based on
+# bazel. Untangling it and building the wheel from source is an open
+# problem.
+
+buildPythonPackage rec {
+  pname = "tensorflow-tensorboard";
+  version = "0.1.5";
+  name = "${pname}-${version}";
+  format = "wheel";
+
+  src = fetchPypi ({
+    pname = "tensorflow_tensorboard";
+    inherit version;
+    format = "wheel";
+  } // (if isPy3k then {
+    python = "py3";
+    sha256 = "0sfia05y1mzgy371faj96vgzhag1rgpa3gnbz9w1fay13jryw26x";
+  } else {
+    python = "py2";
+    sha256 = "0qx4f55zp54x079kxir4zz5b1ckiglsdcb9afz5wcdj6af4a6czg";
+  }));
+
+  propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown ];
+
+  meta = with stdenv.lib; {
+    description = "TensorFlow helps the tensors flow";
+    homepage = http://tensorflow.org;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 5019f17f788..ab604c17300 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -1,7 +1,8 @@
 { stdenv
+, lib
 , fetchurl
 , buildPythonPackage
-, isPy36, isPy35, isPy27
+, isPy3k, isPy35, isPy36, isPy27
 , cudaSupport ? false
 , cudatoolkit ? null
 , cudnn ? null
@@ -9,10 +10,10 @@
 , numpy
 , six
 , protobuf
-, swig
-, werkzeug
 , mock
+, backports_weakref
 , zlib
+, tensorflow-tensorboard
 }:
 
 assert cudaSupport -> cudatoolkit != null
@@ -29,10 +30,10 @@ assert ! (stdenv.isDarwin && cudaSupport);
 
 buildPythonPackage rec {
   pname = "tensorflow";
-  version = "1.1.0";
+  version = "1.3.0";
   name = "${pname}-${version}";
   format = "wheel";
-  disabled = ! (isPy36 || isPy35 || isPy27);
+  disabled = ! (isPy35 || isPy36 || isPy27);
 
   src = let
       tfurl = sys: proc: pykind:
@@ -47,69 +48,77 @@ buildPythonPackage rec {
         darwin.cpu = {
           py2 = {
             url = tfurl "mac" "cpu" "py2-none-any" ;
-            sha256 = "1fgf26lw0liqxc9pywc8y2mj8l1mv48nhkav0pag9vavdacb9mqr";
+            sha256 = "0nkymqbqjx8rsmc8vkc26cfsg4hpr6lj9zrwhjnfizvkzbbsh5z4";
           };
           py3 = {
             url = tfurl "mac" "cpu" "py3-none-any" ;
-            sha256 = "0z5p1fra7bih0vqn618i2w3vyy8d1rkc72k7bmjq0rw8msl717ia";
+            sha256 = "1rj4m817w3lajnb1lgn3bwfwwk3qwvypyx11dim1ybakbmsc1j20";
           };
         };
         linux-x86_64.cpu = {
           py2 = {
             url = tfurl "linux" "cpu" "cp27-none-linux_x86_64";
-            sha256 = "0ld3hqx3idxk0zcrvn3p9yqnmx09zsj3mw66jlfw6fkv5hznx8j2";
+            sha256 = "09pcyx0yfil4dm6cij8n3907pfgva07a38avrbai4qk5h6hxm8w9";
           };
           py35 = {
             url = tfurl "linux" "cpu" "cp35-cp35m-linux_x86_64";
-            sha256 = "0ahz9222rzqrk43lb9w4m351klkm6mlnnvw8xfqip28vbmymw90b";
+            sha256 = "0p10zcf41pi33bi025fibqkq9rpd3v0rrbdmc9i9yd7igy076a07";
           };
           py36 = {
             url = tfurl "linux" "cpu" "cp36-cp36m-linux_x86_64";
-            sha256 = "1a2cc8ihl94iqff76nxg6bq85vfb7sj5cvvi9sxy2f43k32fi4lv";
+            sha256 = "1qm8lm2f6bf9d462ybgwrz0dn9i6cnisgwdvyq9ssmy2f1gp8hxk";
           };
-
         };
         linux-x86_64.cuda = {
           py2 = {
             url = tfurl "linux" "gpu" "cp27-none-linux_x86_64";
-            sha256 = "1baa9jwr6f8f62dyx6isbw8yyrd0pi1dz1srjblfqsyk1x3pnfvh";
+            sha256 = "10yyyn4g2fsv1xgmw99bbr0fg7jvykay4gb5pxrrylh7h38h6wah";
           };
           py35 = {
             url = tfurl "linux" "gpu" "cp35-cp35m-linux_x86_64";
-            sha256 = "0606m2awy0ifhniy8lsyhd0xc388dgrwksn87989xlgy90wpxi92";
+            sha256 = "0icwnhkcf3fxr6bmbihqzipnn4pxybd06qv7l3k0p4xdgycwzmzk";
           };
           py36 = {
             url = tfurl "linux" "gpu" "cp36-cp36m-linux_x86_64";
-            sha256 = "0lvbmfa87qzrajadpsf13gi3l71vryzkryzqfvkykivqrdjsvj8q";
+            sha256 = "12g3akkr083gs3sisjbmm0lpsk8phn3dvy7jjfadfxshqc7za14i";
           };
-
         };
       };
     in
     fetchurl (
       if stdenv.isDarwin then
-        if isPy27 then
-          dls.darwin.cpu.py2
-        else
+        if isPy3k then
           dls.darwin.cpu.py3
-      else if isPy36 then
-        if cudaSupport then
-          dls.linux-x86_64.cuda.py36
-        else dls.linux-x86_64.cpu.py36
-      else if isPy35 then
-        if cudaSupport then
-          dls.linux-x86_64.cuda.py35
-        else dls.linux-x86_64.cpu.py35
+        else
+          dls.darwin.cpu.py2
       else
-        if cudaSupport then
-          dls.linux-x86_64.cuda.py2
+        if isPy35 then
+          if cudaSupport then
+            dls.linux-x86_64.cuda.py35
+          else
+            dls.linux-x86_64.cpu.py35
+        else if isPy36 then
+          if cudaSupport then
+            dls.linux-x86_64.cuda.py36
+          else
+            dls.linux-x86_64.cpu.py36
         else
-          dls.linux-x86_64.cpu.py2
+          if cudaSupport then
+            dls.linux-x86_64.cuda.py2
+          else
+            dls.linux-x86_64.cpu.py2
     );
 
-  propagatedBuildInputs = with stdenv.lib;
-    [ numpy six protobuf swig werkzeug mock ]
-    ++ optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ];
+  propagatedBuildInputs =
+    [ numpy six protobuf mock backports_weakref ]
+    ++ lib.optional (!isPy36) tensorflow-tensorboard
+    ++ lib.optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ];
+
+  # tensorflow-gpu depends on tensorflow_tensorboard, which cannot be
+  # built at the moment (some of its dependencies do not build
+  # [htlm5lib9999999 (seven nines) -> tensorboard], and it depends on an old version of
+  # bleach) Hence we disable dependency checking for now.
+  installFlags = lib.optional isPy36 "--no-dependencies";
 
   # Note that we need to run *after* the fixup phase because the
   # libraries are loaded at runtime. If we run in preFixup then
diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index 030693714f0..da664093d8a 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile_lib }:
+{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile-lib }:
 
 stdenv.mkDerivation rec {
   name = "g-wrap-1.9.15";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   # Note: Glib support is optional, but it's quite useful (e.g., it's
   # used by Guile-GNOME).
-  buildInputs = [ guile pkgconfig glib guile_lib ];
+  buildInputs = [ guile pkgconfig glib guile-lib ];
 
   propagatedBuildInputs = [ libffi ];
 
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index b0d5bcd28f7..ceff549f373 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages }:
 
 stdenv.mkDerivation rec {
   name = "universal-ctags-${version}";
-  version = "2017-01-08";
+  version = "2017-09-22";
 
   src = fetchFromGitHub {
     owner = "universal-ctags";
     repo = "ctags";
-    rev = "9668032d8715265ca5b4ff16eb2efa8f1c450883";
-    sha256 = "0nwcf5mh3ba0g23zw7ym73pgpfdass412k2fy67ryr9vnc709jkj";
+    rev = "b9537289952cc7b26526aaff3094599d714d1729";
+    sha256 = "1kbw9ycl2ddzpfs1v4rbqa4gdhw4inrisf4awyaxb7zxfxmbzk1g";
   };
 
+  nativeBuildInputs = [ pythonPackages.docutils ];
   buildInputs = [ autoreconfHook pkgconfig ];
 
-  # remove when https://github.com/universal-ctags/ctags/pull/1267 is merged
-  patches = [ ./sed-test.patch ];
-
   autoreconfPhase = ''
     ./autogen.sh --tmpdir
   '';
diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile b/pkgs/development/tools/misc/watson-ruby/Gemfile
new file mode 100644
index 00000000000..fc739389e84
--- /dev/null
+++ b/pkgs/development/tools/misc/watson-ruby/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'watson-ruby'
diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock
new file mode 100644
index 00000000000..fa157d794f7
--- /dev/null
+++ b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock
@@ -0,0 +1,15 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    json (2.1.0)
+    watson-ruby (1.6.3)
+      json
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  watson-ruby
+
+BUNDLED WITH
+   1.14.4
diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix
new file mode 100644
index 00000000000..32f94a1f228
--- /dev/null
+++ b/pkgs/development/tools/misc/watson-ruby/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, bundlerEnv, ruby }:
+
+
+stdenv.mkDerivation rec {
+  name = "watson-ruby-${version}";
+  version = (import ./gemset.nix).watson-ruby.version;
+
+  env = bundlerEnv rec {
+    name = "watson-ruby-gems-${version}";
+    inherit ruby;
+    # expects Gemfile, Gemfile.lock and gemset.nix in the same directory
+    gemdir = ./.;
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    ln -s ${env}/bin/watson $out/bin/watson
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An inline issue manager";
+    homepage    = http://goosecode.com/watson/;
+    license     = with licenses; mit;
+    maintainers = with maintainers; [ robertodr ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/misc/watson-ruby/gemset.nix b/pkgs/development/tools/misc/watson-ruby/gemset.nix
new file mode 100644
index 00000000000..a3bb144899c
--- /dev/null
+++ b/pkgs/development/tools/misc/watson-ruby/gemset.nix
@@ -0,0 +1,18 @@
+{
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  watson-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d5m29nr0i030q8ygmbapwri5ndcg2q6lf8a15bk79lfcp9xyj9w";
+      type = "gem";
+    };
+    version = "1.6.3";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
index a4852a8aba0..d8c289015b2 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
 
 	buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned ];
 
+  postPatch = "patchShebangs lib/generate_stubs.sh";
+
 	propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
 
 	buildPhase = "jbuilder build -p js_of_ocaml";
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 28d4724a162..63f79981e1b 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -1,6 +1,5 @@
 { stdenv, lib, fetchgit, fetchurl, makeWrapper,
-  ocaml, unzip, ncurses, curl,
-  aspcudSupport ? !stdenv.isDarwin, aspcud
+  ocaml, unzip, ncurses, curl, aspcud
 }:
 
 assert lib.versionAtLeast ocaml.version "3.12.1";
@@ -72,12 +71,10 @@ in stdenv.mkDerivation rec {
   # Dirty, but apparently ocp-build requires a TERM
   makeFlags = ["TERM=screen"];
 
-  postInstall =
-    if aspcudSupport then ''
-      wrapProgram $out/bin/opam \
-        --suffix PATH : ${aspcud}/bin
-    ''
-    else "";
+  postInstall = ''
+    wrapProgram $out/bin/opam \
+      --suffix PATH : ${aspcud}/bin
+  '';
 
   doCheck = false;
 
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 9028a796381..2c3fb763dc5 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "skopeo-${version}";
-  version = "0.1.22";
+  version = "0.1.23";
   rev = "v${version}";
 
   goPackagePath = "github.com/projectatomic/skopeo";
@@ -16,7 +16,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "projectatomic";
     repo = "skopeo";
-    sha256 = "0aivs37bcvx3g22a9r3q1vj2ahw323g1vaq9jzbmifm9k0pb07jy";
+    sha256 = "1axxnm87fpsd7q28v951ilhmzd42k8wyh741gdfdcajjwglfj0nn";
   };
 
   patches = [
diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 1e8ec2b8a6a..16e0c05e0e2 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "minecraft-server-${version}";
-  version = "1.12";
+  version = "1.12.2";
 
   src  = fetchurl {
     url    = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
-    sha256 = "02fwlg4c9kqckmdi9wxi64jdqynj5myp0995aabc07746hwgzszy";
+    sha256 = "0zhnac6yvkdgdaag0gb0fgrkgizbwrpf7s76yqdiknfswrs947zy";
   };
 
   preferLocalBuild = true;
diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix
index 12d774467c5..4b2323eaa71 100644
--- a/pkgs/misc/apulse/default.nix
+++ b/pkgs/misc/apulse/default.nix
@@ -2,17 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "apulse-${version}";
-  version = "0.1.6";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "i-rinat";
     repo = "apulse";
     rev = "v${version}";
-    sha256 = "1w0mqa8gcrvvlns3pryhmlsc0g1irdnwsawx4g34wgwrp9paqqzm";
+    sha256 = "018gaxn647wz1vjbr49hfrch9svnv0d1nzijc8ckb4fsr8vv95a1";
   };
 
-  buildInputs =
-    [ alsaLib cmake pkgconfig glib ];
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ alsaLib glib ];
 
   meta = with stdenv.lib; {
     description = "PulseAudio emulation for ALSA";
diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index ae96a946e79..f538066e75c 100644
--- a/pkgs/misc/drivers/hplip/3.15.9.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -1,66 +1,62 @@
 { stdenv, fetchurl, substituteAll
 , pkgconfig
+, makeWrapper
 , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
-, net_snmp, polkit
+, net_snmp, openssl, polkit, nettools
 , bash, coreutils, utillinux
-, qtSupport ? true, qt4
+, qtSupport ? true
 , withPlugin ? false
 }:
 
 let
 
   name = "hplip-${version}";
-  version = "3.15.9";
+  version = "3.16.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0vcxz3gsqcamlzx61xm77h7c769ya8kdhzwafa9w2wvkf3l8zxd1";
+    sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn";
   };
 
   plugin = fetchurl {
     url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "1ahalw83xm8x0h6hljhnkknry1hny9flkrlzcymv8nmwgic0kjgs";
+    sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg";
   };
 
-  hplipState =
-    substituteAll
-      {
-        inherit version;
-        src = ./hplip.state;
-      };
-
-  hplipPlatforms =
-    {
-      "i686-linux"   = "x86_32";
-      "x86_64-linux" = "x86_64";
-      "armv6l-linux" = "arm32";
-      "armv7l-linux" = "arm32";
-    };
+  hplipState = substituteAll {
+    inherit version;
+    src = ./hplip.state;
+  };
+
+  hplipPlatforms = {
+    "i686-linux"   = "x86_32";
+    "x86_64-linux" = "x86_64";
+    "armv6l-linux" = "arm32";
+    "armv7l-linux" = "arm32";
+  };
 
   hplipArch = hplipPlatforms."${stdenv.system}"
     or (throw "HPLIP not supported on ${stdenv.system}");
 
-  pluginArches = [ "x86_32" "x86_64" ];
+  pluginArches = [ "x86_32" "x86_64" "arm32" ];
 
 in
 
 assert withPlugin -> builtins.elem hplipArch pluginArches
   || throw "HPLIP plugin not supported on ${stdenv.system}";
 
-stdenv.mkDerivation {
-  inherit name src version;
+pythonPackages.buildPythonApplication {
+  inherit name src;
+  format = "other";
 
   buildInputs = [
     libjpeg
     cups
     libusb1
-    pythonPackages.python
-    pythonPackages.wrapPython
     sane-backends
     dbus
     net_snmp
-  ] ++ stdenv.lib.optionals qtSupport [
-    qt4
+    openssl
   ];
 
   nativeBuildInputs = [
@@ -71,13 +67,14 @@ stdenv.mkDerivation {
     dbus
     pillow
     pygobject2
-    recursivePthLoader
     reportlab
     usbutils
   ] ++ stdenv.lib.optionals qtSupport [
     pyqt4
   ];
 
+  makeWrapperArgs = [ ''--prefix PATH : "${nettools}/bin"'' ];
+
   prePatch = ''
     # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
     find . -type f -exec sed -i \
@@ -92,6 +89,7 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     export configureFlags="$configureFlags
+      --with-hpppddir=$out/share/cups/model/HP
       --with-cupsfilterdir=$out/lib/cups/filter
       --with-cupsbackenddir=$out/lib/cups/backend
       --with-icondir=$out/share/applications
@@ -148,32 +146,30 @@ stdenv.mkDerivation {
     rm $out/etc/udev/rules.d/56-hpmud.rules
   '';
 
-  fixupPhase = ''
-    # Wrap the user-facing Python scripts in $out/bin without turning the
-    # ones in $out /share into shell scripts (they need to be importable).
-    # Note that $out/bin contains only symlinks to $out/share.
+  # The installed executables are just symlinks into $out/share/hplip,
+  # but wrapPythonPrograms ignores symlinks. We cannot replace the Python
+  # modules in $out/share/hplip with wrapper scripts because they import
+  # each other as libraries. Instead, we emulate wrapPythonPrograms by
+  # 1. Calling patchPythonProgram on the original script in $out/share/hplip
+  # 2. Making our own wrapper pointing directly to the original script.
+  dontWrapPythonPrograms = true;
+  preFixup = ''
+    buildPythonPath "$out $pythonPath"
+
     for bin in $out/bin/*; do
-      py=`readlink -m $bin`
+      py=$(readlink -m $bin)
       rm $bin
-      cp $py $bin
-      wrapPythonProgramsIn $bin "$out $pythonPath"
-      sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin
+      echo "patching \`$py'..."
+      patchPythonScript "$py"
+      echo "wrapping \`$bin'..."
+      makeWrapper "$py" "$bin" \
+          --prefix PATH ':' "$program_PATH" \
+          --set PYTHONNOUSERSITE "true" \
+          $makeWrapperArgs
     done
+  '';
 
-    # Remove originals. Knows a little too much about wrapPythonProgramsIn.
-    rm -f $out/bin/.*-wrapped
-
-    # Merely patching shebangs in $out/share does not cause trouble.
-    for i in $out/share/hplip{,/*}/*.py; do
-      substituteInPlace $i \
-        --replace /usr/bin/python \
-        ${pythonPackages.python}/bin/${pythonPackages.python.executable} \
-        --replace "/usr/bin/env python" \
-        ${pythonPackages.python}/bin/${pythonPackages.python.executable}
-    done
-
-    wrapPythonProgramsIn $out/lib "$out $pythonPath"
-
+  postFixup = ''
     substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
   '' + stdenv.lib.optionalString (!withPlugin) ''
     # A udev rule to notify users that they need the binary plugin.
@@ -192,6 +188,6 @@ stdenv.mkDerivation {
       then licenses.unfree
       else with licenses; [ mit bsd2 gpl2Plus ];
     platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ];
-    maintainers = with maintainers; [ jgeerds nckx ];
+    maintainers = with maintainers; [ jgeerds ttuegel ];
   };
 }
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 9342c547a17..a01fc74ce47 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -4,23 +4,23 @@
 , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
 , net_snmp, openssl, polkit, nettools
 , bash, coreutils, utillinux
-, qtSupport ? true
+, withQt5 ? true
 , withPlugin ? false
 }:
 
 let
 
   name = "hplip-${version}";
-  version = "3.16.11";
+  version = "3.17.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn";
+    sha256 = "0y46jjq8jdfk9m4vjq55h8yggibvqbi9rl08vni7vbhxym1diamj";
   };
 
   plugin = fetchurl {
-    url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg";
+    url = "http://hplipopensource.com/hplip-web/plugin/${name}-plugin.run";
+    sha256 = "10z8vzwcwmwni7s4j9xp0fa7l4lwrhl4kp450dga3fj0cck1gxwq";
   };
 
   hplipState = substituteAll {
@@ -69,8 +69,8 @@ pythonPackages.buildPythonApplication {
     pygobject2
     reportlab
     usbutils
-  ] ++ stdenv.lib.optionals qtSupport [
-    pyqt4
+  ] ++ stdenv.lib.optionals withQt5 [
+    pyqt5
   ];
 
   makeWrapperArgs = [ ''--prefix PATH : "${nettools}/bin"'' ];
@@ -188,6 +188,6 @@ pythonPackages.buildPythonApplication {
       then licenses.unfree
       else with licenses; [ mit bsd2 gpl2Plus ];
     platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ];
-    maintainers = with maintainers; [ jgeerds nckx ];
+    maintainers = with maintainers; [ jgeerds ttuegel ];
   };
 }
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
new file mode 100644
index 00000000000..e367d6a1498
--- /dev/null
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, gcc, glib, gtk3,
+  libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "epsxe-${version}";
+  version = "2.0.5";
+
+  src = with stdenv.lib; let
+    version2 = concatStrings (splitString "." version);
+    platform = "linux" + (optionalString stdenv.is64bit "_x64");
+  in fetchurl {
+    url = "http://www.epsxe.com/files/ePSXe${version2}${platform}.zip";
+    sha256 = if stdenv.is64bit
+             then "16fa9qc2xhaz1f6294m0b56s5l86cbmclwm9w3mqnch0yjsrvab0"
+             else "1677lclam557kp8jwvchdrk27zfj50fqx2q9i3bcx26d9k61q3kl";
+  };
+
+  nativeBuildInputs = [ unzip wrapGAppsHook ];
+  sourceRoot = ".";
+
+  buildInputs = [
+    alsaLib
+    curl
+    gdk_pixbuf
+    glib
+    gtk3
+    libX11
+    openssl
+    ncurses5
+    SDL
+    SDL_ttf
+    stdenv.cc.cc.lib
+    zlib
+  ];
+
+  dontStrip = true;
+
+  installPhase = ''
+    install -D ${if stdenv.is64bit then "epsxe_x64" else "ePSXe"} $out/bin/epsxe
+    patchelf \
+      --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
+      --set-rpath ${makeLibraryPath buildInputs} \
+      $out/bin/epsxe
+  '';
+
+  meta = {
+    homepage = http://epsxe.com/;
+    description = "Enhanced PSX (PlayStation 1) emulator";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ yegortimoshenko ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/misc/jackaudio/clang.patch b/pkgs/misc/jackaudio/clang.patch
new file mode 100644
index 00000000000..131f8c4c04d
--- /dev/null
+++ b/pkgs/misc/jackaudio/clang.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/test.cpp b/tests/test.cpp
+index 8a8a811..31e8459 100644
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
+ 	jack_nframes_t delta_time = cur_time - last_time;
+ 
+ 	Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
+-	if (delta_time > 0  && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
++	if (delta_time > 0  && (jack_nframes_t)fabs(delta_time - cur_buffer_size) > tolerance) {
+ 		printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
+ 	}
+ 
+@@ -1064,7 +1064,7 @@ int main (int argc, char *argv[])
+     }
+     jack_sleep(1 * 1000);
+     cur_buffer_size = jack_get_buffer_size(client1);
+-    if (abs((old_buffer_size * factor) - cur_buffer_size) > 5) {  // Tolerance needed for dummy driver...
++    if (fabs((old_buffer_size * factor) - cur_buffer_size) > 5) {  // Tolerance needed for dummy driver...
+         printf("!!! ERROR !!! Buffer size has not been changed !\n");
+         printf("!!! Maybe jack was compiled without the '--enable-resize' flag...\n");
+     } else {
diff --git a/pkgs/misc/jackaudio/darwin-cf.patch b/pkgs/misc/jackaudio/darwin-cf.patch
new file mode 100644
index 00000000000..0fc0902a0c4
--- /dev/null
+++ b/pkgs/misc/jackaudio/darwin-cf.patch
@@ -0,0 +1,49 @@
+diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp
+index 7eea281..4b8d75d 100644
+--- a/common/Jackdmp.cpp
++++ b/common/Jackdmp.cpp
+@@ -50,43 +50,11 @@ are "hard-coded" in the source. A much better approach would be to use the contr
+ - get available drivers and their possible parameters, then prepare to parse them.
+ */
+
+-#ifdef __APPLE__
+-#include <CoreFoundation/CFNotificationCenter.h>
+-#include <CoreFoundation/CoreFoundation.h>
+-
+-static void notify_server_start(const char* server_name)
+-{
+-    // Send notification to be used in the JackRouter plugin
+-    CFStringRef ref = CFStringCreateWithCString(NULL, server_name, kCFStringEncodingMacRoman);
+-    CFNotificationCenterPostNotificationWithOptions(CFNotificationCenterGetDistributedCenter(),
+-            CFSTR("com.grame.jackserver.start"),
+-            ref,
+-            NULL,
+-            kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions);
+-    CFRelease(ref);
+-}
+-
+-static void notify_server_stop(const char* server_name)
+-{
+-    // Send notification to be used in the JackRouter plugin
+-    CFStringRef ref1 = CFStringCreateWithCString(NULL, server_name, kCFStringEncodingMacRoman);
+-    CFNotificationCenterPostNotificationWithOptions(CFNotificationCenterGetDistributedCenter(),
+-            CFSTR("com.grame.jackserver.stop"),
+-            ref1,
+-            NULL,
+-            kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions);
+-    CFRelease(ref1);
+-}
+-
+-#else
+-
+ static void notify_server_start(const char* server_name)
+ {}
+ static void notify_server_stop(const char* server_name)
+ {}
+
+-#endif
+-
+ static void copyright(FILE* file)
+ {
+     fprintf(file, "jackdmp " VERSION "\n"
+
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 52f288deba3..20da91efede 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,9 +1,12 @@
 { stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
 , bash, libsamplerate, libsndfile, readline, eigen, celt
+# Darwin Dependencies
+, aften, AudioToolbox, CoreAudio, CoreFoundation
 
 # Optional Dependencies
 , dbus ? null, libffado ? null, alsaLib ? null
 , libopus ? null
+, darwin
 
 # Extra options
 , prefix ? ""
@@ -16,7 +19,7 @@ let
 
   libOnly = prefix == "lib";
 
-  optDbus = shouldUsePkg dbus;
+  optDbus = if stdenv.isDarwin then null else shouldUsePkg dbus;
   optPythonDBus = if libOnly then null else shouldUsePkg dbus-python;
   optLibffado = if libOnly then null else shouldUsePkg libffado;
   optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
@@ -34,21 +37,36 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];
-  buildInputs = [ python libsamplerate libsndfile readline eigen celt
+  buildInputs = [ libsamplerate libsndfile readline eigen celt
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
-  ];
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
 
-  patchPhase = ''
-    substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
+  # CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ];
+
+  prePatch = ''
+    substituteInPlace svnversion_regenerate.sh \
+        --replace /bin/bash ${bash}/bin/bash
+  '';
+
+  # It looks like one of the frameworks depends on <CoreFoundation/CFAttributedString.h>
+  # since frameworks are impure we also have to use the impure CoreFoundation here.
+  # FIXME: remove when CoreFoundation is updated to 10.11
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE"
   '';
 
   configurePhase = ''
+    runHook preConfigure
+
     python waf configure --prefix=$out \
       ${optionalString (optDbus != null) "--dbus"} \
       --classic \
       ${optionalString (optLibffado != null) "--firewire"} \
       ${optionalString (optAlsaLib != null) "--alsa"} \
       --autostart=${if (optDbus != null) then "dbus" else "classic"} \
+
+    runHook postConfigure
   '';
 
   buildPhase = ''
diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index 55765a520da..6b310236de4 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   installFlags = "DESTDIR=\${out} PREFIX=";
 
-  patchPhase = "sed -i '/chmod u+s/d' Makefile";
+  postPatch = "sed -i '/chmod u+s/d' Makefile";
 
   preBuild = optionalString (conf != null) ''
     cp ${writeText "config.def.h" conf} config.def.h
diff --git a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix b/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix
new file mode 100644
index 00000000000..4ede14d3bb3
--- /dev/null
+++ b/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, sass, glib, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  version = "20160919";
+  name = "numix-solarized-gtk-theme-${version}";
+
+  src = fetchFromGitHub {
+    owner = "Ferdi265";
+    repo = "numix-solarized-gtk-theme";
+    rev = version;
+    sha256 = "0243w918ycmf9vnkzfvwnrxz9zc6xxk7167h8ywxj901pqy59kad";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile --replace \
+      'INSTALL_DIR=$(DESTDIR)/usr/share/themes' "INSTALL_DIR=$out/share/themes"
+    patchShebangs .
+  '';
+
+  buildInputs = [sass glib gdk_pixbuf];
+
+  meta = with stdenv.lib; {
+    description = "GTK3.20-compatible version of bitterologist's Numix Solarized from deviantart";
+    longDescription = ''
+      This is a fork of the Numix GTK theme that replaces the colors of the theme
+      and icons to use the solarized theme with a solarized green accent color.
+      This theme supports both the dark and light theme, just as Numix proper.
+    '';
+    homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme;
+    downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.offline ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 24dd868d64d..adc2a6104e7 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -16,7 +16,7 @@ in
 
 # TL;DR
 # Add your plugin to ./vim-plugin-names
-# Regenerate via `nix-shell -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix"`
+# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix"`
 # Copy the generated expression(s) into this file.
 # If plugin is complicated then make changes to ./vim2nix/additional-nix-code
 
@@ -652,6 +652,17 @@ rec {
 
   };
 
+  xptemplate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "xptemplate-2017-04-18";
+    src = fetchgit {
+      url = "https://github.com/drmingdrmer/xptemplate";
+      rev = "52d84e361e9da53c4309b0d96a1ab667c67b7f07";
+      sha256 = "195r5p4cyiip64zmgcih56c59gwm0irgid6cdrqc2y747gyxmf7m";
+    };
+    dependencies = [];
+
+  };
+
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neco-ghc-2017-07-22";
     src = fetchgit {
@@ -1162,6 +1173,17 @@ rec {
 
   };
 
+  robotframework-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "robotframework-vim-2017-04-14";
+    src = fetchgit {
+      url = "https://github.com/mfukar/robotframework-vim";
+      rev = "75d5b371a4da2a090a2872d55bd0dead013f334e";
+      sha256 = "091ac5rq6f1a7j2q3dy9rc00vckv21m4wd29ijj63jannr02v5ad";
+    };
+    dependencies = [];
+
+  };
+
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-startify-2017-06-15";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index f1983e3eeb6..acde3cf2e5b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -45,6 +45,7 @@
 "github:digitaltoad/vim-jade"
 "github:dleonard0/pony-vim-syntax"
 "github:dracula/vim"
+"github:drmingdrmer/xptemplate"
 "github:eagletmt/neco-ghc"
 "github:editorconfig/editorconfig-vim"
 "github:eikenb/acp"
@@ -91,6 +92,7 @@
 "github:martinda/Jenkinsfile-vim-syntax"
 "github:megaannum/forms"
 "github:megaannum/self"
+"github:mfukar/robotframework-vim"
 "github:mhinz/vim-startify"
 "github:michaeljsmith/vim-indent-object"
 "github:mileszs/ack.vim"
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 87b2f9d3e18..b659266ace7 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -383,6 +383,8 @@ rec {
     unpackPhase ? "",
     configurePhase ? "",
     buildPhase ? "",
+    preInstall ? "",
+    postInstall ? "",
     path ? (builtins.parseDrvName name).name,
     addonInfo ? null,
     ...
@@ -390,9 +392,11 @@ rec {
     addRtp "${rtpPath}/${path}" (stdenv.mkDerivation (a // {
       name = namePrefix + name;
 
-      inherit unpackPhase configurePhase buildPhase addonInfo;
+      inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
 
       installPhase = ''
+        runHook preInstall
+
         target=$out/${rtpPath}/${path}
         mkdir -p $out/${rtpPath}
         cp -r . $target
@@ -401,6 +405,8 @@ rec {
         if [ -n "$addonInfo" ]; then
           echo "$addonInfo" > $target/addon-info.json
         fi
+
+        runHook postInstall
       '';
     }));
 
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index 7b930e86a39..081f713d054 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -23,6 +23,9 @@ with frameworks; with libs; {
   CalendarStore           = [];
   Cocoa                   = [ AppKit ];
   Collaboration           = [];
+  # Impure version of CoreFoundation, this should not be used unless another
+  # framework includes headers that are not available in the pure version.
+  CoreFoundation          = [];
   CoreAudio               = [ CF IOKit ];
   CoreAudioKit            = [ AudioUnit ];
   CoreData                = [];
diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index e2776475432..b14008e11f1 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "reattach-to-user-namespace-2.5";
+stdenv.mkDerivation rec {
+  name = "reattach-to-user-namespace-${version}";
+  version = "2.6";
 
-  src = fetchgit {
-    url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git";
-    sha256 = "0kv11vi54g6waf9941hy1pwmwyab0y7hbmbkcgwhzb5ja21ysc2a";
-    rev = "3689998acce9990726c8a68a85298ab693a62458";
+  src = fetchurl {
+    url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/archive/v2.6.tar.gz";
+    sha256 = "1d8ynzkdlxyyky9f88f7z50g9lwdydkpb2n7gkw3jgl2ac569xc0";
   };
 
   buildFlags = "ARCHES=x86_64";
@@ -16,7 +16,10 @@ stdenv.mkDerivation {
     cp reattach-to-user-namespace $out/bin/
   '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.darwin;
+  meta = with stdenv.lib; {
+    description = "A wrapper that provides access to the Mac OS X pasteboard service";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ lnl7 ];
+    platforms = platforms.darwin;
   };
 }
diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix
deleted file mode 100644
index 5fdcfa58382..00000000000
--- a/pkgs/os-specific/linux/fanctl/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, lib, fetchurl, gnugrep, glibc, gawk, coreutils, bridge-utils, iproute
-, dnsmasq, iptables, kmod, utillinux, gnused }:
-
-stdenv.mkDerivation rec {
-  name = "fanctl-${version}";
-
-  version = "0.12.0";
-
-  src = fetchurl {
-    url = "https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-fan_${version}.tar.xz";
-    sha256 = "0lj7371n06sg5mlbbfgvm0qhzgp464n6v55rgs7kmmx4d37gb5fl";
-  };
-
-  # The Ubuntu package creates a number of state/config directories upon
-  # installation, and so the fanctl script expects those directories to exist
-  # before being used. Instead, we patch the fanctl script to gracefully handle
-  # the fact that the directories might not exist yet.
-  # Also, when dnsmasq is given --conf-file="", it will still attempt to read
-  # /etc/dnsmasq.conf; if that file does not exist, dnsmasq subsequently fails,
-  # so we'll use /dev/null, which actually works as intended.
-  patches = [ ./robustness.patch ];
-
-  postPatch = ''
-    substituteInPlace fanctl \
-      --replace '@PATH@' \
-                '${lib.makeBinPath [
-                     gnugrep gawk coreutils bridge-utils iproute dnsmasq
-                     iptables kmod utillinux gnused
-                     glibc # needed for getent
-                   ]}'
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/man/man8
-    cp fanctl.8 $out/man/man8
-    cp fanctl $out/bin
-  '';
-
-  meta = with lib; {
-    description = "Ubuntu FAN network support enablement";
-    homepage = https://launchpad.net/ubuntu/+source/ubuntu-fan;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ cstrahan ];
-  };
-}
diff --git a/pkgs/os-specific/linux/fanctl/robustness.patch b/pkgs/os-specific/linux/fanctl/robustness.patch
deleted file mode 100644
index 7a70a784e3e..00000000000
--- a/pkgs/os-specific/linux/fanctl/robustness.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/fanctl b/fanctl
-index 4338b75..84cf987 100755
---- a/fanctl
-+++ b/fanctl
-@@ -5,6 +5,8 @@
- #   fanctl down 15 10.1.0.1
- #
- 
-+export PATH="@PATH@"
-+
- usage()
- {
- 	echo "Usage: $0 <cmd> [<options>...]" 1>&2
-@@ -23,8 +25,8 @@ run()
- 	"$@"
- }
- 
--state_dir="/run/ubuntu-fan"
--lconfig_dir="/var/lib/ubuntu-fan/config"
-+state_dir="/run/fan-networking"
-+lconfig_dir="/var/lib/fan-networking/config"
- 
- __ip_split()
- {
-@@ -931,12 +933,12 @@ dhcp_reconfigure()
- 		--strict-order \
- 		--bind-interfaces \
- 		--pid-file="$state_dir/dnsmasq-$C_bridge_state.pid" \
--		--conf-file= \
-+		--conf-file=/dev/null \
- 		$dhcp_flags \
- 		--dhcp-no-override \
- 		--except-interface=lo \
- 		--interface="$C_bridge" \
--		--dhcp-leasefile=/var/lib/misc/dnsmasq."$C_bridge_state".leases \
-+		--dhcp-leasefile=/var/lib/fan-networking/dnsmasq."$C_bridge_state".leases \
- 		--dhcp-authoritative \
- 	    || $fail "$C_bridge: failed to start dnsmasq"
- 
-@@ -1559,21 +1561,23 @@ cmd_config()
- 
- 	case "$cmd" in
- 	list|ls)
--		ls -1 "$lconfig_dir" | \
--		while read config
--		do
--			case "$config" in
--			*.conf)		;;
--			*)		continue ;;
--			esac
-+		if [ -d $lconfig_dir ]; then
-+			ls -1 "$lconfig_dir" | \
-+			while read config
-+			do
-+				case "$config" in
-+				*.conf)		;;
-+				*)		continue ;;
-+				esac
- 
--			config=$( echo "$config" | sed \
--				-e 's/.conf$//' \
--				-e 's/--/ /g' \
--				-e 's@-@/@g'
--			)
--			echo "$config"
--		done
-+				config=$( echo "$config" | sed \
-+					-e 's/.conf$//' \
-+					-e 's/--/ /g' \
-+					-e 's@-@/@g'
-+				)
-+				echo "$config"
-+			done
-+		fi
- 		;;
- 	show)
- 		cmd_decode_init
-@@ -1588,6 +1592,7 @@ cmd_config()
- 		[ -f "$uconfig" ] && cat "$uconfig"
- 		;;
- 	set)
-+		mkdir -p $lconfig_dir || fail "could not create config directory ($lconfig_dir)"
- 		cmd_decode_init
- 		if ! cmd_decode_config "config set" "$@"; then
- 			fail "invalid config"
diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
new file mode 100644
index 00000000000..1564069a0a9
--- /dev/null
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, libargon2, pam }:
+
+# Don't use this for anything important yet!
+
+buildGoPackage rec {
+  name = "fscrypt-${version}";
+  version = "0.2.1";
+
+  goPackagePath = "github.com/google/fscrypt";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "fscrypt";
+    rev = version;
+    sha256 = "0ais6l0dxinnspi6cjnzyk55cdkfsz2bzbaybg6cb4q8a5kzaccq";
+  };
+
+  buildInputs = [ libargon2 pam ];
+
+  meta = with stdenv.lib; {
+    description =
+      "A high-level tool for the management of Linux filesystem encryption";
+    longDescription = ''
+      This tool manages metadata, key generation, key wrapping, PAM integration,
+      and provides a uniform interface for creating and modifying encrypted
+      directories.
+    '';
+    inherit (src.meta) homepage;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix
new file mode 100644
index 00000000000..81cd95332c8
--- /dev/null
+++ b/pkgs/os-specific/linux/fscryptctl/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub }:
+
+# Don't use this for anything important yet!
+
+stdenv.mkDerivation rec {
+  name = "fscryptctl-unstable-${version}";
+  version = "2017-09-12";
+
+  goPackagePath = "github.com/google/fscrypt";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "fscryptctl";
+    rev = "f037dcf4354ce8f25d0f371b58dfe7a7ac27576f";
+    sha256 = "1dw1y6jbm2ibn7npvpw6cl28rcz0jz4as2yl6walz7ppmqbj9scf";
+  };
+
+  patches = [ ./install.patch ];
+
+  makeFlags = [ "DESTDIR=$(out)/bin" ];
+
+  meta = with stdenv.lib; {
+    description = ''
+      A low-level tool that handles raw keys and manages policies for Linux
+      filesystem encryption
+    '';
+    inherit (src.meta) homepage;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/os-specific/linux/fscryptctl/install.patch b/pkgs/os-specific/linux/fscryptctl/install.patch
new file mode 100644
index 00000000000..11f9843bbfb
--- /dev/null
+++ b/pkgs/os-specific/linux/fscryptctl/install.patch
@@ -0,0 +1,22 @@
+--- a/Makefile	2017-09-24 22:48:19.322116085 +0200
++++ b/Makefile	2017-09-24 22:50:07.655725022 +0200
+@@ -19,7 +19,7 @@
+ CFLAGS += -O2 -Wall
+ 
+ INSTALL = install
+-DESTDIR = /usr/local/bin
++DESTDIR ?= /usr/local/bin
+ 
+ OBJECTS = $(NAME).o sha512.o
+ 
+@@ -38,8 +38,8 @@
+ 	@python -m pytest test.py -s -q
+ 
+ install: $(NAME)
+-	$(INSTALL) -d $(DEST_DIR)
+-	$(INSTALL) $(NAME) $(DEST_DIR)
++	$(INSTALL) -d $(DESTDIR)
++	$(INSTALL) $(NAME) $(DESTDIR)
+ 
+ clean:
+ 	rm -f $(OBJECTS)
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index 8938eaae818..b18b6de0d14 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -1,8 +1,10 @@
 { version, sha256Hash, maintainers }:
 
 { stdenv, fetchFromGitHub, fetchpatch
-, utillinux, autoconf, automake, libtool, gettext
-, fusePackages }:
+, fusePackages, utillinux, gettext
+, autoconf, automake, libtool
+, meson, ninja, pkgconfig
+}:
 
 let
   isFuse3 = stdenv.lib.hasPrefix "3" version;
@@ -16,15 +18,25 @@ in stdenv.mkDerivation rec {
     sha256 = sha256Hash;
   };
 
-  patches = stdenv.lib.optional
-    (!isFuse3 && stdenv.isAarch64)
-    (fetchpatch {
-      url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
-      sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
-  });
-
-  nativeBuildInputs = [ libtool autoconf automake ];
-  buildInputs = [ gettext utillinux ];
+  patches =
+    stdenv.lib.optional
+      (!isFuse3 && stdenv.isAarch64)
+      (fetchpatch {
+        url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
+        sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
+      })
+    ++ stdenv.lib.optionals isFuse3 [
+      ./fuse3-no-udev.patch # only required for udevrulesdir
+      ./fuse3-install.patch
+      # install_man makes the build non-reproducible by encoding the date
+      ./fuse3-install_man.patch
+    ];
+
+
+  nativeBuildInputs = if isFuse3
+    then [ meson ninja pkgconfig ]
+    else [ autoconf automake libtool ];
+  buildInputs = stdenv.lib.optional (!isFuse3) gettext;
 
   outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";
 
@@ -39,27 +51,27 @@ in stdenv.mkDerivation rec {
     export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\""
 
     sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
-    sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
-
-    ./makeconf.sh
-  '';
-
-  postFixup = if isFuse3 then ''
-    cd $out
-
+    '' + (if isFuse3 then ''
+      # The configure phase will delete these files (temporary workaround for
+      # ./fuse3-install_man.patch)
+      install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1
+      install -D -m444 doc/mount.fuse.8 $out/share/man/man8/mount.fuse.8
+    '' else ''
+      sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
+      ./makeconf.sh
+    '');
+
+  postFixup = "cd $out\n" + (if isFuse3 then ''
     mv bin/mount.fuse3 bin/mount.fuse
-    mv etc/udev/rules.d/99-fuse3.rules etc/udev/rules.d/99-fuse.rules
 
     install -D -m555 bin/mount.fuse $common/bin/mount.fuse
     install -D -m444 etc/udev/rules.d/99-fuse.rules $common/etc/udev/rules.d/99-fuse.rules
     install -D -m444 share/man/man8/mount.fuse.8.gz $common/share/man/man8/mount.fuse.8.gz
   '' else ''
-    cd $out
-
     cp ${fusePackages.fuse_3.common}/bin/mount.fuse bin/mount.fuse
     cp ${fusePackages.fuse_3.common}/etc/udev/rules.d/99-fuse.rules etc/udev/rules.d/99-fuse.rules
     cp ${fusePackages.fuse_3.common}/share/man/man8/mount.fuse.8.gz share/man/man8/mount.fuse.8.gz
-  '';
+  '');
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 1a6c45c7cee..669d115aab9 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -13,8 +13,8 @@ in {
   };
 
   fuse_3 = mkFuse {
-    version = "3.1.1";
-    sha256Hash = "14mazl2i55fp4vjphwgcmk3mp2x3mhqwh9nci0rd0jl5lhpdmpq6";
+    version = "3.2.0";
+    sha256Hash = "0bfpwkfamg4rcbq1s7v5rblpisqq73z6d5j3dxypgqll07hfg51x";
     maintainers = [ maintainers.primeos ];
   };
 }
diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/pkgs/os-specific/linux/fuse/fuse3-install.patch
new file mode 100644
index 00000000000..f77639367ac
--- /dev/null
+++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch
@@ -0,0 +1,24 @@
+--- a/util/install_helper.sh	1970-01-01 01:00:01.000000000 +0100
++++ b/util/install_helper.sh	2017-09-21 23:43:50.703942577 +0200
+@@ -11,19 +11,11 @@
+ udevrulesdir="$3"
+ prefix="${MESON_INSTALL_DESTDIR_PREFIX}"
+ 
+-chown root:root "${prefix}/${bindir}/fusermount3"
+-chmod u+s "${prefix}/${bindir}/fusermount3"
+-
+-if test ! -e "${DESTDIR}/dev/fuse"; then
+-    mkdir -p "${DESTDIR}/dev"
+-    mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229
+-fi
+-
+ install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
+-        "${DESTDIR}/${udevrulesdir}/99-fuse3.rules"
++        "${prefix}/${udevrulesdir}/99-fuse.rules"
+ 
+ install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
+-        "${DESTDIR}/etc/init.d/fuse3"
++        "${prefix}/etc/init.d/fuse3"
+ 
+ if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
+     /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
diff --git a/pkgs/os-specific/linux/fuse/fuse3-install_man.patch b/pkgs/os-specific/linux/fuse/fuse3-install_man.patch
new file mode 100644
index 00000000000..491f92e364f
--- /dev/null
+++ b/pkgs/os-specific/linux/fuse/fuse3-install_man.patch
@@ -0,0 +1,8 @@
+--- a/doc/meson.build	1970-01-01 01:00:01.000000000 +0100
++++ b/doc/meson.build	2017-09-22 01:53:01.859190506 +0200
+@@ -1,5 +1,4 @@
+ # Attention, emacs, please use -*- mode: python -*-
+ # (even though this isn't actually Python code)
+ 
+-install_man('fusermount3.1', 'mount.fuse.8')
+ 
diff --git a/pkgs/os-specific/linux/fuse/fuse3-no-udev.patch b/pkgs/os-specific/linux/fuse/fuse3-no-udev.patch
new file mode 100644
index 00000000000..c48abfe59c5
--- /dev/null
+++ b/pkgs/os-specific/linux/fuse/fuse3-no-udev.patch
@@ -0,0 +1,12 @@
++++ b/util/meson.build	2017-09-23 20:59:31.555392297 +0200
+--- a/util/meson.build	2017-09-23 20:59:58.333180437 +0200
+@@ -18,8 +18,7 @@
+            install: true,
+            install_dir: get_option('sbindir'))
+ 
+-udev = dependency('udev')
+-udevrulesdir = join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
++udevrulesdir = 'etc/udev/rules.d'
+ 
+ meson.add_install_script('install_helper.sh', get_option('sysconfdir'),
+                          get_option('bindir'), udevrulesdir)
diff --git a/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch b/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch
deleted file mode 100644
index 733a5122d13..00000000000
--- a/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: POC fan driver support
- POC Fan driver support
-Author: Jay Vosburgh <jay.vosburgh@canonical.com>
-
-Index: iproute2-4.1.1/include/linux/if_tunnel.h
-===================================================================
---- iproute2-4.1.1.orig/include/linux/if_tunnel.h
-+++ iproute2-4.1.1/include/linux/if_tunnel.h
-@@ -75,6 +75,9 @@ enum {
- 	IFLA_IPTUN_ENCAP_SPORT,
- 	IFLA_IPTUN_ENCAP_DPORT,
-	IFLA_IPTUN_COLLECT_METADATA,
-+
-+	IFLA_IPTUN_FAN_UNDERLAY = 32,
-+
- 	__IFLA_IPTUN_MAX,
- };
- #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
-Index: iproute2-4.1.1/ip/link_iptnl.c
-===================================================================
---- iproute2-4.1.1.orig/ip/link_iptnl.c
-+++ iproute2-4.1.1/ip/link_iptnl.c
-@@ -66,6 +66,7 @@ static int iptunnel_parse_opt(struct lin
- 	__u32 link = 0;
- 	__u32 laddr = 0;
- 	__u32 raddr = 0;
-+	__u32 underlay = 0;
- 	__u8 ttl = 0;
- 	__u8 tos = 0;
- 	__u8 pmtudisc = 1;
-@@ -174,6 +175,9 @@ get_failed:
- 				raddr = get_addr32(*argv);
- 			else
- 				raddr = 0;
-+		} else if (strcmp(*argv, "underlay") == 0) {
-+			NEXT_ARG();
-+			underlay = get_addr32(*argv);
- 		} else if (strcmp(*argv, "local") == 0) {
- 			NEXT_ARG();
- 			if (strcmp(*argv, "any"))
-@@ -318,6 +322,9 @@ get_failed:
- 		}
- 	}
- 
-+	if (underlay)
-+		addattr32(n, 1024, IFLA_IPTUN_FAN_UNDERLAY, underlay);
-+
- 	return 0;
- }
- 
-@@ -349,6 +356,14 @@ static void iptunnel_print_opt(struct li
- 
- 	fprintf(f, "local %s ", local);
- 
-+	if (tb[IFLA_IPTUN_FAN_UNDERLAY]) {
-+		unsigned addr = rta_getattr_u32(tb[IFLA_IPTUN_FAN_UNDERLAY]);
-+
-+		if (addr)
-+			fprintf(f, "underlay %s ",
-+				format_host_r(AF_INET, 4, &addr, s1, sizeof(s1)));
-+	}
-+
- 	if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) {
- 		unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
- 		const char *n = if_indextoname(link, s2);
diff --git a/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch b/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch
deleted file mode 100644
index 634daa0de29..00000000000
--- a/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Description: Fan driver support v3
- Fan driver support v3
-Author: Jay Vosburgh <jay.vosburgh@canonical.com>
-Index: iproute2-4.1.1/include/linux/if_tunnel.h
-===================================================================
---- iproute2-4.1.1.orig/include/linux/if_tunnel.h
-+++ iproute2-4.1.1/include/linux/if_tunnel.h
-@@ -59,6 +59,7 @@ enum {
- 	IFLA_IPTUN_ENCAP_DPORT,
- 
- 	IFLA_IPTUN_FAN_UNDERLAY = 32,
-+	IFLA_IPTUN_FAN_MAP = 33,
- 
- 	__IFLA_IPTUN_MAX,
- };
-@@ -134,4 +135,20 @@ enum {
- };
- 
- #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)
-+
-+enum {
-+	IFLA_FAN_UNSPEC,
-+	IFLA_FAN_MAPPING,
-+	__IFLA_FAN_MAX,
-+};
-+
-+#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
-+
-+struct ip_tunnel_fan_map {
-+	__be32		underlay;
-+	__be32		overlay;
-+	__u16		underlay_prefix;
-+	__u16		overlay_prefix;
-+};
-+
- #endif /* _IF_TUNNEL_H_ */
-Index: iproute2-4.1.1/ip/link_iptnl.c
-===================================================================
---- iproute2-4.1.1.orig/ip/link_iptnl.c
-+++ iproute2-4.1.1/ip/link_iptnl.c
-@@ -49,6 +49,42 @@ static void usage(int sit)
- 	print_usage(stderr, sit);
- 	exit(-1);
- }
-+static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
-+{
-+	inet_prefix underlay, overlay;
-+	struct ip_tunnel_fan_map map;
-+	struct rtattr *nest;
-+	char **argv = *argvp;
-+	int argc = *argcp;
-+
-+	nest = addattr_nest(n, 1024, IFLA_IPTUN_FAN_MAP);
-+	while (argc > 0) {
-+		char *colon = strchr(*argv, ':');
-+
-+		if (!colon)
-+			break;
-+		*colon = '\0';
-+
-+		if (get_prefix(&overlay, *argv, AF_INET))
-+			invarg("invalid fan-map overlay", *argv);
-+		if (get_prefix(&underlay, colon + 1, AF_INET))
-+			invarg("invalid fan-map underlay", colon + 1);
-+		
-+		memcpy(&map.underlay, underlay.data, 4);
-+		map.underlay_prefix = underlay.bitlen;
-+		memcpy(&map.overlay, overlay.data, 4);
-+		map.overlay_prefix = overlay.bitlen;
-+
-+		argc--, argv++;
-+
-+		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
-+	}
-+	addattr_nest_end(n, nest);
-+
-+	*argcp = argc;
-+	*argvp = argv;
-+	return 0;
-+}
- 
- static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
- 			      struct nlmsghdr *n)
-@@ -178,6 +214,10 @@ get_failed:
- 		} else if (strcmp(*argv, "underlay") == 0) {
- 			NEXT_ARG();
- 			underlay = get_addr32(*argv);
-+		} else if (strcmp(*argv, "fan-map") == 0) {
-+			NEXT_ARG();
-+			if (fan_parse_map(&argc, &argv, n))
-+				invarg("invalid fan-map", *argv);
- 		} else if (strcmp(*argv, "local") == 0) {
- 			NEXT_ARG();
- 			if (strcmp(*argv, "any"))
-@@ -328,6 +368,28 @@ get_failed:
- 	return 0;
- }
- 
-+static void fan_print_map(FILE *f, struct rtattr *attr)
-+{
-+	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
-+	struct ip_tunnel_fan_map *m;
-+	struct rtattr *i;
-+	int rem;
-+	int p;
-+
-+	fprintf(f, "fan-map ");
-+
-+	rem = RTA_PAYLOAD(attr);
-+	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
-+		p = RTA_PAYLOAD(i);
-+		m = RTA_DATA(i);
-+		fprintf(f, "%s/%d:%s/%d ",
-+			rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),
-+			m->overlay_prefix,
-+			rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),
-+			m->underlay_prefix);
-+	}
-+}
-+
- static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
- {
- 	char s1[1024];
-@@ -364,6 +426,9 @@ static void iptunnel_print_opt(struct li
- 				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));
- 	}
- 
-+	if (tb[IFLA_IPTUN_FAN_MAP])
-+		fan_print_map(f, tb[IFLA_IPTUN_FAN_MAP]);
-+
- 	if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) {
- 		unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
- 		const char *n = if_indextoname(link, s2);
diff --git a/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch b/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch
deleted file mode 100644
index 070023d0b92..00000000000
--- a/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Description: Fan driver support VXLAN (p4)
- Fan driver setup support for vxlan interfaces.
-
-Index: iproute2-4.3.0/include/linux/if_link.h
-===================================================================
---- iproute2-4.3.0.orig/include/linux/if_link.h
-+++ iproute2-4.3.0/include/linux/if_link.h
-@@ -392,6 +392,7 @@ enum {
- 	IFLA_VXLAN_COLLECT_METADATA,
- 	IFLA_VXLAN_LABEL,
- 	IFLA_VXLAN_GPE,
-+	IFLA_VXLAN_FAN_MAP = 33,
- 	__IFLA_VXLAN_MAX
- };
- #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)
-Index: iproute2-4.3.0/include/linux/if_tunnel.h
-===================================================================
---- iproute2-4.3.0.orig/include/linux/if_tunnel.h
-+++ iproute2-4.3.0/include/linux/if_tunnel.h
-@@ -145,7 +145,7 @@ enum {
- 
- #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
- 
--struct ip_tunnel_fan_map {
-+struct ifla_fan_map {
- 	__be32		underlay;
- 	__be32		overlay;
- 	__u16		underlay_prefix;
-Index: iproute2-4.3.0/ip/iplink_vxlan.c
-===================================================================
---- iproute2-4.3.0.orig/ip/iplink_vxlan.c
-+++ iproute2-4.3.0/ip/iplink_vxlan.c
-@@ -15,7 +15,10 @@
- #include <net/if.h>
- #include <linux/ip.h>
- #include <linux/if_link.h>
-+#include <linux/types.h>
- #include <arpa/inet.h>
-+#include <linux/in6.h>
-+#include <linux/if_tunnel.h>
- 
- #include "rt_names.h"
- #include "utils.h"
-@@ -43,6 +46,45 @@ static void explain(void)
- 	print_explain(stderr);
- }
- 
-+static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
-+{
-+	inet_prefix underlay, overlay;
-+	struct ifla_fan_map map;
-+	struct rtattr *nest;
-+	char **argv = *argvp;
-+	int argc = *argcp;
-+
-+	nest = addattr_nest(n, 1024, IFLA_VXLAN_FAN_MAP);
-+	while (argc > 0) {
-+		char *colon = strchr(*argv, ':');
-+
-+		if (!colon) {
-+			PREV_ARG();
-+			break;
-+		}
-+		*colon = '\0';
-+
-+		if (get_prefix(&overlay, *argv, AF_INET))
-+			invarg("invalid fan-map overlay", *argv);
-+		if (get_prefix(&underlay, colon + 1, AF_INET))
-+			invarg("invalid fan-map underlay", colon + 1);
-+
-+		memcpy(&map.underlay, underlay.data, 4);
-+		map.underlay_prefix = underlay.bitlen;
-+		memcpy(&map.overlay, overlay.data, 4);
-+		map.overlay_prefix = overlay.bitlen;
-+
-+		argc--, argv++;
-+
-+		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
-+	}
-+	addattr_nest_end(n, nest);
-+
-+	*argcp = argc;
-+	*argvp = argv;
-+	return 0;
-+}
-+
- static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
- 			  struct nlmsghdr *n)
- {
-@@ -201,6 +243,10 @@ static int vxlan_parse_opt(struct link_u
- 			gbp = 1;
- 		} else if (!matches(*argv, "gpe")) {
- 			gpe = 1;
-+		} else if (!matches(*argv, "fan-map")) {
-+			NEXT_ARG();
-+			if (fan_parse_map(&argc, &argv, n))
-+				invarg("invalid fan-map", *argv);
- 		} else if (matches(*argv, "help") == 0) {
- 			explain();
- 			return -1;
-@@ -279,6 +325,28 @@ static int vxlan_parse_opt(struct link_u
- 	return 0;
- }
- 
-+static void fan_print_map(FILE *f, struct rtattr *attr)
-+{
-+	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
-+	struct ifla_fan_map *m;
-+	struct rtattr *i;
-+	int rem;
-+	int p;
-+
-+	fprintf(f, "fan-map ");
-+
-+	rem = RTA_PAYLOAD(attr);
-+	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
-+		p = RTA_PAYLOAD(i);
-+		m = RTA_DATA(i);
-+		fprintf(f, "%s/%d:%s/%d ",
-+			rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),
-+			m->overlay_prefix,
-+			rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),
-+			m->underlay_prefix);
-+	}
-+}
-+
- static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
- {
- 	__u32 vni;
-@@ -321,6 +389,9 @@ static void vxlan_print_opt(struct link_
- 		}
- 	}
- 
-+	if (tb[IFLA_VXLAN_FAN_MAP])
-+		fan_print_map(f, tb[IFLA_VXLAN_FAN_MAP]);
-+
- 	if (tb[IFLA_VXLAN_LOCAL]) {
- 		__be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_LOCAL]);
- 		if (addr)
-Index: iproute2-4.3.0/ip/link_iptnl.c
-===================================================================
---- iproute2-4.3.0.orig/ip/link_iptnl.c
-+++ iproute2-4.3.0/ip/link_iptnl.c
-@@ -49,10 +49,11 @@ static void usage(int sit)
- 	print_usage(stderr, sit);
- 	exit(-1);
- }
-+
- static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
- {
- 	inet_prefix underlay, overlay;
--	struct ip_tunnel_fan_map map;
-+	struct ifla_fan_map map;
- 	struct rtattr *nest;
- 	char **argv = *argvp;
- 	int argc = *argcp;
-@@ -61,8 +62,10 @@ static int fan_parse_map(int *argcp, cha
- 	while (argc > 0) {
- 		char *colon = strchr(*argv, ':');
- 
--		if (!colon)
-+		if (!colon) {
-+			PREV_ARG();
- 			break;
-+		}
- 		*colon = '\0';
- 
- 		if (get_prefix(&overlay, *argv, AF_INET))
-@@ -371,7 +374,7 @@ get_failed:
- static void fan_print_map(FILE *f, struct rtattr *attr)
- {
- 	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
--	struct ip_tunnel_fan_map *m;
-+	struct ifla_fan_map *m;
- 	struct rtattr *i;
- 	int rem;
- 	int p;
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 404e21bcbce..1d312be42ec 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,6 +1,4 @@
-{ fetchurl, stdenv, lib, flex, bison, db, iptables, pkgconfig
-, enableFan ? false
-}:
+{ fetchurl, stdenv, lib, flex, bison, db, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
@@ -11,14 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "0zdxdsxyaazl85xhwskvsmpyzwf5qp21cvjsi1lw3xnrc914q2if";
   };
 
-  patches = lib.optionals enableFan [
-    # These patches were pulled from:
-    # https://launchpad.net/ubuntu/xenial/+source/iproute2
-    ./1000-ubuntu-poc-fan-driver.patch
-    ./1001-ubuntu-poc-fan-driver-v3.patch
-    ./1002-ubuntu-poc-fan-driver-vxlan.patch
-  ];
-
   preConfigure = ''
     patchShebangs ./configure
     sed -e '/ARPDDIR/d' -i Makefile
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index e97d5c47da2..7d67bc2ff60 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.14-rc1";
-  modDirVersion = "4.14.0-rc1";
+  version = "4.14-rc2";
+  modDirVersion = "4.14.0-rc2";
   extraMeta.branch = "4.14";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0dhcsjgcy28pyyzwf2s0862p92bwb324kapli2y9n90bw0kl53gi";
+    sha256 = "0ahcmr0y9i47lwjn140w436hg68apnh8rl66y56qdvdic8f61mj4";
   };
 
   # Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix
index 3116c50435a..a656db30645 100644
--- a/pkgs/os-specific/linux/mba6x_bl/default.nix
+++ b/pkgs/os-specific/linux/mba6x_bl/default.nix
@@ -1,23 +1,16 @@
 { fetchFromGitHub, kernel, stdenv }:
 
-with stdenv.lib;
-
-let pkgName = "mba6x_bl";
-in
-
 stdenv.mkDerivation rec {
-  name = "${pkgName}-${version}";
-  version = "2016-04-22";
+  name = "mba6x_bl-2016-12-08";
 
   src = fetchFromGitHub {
     owner = "patjak";
-    repo = pkgName;
-    rev = "d05c125efe182376ddab30d486994ec00e144650";
-    sha256 = "15h90z3ijq4lv37nmx70xqggcvn21vr7mki2psk1jyj88in3j3xn";
+    repo = "mba6x_bl";
+    rev = "b96aafd30c18200b4ad1f6eb995bc19200f60c47";
+    sha256 = "10payvfxahazdxisch4wm29fhl8y07ki72q4c78sl4rn73sj6yjq";
   };
 
   enableParallelBuilding = true;
-
   hardeningDisable = [ "pic" ];
 
   makeFlags = [
@@ -25,7 +18,7 @@ stdenv.mkDerivation rec {
     "INSTALL_MOD_PATH=$(out)"
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "MacBook Air 6,1 and 6,2 (mid 2013) backlight driver";
     homepage = https://github.com/patjak/mba6x_bl;
     license = licenses.gpl2;
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 99813d38236..cd7733f43a4 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -46,7 +46,8 @@ installPhase() {
 
     # Install ICDs.
     install -Dm644 nvidia.icd $out/etc/OpenCL/vendors/nvidia.icd
-    if [ -e nvidia_icd.json ]; then
+    if [ -e nvidia_icd.json.template ]; then
+        sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
         install -Dm644 nvidia_icd.json $out/share/vulkan/icd.d/nvidia.json
     fi
     if [ "$useGLVND" = "1" ]; then
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 2d8ee2719da..31af8a49de1 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -68,8 +68,8 @@ in
     };
 
     splUnstable = common {
-      version = "2017-08-11";
-      rev = "9df9692637aeee416f509c7f39655beb2d35b549";
-      sha256 = "1dggf6xqgk2f7vccv6cgvr8krj7h9f921szp1j2qbxnnq41m37mi";
+      version = "2017-09-26";
+      rev = "e8474f9ad3b3d23c3277535c4f53f8fd1e6cbd74";
+      sha256 = "1hydfhmngpq31gxkxipqxnin74l760d1ia202h12vsgix9sp32h7";
     };
 }
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index ca5cea0a012..fbd2cff1b17 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "sysdig-${version}";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "draios";
     repo = "sysdig";
     rev = version;
-    sha256 = "0xw4in2yb3ynpc8jwl95j92kbyr7fzda3mab8nyxcyld7gshrlvd";
+    sha256 = "1hmkjvfg3371hp873mnkjq9cirqszw2ji4p7mb6jcn9ihwxil2z2";
   };
 
   buildInputs = [
@@ -29,12 +29,6 @@ stdenv.mkDerivation rec {
     "-DluaL_getn(L,i)=((int)lua_objlen(L,i))"
   ];
 
-  postPatch = ''
-    sed 's|curl/curlbuild\.h|curl/system.h|' -i \
-        userspace/libsinsp/marathon_http.cpp \
-        userspace/libsinsp/mesos_http.cpp
- '';
-
   preConfigure = ''
     export INSTALL_MOD_PATH="$out"
   '' + optionalString (kernel != null) ''
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index c3af49e08f2..6ab9063d719 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -157,10 +157,10 @@ in {
     incompatibleKernelVersion = null;
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2017-09-12";
+    version = "2017-09-26";
 
-    rev = "ded8f06a3cfee60b3a8ea5309e9c4d0e567ed3b5";
-    sha256 = "0yn4fg4a00hpflmmr0jbbhfb921nygpw2xbbjy35abl57k6zk375";
+    rev = "7e98073379353a05498ac5a2f1a5df2a2257d6b0";
+    sha256 = "1hydfhmngpq31gxkxipqxnin74l760d1ia202h12vsgix9sp32h7";
     isUnstable = true;
 
     extraPatches = [
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 0b556a0859c..1df36cd37c7 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -20,17 +20,13 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gnutls jansson liburcu libidn
     nettle libedit
-    libiconv
+    libiconv lmdb
     # without sphinx &al. for developer documentation
   ]
-    # Use embedded lmdb there for now, as detection is broken on Darwin somehow.
-    ++ optionals stdenv.isLinux [ libcap_ng systemd lmdb ]
+    ++ optionals stdenv.isLinux [ libcap_ng systemd ]
     ++ libintlOrEmpty
     ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls
 
-  # Not ideal but seems to work on Linux.
-  configureFlags = optional stdenv.isLinux "--with-lmdb=${stdenv.lib.getLib lmdb}";
-
   enableParallelBuilding = true;
 
   CFLAGS = [ "-O2" "-DNDEBUG" ];
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 6130550917e..44c8b933400 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];
 
   # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
-  buildInputs = [ knot-dns luajit libuv gnutls nettle ]
-    ++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin
+  buildInputs = [ knot-dns luajit libuv gnutls nettle lmdb ]
     ++ optional doInstallCheck cmocka
     ++ optional stdenv.isLinux systemd # sd_notify
     ++ optionals extraFeatures [
diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix
new file mode 100644
index 00000000000..2e694ede497
--- /dev/null
+++ b/pkgs/servers/monitoring/fusion-inventory/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchurl, buildPerlPackage, perlPackages
+}:
+
+buildPerlPackage rec {
+  version = "2.3.18";
+  name = "FusionInventory-Agent-${version}";
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/G/GR/GROUSSE/${name}.tar.gz";
+    sha256 = "543d96fa61b8f2a2bc599fe9f694f19d1f2094dc5506bc514d00b8a445bc5401";
+  };
+
+  patches = [ ./remove_software_test.patch ];
+
+  postPatch = ''
+    patchShebangs bin
+  '';
+
+  buildTools = [];
+  buildInputs = with perlPackages; [
+    CGI
+    DataStructureUtil
+    FileCopyRecursive
+    HTTPProxy
+    HTTPServerSimple
+    HTTPServerSimpleAuthen
+    IOCapture
+    IOSocketSSL
+    IPCRun
+    JSON
+    LWPProtocolhttps
+    NetSNMP
+    TestCompile
+    TestDeep
+    TestException
+    TestMockModule
+    TestMockObject
+    TestNoWarnings
+  ];
+  propagatedBuildInputs = with perlPackages; [
+    FileWhich
+    LWP
+    NetIP
+    TextTemplate
+    UNIVERSALrequire
+    XMLTreePP
+  ];
+
+  installPhase = ''
+    mkdir -p $out
+
+    cp -r bin $out
+    cp -r lib $out
+
+    for cur in $out/bin/*; do
+      sed -e "s|./lib|$out/lib|" -i "$cur"
+    done
+  '';
+
+  outputs = [ "out" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.fusioninventory.org;
+    description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ maintainers.phile314 ];
+  };
+}
diff --git a/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch b/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch
new file mode 100644
index 00000000000..5449f4d3740
--- /dev/null
+++ b/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch
@@ -0,0 +1,54 @@
+diff --git a/t/agent/snmp/live.t b/t/agent/snmp/live.t
+index 8ee7ff02c..bd5551ab3 100755
+--- a/t/agent/snmp/live.t
++++ b/t/agent/snmp/live.t
+@@ -11,7 +11,7 @@ use Test::More;
+ use FusionInventory::Agent::XML::Response;
+ use FusionInventory::Agent::SNMP::Live;
+ 
+-plan tests => 12;
++plan tests => 11;
+ 
+ my $snmp;
+ throws_ok {
+@@ -52,15 +52,6 @@ throws_ok {
+ } qr/^Unable to resolve the UDP\/IPv4 address "none"/,
+ 'instanciation: unresolvable host';
+ 
+-throws_ok {
+-    $snmp = FusionInventory::Agent::SNMP::Live->new(
+-        version   => 1,
+-        community => 'public',
+-        hostname  => '1.1.1.1'
+-    );
+-} qr/no response from host 1.1.1.1/,
+-'instanciation: unresponding host';
+-
+ SKIP: {
+ skip 'live SNMP test disabled', 6 unless $ENV{TEST_LIVE_SNMP};
+ 
+diff --git a/t/apps/agent.t b/t/apps/agent.t
+index f417b4106..12207f192 100755
+--- a/t/apps/agent.t
++++ b/t/apps/agent.t
+@@ -12,7 +12,7 @@ use XML::TreePP;
+ use FusionInventory::Agent::Tools;
+ use FusionInventory::Test::Utils;
+ 
+-plan tests => 34;
++plan tests => 33;
+ 
+ my ($content, $out, $err, $rc);
+ 
+@@ -73,11 +73,6 @@ subtest "first inventory execution and content" => sub {
+ };
+ 
+ ok(
+-    exists $content->{REQUEST}->{CONTENT}->{SOFTWARES},
+-    'inventory has software'
+-);
+-
+-ok(
+     exists $content->{REQUEST}->{CONTENT}->{ENVS},
+     'inventory has environment variables'
+ );
diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index 8a4e0e571b1..95218c76ea7 100644
--- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix
+++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
@@ -1,15 +1,15 @@
 # Generated by bower2nix v3.1.1 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "uchiwa-web" "0.25.3" "0.25.3" "065qyrm1vyi8fp5d5b0b8q5nk8gwh0kcrckl2q1d30c6zlqshg0v")
-  (fetchbower "angular" "1.6.5" "~1.6.3" "0iy7crwr2akh6pmfslbnsrw8m91rffqjibjmzza78xmpk1f4hs73")
+  (fetchbower "uchiwa-web" "0.26.0" "0.26.0" "1p091rsb78wixpj5h5n4sm0a5ad60w6wi1lq7ljy31x5c5srd3l8")
+  (fetchbower "angular" "1.6.6" "~1.6.3" "1h0irwglk6qybnn5j7g25m01fx61bzjb2ina4l50a73x617s8a7v")
   (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "0zbimxmrmgbz60xg5rnkhv4gd0zvp5fdjdx5407r6a942irfy2x7")
-  (fetchbower "angular-cookies" "1.6.5" "~1.6.3" "135yipc576gl9svsk30q62mbf70yp9hy0mbsmvx4jrl9kais495p")
+  (fetchbower "angular-cookies" "1.6.6" "~1.6.3" "0fkhm885mcqvy9c8hb072gby3yay1hcs5d391pshikwam98d093c")
   (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "19q40hsjhwz8y3phmyrrg27f20qpaknvw44cfx4gliin2zqwwsfk")
   (fetchbower "angular-moment" "1.0.1" "~1.0.1" "1ydnilyf6nysxxjir51lhn92k7mjqii5277xxdqnpcvc376la244")
-  (fetchbower "angular-resource" "1.6.5" "~1.6.3" "02jiqnkn14kn69ybb74ajhaxxwh71fh5b1g67fajhirkiimpnmxy")
-  (fetchbower "angular-route" "1.6.5" "~1.6.3" "1n1q9a9khvqjas0jb277pzk44zjziblrflvh6w0s6im3ljcb6a7g")
-  (fetchbower "angular-sanitize" "1.6.5" "~1.6.3" "0jj56xwrlyslr3pi94xnbz7xy5g7pwg47p2pnbwhr1a1piwfzh87")
+  (fetchbower "angular-resource" "1.6.6" "~1.6.3" "119ly273fa0ygb416d03av6z9zb78m618nbdqim7p6vhn07h3sww")
+  (fetchbower "angular-route" "1.6.6" "~1.6.3" "1gzndkaqjgg2cjmch71nlcf1l0lwkjjjh2xaq1yhgcbj47k0j878")
+  (fetchbower "angular-sanitize" "1.6.6" "~1.6.3" "1pyw0prnm6pca563kn0cg1sx0mxs7hyhmg06161mjr3n8c978x3y")
   (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1yksx3a4c3cva5liq087z4j196p0vxp1mzhbr27qr9wmyy6z84z1")
   (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1rr7xf3a2l15g2nmd9svq8ijy1v0igc5jdpwp21kna1kzc65jg3m")
   (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0z24747b0sywjyzl5chcwr96mpmyr595bry63c4d35mp186ail5z")
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix
index c0ddf9cb7a4..4b14eea17ff 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -1,4 +1,4 @@
 {
-  version = "0.25.3-1";
-  sha256  = "1sgr9fpjfx7qn7dbiaxhsw7iagcrqi39bjc0ba1lh1db5jh7ymks";
+  version = "0.26.0-1";
+  sha256  = "10f71wsv43jbbwvw3wicr8r1bml51smfakf4r10mi4zq1l37h77z";
 }
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index 93c854d8e08..263df09ebb5 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "openafs-${version}-${kernel.version}";
-  version = "1.6.21";
+  version = "1.6.21.1";
 
   src = fetchurl {
     url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
-    sha256 = "ba9c1f615edd53b64fc271ad369c49a816acedca70cdd090975033469a84118f";
+    sha256 = "0nisxnfl8nllcfmi7mxj1gngkpxd4jp1wapbkhz07qwqynq9dn5f";
   };
 
   nativeBuildInputs = [ autoconf automake flex yacc perl which ];
@@ -46,8 +46,6 @@ stdenv.mkDerivation rec {
     license = licenses.ipl10;
     platforms = platforms.linux;
     maintainers = [ maintainers.z77z ];
-    broken =
-      (builtins.compareVersions kernel.version  "3.18" == -1) ||
-      (builtins.compareVersions kernel.version "4.13" == 0);
+    broken = versionOlder kernel.version "3.18";
   };
 }
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 9b2278fe366..37c5c633825 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -6,9 +6,9 @@
 let
   plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
   plexpkg = if enablePlexPass then plexPass else {
-    version = "1.8.4.4249";
-    vsnHash = "3497d6779";
-    sha256 = "ca3db297f4dbc73a5a405ac032ff250e5df97b84da6dcac55165b13e6445ca80";
+    version = "1.9.1.4272";
+    vsnHash = "b207937f1";
+    sha256 = "e7e313700d994e9c406706cf5dbaab6974a998b5e7f556a014e66eaa4f9cf9c8";
   };
 
 in stdenv.mkDerivation rec {
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 8a3097ae9de..022ac15aee7 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -11,7 +11,7 @@ let
       inherit sha256;
     };
 
-    outputs = [ "out" "lib" "doc" "man" ];
+    outputs = [ "out" "dev" "lib" "doc" "man" ];
     setOutputFlags = false; # $out retains configureFlags :-/
 
     buildInputs =
@@ -51,13 +51,11 @@ let
 
     postInstall =
       ''
-        moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it
+        moveToOutput "bin/pg_config" "$dev"
+        moveToOutput "lib/pgxs" "$dev" # looks strange, but not deleting it
         moveToOutput "lib/*.a" "$out"
         moveToOutput "lib/libecpg*" "$out"
 
-        # Prevent a retained dependency on gcc-wrapper.
-        substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld
-
         # Remove static libraries in case dynamic are available.
         for i in $out/lib/*.a; do
           name="$(basename "$i")"
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 82bbe048e43..468cc86d889 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.varnish-cache.org;
     license = licenses.bsd2;
     maintainers = with maintainers; [ garbas fpletz ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index 22f5aa48d61..8b8a67c2452 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2017-06-22";
+  version = "2017-09-24";
   name = "oh-my-zsh-${version}";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "d848c94804918138375041a9f800f401bec12068";
-    sha256 = "0mxmqkdpimwrskqjri3lp3haj1hzf583g7psnv34y3hyymzcx1h6";
+    rev = "accdcb2f1c3cca40527fef1fe4ab2d39eb6cf897";
+    sha256 = "0jrixz02mdab63yr0s16sr8gzwzhf9xnhad852swnfp3c7qlq06z";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/tools/X11/sct/DISPLAY-segfault.patch b/pkgs/tools/X11/sct/DISPLAY-segfault.patch
new file mode 100644
index 00000000000..6b83afa332b
--- /dev/null
+++ b/pkgs/tools/X11/sct/DISPLAY-segfault.patch
@@ -0,0 +1,10 @@
+--- a/sct.c	2017-09-22 00:44:20.270421881 +0000
++++ b/sct.c	2017-09-26 10:50:38.964562740 +0000
+@@ -36,6 +36,7 @@
+ main(int argc, char **argv)
+ {
+ 	Display *dpy = XOpenDisplay(NULL);
++	if (!dpy) exit(1);
+ 	int screen = DefaultScreen(dpy);
+ 	Window root = RootWindow(dpy, screen);
+ 
diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/tools/X11/sct/default.nix
index 1890e9c5266..9f45bbe3087 100644
--- a/pkgs/tools/X11/sct/default.nix
+++ b/pkgs/tools/X11/sct/default.nix
@@ -1,31 +1,26 @@
-{stdenv, fetchurl, libX11, libXrandr}:
+{ stdenv, fetchurl, libX11, libXrandr }:
+
 stdenv.mkDerivation rec {
   name = "sct";
-  buildInputs = [libX11 libXrandr];
+
   src = fetchurl {
     url = http://www.tedunangst.com/flak/files/sct.c;
     sha256 = "01f3ndx3s6d2qh2xmbpmhd4962dyh8yp95l87xwrs4plqdz6knhd";
-    
-    # Discussion regarding the checksum and the source code can be found in issue #17163 
-    # The code seems unmaintained, yet an unknown (probably small change) in the code caused 
-    # failed builds as the checksum had changed.
-    # The checksum is updated for now, however, this is unpractical and potentially unsafe 
-    # so any future changes might warrant a fork of the (feature complete) project. 
-    # The code is under public domain.
-    
   };
-  phases = ["patchPhase" "buildPhase" "installPhase"];
-  patchPhase = ''
-    sed -re "/Xlibint/d" ${src} > sct.c 
-  '';
-  buildPhase = "gcc -std=c99 sct.c -o sct -lX11 -lXrandr -lm";
-  installPhase = ''
-    mkdir -p "$out/bin"
-    cp sct "$out/bin"
-  '';
-  meta = {
-    description = ''A minimal utility to set display colour temperature'';
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd;
+
+  unpackPhase = "cat ${src} > sct.c";
+  patches = [ ./DISPLAY-segfault.patch ];
+
+  buildInputs = [ libX11 libXrandr ];
+  buildPhase = "cc sct.c -o sct -lm -lX11 -lXrandr";
+
+  installPhase = "install -Dt $out/bin sct";
+
+  meta = with stdenv.lib; {
+    homepage = https://www.tedunangst.com/flak/post/sct-set-color-temperature;
+    description = "A minimal utility to set display colour temperature";
+    maintainers = [ maintainers.raskin ];
+    license = licenses.publicDomain;
+    platforms = with platforms; linux ++ freebsd ++ openbsd;
   };
 }
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index d31f3023c96..f1165f6172b 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -1,33 +1,33 @@
-{stdenv, fetchurl, python27, python27Packages, makeWrapper}:
-
-with python27Packages;
+{ stdenv, lib, fetchurl, python, cffi, cryptography, pyopenssl, crcmod, google-compute-engine, makeWrapper }:
 
 # other systems not supported yet
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin";
+let
+  pythonInputs = [ cffi cryptography pyopenssl crcmod google-compute-engine ];
+  pythonPath = lib.makeSearchPath python.sitePackages pythonInputs;
 
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "161.0.0";
+  version = "171.0.0";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
-        sha256 = "43a78a9d2c3ee9d9e50200b1e90512cd53ded40b56e05effe31fe9847b1bdd4c";
+        sha256 = "0scp9nhd46mrnd02bw7skm5fa04i7azf68g08js8kawvjgbwq0sb";
       }
     else if stdenv.system == "x86_64-darwin" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
-        sha256 = "0706dbea1279be2bc98a497d1bfed61a9cc29c305d908a376bcdb4403035b323";
+        sha256 = "0xvrqsg0vqws9n20lvipxilb45aln5p9iy0ldjfxx8vvi0s42298";
       }
     else
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
-        sha256 = "7aa6094d1f9c87f4c2c4a6bdad6a1113aac5e72ea673e659d9acbb059dfd037e";
+        sha256 = "0b9rqhwd30hn5l82a2x10rz86jz1j03b19di7bc3bqn4x041qii5";
       };
 
 
-  buildInputs = [python27 makeWrapper];
+  buildInputs = [ python makeWrapper ];
 
   phases = [ "installPhase" "fixupPhase" ];
 
@@ -46,16 +46,13 @@ stdenv.mkDerivation rec {
         programPath="$out/google-cloud-sdk/bin/$program"
         binaryPath="$out/bin/$program"
         wrapProgram "$programPath" \
-            --set CLOUDSDK_PYTHON "${python27}/bin/python" \
-            --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl}):$(toPythonPath ${crcmod})"
+            --set CLOUDSDK_PYTHON "${python}/bin/python" \
+            --prefix PYTHONPATH : "${pythonPath}"
 
         mkdir -p $out/bin
         ln -s $programPath $binaryPath
     done
 
-    # install man pages
-    mv "$out/google-cloud-sdk/help/man" "$out"
-
     # setup bash completion
     mkdir -p "$out/etc/bash_completion.d/"
     mv "$out/google-cloud-sdk/completion.bash.inc" "$out/etc/bash_completion.d/gcloud.inc"
@@ -68,11 +65,10 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Tools for the google cloud platform";
     longDescription = "The Google Cloud SDK. This package has the programs: gcloud, gsutil, and bq";
-    version = version;
     # This package contains vendored dependencies. All have free licenses.
     license = licenses.free;
-    homepage = https://cloud.google.com/sdk/;
-    maintainers = with maintainers; [stephenmw zimbatm];
-    platforms = with platforms; linux ++ darwin;
+    homepage = "https://cloud.google.com/sdk/";
+    maintainers = with maintainers; [ stephenmw zimbatm ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
   };
 }
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 7fdef68f30f..5afe14209f6 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -8,12 +8,12 @@
 
 python2Packages.buildPythonApplication rec {
   pname = "salt";
-  version = "2016.11.5";
+  version = "2017.7.1";
   name = "${pname}-${version}";
 
   src = python2Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1gpq6s87vy782z4b5h6s7zwndcxnllbdr2wldxr9hyp4lfj2f55q";
+    sha256 = "079kymgxyzhf47dd42l7f42jp45gx5im4k3g31bj25p1s0aq91py";
   };
 
   propagatedBuildInputs = with python2Packages; [
diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
index fa2c5c0aa52..f7560b1fc56 100644
--- a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
+++ b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
@@ -1,11 +1,14 @@
 diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py
-index 9eb1f4a..d764f7a 100644
+index f827cc6db8..b728595186 100644
 --- a/salt/utils/rsax931.py
 +++ b/salt/utils/rsax931.py
-@@ -36,7 +36,6 @@ def _load_libcrypto():
-                 'libcrypto.so*'))
+@@ -47,6 +47,9 @@ def _load_libcrypto():
              lib = lib[0] if len(lib) > 0 else None
--        if lib:
--            return cdll.LoadLibrary(lib)
-+        return cdll.LoadLibrary('@libcrypto@')
+         if lib:
+             return cdll.LoadLibrary(lib)
++        else:
++            return cdll.LoadLibrary('@libcrypto@')
++
          raise OSError('Cannot locate OpenSSL libcrypto')
+ 
+ 
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 518edbb3ea4..3df76d82831 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -5,10 +5,10 @@
 
 stdenv.mkDerivation rec {
   name = "encfs-${version}";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
-    sha256 = "1pyldd802db987m13jfmy491mp8mnsv2mwki0ra4wbnngbqgalhv";
+    sha256 = "0isx7n4r8znk02464s0wvlzk6ry5mlnq3kgnd0rapnhjwdvwqr5y";
     rev = "v${version}";
     repo = "encfs";
     owner = "vgough";
diff --git a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch b/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch
new file mode 100644
index 00000000000..fba1d250c42
--- /dev/null
+++ b/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch
@@ -0,0 +1,11 @@
+--- a/meson.build	2017-09-23 22:02:57.770555382 +0200
++++ b/meson.build	2017-09-23 23:11:28.258095182 +0200
+@@ -25,7 +25,7 @@
+ endif
+ 
+ 
+-rst2man = find_program('rst2man', required: false)
++rst2man = find_program('rst2man.py', required: true)
+   
+ cfg = configuration_data()
+ 
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 274be305da8..eace7c2783e 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,17 +1,25 @@
-{ stdenv, fetchFromGitHub, pkgconfig, glib, fuse3, autoreconfHook }:
+{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3
+, buildManPages ? true, docutils
+}:
 
-stdenv.mkDerivation rec {
-  version = "3.2.0";
+let
+  inherit (stdenv.lib) optional;
+  rpath = stdenv.lib.makeLibraryPath [ fuse3 glib ];
+in stdenv.mkDerivation rec {
+  version = "3.3.0";
   name = "sshfs-fuse-${version}";
 
   src = fetchFromGitHub {
     owner = "libfuse";
     repo = "sshfs";
     rev = "sshfs-${version}";
-    sha256 = "09pqdibhcj1p7m6vxkqiprvbcxp9iq2lm1hb6w7p8iarmvp80rlv";
+    sha256 = "1hn5c0059ppjqygdhvapxm7lrqm5bnpwaxgjylskz04c0vr8nygp";
   };
 
-  buildInputs = [ pkgconfig glib fuse3 autoreconfHook ];
+  patches = optional buildManPages ./build-man-pages.patch;
+
+  nativeBuildInputs = [ meson pkgconfig ninja ];
+  buildInputs = [ fuse3 glib ] ++ optional buildManPages docutils;
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optional
     (stdenv.system == "i686-linux")
@@ -22,6 +30,10 @@ stdenv.mkDerivation rec {
     ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
   '';
 
+  postFixup = ''
+       patchelf --set-rpath '${rpath}' "$out/bin/sshfs"
+  '';
+
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH";
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index de3ba3621a8..6c6a93dc73a 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -50,6 +50,8 @@ stdenv.mkDerivation {
     sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info
     rmdir $out/share/info/asymptote
     rm $out/share/info/dir
+
+    rm -rf "$out"/share/texmf
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index a68e2be6aeb..582e01c6f2f 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "entr-${version}";
-  version = "3.7";
+  version = "3.8";
 
   src = fetchurl {
     url = "http://entrproject.org/code/${name}.tar.gz";
-    sha256 = "0bx2ivx9hwixjwmk7aqlx20mwmn3cvryppnmc285d7byiw6dbvwl";
+    sha256 = "1g969gw92q8pd3zfbx37w14l92xd3nzi24083x47dns8v69ygcgb";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix
index 5fda26bacad..747c9837641 100644
--- a/pkgs/tools/misc/pick/default.nix
+++ b/pkgs/tools/misc/pick/default.nix
@@ -1,23 +1,19 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, ncurses }:
+{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "pick-${version}";
-  version = "1.7.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "calleerlandsson";
     repo = "pick";
     rev = "v${version}";
-    sha256 = "1x7ql530rj4yj50dzp8526mz92g4hhqxnig1qgiq3h3k815p31qb";
+    sha256 = "0s0mn9iz17ldhvahggh9rsmgfrjh0kvk5bh4p9xhxcn7rcp0h5ka";
   };
 
   buildInputs = [ ncurses ];
 
-  nativeBuildInputs = [ autoreconfHook ];
-
-  postPatch = ''
-    sed -i -e 's/\[curses]/\[ncurses]/g' configure.ac
-  '';
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix
index 322a1a06289..99c225ec259 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/tools/networking/axel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "axel-${version}";
-  version = "2.13.1";
+  version = "2.14.1";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz";
-    sha256 = "15bi5wx6fyf9k0y03dy5mk2rv06mrfgiyrlh44add9n07wi574p1";
+    sha256 = "0fayfpyc9cs6yp474400nyjbix6aywicz6pw17rzm4m7k06q5xmc";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix
new file mode 100644
index 00000000000..7537ab1c47a
--- /dev/null
+++ b/pkgs/tools/networking/djbdns/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, glibc } :
+
+let
+  version = "1.05";
+
+  manSrc = fetchurl {
+    url = "http://smarden.org/pape/djb/manpages/djbdns-${version}-man-20031023.tar.gz";
+    sha256 = "0sg51gjy6j1hnrra406q1qhf5kvk1m00y8qqhs6r0a699gqmh75s";
+  };
+
+in
+
+stdenv.mkDerivation {
+  name = "djbdns-${version}";
+
+  src = fetchurl {
+    url = "https://cr.yp.to/djbdns/djbdns-${version}.tar.gz";
+    sha256 = "0j3baf92vkczr5fxww7rp1b7gmczxmmgrqc8w2dy7kgk09m85k9w";
+  };
+
+  patches = [ ./hier.patch ];
+
+  postPatch = ''
+    echo gcc -O2 -include ${glibc.dev}/include/errno.h > conf-cc
+    echo $out > conf-home
+    sed -i "s|/etc/dnsroots.global|$out/etc/dnsroots.global|" dnscache-conf.c
+  '';
+
+  installPhase = ''
+    mkdir -pv $out/etc;
+    make setup
+    cd $out;
+    tar xzvf ${manSrc};
+    for n in 1 5 8; do
+      mkdir -p man/man$n;
+      mv -iv djbdns-man/*.$n man/man$n;
+    done;
+    rm -rv djbdns-man;
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A collection of Domain Name System tools";
+    longDescription = "Includes software for all the fundamental DNS operations: DNS cache: finding addresses of Internet hosts; DNS server: publishing addresses of Internet hosts; and DNS client: talking to a DNS cache.";
+    homepage = https://cr.yp.to/djbdns.html;
+    license = licenses.publicDomain;
+    maintainers = with maintainers; [ jerith666 ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/networking/djbdns/hier.patch b/pkgs/tools/networking/djbdns/hier.patch
new file mode 100644
index 00000000000..7fddd121383
--- /dev/null
+++ b/pkgs/tools/networking/djbdns/hier.patch
@@ -0,0 +1,15 @@
+--- a/hier.c	2016-04-19 21:22:21.992192405 -0400
++++ b/hier.c	2016-04-19 21:22:33.160229778 -0400
+@@ -2,9 +2,9 @@
+ 
+ void hier()
+ {
+-  c("/","etc","dnsroots.global",-1,-1,0644);
++  c(auto_home,"etc","dnsroots.global",-1,-1,0644);
+ 
+-  h(auto_home,-1,-1,02755);
+-  d(auto_home,"bin",-1,-1,02755);
++  h(auto_home,-1,-1,0755);
++  d(auto_home,"bin",-1,-1,0755);
+ 
+   c(auto_home,"bin","dnscache-conf",-1,-1,0755);
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index e1829bcaf7d..cd4c4512169 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--localstatedir=/var"
     "--with-botan-config=${botan}/bin/botan-config-1.10"
-    "--with-dhcp-pgsql=${postgresql}/bin/pg_config"
+    "--with-dhcp-pgsql=${postgresql.dev}/bin/pg_config"
     "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config"
   ];
 
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index c596ea63f4d..c0c4950f447 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -6,15 +6,20 @@
 stdenv.mkDerivation rec {
   name    = "${pname}-${major}.${minor}";
   pname   = "network-manager-applet";
-  major   = "1.4";
-  minor   = "6";
+  major   = "1.8";
+  minor   = "2";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
-    sha256 = "0xpcdwqmnwiqqqsd5rx1gh5rvv5m2skj59bqxhccy1k2ikzgr9hh";
+    sha256 = "09f9hjpn9nkhw57mk6pi7q1bq3lhf5hvmwas0fknscssak7yjmry";
   };
 
-  configureFlags = [ "--sysconfdir=/etc" ];
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--without-selinux"
+  ];
+
+  outputs = [ "out" "dev" ];
 
   buildInputs = [
     gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index d2a51b3acc8..ace568d6900 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -3,19 +3,17 @@
 , libgcrypt, dnsmasq, bluez5, readline
 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
 , ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
-, python3Packages, docbook_xsl, fetchpatch, openconnect }:
+, python3Packages, docbook_xsl, fetchpatch, openconnect, curl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name    = "network-manager-${version}";
   pname   = "NetworkManager";
-  major   = "1.6";
+  major   = "1.8";
   version = "${major}.2";
-  # FIXME: this problem is fixed upstream (commit 6a77258f4ec2), remove when upgrading ^^^
-  hardeningDisable = [ "format" ];
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
-    sha256 = "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj";
+    sha256 = "1x0vzxvrck0snga2n3pc7g74m20zz74cr4r8gfspl8sckv6yz9bi";
   };
 
   outputs = [ "out" "dev" ];
@@ -46,13 +44,15 @@ stdenv.mkDerivation rec {
       --subst-var-by modprobeBinPath ${kmod}/bin/modprobe
     # to enable link-local connections
     configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"
+
+    # Fixes: error: po/Makefile.in.in was not created by intltoolize.
+    intltoolize --automake --copy --force
   '';
 
   # Right now we hardcode quite a few paths at build time. Probably we should
   # patch networkmanager to allow passing these path in config file. This will
   # remove unneeded build-time dependencies.
   configureFlags = [
-    "--with-distro=exherbo"
     "--with-dhclient=${dhcp}/bin/dhclient"
     "--with-dnsmasq=${dnsmasq}/bin/dnsmasq"
     # Upstream prefers dhclient, so don't add dhcpcd to the closure
@@ -69,26 +69,21 @@ stdenv.mkDerivation rec {
     "--with-session-tracking=systemd"
     "--with-modem-manager-1"
     "--with-nmtui"
-    "--with-libsoup=yes"
+    "--disable-gtk-doc"
   ];
 
   patches = [
     ./PppdPath.patch
-    (fetchpatch {
-      sha256 = "1n90j5rwg97xkrhlldyr92filc2dmycl9pr0svky9hlcn9csk2z6";
-      name = "null-dereference.patch";
-      url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch";
-    })
     ./openconnect_helper_path.patch
     ./modprobe.patch
   ];
 
-  buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp
+  buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp curl
                   bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ];
 
   propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ];
 
-  nativeBuildInputs = [ intltool pkgconfig libxslt docbook_xsl ];
+  nativeBuildInputs = [ autoreconfHook intltool pkgconfig libxslt docbook_xsl ];
 
   preInstall = ''
     installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" )
diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index 3edbe7dba6e..47dca561d6c 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -4,12 +4,12 @@
 stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname   = "NetworkManager-openvpn";
-  major   = "1.2";
-  version = "${major}.8";
+  major   = "1.8";
+  version = "${major}.0";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
-    sha256 = "0m06sg2rnz764psvpsrx0pvll11nfn9hypgbp3s6vna8y83l02ry";
+    sha256 = "1973n89g66a3jfx8r45a811fga4kadh6r1w35cb25cz1mlii2vhn";
   };
 
   buildInputs = [ openvpn networkmanager libsecret ]
diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix
index 5e38aee7f83..4fccb107771 100644
--- a/pkgs/tools/networking/openconnect/default.nix
+++ b/pkgs/tools/networking/openconnect/default.nix
@@ -1,10 +1,6 @@
 { stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib } :
 
-let
-  xor = a: b: (a || b) && (!(a && b));
-in
-
-assert xor (openssl != null) (gnutls != null);
+assert (openssl != null) == (gnutls == null);
 
 stdenv.mkDerivation rec {
   name = "openconnect-7.08";
@@ -16,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w";
   };
 
+  outputs = [ "out" "dev" ];
+
   preConfigure = ''
       export PKG_CONFIG=${pkgconfig}/bin/pkg-config
       export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2"
diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix
new file mode 100644
index 00000000000..0ed1150159d
--- /dev/null
+++ b/pkgs/tools/networking/radsecproxy/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "radsecproxy-${version}";
+  version = "1.6.9";
+
+  src = fetchurl {
+    url = "https://software.nordu.net/radsecproxy/radsecproxy-${version}.tar.xz";
+    sha256 = "6f2c7030236c222782c9ac2c52778baa63540a1865b75a7a6d8c1280ce6ad816";
+  };
+
+  buildInputs = [ openssl ];
+
+  configureFlags = [
+     "--with-ssl=${openssl.dev}"
+     "--sysconfdir=/etc"
+     "--localstatedir=/var"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://software.nordu.net/radsecproxy/;
+    description = "A generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports.";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ sargon ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index c025fba4921..508816dbfa8 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, lzo, openssl, zlib}:
 
 stdenv.mkDerivation rec {
-  version = "1.0.31";
+  version = "1.0.32";
   name = "tinc-${version}";
 
   src = fetchurl {
     url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
-    sha256 = "d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b";
+    sha256 = "11smq1h6jyp6x2cwrv2zxck9phzdz3svi95pxnvvpd4dzzm4zcjd";
   };
 
   buildInputs = [ lzo openssl zlib ];
diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix
new file mode 100644
index 00000000000..f85d847f5f9
--- /dev/null
+++ b/pkgs/tools/security/bash-supergenpass/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }:
+
+stdenv.mkDerivation rec {
+  name = "bash-supergenpass-unstable-${version}";
+  version = "2012-11-02";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  src = fetchFromGitHub {
+    owner = "lanzz";
+    repo = "bash-supergenpass";
+    rev = "c84eaa22fb59ab6c390e7f2de7984513347e3a9a";
+    sha256 = "0d3l55kdrf6arb98vwwz9ww55ing5w323fg7546v56hlq3hs5qc9";
+  };
+
+  installPhase = ''
+    install -m755 -D supergenpass.sh "$out/bin/supergenpass"
+    wrapProgram "$out/bin/supergenpass" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnugrep ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Bash shell-script implementation of SuperGenPass password generation";
+    longDescription = ''
+      Bash shell-script implementation of SuperGenPass password generation
+      Usage: ./supergenpass.sh <domain> [ <length> ]
+
+      Default <length> is 10, which is also the original SuperGenPass default length.
+
+      The <domain> parameter is also optional, but it does not make much sense to omit it.
+
+      supergenpass will ask for your master password interactively, and it will not be displayed on your terminal.
+    '';
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fgaz ];
+    homepage = https://github.com/lanzz/bash-supergenpass;
+  };
+}
+
diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix
index 28c6caae6c3..7b3e7d99a43 100644
--- a/pkgs/tools/security/kbfs/default.nix
+++ b/pkgs/tools/security/kbfs/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "kbfs-${version}";
-  version = "20170429.44efa06";
+  version = "20170922.f76290";
 
   goPackagePath = "github.com/keybase/kbfs";
   subPackages = [ "kbfsfuse" ];
@@ -12,8 +12,8 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     owner = "keybase";
     repo = "kbfs";
-    rev = "44efa0682d931d8489f5e84542e8d00baeb12592";
-    sha256 = "1q6hklyr6zq3xr1azz1c6rlpsjc036f222cd20vf79m58dn906n5";
+    rev = "f76290f6e1a8cbaa6046980c67c548fbff9e123a";
+    sha256 = "1v086wmc0hly4b91y6xndfdhj981n2yr6nnb3rl6f4kwx291ih54";
   };
 
   buildFlags = [ "-tags production" ];
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 8f19b257747..229a45b8731 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -16,12 +16,16 @@ buildGoPackage rec {
     sha256 = "0vivc71xfi4y3ydd29b17qxzi10r3a1ppmjjws6vrs0gz58bz1j8";
   };
 
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -delete_rpath $out/lib $bin/bin/keybase
+  '';
+
   buildFlags = [ "-tags production" ];
 
   meta = with stdenv.lib; {
     homepage = https://www.keybase.io/;
     description = "The Keybase official command-line utility and service.";
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ carlsverre np rvolosatovs ];
   };
 }
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix
index 98635f8cc85..965ecda164b 100644
--- a/pkgs/tools/security/oath-toolkit/default.nix
+++ b/pkgs/tools/security/oath-toolkit/default.nix
@@ -6,14 +6,14 @@ let
     else pam;
 in
 stdenv.mkDerivation rec {
-  name = "oath-toolkit-2.6.1";
+  name = "oath-toolkit-2.6.2";
 
   src = fetchurl {
     url = "mirror://savannah/oath-toolkit/${name}.tar.gz";
-    sha256 = "0ybg0gnddmhxga0jwdipyz8jv5mxs0kiiflhvzffl9mw0wcq6mww";
+    sha256 = "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h";
   };
 
-  
+
   buildInputs = [ securityDependency ];
 
   meta = {
diff --git a/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch b/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch
deleted file mode 100644
index 650e80c24fb..00000000000
--- a/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2e9ac201af238b742c7032962b9b12a8b66bab0c Mon Sep 17 00:00:00 2001
-From: zimbatm <zimbatm@zimbatm.com>
-Date: Mon, 29 May 2017 22:36:15 +0100
-Subject: [PATCH] allow nologin on other paths
-
----
- google_compute_engine/accounts/accounts_utils.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/google_compute_engine/accounts/accounts_utils.py b/google_compute_engine/accounts/accounts_utils.py
-index 57e62be..d7eda06 100644
---- a/google_compute_engine/accounts/accounts_utils.py
-+++ b/google_compute_engine/accounts/accounts_utils.py
-@@ -295,8 +295,8 @@ class AccountsUtils(object):
-     # logins. This helps avoid problems caused by operator and root sharing
-     # a home directory in CentOS and RHEL.
-     pw_entry = self._GetUser(user)
--    if pw_entry and pw_entry.pw_shell == '/sbin/nologin':
--      message = 'Not updating user %s. User set /sbin/nologin as login shell.'
-+    if pw_entry and os.path.basename(pw_entry.pw_shell) == 'nologin':
-+      message = 'Not updating user %s. User set `nologin` as login shell.'
-       self.logger.debug(message, user)
-       return True
- 
--- 
-2.13.0
-
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 7a5350fe2eb..bd766d7c5a9 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -1,27 +1,26 @@
 { lib
 , fetchFromGitHub
-, pythonPackages
+, buildPythonApplication
 , bash
 , shadow
 , systemd
 , utillinux
+, boto
+, setuptools
 }:
-let
-  version = "20170523";
-in
-pythonPackages.buildPythonApplication {
+
+buildPythonApplication rec {
   name = "google-compute-engine-${version}";
+  version = "20170914";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "compute-image-packages";
     rev = version;
-    sha256 = "1qxyj3lj9in6m8yi6y6wcmc3662h9z4qax07v97rdnay99mxdv68";
+    sha256 = "0hlzcrf6yhzan25f4wzy1vbncak9whhqzrzza026ly3sq0smmjpg";
   };
 
-  patches = [ ./0001-allow-nologin-other-paths.patch ];
-
   postPatch = ''
     for file in $(find google_compute_engine -type f); do
       substituteInPlace "$file" \
@@ -44,11 +43,11 @@ pythonPackages.buildPythonApplication {
     cp -r google_config/udev/*.rules $out/lib/udev/rules.d
   '';
 
-  propagatedBuildInputs = with pythonPackages; [ boto setuptools ];
+  propagatedBuildInputs = [ boto setuptools ];
 
   meta = with lib; {
     description = "Google Compute Engine tools and services";
-    homepage = https://github.com/GoogleCloudPlatform/compute-image-packages;
+    homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages";
     license = licenses.asl20;
     maintainers = with maintainers; [ zimbatm ];
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c40dcb63bf7..4fafdfb726c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -66,6 +66,10 @@ mapAliases (rec {
   gst_plugins_bad = gst-plugins-bad;  # added 2017-02
   gst_plugins_ugly = gst-plugins-ugly;  # added 2017-02
   gst_python = gst-python;  # added 2017-02
+  guileCairo = guile-cairo; # added 2017-09-24
+  guileGnome = guile-gnome; # added 2017-09-24
+  guile_lib = guile-lib; # added 2017-09-24
+  guile_ncurses = guile-ncurses; # added 2017-09-24
   gupnptools = gupnp-tools;  # added 2015-12-19
   gnustep-make = gnustep.make; # added 2016-7-6
   htmlTidy = html-tidy;  # added 2014-12-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc9677d03e0..43cec9a5a9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -808,8 +808,10 @@ with pkgs;
       makeWrapper $exe $out/bin/${drv.pname} \
         --prefix PATH ":" "${nix}/bin" \
         --prefix PATH ":" "${nix-prefetch-scripts}/bin"
-      mkdir -p $out/share/bash-completion/completions
+      mkdir -p $out/share/{bash-completion/completions,zsh/vendor-completions,fish/completions}
       $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname}
+      $exe --zsh-completion-script $exe >$out/share/zsh/vendor-completions/_${drv.pname}
+      $exe --fish-completion-script $exe >$out/share/fish/completions/${drv.pname}.fish
     '';
   });
 
@@ -1150,6 +1152,8 @@ with pkgs;
 
   stagit = callPackage ../development/tools/stagit { };
 
+  bash-supergenpass = callPackage ../tools/security/bash-supergenpass { };
+
   syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};
 
   syslogng = callPackage ../tools/system/syslog-ng { };
@@ -1671,6 +1675,8 @@ with pkgs;
 
   dev86 = callPackage ../development/compilers/dev86 { };
 
+  djbdns = callPackage ../tools/networking/djbdns { };
+
   dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { };
 
   dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { };
@@ -1877,6 +1883,8 @@ with pkgs;
 
   epstool = callPackage ../tools/graphics/epstool { };
 
+  epsxe = callPackage ../misc/emulators/epsxe { };
+
   ethtool = callPackage ../tools/misc/ethtool { };
 
   ettercap = callPackage ../applications/networking/sniffers/ettercap { };
@@ -2297,11 +2305,11 @@ with pkgs;
 
   google-authenticator = callPackage ../os-specific/linux/google-authenticator { };
 
-  google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
+  google-cloud-sdk = python2.pkgs.google-cloud-sdk;
 
   google-fonts = callPackage ../data/fonts/google-fonts { };
 
-  google-compute-engine = callPackage ../tools/virtualization/google-compute-engine {  };
+  google-compute-engine = python2.pkgs.google-compute-engine;
 
   gource = callPackage ../applications/version-management/gource { };
 
@@ -3889,6 +3897,8 @@ with pkgs;
 
   platinum-searcher = callPackage ../tools/text/platinum-searcher { };
 
+  playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { };
+
   plex = callPackage ../servers/plex { enablePlexPass = config.plex.enablePlexPass or false; };
 
   ploticus = callPackage ../tools/graphics/ploticus {
@@ -4060,6 +4070,8 @@ with pkgs;
 
   radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { };
 
+  radsecproxy = callPackage ../tools/networking/radsecproxy { };
+
   radvd = callPackage ../tools/networking/radvd { };
 
   rainbowstream = pythonPackages.rainbowstream;
@@ -4626,6 +4638,11 @@ with pkgs;
 
   tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { };
 
+  tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle {
+    stdenv = stdenvNoCC;
+    tor-browser-unwrapped = firefoxPackages.tor-browser;
+  };
+
   touchegg = callPackage ../tools/inputmethods/touchegg { };
 
   torsocks = callPackage ../tools/security/tor/torsocks.nix { };
@@ -5594,8 +5611,8 @@ with pkgs;
     profiledCompiler = false;
   });
 
-  gcj = gcj49;
-  gcj49 = wrapCC (gcc49.cc.override {
+  gcj = gcj6;
+  gcj6 = wrapCC (gcc6.cc.override {
     name = "gcj";
     langJava = true;
     langFortran = false;
@@ -5876,12 +5893,18 @@ with pkgs;
 
   oraclejdk8psu = pkgs.oraclejdk8psu_distro true false;
 
+  oraclejdk9 = pkgs.oraclejdk9distro "JDK" false;
+
   oraclejre = lowPrio (pkgs.jdkdistro false false);
 
   oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);
 
   oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false);
 
+  oraclejre9 = lowPrio (pkgs.oraclejdk9distro "JRE" false);
+
+  oracleserverjre9 = lowPrio (pkgs.oraclejdk9distro "ServerJRE" false);
+
   jrePlugin = jre8Plugin;
 
   jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true);
@@ -5896,12 +5919,17 @@ with pkgs;
   oraclejdk8distro = installjdk: pluginSupport:
     assert supportsJDK;
     (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk; });
+      (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk pluginSupport; });
 
   oraclejdk8psu_distro = installjdk: pluginSupport:
     assert supportsJDK;
     (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk; });
+      (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; });
+
+  oraclejdk9distro = packageType: pluginSupport:
+    assert supportsJDK;
+    (if pluginSupport then appendToName "with-plugin" else x: x)
+      (callPackage ../development/compilers/oraclejdk/jdk9-linux.nix { inherit packageType pluginSupport; });
 
   jikes = callPackage ../development/compilers/jikes { };
 
@@ -6704,16 +6732,18 @@ with pkgs;
 
   jython = callPackage ../development/interpreters/jython {};
 
-  guileCairo = callPackage ../development/guile-modules/guile-cairo { };
+  guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
+
+  guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
 
-  guileGnome = callPackage ../development/guile-modules/guile-gnome {
+  guile-gnome = callPackage ../development/guile-modules/guile-gnome {
     gconf = gnome2.GConf;
     inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui;
   };
 
-  guile_lib = callPackage ../development/guile-modules/guile-lib { };
+  guile-lib = callPackage ../development/guile-modules/guile-lib { };
 
-  guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { };
+  guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { };
 
   guile-opengl = callPackage ../development/guile-modules/guile-opengl { };
 
@@ -7566,6 +7596,8 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  watson-ruby = callPackage ../development/tools/misc/watson-ruby {};
+
   xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
 
   xcbuild  = callPackage ../development/tools/xcbuild/wrapper.nix {
@@ -9247,6 +9279,8 @@ with pkgs;
 
   libminc = callPackage ../development/libraries/libminc { };
 
+  libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; 
+  
   libmkv = callPackage ../development/libraries/libmkv { };
 
   libmms = callPackage ../development/libraries/libmms { };
@@ -10371,8 +10405,8 @@ with pkgs;
   resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
 
   rhino = callPackage ../development/libraries/java/rhino {
-    javac = gcj;
-    jvm = gcj;
+    javac = jdk;
+    jvm = jre;
   };
 
   rlog = callPackage ../development/libraries/rlog { };
@@ -11363,6 +11397,8 @@ with pkgs;
     openssl = openssl_1_0_2;
   };
 
+  fusionInventory = callPackage ../servers/monitoring/fusion-inventory { };
+
   gatling = callPackage ../servers/http/gatling { };
 
   glabels = callPackage ../applications/graphics/glabels { };
@@ -12022,6 +12058,10 @@ with pkgs;
 
   dstat = callPackage ../os-specific/linux/dstat { };
 
+  # unstable until the first 1.x release
+  fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { };
+  fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { };
+
   fwupd = callPackage ../os-specific/linux/firmware/fwupd { inherit (gnome2) gtk_doc; inherit (python3Packages) pygobject3 pillow; };
 
   fwupdate = callPackage ../os-specific/linux/firmware/fwupdate { };
@@ -12057,10 +12097,6 @@ with pkgs;
 
   facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { };
 
-  fanctl = callPackage ../os-specific/linux/fanctl {
-    iproute = iproute.override { enableFan = true; };
-  };
-
   fatrace = callPackage ../os-specific/linux/fatrace { };
 
   ffadoFull = callPackage ../os-specific/linux/ffado {
@@ -13156,6 +13192,8 @@ with pkgs;
 
   kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};
 
+  latinmodern-math = callPackage ../data/fonts/lm-math {};
+
   lato = callPackage ../data/fonts/lato {};
 
   league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {};
@@ -13363,6 +13401,8 @@ with pkgs;
 
   terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { };
 
+  tex-gyre-termes-math = callPackage ../data/fonts/tex-gyre-termes-math { };
+
   tipa = callPackage ../data/fonts/tipa { };
 
   ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { };
@@ -14373,6 +14413,8 @@ with pkgs;
 
   gqrx = qt5.callPackage ../applications/misc/gqrx { };
 
+  gpx-viewer = callPackage ../applications/misc/gpx-viewer { };
+
   grass = callPackage ../applications/gis/grass { };
 
   grepm = callPackage ../applications/search/grepm { };
@@ -14789,8 +14831,6 @@ with pkgs;
 
   hello = callPackage ../applications/misc/hello { };
 
-  kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
-
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };
 
   heme = callPackage ../applications/editors/heme { };
@@ -15114,9 +15154,9 @@ with pkgs;
 
   ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };
 
-  kubernetes = callPackage ../applications/networking/cluster/kubernetes {
-    go = go_1_7;
-  };
+  kubernetes = callPackage ../applications/networking/cluster/kubernetes {  };
+
+  kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
 
   kupfer = callPackage ../applications/misc/kupfer { };
 
@@ -16220,6 +16260,11 @@ with pkgs;
 
   ssvnc = callPackage ../applications/networking/remote/ssvnc { };
 
+  stupidterm = callPackage ../applications/misc/stupidterm {
+    vte = gnome3.vte;
+    gtk = gtk3;
+  };
+
   styx = callPackage ../applications/misc/styx { };
 
   tecoc = callPackage ../applications/editors/tecoc { };
@@ -16607,6 +16652,8 @@ with pkgs;
 
   twmn = libsForQt5.callPackage ../applications/misc/twmn { };
 
+  testssl = callPackage ../applications/networking/testssl { };
+
   umurmur = callPackage ../applications/networking/umurmur { };
 
   unigine-valley = callPackage ../applications/graphics/unigine-valley { };
@@ -17225,6 +17272,8 @@ with pkgs;
 
   inherit (pythonPackages) youtube-dl;
 
+  youtube-viewer = perlPackages.WWWYoutubeViewer;
+
   zam-plugins = callPackage ../applications/audio/zam-plugins { };
 
   zanshin = libsForQt5.callPackage ../applications/office/zanshin {
@@ -17951,9 +18000,7 @@ with pkgs;
     libcanberra = self.libcanberra_gtk2;
   });
 
-  gnome3_24 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.24 { });
-
-  gnome3 = gnome3_24;
+  gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });
 
   gnomeExtensions = {
     caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };
@@ -18021,6 +18068,8 @@ with pkgs;
 
   numix-gtk-theme = callPackage ../misc/themes/numix { };
 
+  numix-solarized-gtk-theme = callPackage ../misc/themes/gtk3/numix-solarized-gtk-theme {  };
+
   numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { };
 
   theme-vertex = callPackage ../misc/themes/vertex { };
@@ -18547,7 +18596,9 @@ with pkgs;
     sbcl = null;
   };
 
-  mxnet = callPackage ../applications/science/math/mxnet { };
+  mxnet = callPackage ../applications/science/math/mxnet {
+    inherit (linuxPackages) nvidia_x11;
+  };
 
   wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; };
 
@@ -18565,9 +18616,12 @@ with pkgs;
     inherit (gnome3) gtksourceview;
   };
 
-  singular = callPackage ../applications/science/math/singular {};
+  singular = callPackage ../applications/science/math/singular {
+    stdenv = overrideCC stdenv gcc5;
+  };
   libsingular = callPackage ../applications/science/math/singular {
     asLibsingular = true;
+    stdenv = overrideCC stdenv gcc5;
   };
 
   scilab = callPackage ../applications/science/math/scilab {
@@ -18872,9 +18926,9 @@ with pkgs;
 
   hplipWithPlugin = hplip.override { withPlugin = true; };
 
-  hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { };
+  hplip_3_16_11 = callPackage ../misc/drivers/hplip/3.16.11.nix { };
 
-  hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; };
+  hplipWithPlugin_3_16_11 = hplip.override { withPlugin = true; };
 
   epkowa = callPackage ../misc/drivers/epkowa { };
 
@@ -18885,6 +18939,7 @@ with pkgs;
 
   jack2Full = callPackage ../misc/jackaudio {
     libopus = libopus.override { withCustomModes = true; };
+    inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation;
   };
   libjack2 = jack2Full.override { prefix = "lib"; };
 
@@ -19099,7 +19154,9 @@ with pkgs;
 
   seafile-shared = callPackage ../misc/seafile-shared { };
 
-  slock = callPackage ../misc/screensavers/slock { };
+  slock = callPackage ../misc/screensavers/slock {
+    conf = config.slock.conf or null;
+  };
 
   smokeping = callPackage ../tools/networking/smokeping {
     inherit fping rrdtool;
@@ -19330,6 +19387,10 @@ with pkgs;
 
   xosd = callPackage ../misc/xosd { };
 
+  xpad = callPackage ../applications/misc/xpad {
+    inherit (gnome3) gtksourceview;
+  };
+
   xsane = callPackage ../applications/graphics/sane/xsane.nix {
     libpng = libpng12;
   };
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 91efa306ce4..98192d2c3d7 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -8,7 +8,7 @@
 { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
 , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
 , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
-, fetchFromGitHub, libmpack
+, fetchFromGitHub, libmpack, which
 }:
 
 let
@@ -270,6 +270,33 @@ let
     };
   };
 
+  luxio = buildLuaPackage rec {
+    name = "luxio-${version}";
+    version = "13";
+    src = fetchurl {
+      url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2";
+      sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz";
+    };
+    nativeBuildInputs = [ which pkgconfig ];
+    postPatch = ''
+      patchShebangs .
+    '';
+    meta = {
+      platforms = stdenv.lib.platforms.unix;
+      license = stdenv.lib.licenses.mit;
+      description = "Lightweight UNIX I/O and POSIX binding for Lua";
+      maintainers = [ maintainers.richardipsum ];
+    };
+    preBuild = ''
+      makeFlagsArray=(
+        INST_LIBDIR="$out/lib/lua/${lua.luaversion}"
+        INST_LUADIR="$out/share/lua/${lua.luaversion}"
+        LUA_BINDIR="$out/bin"
+        INSTALL=install
+        );
+    '';
+  };
+
   luazip = buildLuaPackage rec {
     name = "zip-${version}";
     version = "1.2.3";
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2cba7966bb0..d8c69ae44e9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -549,6 +549,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  AuthenSimple = buildPerlPackage rec {
+    name = "Authen-Simple-0.5";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CH/CHANSEN/${name}.tar.gz";
+      sha256 = "02cddab47f8bf1a1cbd4c9bf8d258f6d05111499c33f8315e7244812f72613aa";
+    };
+    propagatedBuildInputs = [ ClassAccessor ClassDataInheritable CryptPasswdMD5 ParamsValidate ];
+    meta = {
+      description = "Simple Authentication";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   autobox = buildPerlPackage rec {
     name = "autobox-2.84";
     src = fetchurl {
@@ -3177,6 +3190,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DataStructureUtil = buildPerlPackage rec {
+    name = "Data-Structure-Util-0.16";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz";
+      sha256 = "9cd42a13e65cb15f3a76296eb9a134da220168ec747c568d331a50ae7a2ddbc6";
+    };
+    buildInputs = [ TestPod ];
+    meta = {
+      description = "Change nature of data within a structure";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   DataTaxi = buildPerlPackage {
     name = "Data-Taxi-0.96";
     propagatedBuildInputs = [DebugShowStuff];
@@ -6824,6 +6850,22 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestMore ];
   };
 
+  HTTPProxy = buildPerlPackage rec {
+    name = "HTTP-Proxy-0.304";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz";
+      sha256 = "b05290534ec73625c21a0565fc35170890dab163843d95331c292c23f504c69d";
+    };
+    buildInputs = [ HTMLParser ];
+    propagatedBuildInputs = [ HTTPDaemon HTTPDate HTTPMessage LWP ];
+    meta = {
+      description = "A pure Perl HTTP proxy";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+    # tests fail because they require network access
+    doCheck = false;
+  };
+
   HTTPRequestAsCGI = buildPerlPackage rec {
     name = "HTTP-Request-AsCGI-1.2";
     src = fetchurl {
@@ -6857,6 +6899,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  HTTPServerSimpleAuthen = buildPerlPackage rec {
+    name = "HTTP-Server-Simple-Authen-0.04";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
+      sha256 = "2dddc8ab9dc8986980151e4ba836a6bbf091f45cf195be1768ebdb4a993ed59b";
+    };
+    propagatedBuildInputs = [ AuthenSimple HTTPServerSimple ];
+    meta = {
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   HTTPServerSimpleMason = buildPerlPackage {
     name = "HTTP-Server-Simple-Mason-0.14";
     src = fetchurl {
@@ -6995,6 +7049,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  IOCapture = buildPerlPackage rec {
+    name = "IO-Capture-0.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RE/REYNOLDS/${name}.tar.gz";
+      sha256 = "c2c15a254ca74fb8c57d25d7b6cbcaff77a3b4fb5695423f1f80bb423abffea9";
+    };
+    meta = {
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   IOCaptureOutput = buildPerlPackage rec {
     name = "IO-CaptureOutput-1.1104";
     src = fetchurl {
@@ -13314,6 +13379,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestCompile = buildPerlPackage rec {
+    name = "Test-Compile-v1.3.0";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/E/EG/EGILES/${name}.tar.gz";
+      sha256 = "77527e9477ac5260443c756367a7f7bc3d8f6c6ebbc561b0b2fb3f79303bad33";
+    };
+    buildInputs = [ ModuleBuild ];
+    propagatedBuildInputs = [ UNIVERSALrequire ];
+    meta = {
+      description = "Check whether Perl files compile correctly";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   TestCPANMeta = buildPerlPackage {
     name = "Test-CPAN-Meta-0.23";
     src = fetchurl {
@@ -15501,6 +15580,32 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  WWWYoutubeViewer = buildPerlPackage rec {
+    name = "WWW-YoutubeViewer-${version}";
+    version = "3.3.0";
+
+    src = fetchFromGitHub {
+      owner  = "trizen";
+      repo   = "youtube-viewer";
+      rev    = "${version}";
+      sha256 = "15xyrwv08fw8jmpydwzks26ipxnzliwddgyjcfqiaj0p7lwlhmx1";
+    };
+
+    propagatedBuildInputs = [
+      LWP
+      LWPProtocolHttps
+      DataDump
+      JSON
+    ];
+
+    meta = {
+      description = "A lightweight application for searching and streaming videos from YouTube";
+      homepage = https://github.com/trizen/youtube-viewer;
+      maintainers = with maintainers; [ woffs ];
+      license = with stdenv.lib.licenses; [ artistic2 ];
+    };
+  };
+
   Want = buildPerlPackage rec {
     name = "Want-0.29";
     src = fetchurl {
@@ -15857,6 +15962,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  XMLTreePP = buildPerlPackage rec {
+    name = "XML-TreePP-0.43";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/K/KA/KAWASAKI/${name}.tar.gz";
+      sha256 = "7fbe2d6430860059894aeeebf75d4cacf1bf8d7b75294eb87d8e1502f81bd760";
+    };
+    propagatedBuildInputs = [ LWP ];
+    meta = {
+      description = "Pure Perl implementation for parsing/writing XML documents";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   XMLTwig = buildPerlPackage rec {
     name = "XML-Twig-3.49";
     src = fetchurl {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index adbe3747ea0..1c56fe5f1ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1313,11 +1313,11 @@ in {
   };
 
   betamax = buildPythonPackage rec {
-    name = "betamax-0.6.0";
+    name = "betamax-0.8.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/betamax/${name}.tar.gz";
-      sha256 = "0vw4d53jbbb2kdl7l891h8iyxklqcd6ldvgcyhw9hl40ljdhv1wz";
+      sha256 = "18f8v5gng3j773jlbbzx4rg1i4y2zw3m2l1zpmbvp8bh5a2q1i42";
     };
 
     propagatedBuildInputs = [ self.requests ];
@@ -1944,6 +1944,23 @@ in {
 
   blaze = callPackage ../development/python-modules/blaze { };
 
+  # Needed for bleach 1.5.0
+  html5lib_0_9999999 = self.html5lib.overridePythonAttrs rec {
+    name = "html5lib-${version}";
+    disabled = isPy3k && pythonAtLeast "3.6";
+    buildInputs = with self; [ nose flake8 ];
+    propagatedBuildInputs = with self; [ six ];
+    checkPhase = ''
+      nosetests
+    '';
+
+    version = "0.9999999";
+    src = pkgs.fetchurl {
+      url = "https://github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz";
+      sha256 = "1s6wdbrjzw5jhyfbskf4nj1i5bjpjqq9f89a7r1rl59rhpwmfhhq";
+    };
+  };
+
   html5-parser = callPackage ../development/python-modules/html5-parser {};
 
   httpserver = callPackage ../development/python-modules/httpserver {};
@@ -1981,6 +1998,24 @@ in {
     };
   };
 
+  # needed for tensorflow-tensorboard
+  bleach_1_5_0 = self.bleach.overridePythonAttrs rec {
+    version = "1.5.0";
+    pname = "bleach";
+    name = "${pname}-${version}";
+
+    propagatedBuildInputs = with self; [ six html5lib_0_9999999 ];
+
+    preCheck = ''
+      sed -i 's,pytest==[0-9.]*,pytest,' setup.py
+    '';
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0rdwb3piwwl30wfqg4ywm07276w7090xfq71lb5d6k5mk62pb3lp";
+    };
+  };
+
   blinker = buildPythonPackage rec {
     name = "blinker-${version}";
     version = "1.4";
@@ -2571,6 +2606,15 @@ in {
     # https://github.com/celery/celery/pull/3736#issuecomment-274155454 from upstream
     patches = [ ../development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch ];
 
+    # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
+    preCheck = ''
+      export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \
+        LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so
+    '';
+    postCheck = ''
+      unset NIX_REDIRECTS LD_PRELOAD
+    '';
+
     buildInputs = with self; [ pytest case ];
     propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ];
 
@@ -5814,17 +5858,9 @@ in {
     };
   };
 
-  google-compute-engine = buildPythonPackage rec {
-    version = "2.3.0";
-    name    = "google-compute-engine-${version}";
-
-    src = pkgs.fetchurl {
-      url    = "mirror://pypi/g/google-compute-engine/google-compute-engine-${version}.tar.gz";
-      sha256 = "1pjj95b3l61h8xz5kjfcgnql066cr8bq5wl480a6dxd2inw8mynf";
-    };
+  google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
 
-    propagatedBuildInputs = with self; [ boto ];
-  };
+  google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };
 
   googlecl = buildPythonPackage rec {
     version = "0.9.14";
@@ -6027,6 +6063,8 @@ in {
 
   };
 
+  hupper = callPackage ../development/python-modules/hupper {};
+
   hovercraft = buildPythonPackage rec {
     disabled = ! isPy3k;
     name = "hovercraft-${version}";
@@ -7015,6 +7053,10 @@ in {
 
   phpserialize = callPackage ../development/python-modules/phpserialize { };
 
+  plaster = callPackage ../development/python-modules/plaster {};
+
+  plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {};
+
   plotly = callPackage ../development/python-modules/plotly { };
 
   podcastparser = callPackage ../development/python-modules/podcastparser { };
@@ -7293,11 +7335,13 @@ in {
   };
 
   pyramid = buildPythonPackage rec {
-    name = "pyramid-1.7";
+    pname = "pyramid";
+    version = "1.9.1";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyramid/${name}.tar.gz";
-      sha256 = "161qacv7qqln3q02kcqll0q2mmaypm701hn1llwdwnkaywkb3xi6";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0dhbzc4q0vsnv3aihy728aczg56xs6h9s1rmvr096q4lb6yln3w4";
     };
 
     buildInputs = with self; [
@@ -7306,6 +7350,9 @@ in {
       webtest
       zope_component
       zope_interface
+      plaster
+      plaster-pastedeploy
+      hupper
     ] ++ optional isPy26 unittest2;
 
     propagatedBuildInputs = with self; [
@@ -8829,18 +8876,21 @@ in {
   };
 
   eventlet = buildPythonPackage rec {
-    name = "eventlet-0.17.4";
+    pname = "eventlet";
+    version = "0.20.0";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/e/eventlet/${name}.tar.gz";
-      sha256 = "0vam0qfm8p5jkpp2cv12r5bnpnv902ld7q074h7x5y5g9rqyj8c7";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "15bq5ybbigxnp5xwkps53zyhlg15lmcnq3ny2dppj0r0bylcs5rf";
     };
 
     buildInputs = with self; [ nose httplib2 pyopenssl  ];
 
     doCheck = false;  # too much transient errors to bother
 
-    propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ];
+    propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ] ++
+      (with self; [ enum-compat ]) ;
 
     meta = {
       homepage = http://pypi.python.org/pypi/eventlet/;
@@ -10832,6 +10882,28 @@ in {
 
   keyring = callPackage ../development/python-modules/keyring { };
 
+  keyutils = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "keyutils";
+    version = "0.5";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/k/${pname}/${name}.tar.gz";
+      sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10";
+    };
+
+    buildInputs = with self; [ pkgs.keyutils pytestrunner ];
+
+    doCheck = false;
+
+    meta = {
+      description = "A set of python bindings for keyutils";
+      homepage = https://github.com/sassoftware/python-keyutils;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ primeos ];
+    };
+  };
+
   klaus = buildPythonPackage rec {
     version = "0.9.1";
     name = "klaus-${version}";
@@ -12596,13 +12668,15 @@ in {
   };
 
   monotonic = buildPythonPackage rec {
-    name = "monotonic-0.4";
+    pname = "monotonic";
+    version = "1.3";
+    name = "${pname}-${version}";
 
     __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/monotonic/${name}.tar.gz";
-      sha256 = "1diab6hfh3jpa1f0scpqaqrawk4g97ss4v7gkn2yw8znvdm6abw5";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "06vw7jwq96106plhlc5vz1v1xvjismdgw9wjyzvzf0ylglnrwiib";
     };
 
     patchPhase = optionalString stdenv.isLinux ''
@@ -13819,12 +13893,13 @@ in {
   };
 
   oslo-serialization = buildPythonPackage rec {
-    name = "oslo.serialization-${version}";
-    version = "1.10.0";
+    pname = "oslo.serialization";
+    version = "2.20.0";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/oslo.serialization/${name}.tar.gz";
-      sha256 = "15k8aql2rx5jzv3hfvmd48vsyw172qa64bs3fmsyx25p37zyfy8a";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "00j8hn8f0shk4anzb6zwn8w1sfxcil9a3jgxljwalq6ma2rzp9pw";
     };
 
     patchPhase = ''
@@ -13866,12 +13941,13 @@ in {
 
 
   oslo-utils = buildPythonPackage rec {
-    name = "oslo.utils-${version}";
-    version = "2.6.0";
+    pname = "oslo.utils";
+    version = "3.29.0";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/oslo.utils/${name}.tar.gz";
-      sha256 = "1prgi03nxkcykyja821qkycsqlnpyzw17mpvj8qf3pjmgb9gv1fy";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0l90ijw96czjd6z8bw88983rsnq5753iw86rhk1wi064w4rs19ig";
     };
 
     propagatedBuildInputs = with self; [ pbr Babel six iso8601 pytz netaddr netifaces
@@ -14227,12 +14303,14 @@ in {
 
 
   oslo-service = buildPythonPackage rec {
-    name = "oslo.service-${version}";
-    version = "0.10.0";
+    pname = "oslo.service";
+    version = "1.26.0";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/oslo.service/oslo.service-0.10.0.tar.gz";
-      sha256 = "1pcnimc2a50arcgq355ad9lramf6y1yv974swgfj6w90v5c6p9gz";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "083q7z6nrska5fq12vnd70blphxscd7ivca2d78jk84d99h0m5n5";
     };
 
     propagatedBuildInputs = with self; [
@@ -14240,16 +14318,15 @@ in {
       oslo-concurrency wrapt eventlet six oslo-serialization greenlet paste
       oslo-config monotonic iso8601 oslo-log pytz routes msgpack
       oslo-i18n argparse oslo-utils pbr enum34 netaddr stevedore netifaces
-      pyinotify webob retrying pyinotify ];
+      pyinotify webob retrying pyinotify oslo-log ];
     buildInputs = with self; [
       oslosphinx oslotest pkgs.procps mock mox3 fixtures subunit testrepository
       testtools testscenarios
     ];
 
-    # failing tests
-    preCheck = ''
-      rm oslo_service/tests/test_service.py
-    '';
+    ## cannot import eventlet due to:
+    # _proto_tcp = socket.getprotobyname('tcp')
+    doCheck = false;
 
     meta = with stdenv.lib; {
       homepage = "http://wiki.openstack.org/wiki/Oslo#oslo.service";
@@ -14694,13 +14771,14 @@ in {
 
 
   oslo-concurrency = buildPythonPackage rec {
-   name = "oslo-concurrency-${version}";
-   version = "2.7.0";
+    pname = "oslo.concurrency";
+    version = "3.22.0";
+    name = "${pname}-${version}";
 
-   src = pkgs.fetchurl {
-     url = "mirror://pypi/o/oslo.concurrency/oslo.concurrency-2.7.0.tar.gz";
-     sha256 = "1yp8c87yi6fx1qbq4y1xkx47iiifg7jqzpcghivhxqra8vna185d";
-   };
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0nh1ycc2s6w05g5w63bsmmda0gw7qsrwlax3as8a0piai99z4m51";
+    };
 
    propagatedBuildInputs = with self; [
      oslo-i18n argparse six wrapt oslo-utils pbr enum34 Babel netaddr monotonic
@@ -14708,8 +14786,8 @@ in {
      eventlet
    ];
    buildInputs = with self; [
-     oslosphinx fixtures futures coverage oslotest
-   ];
+     oslosphinx fixtures coverage oslotest
+   ] ++ (optional (!isPy3k) futures);
 
    # too much magic in tests
    doCheck = false;
@@ -14789,16 +14867,17 @@ in {
   olefile = callPackage ../development/python-modules/olefile { };
 
   oslo-log = buildPythonPackage rec {
-    name = "oslo.log-${version}";
-    version = "1.12.1";
+    name = "${pname}-${version}";
+    pname = "oslo.log";
+    version = "3.31.0";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/oslo.log/${name}.tar.gz";
-      sha256 = "10x596r19zjla5n1bf04j5vncx0c9gpc5wc2jlmgjbl3cyx3vgsv";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1w08cl98n8592pvb2gw01mqlwi8nnnpg1zy10mvj6xdpvfk2yqzz";
     };
 
     propagatedBuildInputs = with self; [
-      pbr Babel six iso8601 debtcollector
+      pbr Babel six iso8601 debtcollector dateutil
       oslo-utils oslo-i18n oslo-config oslo-serialization oslo-context
     ] ++ stdenv.lib.optional stdenv.isLinux pyinotify;
     buildInputs = with self; [ oslotest oslosphinx ];
@@ -14808,12 +14887,13 @@ in {
   };
 
   oslo-context = buildPythonPackage rec {
-    name = "oslo.context-${version}";
-    version = "0.7.0";
+    name = "${pname}-${version}";
+    pname = "oslo.context";
+    version = "2.18.1";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/oslo.context/${name}.tar.gz";
-      sha256 = "18fmg9dhgngshk63wfb3ddrgx5br8jxkk3x30z40741mslp1fdjy";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1sc7qrwffsm15m91c17k0xiglv6bxh9sbksvxvrrgja82m57mgh6";
     };
 
     propagatedBuildInputs = with self; [ pbr Babel ];
@@ -14825,14 +14905,14 @@ in {
 
   oslo-i18n = buildPythonPackage rec {
     name = "oslo.i18n-${version}";
-    version = "2.7.0";
+    version = "3.18.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/o/oslo.i18n/${name}.tar.gz";
-      sha256 = "11jgcvj36g97awh7fpar4xxgwrvzfahq6rw7xxqac32ia790ylcz";
+      sha256 = "19w6wil588fgppc7d42fqkrjs0y81ap62svzbij8hlb3w2d4a91n";
     };
 
-    propagatedBuildInputs = with self; [ pbr Babel six oslo-config ];
+    propagatedBuildInputs = with self; [ pbr Babel six ];
     buildInputs = with self; [ mock coverage oslotest ];
     patchPhase = ''
       sed -i 's@python@${python.interpreter}@' .testr.conf
@@ -14843,11 +14923,11 @@ in {
 
   oslotest = buildPythonPackage rec {
     name = "oslotest-${version}";
-    version = "1.12.0";
+    version = "2.18.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/o/oslotest/${name}.tar.gz";
-      sha256 = "17i92hymw1dwmmb5yv90m2gam2x21mc960q1pr7bly93x49h8666";
+      sha256 = "0a0zhpb4yp7g6d290jk7a4pfci4ciwhsrqzhbwbl2szi50gp7km1";
     };
 
     patchPhase = ''
@@ -14855,28 +14935,27 @@ in {
     '';
 
     propagatedBuildInputs = with self; [ pbr fixtures subunit six testrepository
-      testscenarios testtools mock mox3 oslo-config os-client-config ];
+      os-client-config debtcollector testscenarios testtools mock mox3 os-client-config ];
   };
 
   os-client-config = buildPythonPackage rec {
     name = "os-client-config-${version}";
-    version = "1.8.1";
+    version = "1.28.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/o/os-client-config/${name}.tar.gz";
-      sha256 = "10hz4yp594mi1p7v1pvgsmx5w2rnb9y8d0jvb2lfv03ljnwzv8jz";
+      sha256 = "1f7q384b9drp3fqcg0w8aihv9k4idaay8vr3an187zjpgbx9rgp5";
     };
 
-    buildInputs = with self; [ pbr testtools testscenarios testrepository fixtures ];
-    propagatedBuildInputs = with self; [ appdirs pyyaml keystoneauth1 ];
+    # requires oslotest but is a dependency of that package ...
+    doCheck = false;
+
+    buildInputs = with self; [ pbr testtools testscenarios testrepository fixtures jsonschema ];
+    propagatedBuildInputs = with self; [ appdirs pyyaml keystoneauth1 requestsexceptions ];
 
     patchPhase = ''
       sed -i 's@python@${python.interpreter}@' .testr.conf
     '';
-    # TODO: circular import on oslotest
-    preCheck = ''
-      rm os_client_config/tests/{test_config,test_cloud_config,test_environ}.py
-    '';
   };
 
   keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 {};
@@ -14900,38 +14979,42 @@ in {
 
   mox3 = buildPythonPackage rec {
     name = "mox3-${version}";
-    version = "0.11.0";
+    version = "0.23.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/m/mox3/${name}.tar.gz";
-      sha256 = "09dkgki21v5zqrx575h1aazxsq5akkv0a90z644bk1ry9a4zg1pn";
+      sha256 = "0q26sg0jasday52a7y0cch13l0ssjvr4yqnvswqxsinj1lv5ld88";
     };
 
     patchPhase = ''
       sed -i 's@python@${python.interpreter}@' .testr.conf
     '';
 
+    #  FAIL: mox3.tests.test_mox.RegexTest.testReprWithFlags
+    #  ValueError: cannot use LOCALE flag with a str pattern
+    doCheck = !isPy36;
+
     buildInputs = with self; [ subunit testrepository testtools six ];
     propagatedBuildInputs = with self; [ pbr fixtures ];
   };
 
   debtcollector = buildPythonPackage rec {
     name = "debtcollector-${version}";
-    version = "0.9.0";
+    version = "1.17.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/debtcollector/${name}.tar.gz";
-      sha256 = "1mvdxdrnwlgfqg26s5himkjq6f06r2khlrignx36kkbyaix6j9xb";
+      sha256 = "0rh47fd5kgjcdv9dxr7xf0x308cvfic3h2zk03ifvb4pdc5kbqvi";
     };
     patchPhase = ''
       sed -i 's@python@${python.interpreter}@' .testr.conf
     '';
 
     buildInputs = with self; [ pbr ];
-    propagatedBuildInputs = with self; [ wrapt Babel six doc8 ];
+    propagatedBuildInputs = with self; [ wrapt Babel six doc8 ] ++
+                              (optional (isPy26 || isPy27) funcsigs);
     checkInputs = with self; [ pbr Babel six wrapt testtools testscenarios
-       testrepository subunit coverage oslotest ];
-    doCheck = false; # oslo is broken
+                               testrepository subunit coverage ];
   };
 
   doc8 = callPackage ../development/python-modules/doc8 { };
@@ -16808,7 +16891,7 @@ in {
     };
 
     disabled = !isPy3k;
-
+    
     # No tests in archive
     doCheck = false;
 
@@ -17797,17 +17880,25 @@ in {
 
   pyscss = buildPythonPackage rec {
     name = "pyScss-${version}";
-    version = "1.3.4";
+    version = "1.3.5";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyScss/${name}.tar.gz";
-      sha256 = "03lcp853kgr66aqrw2jd1q9jhs9h049w7zlwp7bfmly7xh832cnh";
+    src = pkgs.fetchFromGitHub {
+      sha256 = "0lfsan74vcw6dypb196gmbprvlbran8p7w6czy8hyl2b1l728mhz";
+      rev = "v1.3.5";
+      repo = "pyScss";
+      owner = "Kronuz";
     };
 
+    checkInputs = with self; [ pytest ];
+
     propagatedBuildInputs = with self; [ six ]
       ++ (optionals (pythonOlder "3.4") [ enum34 pathlib ])
       ++ (optionals (pythonOlder "2.7") [ ordereddict ]);
 
+    checkPhase = ''
+      py.test
+    '';
+
     meta = {
       description = "A Scss compiler for Python";
       homepage = http://pyscss.readthedocs.org/en/latest/;
@@ -18328,6 +18419,8 @@ in {
     };
   };
 
+  requestsexceptions = callPackage ../development/python-modules/requestsexceptions {};
+
   requests_ntlm = callPackage ../development/python-modules/requests_ntlm { };
 
   requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { };
@@ -19010,14 +19103,16 @@ in {
   ropper = callPackage ../development/python-modules/ropper { };
 
   routes = buildPythonPackage rec {
-    name = "routes-1.12.3";
+    pname = "Routes";
+    version = "2.4.1";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = mirror://pypi/R/Routes/Routes-1.12.3.tar.gz;
-      sha256 = "eacc0dfb7c883374e698cebaa01a740d8c78d364b6e7f3df0312de042f77aa36";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1zamff3m0kc4vyfniyhxpkkcqv1rrgnmh37ykxv34nna1ws47vi6";
     };
 
-    propagatedBuildInputs = with self; [ paste webtest ];
+    propagatedBuildInputs = with self; [ paste webtest repoze_lru ];
 
     meta = {
       description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions";
@@ -19527,6 +19622,8 @@ in {
     };
   };
 
+  simanneal = callPackage ../development/python-modules/simanneal { };
+
   simplebayes = buildPythonPackage rec {
     name = "simplebayes-${version}";
     version = "1.5.8";
@@ -22450,15 +22547,16 @@ EOF
   };
 
   webob = buildPythonPackage rec {
-    version = "1.4.1";
-    name = "webob-${version}";
+    pname = "WebOb";
+    version = "1.7.3";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/W/WebOb/WebOb-${version}.tar.gz";
-      sha256 = "1nz9m6ijf46wfn33zfza13c0k1n4kjnmn3icdlrlgz5yj21vky0j";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "10vjp2rvqiyvw157fk3sy7yds1gknzw97z4gk0qv1raskx5s2p76";
     };
 
-    propagatedBuildInputs = with self; [ nose ];
+    propagatedBuildInputs = with self; [ nose pytest ];
 
     meta = {
       description = "WSGI request and response object";
@@ -26040,6 +26138,8 @@ EOF
     };
   };
 
+  tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { };
+
   tensorflow = self.tensorflowWithoutCuda;
 
   tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { };
@@ -26047,7 +26147,7 @@ EOF
   tensorflowWithCuda = callPackage ../development/python-modules/tensorflow {
     cudaSupport = true;
     cudatoolkit = pkgs.cudatoolkit8;
-    cudnn = pkgs.cudnn51_cudatoolkit80;
+    cudnn = pkgs.cudnn60_cudatoolkit80;
   };
 
   tflearn = buildPythonPackage rec {
@@ -26518,7 +26618,9 @@ EOF
   ROPGadget = callPackage ../development/python-modules/ROPGadget { };
 
   # We need "normal" libxml2 and not the python package by the same name.
-  pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; };
+  pywbem = if !(isPy36)
+    then callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }
+    else throw "pywbem not supported for interpreter ${python.executable}";
 
   unicorn = callPackage ../development/python-modules/unicorn { };
 
@@ -26668,6 +26770,7 @@ EOF
 
   parse-type = callPackage ../development/python-modules/parse-type { };
 
+  ephem = callPackage ../development/python-modules/ephem { };
 });
 
 in fix' (extends overrides packages)