Merge branch 'upd.lxqt' of github.com:romildo/nixpkgs into upd.lxqt

2017-11-02 10:22:22 -02:00 · 2017-11-02 10:22:22 -02:00 · 82e75a0bac
commit 82e75a0bac
parent d9f9c0d0d1 ad4f757783
304 changed files with 8628 additions and 12746 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -15,7 +15,31 @@ pkgs/stdenv/    @edolstra
 pkgs/build-support/cc-wrapper/  @edolstra

 # Libraries
-lib/  @edolstra
+lib/                       @edolstra @nbp
+
+# Nixpkgs Internals
+default.nix                @nbp
+pkgs/top-level/default.nix @nbp
+pkgs/top-level/impure.nix  @nbp
+pkgs/top-level/stage.nix   @nbp
+
+# NixOS Internals
+nixos/default.nix         @nbp
+nixos/lib/from-env.nix    @nbp
+nixos/lib/eval-config.nix @nbp
+nixos/doc/manual/configuration/abstractions.xml      @nbp
+nixos/doc/manual/configuration/config-file.xml       @nbp
+nixos/doc/manual/configuration/config-syntax.xml     @nbp
+nixos/doc/manual/configuration/modularity.xml        @nbp
+nixos/doc/manual/development/assertions.xml          @nbp
+nixos/doc/manual/development/meta-attributes.xml     @nbp
+nixos/doc/manual/development/option-declarations.xml @nbp
+nixos/doc/manual/development/option-def.xml          @nbp
+nixos/doc/manual/development/option-types.xml        @nbp
+nixos/doc/manual/development/replace-modules.xml     @nbp
+nixos/doc/manual/development/writing-modules.xml     @nbp
+nixos/doc/manual/man-nixos-option.xml                @nbp
+nixos/modules/installer/tools/nixos-option.sh        @nbp

 # Python-related code and docs
 pkgs/top-level/python-packages.nix      @FRidh
@ -34,6 +58,10 @@ pkgs/development/haskell-modules/hoogle.nix          @peti
 pkgs/applications/science/math/R @peti
 pkgs/development/r-modules       @peti

+# Ruby
+pkgs/development/interpreters/ruby/* @zimbatm
+pkgs/development/ruby-modules/*      @zimbatm
+
 # Darwin-related
 /pkgs/stdenv/darwin/             @org/darwin-maintainers
 /pkgs/os-specific/darwin/        @org/darwin-maintainers
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -32,11 +32,14 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
    The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).

 * `meta.description` should:
-  * Be capitalized
-  * Not start with the package name
-  * Not have a dot at the end
+  * Be capitalized.
+  * Not start with the package name.
+  * Not have a period at the end.
+* `meta.license` must be set and fit the upstream license.
+  * If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`.
+* `meta.maintainers` must be set.

-See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
+See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).

 ## Writing good commit messages

--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@ -55,6 +55,10 @@ configuration file located at
 </programlisting>
 </para>

+<para>Note that we are not able to test or build unfree software on Hydra
+due to policy. Most unfree licenses prohibit us from either executing or
+distributing the software.</para>
+
 <section xml:id="sec-allow-broken">
  <title>Installing broken packages</title>

--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@ -698,8 +698,14 @@ nothing.</para>
    <listitem><para>A list of strings passed as additional flags to
    <command>make</command>.  These flags are also used by the default
    install and check phase.  For setting make flags specific to the
-    build phase, use <varname>buildFlags</varname> (see
-    below).</para></listitem>
+    build phase, use <varname>buildFlags</varname> (see below).
+
+<programlisting>
+makeFlags = [ "PREFIX=$(out)" ];
+</programlisting>
+
+    <note><para>The flags are quoted in bash, but environment variables can
+    be specified by using the make syntax.</para></note></para></listitem>
  </varlistentry>

  <varlistentry>
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -66,7 +66,7 @@
  aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
  bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
  badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
-  balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
+  balajisivaraman = "Balaji Sivaraman <sivaraman.balaji@gmail.com>";
  barrucadu = "Michael Walker <mike@barrucadu.co.uk>";
  basvandijk = "Bas van Dijk <v.dijk.bas@gmail.com>";
  Baughn = "Svein Ove Aas <sveina@gmail.com>";
@ -116,6 +116,7 @@
  christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
  ciil = "Simon Lackerbauer <simon@lackerbauer.com>";
  ckampka = "Christian Kampka <christian@kampka.net>";
+  ckauhaus = "Christian Kauhaus <christian@kauhaus.de>";
  cko = "Christine Koppelt <christine.koppelt@gmail.com>";
  cleverca22 = "Michael Bishop <cleverca22@gmail.com>";
  cmcdragonkai = "Roger Qiu <roger.qiu@matrix.ai>";
@ -135,6 +136,7 @@
  cryptix = "Henry Bubert <cryptix@riseup.net>";
  CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>";
  cstrahan = "Charles Strahan <charles@cstrahan.com>";
+  csingley = "Christopher Singley <csingley@gmail.com>";
  cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
  DamienCassou = "Damien Cassou <damien@cassou.me>";
  danbst = "Danylo Hlynskyi <abcz2.uprola@gmail.com>";
@ -441,7 +443,7 @@
  nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";
  nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
  NikolaMandic = "Ratko Mladic <nikola@mandic.email>";
-  nixy = "Andrew R. M. <andrewmiller237@gmail.com>";
+  nixy = "Andrew R. M. <nixy@nixy.moe>";
  nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>";
  notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
  np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
@ -550,6 +552,7 @@
  ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";
  rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>";
  s1lvester = "Markus Silvester <s1lvester@bockhacker.me>";
+  samdroid-apps = "Sam Parkinson <sam@sam.today>";
  samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";
  sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
  sargon = "Daniel Ehlers <danielehlers@mindeye.net>";
--- a/lib/types.nix
+++ b/lib/types.nix
@ -288,8 +288,17 @@ rec {
          }).config;
        getSubOptions = prefix: (evalModules
          { modules = opts'; inherit prefix;
-            # FIXME: hack to get shit to evaluate.
-            args = { name = ""; }; }).options;
+            # This is a work-around due to the fact that some sub-modules,
+            # such as the one included in an attribute set, expects a "args"
+            # attribute to be given to the sub-module. As the option
+            # evaluation does not have any specific attribute name, we
+            # provide a default one for the documentation.
+            #
+            # This is mandatory as some option declaration might use the
+            # "name" attribute given as argument of the submodule and use it
+            # as the default of option declarations.
+            args.name = "&lt;name&gt;";
+          }).options;
        getSubModules = opts';
        substSubModules = m: submodule m;
        functor = (defaultFunctor name) // {
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@ -16,7 +16,8 @@
  hardware.</para></listitem>

  <listitem><para>The NixOS manual is available on virtual console 8
-  (press Alt+F8 to access).</para></listitem>
+  (press Alt+F8 to access) or by running <command>nixos-help</command>.
+  </para></listitem>

  <listitem><para>You get logged in as <literal>root</literal>
  (with empty password).</para></listitem>
@ -139,6 +140,11 @@
    the GRUB boot loader is to be installed.  Without it, NixOS cannot
    boot.</para>

+    <para>If there are other operating systems running on the machine before
+    installing NixOS, the
+    <option>boot.loader.grub.useOSProber</option> option can be set to
+    <literal>true</literal> to automatically add them to the grub menu.</para>
+
    <para>Another critical option is <option>fileSystems</option>,
    specifying the file systems that need to be mounted by NixOS.
    However, you typically don’t need to set it yourself, because
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@ -8,6 +8,7 @@ use File::Basename;
 use File::Slurp;
 use File::stat;

+umask(0022);

 sub uniq {
    my %seen;
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -328,6 +328,7 @@
  ./services/misc/parsoid.nix
  ./services/misc/phd.nix
  ./services/misc/plex.nix
+  ./services/misc/plexpy.nix
  ./services/misc/pykms.nix
  ./services/misc/radarr.nix
  ./services/misc/redmine.nix
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@ -148,11 +148,11 @@ in
          [
            {
              hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
-              publicKeyFile = "./pubkeys/myhost_ssh_host_dsa_key.pub";
+              publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
            }
            {
              hostNames = [ "myhost2" ];
-              publicKeyFile = "./pubkeys/myhost2_ssh_host_dsa_key.pub";
+              publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
            }
          ]
        '';
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@ -89,8 +89,5 @@ services.nginx = {
  };
 }
 </programlisting>
-
-<para>At the moment you still have to restart Nginx after the ACME
-certs arrive.</para>
 </section>
 </chapter>
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@ -60,11 +60,11 @@ let
    manpage_directory    = "${pkgs.postfix}/share/man";
    html_directory       = "${pkgs.postfix}/share/postfix/doc/html";
    shlib_directory      = false;
-    relayhost            = if cfg.lookupMX || cfg.relayHost == ""
-                             then cfg.relayHost
-                             else
-			       "[${cfg.relayHost}]"
-			       + optionalString (cfg.relayPort != null) ":${toString cfg.relayPort}";
+    relayhost            = if cfg.relayHost == "" then "" else
+                             if cfg.lookupMX
+                             then "${cfg.relayHost}:${toString cfg.relayPort}"
+                             else "[${cfg.relayHost}]:${toString cfg.relayPort}";
+
    mail_spool_directory = "/var/spool/mail/";
    setgid_group         = setgidGroup;
  }
@ -461,13 +461,10 @@ in
      };

      relayPort = mkOption {
-        type = types.nullOr types.int;
-        default = null;
-        example = 587;
+        type = types.int;
+        default = 25;
        description = "
-          Specify an optional port for outbound mail relay. (Note:
-          only used if an explicit <option>relayHost</option> is
-          defined.)
+          SMTP port for relay mail relay.
        ";
      };

--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@ -572,7 +572,7 @@ in {
        rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
        mkdir -p ${cfg.statePath}/config

-        tr -dc A-Za-z0-9 < /dev/urandom | head -c 32 > ${cfg.statePath}/config/gitlab_shell_secret
+        ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret

        # The uploads directory is hardcoded somewhere deep in rails. It is
        # symlinked in the gitlab package to /run/gitlab/uploads to make it
@ -619,7 +619,7 @@ in {
        fi

        # enable required pg_trgm extension for gitlab
-        ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql gitlab -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
+        ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
        # Always do the db migrations just to be sure the database is up-to-date
        ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production

@ -634,7 +634,7 @@ in {

        # The gitlab:shell:create_hooks task seems broken for fixing links
        # so we instead delete all the hooks and create them anew
-        rm ${cfg.statePath}/repositories/**/*.git/hooks
+        rm -f ${cfg.statePath}/repositories/**/*.git/hooks
        ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production

        # Change permissions in the last step because some of the
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@ -135,8 +135,9 @@ in
        };
      };

-    services.mingetty.helpLine = mkIf cfg.showManual
-      "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
+      services.mingetty.helpLine = "\nRun `nixos-help` "
+        + lib.optionalString cfg.showManual "or press <Alt-F${toString cfg.ttyNumber}> "
+        + "for the NixOS manual.";

  };

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

  graphiteApiConfig = pkgs.writeText "graphite-api.yaml" ''
-    time_zone: ${config.time.timeZone}
    search_index: ${dataDir}/index
+    ${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''}
    ${optionalString (cfg.api.finders != []) ''finders:''}
    ${concatMapStringsSep "\n" (f: "  - " + f.moduleName) cfg.api.finders}
    ${optionalString (cfg.api.functions != []) ''functions:''}
@ -536,7 +536,7 @@ in {
        environment = {
          PYTHONPATH = let
              aenv = pkgs.python.buildEnv.override {
-                extraLibs = [ cfg.api.package pkgs.cairo ] ++ cfg.api.finders;
+                extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders;
              };
            in "${aenv}/${pkgs.python.sitePackages}";
          GRAPHITE_API_CONFIG = graphiteApiConfig;
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixos/modules/services/networking/dnschain.nix
@ -158,7 +158,7 @@ in
      serviceConfig = {
        User = "dnschain";
        Restart = "on-failure";
-        ExecStart = "${pkgs.dnschain}/bin/dnschain";
+        ExecStart = "${pkgs.nodePackages.dnschain}/bin/dnschain";
      };

      preStart = ''
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@ -676,6 +676,7 @@ in
      ''
        ; Needed for PHP's mail() function.
        sendmail_path = sendmail -t -i
+      '' + optionalString (!isNull config.time.timeZone) ''

        ; Apparently PHP doesn't use $TZ.
        date.timezone = "${config.time.timeZone}"
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@ -13,6 +13,7 @@ let
    define('DB_HOST',     '${config.dbHost}');
    define('DB_CHARSET',  'utf8');
    $table_prefix  = '${config.tablePrefix}';
+    define('AUTOMATIC_UPDATER_DISABLED', true);
    ${config.extraConfig}
    if ( !defined('ABSPATH') )
    	define('ABSPATH', dirname(__FILE__) . '/');
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@ -125,6 +125,7 @@ in
      "getty@tty1.service"
    ];

+    systemd.services."getty@tty1".enable = false;
    systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
    systemd.services.display-manager.serviceConfig = {
      # Restart = "always"; - already defined in xserver.nix
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@ -93,6 +93,7 @@ let
            after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ];
            before = [ "network.target" "shutdown.target" ];
            wants = [ "network.target" ];
+            partOf = map (i: "network-addresses-${i.name}.service") interfaces;
            conflicts = [ "shutdown.target" ];
            wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target";

@ -171,8 +172,6 @@ let
              "network-link-${i.name}.service"
              "network.target"
            ];
-            # propagate stop and reload from network-setup
-            partOf = [ "network-setup.service" ];
            # order before network-setup because the routes that are configured
            # there may need ip addresses configured
            before = [ "network-setup.service" ];
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@ -537,7 +537,7 @@ in
              type = types.bool;
              default = false;
              description = ''
-                Wether the container is automatically started at boot-time.
+                Whether the container is automatically started at boot-time.
              '';
            };

--- a/nixos/tests/graphite.nix
+++ b/nixos/tests/graphite.nix
@ -4,22 +4,28 @@ import ./make-test.nix ({ pkgs, ...} :
  nodes = {
    one =
      { config, pkgs, ... }: {
+        time.timeZone = "UTC";
        services.graphite = {
-          web = {
+          web.enable = true;
+          api = {
            enable = true;
+            port = 8082;
          };
-          carbon = {
-            enableCache = true;
-          };
+          carbon.enableCache = true;
+          seyren.enable = true;
+          pager.enable = true;
        };
      };
-    };
+  };

  testScript = ''
    startAll;
    $one->waitForUnit("default.target");
    $one->requireActiveUnit("graphiteWeb.service");
+    $one->requireActiveUnit("graphiteApi.service");
+    $one->requireActiveUnit("graphitePager.service");
    $one->requireActiveUnit("carbonCache.service");
+    $one->requireActiveUnit("seyren.service");
    $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003");
    $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo")
  '';
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
    owner = "bitcoinunlimited";
    repo = "bitcoinunlimited";
    rev = "v${version}";
-    sha256 = "0rhk6xvzvzyfppg0pgq72nqgm2rmkiw0nhg3rwnzcvvj90nrz3da";
+    sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q";
  };

  nativeBuildInputs = [ pkgconfig autoreconfHook ];
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
-, libmowgli, libmcs, dbus_glib, libxml2, xorg, gnome3, alsaLib
+, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib
 , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
 , libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
 , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gettext glib gtk3 libmowgli libmcs dbus_glib libxml2
+    gettext glib gtk3 libmowgli dbus_glib libxml2
    xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
    libpulseaudio fluidsynth libmad libogg libvorbis libcdio082
    libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@ -3,7 +3,7 @@
  gettext, pkgconfig,
  qtbase,
  alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
-  libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug,
+  libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug,
  libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
  libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
  wavpack
@ -39,7 +39,7 @@ mkDerivation {

    # Plugin dependencies
    alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb
-    libcdio082 libcue libjack2 libmad libmcs libmms libmodplug libmowgli
+    libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli
    libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
    libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
  ];
--- a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
+++ b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
@ -0,0 +1,23 @@
+From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001
+From: Sam Parkinson <sam@sam.today>
+Date: Thu, 26 Oct 2017 14:50:13 +1100
+Subject: [PATCH] Remove post-install script that hardcodes paths
+
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 25f3e1a..18b43bd 100644
+--- a/meson.build
+++ b/meson.build
+@@ -21,4 +21,5 @@ subdir('src')
+ # subdir('tests')
+ # TODO: unit tests
+ 
+-meson.add_install_script('meson_post_install.sh')
+# This does not work for nixos; it hard-codes paths
+# meson.add_install_script('meson_post_install.sh')
+-- 
+2.14.2
+
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@ -0,0 +1,72 @@
+{ stdenv, fetchFromGitHub, pkgconfig
+, gcc
+, python3
+, gsettings_desktop_schemas
+, desktop_file_utils
+, glib
+, gtk3
+, intltool
+, libsoup
+, json_glib
+, wrapGAppsHook
+, meson
+, ninja
+, vala
+, sqlite
+, gst_all_1
+, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
+}:
+let
+  version = "6.0.2";
+
+in stdenv.mkDerivation rec {
+  name = "gradio-${version}";
+
+  src = fetchFromGitHub {
+    owner = "haecker-felix";
+    repo = "gradio";
+    rev = "v${version}";
+    sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+
+    meson
+    ninja
+    vala
+
+    python3
+  ];
+  buildInputs = [
+    sqlite
+
+    glib
+    intltool
+    libsoup
+    json_glib
+
+    gtk3
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+
+    wrapGAppsHook
+    desktop_file_utils
+    gsettings_desktop_schemas
+  ] ++ gst_plugins;
+
+  enableParallelBuilding = true;
+  postInstall = ''
+    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+  '';
+
+  patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/haecker-felix/gradio;
+    description = "A GTK3 app for finding and listening to internet radio stations";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.samdroid-apps ];
+  };
+}
--- a/pkgs/applications/audio/groovebasin/default.nix
+++ b/pkgs/applications/audio/groovebasin/default.nix
@ -1,69 +0,0 @@
-{ stdenv, fetchFromGitHub, makeWrapper, callPackage, libgroove, python, utillinux, nodejs }:
-
-with stdenv.lib;
-
-let
-  nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
-    inherit nodejs;
-    neededNatives = [ libgroove python utillinux ];
-    self = nodePackages;
-    generated = ./package.nix;
-  };
-
-in nodePackages.buildNodePackage rec {
-  version = "1.5.1";
-  name = "groovebasin-${version}";
-
-  src = fetchFromGitHub {
-    owner = "andrewrk";
-    repo = "groovebasin";
-    rev = "${version}";
-    sha256 = "1g7v0qhvgzpb050hf45pibp68qd67hnnry5npw58f4dvaxdd8yhd";
-  };
-
-  deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
-
-  buildInputs = [ makeWrapper ];
-
-  postInstall = ''
-    mkdir -p "$out/lib/node_modules/groovebasin/public"
-    stylus -o "$out/lib/node_modules/groovebasin/public/" -c --include-css "$out/lib/node_modules/groovebasin/src/client/styles"
-    browserify-lite "$out/lib/node_modules/groovebasin/src/client/app.js" --outfile "$out/lib/node_modules/groovebasin/public/app.js"
-    wrapProgram "$out/bin/groovebasin" --set NODE_PATH "$out/lib/node_modules/groovebasin/node_modules/"
-  '';
-
-  passthru.names = ["groovebasin"];
-
-  meta = {
-    description = "Music player server with a web-based user interface";
-    homepage = http://groovebasin.com/;
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.andrewrk ];
-    longDescription = ''
-      Groove Basin runs on a server optionally connected to speakers. Guests can
-      control the music player by connecting with a laptop, tablet, or smart phone.
-      Further, users can stream their music libraries remotely.
-
-      Groove Basin comes with a fast, responsive web interface that supports keyboard
-      shortcuts and drag drop. It also provides the ability to upload songs,
-      download songs, and import songs by URL, including YouTube URLs.
-
-      Groove Basin supports Dynamic Mode which automatically queues random songs,
-      favoring songs that have not been queued recently.
-
-      Groove Basin automatically performs ReplayGain scanning on every song using
-      the EBU R128 loudness standard, and automatically switches between track
-      and album mode.
-
-      Groove Basin supports the MPD protocol, which means it is compatible with MPD
-      clients. There is also a more powerful Groove Basin protocol which you can
-      use if the MPD protocol does not meet your needs.
-
-      Groove Basin supports Last.fm scrobbling.
-    '';
-    # groovebasin was built with nodejs 0.10 which reached end of LTS
-    # in October 216, it doesn't built with nodejs 4.x
-    broken = true;
-  };
-}
--- a/pkgs/applications/audio/groovebasin/package.nix
+++ b/pkgs/applications/audio/groovebasin/package.nix
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "atom-${version}";
-  version = "1.21.1";
+  version = "1.21.2";

  src = fetchurl {
    url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "13mpj3wvcgsxz9q6lai36lkfgd7rabcjrrih1j5309kd1dqaswnn";
+    sha256 = "0snhhp8rjmk750snyzkqzwvi7f915pbc6qpa3vf0f57syf47m7vl";
    name = "${name}.deb";
  };

--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@ -106,16 +106,16 @@ rec {

  anyedittools = buildEclipsePlugin rec {
    name = "anyedit-${version}";
-    version = "2.7.0.201705171641";
+    version = "2.7.1.201709201439";

    srcFeature = fetchurl {
      url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
-      sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9";
+      sha256 = "1wqzl7wq85m9gil8rnvly45ps0a2m0svw613pg6djs5i7amhnayh";
    };

    srcPlugin = fetchurl {
-      url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
-      sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h";
+      url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.1/de.loskutov.anyedit.AnyEditTools_${version}.jar";
+      sha256 = "03iyb6j2srq74iigmg7dk098c2svyv0ygdfql5jqr44a32n07k8q";
    };

    meta = with stdenv.lib; {
@ -394,7 +394,7 @@ rec {
      sha256 = "1xfj4j27d1h4bdf2v7f78zi8lz4zkkj7s9kskmsqx5jcs2d459yp";
      extraPostFetch =
        ''
-          mv "$out/${repo}-${rev}/releases/local-repo"/* "$out/"
+          mv "$out/${repo}-${rev}/releases/local-repo/"* "$out/"
        '';
    };

@ -424,6 +424,29 @@ rec {
    };
  };

+  spotbugs = buildEclipsePlugin rec {
+    name = "spotbugs-${version}";
+    version = "3.1.0.r201710241414-11c9895";
+
+    srcFeature = fetchurl {
+      url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar";
+      sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs";
+    };
+
+    srcPlugin = fetchurl {
+      url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar";
+      sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://spotbugs.github.io/;
+      description = "Plugin that uses static analysis to look for bugs in Java code";
+      license = licenses.lgpl21;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
  testng = buildEclipsePlugin rec {
    name = "testng-${version}";
    version = "6.9.13.201609291640";
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@ -95,10 +95,10 @@
    ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
    elpaBuild {
        pname = "ahungry-theme";
-        version = "1.6.0";
+        version = "1.8.0";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ahungry-theme-1.6.0.tar";
-          sha256 = "1b0x7g753gn7mym8286b937zmxv50jgdish2h6wc05w1g1lygwsz";
+          url = "https://elpa.gnu.org/packages/ahungry-theme-1.8.0.tar";
+          sha256 = "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v";
        };
        packageRequires = [ emacs ];
        meta = {
@ -700,10 +700,10 @@
    ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
    elpaBuild {
        pname = "ebdb";
-        version = "0.3.4";
+        version = "0.4.1";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.3.4.tar";
-          sha256 = "1jj7s0646wqg9ykmpi52cc6m6m0gk2inqc2h6h7cr7gr4v7n2l00";
+          url = "https://elpa.gnu.org/packages/ebdb-0.4.1.tar";
+          sha256 = "0gv1q1xkhjab0l77c92znn6x0dfdbnj6hc48axmrx6a7zwbm3g2r";
        };
        packageRequires = [ cl-lib emacs seq ];
        meta = {
@ -945,10 +945,10 @@
    gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
    elpaBuild {
        pname = "gnorb";
-        version = "1.3.0";
+        version = "1.3.1";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnorb-1.3.0.tar";
-          sha256 = "0c256473llp7ahl1wbm6m236cj2lhp9ms1clmxpsfv51ds27ljqv";
+          url = "https://elpa.gnu.org/packages/gnorb-1.3.1.tar";
+          sha256 = "1g6xldkc6l6zlzd1slqizbbd5b9k4pbr66nrf5svidgiy7mlifw5";
        };
        packageRequires = [ cl-lib ];
        meta = {
@ -1556,10 +1556,10 @@
      }) {};
    org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "org";
-        version = "20171016";
+        version = "20171030";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20171016.tar";
-          sha256 = "1196kv83p953nd9c5gxkn8ndw2kmm2kfw34dldap6m89khqflz5a";
+          url = "https://elpa.gnu.org/packages/org-20171030.tar";
+          sha256 = "1lszws6b5s4r7w871cyigs433dflf6w0y33fj6rzrq8240d5092i";
        };
        packageRequires = [];
        meta = {
--- a/pkgs/applications/editors/emacs-modes/gn/default.nix
+++ b/pkgs/applications/editors/emacs-modes/gn/default.nix
@ -0,0 +1,20 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation {
+  name = "gn-mode-2017-09-21";
+  src = fetchgit {
+    url = "https://chromium.googlesource.com/chromium/src/tools/gn";
+    rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36";
+    sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866";
+  };
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp/
+    cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/
+  '';
+}
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@ -2,27 +2,28 @@

 let
  modules = [
-    { name = "icicles.el"; sha256 = "175g8w620vy73pp3zyasfjspgljk6g0lki71kdnvw5z88w3s9d1n"; }
-    { name = "icicles-chg.el"; sha256 = "1bx5xdhirvnrjqk4pk0sjp9bpj1syymsjnckklsw04gv6y0x8zik"; }
-    { name = "icicles-cmd1.el"; sha256 = "1ff0mndin9zxrswwwq3a7b1s879rr6gy8rzxanr7kxg1ppciafad"; }
-    { name = "icicles-cmd2.el"; sha256 = "1a44l86jacp9nsy4z260azz6y672drjw3w5a0jsc8w26fgsrnx1k"; }
-    { name = "icicles-doc1.el"; sha256 = "0s3r4z3y06hd1nxp18wd0b8b88z2a7ryy0j8sx5fzibbmp58ars1"; }
-    { name = "icicles-doc2.el"; sha256 = "0c10jg91qxyrg1zwiyi4m57dbw3yf43jdrpi4nnby3pkzh6i37ic"; }
-    { name = "icicles-face.el"; sha256 = "0n0vcbhwgd2lyj7anq1zpwja28xry018qxbm8sprxkh6y3vlw8d2"; }
-    { name = "icicles-fn.el"; sha256 = "1i10593a7hp465bxd86h7h7gwrdyqxx0d13in53z4jnab8icp3d4"; }
-    { name = "icicles-mac.el"; sha256 = "1piq0jk8nz0hz9wwci7dkxnfxscdpygjzpj5zg3310vs22l7rrsz"; }
-    { name = "icicles-mcmd.el"; sha256 = "0c4325yp84i46605nlxmjm6n0f4fh69shsihvd0wb9ryg0a8qa65"; }
-    { name = "icicles-mode.el"; sha256 = "069wx5clqpsq2c9aavgd9xihvlad3g00iwwrc3cpl47v64dvlipq"; }
-    { name = "icicles-opt.el"; sha256 = "16487l3361ca8l6il2c0z892843sc5l9v4gr7lx5fxbmrlsswvvn"; }
-    { name = "icicles-var.el"; sha256 = "1a9cwxpi10x44fngxa7qnrg8hqfvdjb8s8k47gnn1rbh63blkkry"; }
+    { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; }
+    { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; }
+    { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; }
+    { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; }
+    { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; }
+    { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; }
+    { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; }
+    { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; }
+    { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; }
+    { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; }
+    { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; }
+    { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; }
+    { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; }
  ];

  forAll = f: map f modules;
 in
-stdenv.mkDerivation {
-  name = "icicles-2014-11-06";
+stdenv.mkDerivation rec {
+  version = "2017-10-28";
+  name = "icicles-${version}";

-  srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs-en/download/${name}"; inherit sha256; });
+  srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });

  buildInputs = [ emacs ];

@ -30,11 +31,13 @@ stdenv.mkDerivation {

  buildPhase = "emacs --batch -L . -f batch-byte-compile *.el";

-  installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/";
+  installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/";

  meta = {
    homepage = http://www.emacswiki.org/emacs/Icicles;
    description = "Enhance Emacs minibuffer input with cycling and powerful completion";
    license = stdenv.lib.licenses.gpl2Plus;
+    platforms   = emacs.meta.platforms;
+    maintainers = with stdenv.lib.maintainers; [ scolobb ];
  };
 }
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@ -548,12 +548,12 @@
    ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
    melpaBuild {
        pname = "ac-php";
-        version = "1.8";
+        version = "1.8.1";
        src = fetchFromGitHub {
          owner = "xcwen";
          repo = "ac-php";
-          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
-          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+          rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+          sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@ -569,12 +569,12 @@
    ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
    melpaBuild {
        pname = "ac-php-core";
-        version = "1.8";
+        version = "1.8.1";
        src = fetchFromGitHub {
          owner = "xcwen";
          repo = "ac-php";
-          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
-          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+          rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+          sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@ -989,12 +989,12 @@
    aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "aes";
-        version = "0.8";
+        version = "0.9";
        src = fetchFromGitHub {
          owner = "Sauermann";
          repo = "emacs-aes";
-          rev = "d78796facc034b09f379cda5f27090f3139305ec";
-          sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2";
+          rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af";
+          sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes";
@ -1073,12 +1073,12 @@
    ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "ahungry-theme";
-        version = "1.6.0";
+        version = "1.8.0";
        src = fetchFromGitHub {
          owner = "ahungry";
          repo = "color-theme-ahungry";
-          rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c";
-          sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d";
+          rev = "32ce7765c95559f6a0552cdaeedb6eb97bb7a476";
+          sha256 = "0c1xwqknhjx6y29fwca949r8d2fqb17mca5qc79pdxdlp3l606fg";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@ -3331,6 +3331,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "build-status";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "sshaw";
+          repo = "build-status";
+          rev = "c29a0146c5d0be274f5e17921e01698f572c23a1";
+          sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
+          sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92";
+          name = "build-status";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/build-status";
+          license = lib.licenses.free;
+        };
+      }) {};
    bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
    melpaBuild {
        pname = "bundler";
@ -3670,12 +3691,12 @@
    caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "caml";
-        version = "4.6.0beta2";
+        version = "4.6.0pre1";
        src = fetchFromGitHub {
          owner = "ocaml";
          repo = "ocaml";
-          rev = "817604da4d38362b6b2bd4c7787a5add6741cd21";
-          sha256 = "1d49kiv9nfr624924qwmf0mfsvja28mvliipaylfbslyb3f7jpkl";
+          rev = "500625015d40f716e19278209faaa44216dcff58";
+          sha256 = "1s10wirx080yl0gd2n09lw5kj8yy1mbiipmcr8gpfyc8dq7kfjna";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@ -4235,12 +4256,12 @@
    circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "circadian";
-        version = "0.2.3";
+        version = "0.3.0";
        src = fetchFromGitHub {
          owner = "GuidoSchmidt";
          repo = "circadian.el";
-          rev = "0034de1551de9f420f42267f3ec081351c2b5d7f";
-          sha256 = "1khczk5lsiicyjra7g5m3dcl1rc6g43zbypigkj3izx2dsa47n5d";
+          rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee";
+          sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
@ -4667,12 +4688,12 @@
    cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "cmake-mode";
-        version = "3.10.0pre3";
+        version = "3.10.0pre4";
        src = fetchFromGitHub {
          owner = "Kitware";
          repo = "CMake";
-          rev = "319622a49fb300cd8a7efd8378421a32204510de";
-          sha256 = "19n0s0kd051xh3av9nd5ncpccx6bmvay6115g0kqgmi8wbw7587q";
+          rev = "45da558742bad36be518e8d95dee0d0ec3793a64";
+          sha256 = "0qq7dhwcl290ymza5imc16cg3f9crxym1q6b4i7w9fax8x2vlc1m";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@ -5294,6 +5315,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
+    melpaBuild {
+        pname = "company-lsp";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "tigersoldier";
+          repo = "company-lsp";
+          rev = "86fda23d29b732ba3987bf20901034da1515b077";
+          sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
+          sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
+          name = "company-lsp";
+        };
+        packageRequires = [ company emacs lsp-mode s ];
+        meta = {
+          homepage = "https://melpa.org/#/company-lsp";
+          license = lib.licenses.free;
+        };
+      }) {};
    company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
    melpaBuild {
        pname = "company-math";
@ -5360,12 +5402,12 @@
    company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "company-php";
-        version = "1.8";
+        version = "1.8.1";
        src = fetchFromGitHub {
          owner = "xcwen";
          repo = "ac-php";
-          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
-          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+          rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+          sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@ -5660,12 +5702,12 @@
    conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
    melpaBuild {
        pname = "conda";
-        version = "0.0.7";
+        version = "0.0.8";
        src = fetchFromGitHub {
          owner = "necaris";
          repo = "conda.el";
-          rev = "6ba9ef5d72ef613f478e07e2ebf57b47066beee7";
-          sha256 = "0mp6jzyvz3m41vb4kwwikyvcjgc8qgryyx71n1m50jr2i23s9nk2";
+          rev = "526be691824f4a32299f560a883913697bc4d847";
+          sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@ -6329,6 +6371,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
+    melpaBuild {
+        pname = "cwl-mode";
+        version = "0.2.4";
+        src = fetchFromGitHub {
+          owner = "tom-tan";
+          repo = "cwl-mode";
+          rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9";
+          sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
+          sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j";
+          name = "cwl-mode";
+        };
+        packageRequires = [ emacs yaml-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/cwl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
    cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "cyberpunk-theme";
@ -6374,12 +6437,12 @@
    cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "cython-mode";
-        version = "0.27.1";
+        version = "0.27.2";
        src = fetchFromGitHub {
          owner = "cython";
          repo = "cython";
-          rev = "32538fc162be830bf01ff96e43a020bc4924a1ee";
-          sha256 = "03v4ig9zlh8dz9s0c31f5hz2wfpvjydiidb0zgghnrshlqacpyj3";
+          rev = "41b4a28d7c7c505d58502c9cf69bde2e33091de0";
+          sha256 = "04k534xyr8816821y0lf2dq24bzvb40v99ijdwgy5qhv4rjxbr18";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@ -8057,15 +8120,36 @@
          license = lib.licenses.free;
        };
      }) {};
+    eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eacl";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "eacl";
+          rev = "c7a8d705295dc51cc306cb4c2d8773e24c4c74f4";
+          sha256 = "1f3liqrw55v9wnf7g475iabx4pf7gbg2x82mqrf22hhkvxzi2b2b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
+          sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr";
+          name = "eacl";
+        };
+        packageRequires = [ emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/eacl";
+          license = lib.licenses.free;
+        };
+      }) {};
    easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "easy-hugo";
-        version = "2.0.15";
+        version = "2.0.16";
        src = fetchFromGitHub {
          owner = "masasam";
          repo = "emacs-easy-hugo";
-          rev = "0b55c207c6552223857de03bf8aec8be3344ed26";
-          sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0";
+          rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0";
+          sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@ -9139,12 +9223,12 @@
    elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
    melpaBuild {
        pname = "elpy";
-        version = "1.16.1";
+        version = "1.17.0";
        src = fetchFromGitHub {
          owner = "jorgenschaefer";
          repo = "elpy";
-          rev = "1e65cb6e988df088c299572464335b6f149addcd";
-          sha256 = "01mfrn6mn8h9fkpkqg2shp21864ffjr7q5h3rpbnk6wpa3pmjc1m";
+          rev = "99f0b6401bff25d40b9f58123533271f7870a286";
+          sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@ -9440,12 +9524,12 @@
    embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "embrace";
-        version = "0.1.3";
+        version = "0.1.4";
        src = fetchFromGitHub {
          owner = "cute-jumper";
          repo = "embrace.el";
-          rev = "a57b4be5d60daf8c176f9bd35770540c2d3963c9";
-          sha256 = "0sn81a7f8g5i4q74byfkj0jlg4aj0rxpfvx9sqv8azcg6wq2f65l";
+          rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2";
+          sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@ -9479,20 +9563,21 @@
          license = lib.licenses.free;
        };
      }) {};
-    emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
        pname = "emms";
-        version = "4.3";
+        version = "4.4";
        src = fetchgit {
          url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "4cb3ae341847e8e8586373a95a458a453469812d";
-          sha256 = "0bmxlrk2p51bw5lgh2arkcz1v9bw6rpflwk778rdzn0rhzhvhp5b";
+          rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d";
+          sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
          sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
          name = "emms";
        };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
        meta = {
          homepage = "https://melpa.org/#/emms";
          license = lib.licenses.free;
@ -10064,12 +10149,12 @@
    erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "erlang";
-        version = "20.1.2";
+        version = "20.1.3";
        src = fetchFromGitHub {
          owner = "erlang";
          repo = "otp";
-          rev = "919ef5de2858e606d4a9be3e0e995b0802c76e33";
-          sha256 = "0y76ci80wmzrxvj90bhiz6cvwbis34kcc6dzas9xxsj92b6sh7sk";
+          rev = "a98379d0519c28f9bc9b673ed2c09fb1ad52456e";
+          sha256 = "1672yqqh7ql88c6ifv555wvqrj8nyn5a2nph43n2nc43h7hhz17c";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@ -12585,6 +12670,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, nim-mode }:
+    melpaBuild {
+        pname = "flycheck-nimsuggest";
+        version = "0.8.1";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "flycheck-nimsuggest";
+          rev = "8b1c69e9aa924368bc4dadd4cde818ff158cd3f0";
+          sha256 = "0vnwy7b3xs2smbr6ah6yk8hq7vvsciq7d6m1qr91nfnazdgvxmvg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest";
+          sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv";
+          name = "flycheck-nimsuggest";
+        };
+        packageRequires = [ emacs flycheck nim-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-nimsuggest";
+          license = lib.licenses.free;
+        };
+      }) {};
    flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
    melpaBuild {
        pname = "flycheck-objc-clang";
@ -19471,12 +19577,12 @@
    import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
    melpaBuild {
        pname = "import-js";
-        version = "1.0.0";
+        version = "2.0.0";
        src = fetchFromGitHub {
          owner = "Galooshi";
          repo = "emacs-import-js";
-          rev = "15d395126f57408d770a72db2e5f43271f90fa52";
-          sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l";
+          rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250";
+          sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
@ -19992,6 +20098,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iter2";
+        version = "0.9.4";
+        src = fetchFromGitHub {
+          owner = "doublep";
+          repo = "iter2";
+          rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55";
+          sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
+          sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65";
+          name = "iter2";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/iter2";
+          license = lib.licenses.free;
+        };
+      }) {};
    ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "ivy";
@ -20452,6 +20579,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jetbrains";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "jetbrains.el";
+          rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8";
+          sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
+          sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7";
+          name = "jetbrains";
+        };
+        packageRequires = [ cl-lib emacs f ];
+        meta = {
+          homepage = "https://melpa.org/#/jetbrains";
+          license = lib.licenses.free;
+        };
+      }) {};
    jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "jinja2-mode";
@ -20518,12 +20666,12 @@
    js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "js-auto-format-mode";
-        version = "1.0.1";
+        version = "1.0.2";
        src = fetchFromGitHub {
          owner = "ybiquitous";
          repo = "js-auto-format-mode";
-          rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09";
-          sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag";
+          rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb";
+          sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
@ -20956,24 +21104,24 @@
          license = lib.licenses.free;
        };
      }) {};
-    kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
-        pname = "kaolin-theme";
-        version = "0.9";
+        pname = "kaolin-themes";
+        version = "1.0";
        src = fetchFromGitHub {
          owner = "ogdenwebb";
-          repo = "kaolin-theme";
-          rev = "d43ba0e8e6b13b08e4d74de20c6e594ebb225501";
-          sha256 = "0gg19rh5q1gl6ylwrmjq0dqh6p5fkms1av6bbgry6fqv8220xf8n";
+          repo = "emacs-kaolin-themes";
+          rev = "720762a42ad4cb4b325f78a9d41af380b8783501";
+          sha256 = "104prgkjqnnv1bqgpcl0di1q9sqkfnj4ibqvrk6ls32hw75shvdh";
        };
        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme";
-          sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c";
-          name = "kaolin-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
+          sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw";
+          name = "kaolin-themes";
        };
-        packageRequires = [ emacs ];
+        packageRequires = [ autothemer cl-lib emacs ];
        meta = {
-          homepage = "https://melpa.org/#/kaolin-theme";
+          homepage = "https://melpa.org/#/kaolin-themes";
          license = lib.licenses.free;
        };
      }) {};
@ -24629,6 +24777,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nim-mode";
+        version = "0.4.1";
+        src = fetchFromGitHub {
+          owner = "nim-lang";
+          repo = "nim-mode";
+          rev = "86abed21b9b718ac65cc167f208e0bd5b92c79ed";
+          sha256 = "0h1paf9z6xvkay97ns74w2w9plwi46md5f2kik4jvjy74p57gxal";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
+          sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
+          name = "nim-mode";
+        };
+        packageRequires = [ commenter emacs epc flycheck let-alist ];
+        meta = {
+          homepage = "https://melpa.org/#/nim-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
    ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "ninja-mode";
@ -24682,8 +24851,8 @@
          sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz";
        };
        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode";
-          sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
+          sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5";
          name = "nix-mode";
        };
        packageRequires = [ emacs ];
@ -25472,8 +25641,8 @@
        src = fetchFromGitHub {
          owner = "OmniSharp";
          repo = "omnisharp-emacs";
-          rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a";
-          sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj";
+          rev = "906e29a702237f039f24c215fdb561a728a3df1b";
+          sha256 = "1l1rzl7y5j2wmlgx7ivivwvwvbn4h7pg5s7yqsk65n9kb59ha8s8";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@ -26109,12 +26278,12 @@
    org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "org-mru-clock";
-        version = "0.1.1";
+        version = "0.1.2";
        src = fetchFromGitHub {
          owner = "unhammer";
          repo = "org-mru-clock";
-          rev = "096a7c514ab8487ec63def6281cf4dce24e3a626";
-          sha256 = "1hmyqvi1dj5yrlish8kw4sdh3yy0b0w33smw4cbjagp4rs29p3fp";
+          rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832";
+          sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@ -27136,12 +27305,12 @@
    ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
    melpaBuild {
        pname = "ox-hugo";
-        version = "0.3.1";
+        version = "0.4.1";
        src = fetchFromGitHub {
          owner = "kaushalmodi";
          repo = "ox-hugo";
-          rev = "16cf5d595644ee4e05b05b351e0c4fdd5df0ac44";
-          sha256 = "1n5xbgwv9x2b9zmv7nw0x64qbll4ycjf2dp09rdj3m4bmcg2gv42";
+          rev = "c32359c71e7926c7f13039069d8d7481dfb9bc82";
+          sha256 = "1nw2dp6rn3hnnzzffvpr6yz7c154338h9i5ixxgh5vjxm9phzdml";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@ -28705,12 +28874,12 @@
    pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
    melpaBuild {
        pname = "pocket-reader";
-        version = "0.1";
+        version = "0.1.1";
        src = fetchFromGitHub {
          owner = "alphapapa";
          repo = "pocket-reader.el";
-          rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd";
-          sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh";
+          rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574";
+          sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
@ -30957,22 +31126,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+    rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
    melpaBuild {
        pname = "rg";
-        version = "1.3.1";
+        version = "1.4.0";
        src = fetchFromGitHub {
          owner = "dajva";
          repo = "rg.el";
-          rev = "081685a8c624220ece68d6dca8d60016585b04ff";
-          sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z";
+          rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14";
+          sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
          sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
          name = "rg";
        };
-        packageRequires = [ cl-lib emacs s seq ];
+        packageRequires = [ cl-lib emacs s ];
        meta = {
          homepage = "https://melpa.org/#/rg";
          license = lib.licenses.free;
@ -33457,12 +33626,12 @@
    sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "sparql-mode";
-        version = "2.1.1";
+        version = "3.0.0";
        src = fetchFromGitHub {
          owner = "ljos";
          repo = "sparql-mode";
-          rev = "262c46a282ce54ca4745b863cf323d9bf69e2faa";
-          sha256 = "02ai86c15x0fbgg2bw6a9k3k825gkhl3hy9abq62dfgdwc0cqxmn";
+          rev = "e220a0c0c478fee0be3622442651981cdd82090c";
+          sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@ -35135,12 +35304,12 @@
    tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "tickscript-mode";
-        version = "0.3.1";
+        version = "0.4";
        src = fetchFromGitHub {
          owner = "msherry";
          repo = "tickscript-mode";
-          rev = "eb6eafee2df253a0f1356f260cc7f435ab68aea2";
-          sha256 = "04pd1dvvs914f98yaq5n0nv1jbjr2sjgi3a288vpismrmxfybcch";
+          rev = "9acf389dd055ae77c92170802769838810472490";
+          sha256 = "1v60y244papzrirwqk9c2wcwgz4qp9h7m3887kvgr5ffn5imjss8";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
@ -37237,22 +37406,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "winum";
-        version = "1.0.2";
+        version = "2.0.0";
        src = fetchFromGitHub {
          owner = "deb0ch";
          repo = "emacs-winum";
-          rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883";
-          sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37";
+          rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c";
+          sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
          sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
          name = "winum";
        };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib dash ];
        meta = {
          homepage = "https://melpa.org/#/winum";
          license = lib.licenses.free;
@ -38018,8 +38187,8 @@
        version = "1.80";
        src = fetchhg {
          url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "ca7cf34e959c";
-          sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma";
+          rev = "16763e5b7481";
+          sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
@ -38276,12 +38445,12 @@
    zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "zoom";
-        version = "0.1.0";
+        version = "0.2.0";
        src = fetchFromGitHub {
          owner = "cyrus-and";
          repo = "zoom";
-          rev = "ed8aca43820678ff6e7b8ed697cba8dbb3a6136e";
-          sha256 = "1na1syvbayqwbsvd1d0ajyzjvhg8q3s3mqrx82ffcbxr0ijyzzj8";
+          rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40";
+          sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@ -1,10 +1,10 @@
 { callPackage }: {
    org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "org";
-        version = "20171016";
+        version = "20171030";
        src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20171016.tar";
-          sha256 = "1v89wl8xlxavvv2kdd5vms0rwpqaw2x73q0162ybxmrzf4a5f5mw";
+          url = "http://orgmode.org/elpa/org-20171030.tar";
+          sha256 = "1g2dyzy1844lli2hhfjnbskn1mskccgaaf0mxb1cm0zhhas8bnfd";
        };
        packageRequires = [];
        meta = {
@ -14,10 +14,10 @@
      }) {};
    org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "org-plus-contrib";
-        version = "20171016";
+        version = "20171030";
        src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20171016.tar";
-          sha256 = "0xy2xrndlhs4kyvh6mmv24dnh3fn5p63d2gaimnrypf1p8znwzh4";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20171030.tar";
+          sha256 = "0pq2hs5d2i6s036pcs0jn6ld2p1ap08dmbjf17hsh899741mg9cj";
        };
        packageRequires = [];
        meta = {
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@ -4,13 +4,13 @@

 stdenv.mkDerivation rec {
  name = "ahoviewer-${version}";
-  version = "1.4.8";
+  version = "1.4.9";

  src = fetchFromGitHub {
    owner = "ahodesuka";
    repo = "ahoviewer";
    rev = version;
-    sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4";
+    sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx";
  };

  enableParallelBuilding = true; 
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    homepage = https://github.com/ahodesuka/ahoviewer;
    description = "A GTK2 image viewer, manga reader, and booru browser";
-    maintainers = [ maintainers.skrzyp ];
+    maintainers = with maintainers; [ skrzyp xzfc ];
    license = licenses.mit;
    platforms = platforms.allBut [ "darwin" "cygwin" ];
  };
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/pkgs/applications/graphics/autotrace/default.nix
@ -66,5 +66,59 @@ stdenv.mkDerivation rec {
    platforms = platforms.unix;
    maintainers = with maintainers; [ hodapp ];
    license = licenses.gpl2;
+    knownVulnerabilities = [
+      "CVE-2013-1953"
+      "CVE-2016-7392"
+      "CVE-2017-9151"
+      "CVE-2017-9152"
+      "CVE-2017-9153"
+      "CVE-2017-9154"
+      "CVE-2017-9155"
+      "CVE-2017-9156"
+      "CVE-2017-9157"
+      "CVE-2017-9158"
+      "CVE-2017-9159"
+      "CVE-2017-9160"
+      "CVE-2017-9161"
+      "CVE-2017-9162"
+      "CVE-2017-9163"
+      "CVE-2017-9164"
+      "CVE-2017-9165"
+      "CVE-2017-9166"
+      "CVE-2017-9167"
+      "CVE-2017-9168"
+      "CVE-2017-9169"
+      "CVE-2017-9170"
+      "CVE-2017-9171"
+      "CVE-2017-9172"
+      "CVE-2017-9173"
+      "CVE-2017-9174"
+      "CVE-2017-9175"
+      "CVE-2017-9176"
+      "CVE-2017-9177"
+      "CVE-2017-9178"
+      "CVE-2017-9179"
+      "CVE-2017-9180"
+      "CVE-2017-9181"
+      "CVE-2017-9182"
+      "CVE-2017-9183"
+      "CVE-2017-9184"
+      "CVE-2017-9185"
+      "CVE-2017-9186"
+      "CVE-2017-9187"
+      "CVE-2017-9188"
+      "CVE-2017-9189"
+      "CVE-2017-9190"
+      "CVE-2017-9191"
+      "CVE-2017-9192"
+      "CVE-2017-9193"
+      "CVE-2017-9194"
+      "CVE-2017-9195"
+      "CVE-2017-9196"
+      "CVE-2017-9197"
+      "CVE-2017-9198"
+      "CVE-2017-9199"
+      "CVE-2017-9200"
+    ];
  };
 }
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@ -5,11 +5,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "hugin-2016.2.0";
+  name = "hugin-2017.0.0";

  src = fetchurl {
    url = "mirror://sourceforge/hugin/${name}.tar.bz2";
-    sha256 = "058zd63vx29yrx2pphbbll7kzcxkai22q26lpw13rn4lvp41pasl";
+    sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46";
  };

  buildInputs = [
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@ -23,6 +23,11 @@ stdenv.mkDerivation rec {

  buildInputs = [ libX11 imlib2 giflib libexif ];

+  postInstall = ''
+    mkdir -p $out/share/applications/
+    cp -v sxiv.desktop $out/share/applications/
+  '';
+
  meta = {
    description = "Simple X Image Viewer";
    homepage = https://github.com/muennich/sxiv;
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@ -27,7 +27,7 @@ mkDerivation {
        lib.makeBinPath
        ([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar);
    in ''
-      wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}"
+      wrapProgram "$out/bin/ark" --prefix PATH : "${PATH}"
    '';
  meta = {
    license = with lib.licenses;
--- a/pkgs/applications/kde/kde-locale-5.nix
+++ b/pkgs/applications/kde/kde-locale-5.nix
@ -1,24 +0,0 @@
-name: args:
-
-{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }:
-
-mkDerivation (args // {
-  sname = "kde-l10n-${name}";
-  name = "kde-l10n-${name}-qt5";
-
-  outputs = [ "out" ];
-
-  nativeBuildInputs =
-    [ cmake extra-cmake-modules gettext kdoctools ]
-    ++ (args.nativeBuildInputs or []);
-
-  preConfigure = ''
-    sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
-    ${args.preConfigure or ""}
-  '';
-
-  preFixup = ''
-    propagatedBuildInputs=
-    propagatedNativeBuildInputs=
-  '';
-})
--- a/pkgs/applications/kde/l10n.nix
+++ b/pkgs/applications/kde/l10n.nix
@ -3,7 +3,6 @@
 let

  kdeLocale4 = import ./kde-locale-4.nix;
-  kdeLocale5 = import ./kde-locale-5.nix;

 in

--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }:

 stdenv.mkDerivation rec {
-  version = "1.5";
+  version = "1.6";
  name = "cli-visualizer-${version}";

  src = fetchFromGitHub {
    owner = "dpayne";
    repo = "cli-visualizer";
    rev = version;
-    sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs";
+    sha256 = "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc";
  };

  postPatch = ''
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
    license = licenses.gpl3;
    maintainers = with maintainers; [ viric ];
    platforms = platforms.linux;
-    hydraPlatforms = [];
+    broken = true;
  };
 }
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline, ncurses }:

 let
-  version = "1.22";
+  version = "1.23";
 in
 stdenv.mkDerivation rec {

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
-    sha256 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp";
+    sha256 = "1hnira256p7sdilx34mnkji7gi2jcl98zz4izqxsqmnzj8ghhzkv";
  };

  buildInputs = [ readline ncurses ];
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "josm-${version}";
-  version = "12921";
+  version = "13053";

  src = fetchurl {
    url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1fp6mpl8fa91dhdf3hw5hk8xsp1imj7558adjnjkb6n4vmrbszhm";
+    sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6";
  };

  buildInputs = [ jre8 makeWrapper ];
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@ -5,11 +5,11 @@ with python3Packages;
 buildPythonApplication rec {
  name = "${pname}-${version}";
  pname = "khal";
-  version = "0.9.7";
+  version = "0.9.8";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0x1p62ff7ggb172rjr6sbdrjh1gl3ck3bwxsqlsix8i5wycwvnmv";
+    sha256 = "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y";
  };

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

  desktopItem = makeDesktopItem {
-    name = "Robo3T";
+    name = "robo3t";
    exec = "robo3t";
    icon = icon;
    comment = "Query GUI for mongodb";
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@ -54,8 +54,7 @@ rec {
      unpackPhase = ''
        # fetchFromGitHub produces ro sources, root dir gets a name that
        # is too long for shebangs. fixing
-        cp -a $src .
-        mv *-src tor-browser
+        cp -a $src tor-browser
        chmod -R +w tor-browser
        cd tor-browser

@ -106,9 +105,10 @@ in rec {
    # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
    src = fetchFromGitHub {
      owner = "SLNOS";
-      repo  = "tor-browser";
-      rev   = "tor-browser-45.8.0esr-6.5-2";
-      sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j";
+      repo = "tor-browser";
+      # branch "tor-browser-45.8.0esr-6.5-2"
+      rev = "e4140ea01b9906934f0347e95f860cec207ea824";
+      sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60";
    };
  } // commonAttrs) {
    stdenv = overrideCC stdenv gcc5;
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@ -2,7 +2,7 @@

 buildGoPackage rec {
  name = "kops-${version}";
-  version = "1.6.2";
+  version = "1.7.1";

  goPackagePath = "k8s.io/kops";

@ -10,7 +10,7 @@ buildGoPackage rec {
    rev = version;
    owner = "kubernetes";
    repo = "kops";
-    sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l";
+    sha256 = "0wii6w6hs9hjz3vvgqwa5ilwdi8a3qknmqsg3izazmgmnhl712wd";
  };

  buildInputs = [go-bindata];
@ -39,7 +39,7 @@ buildGoPackage rec {
    description = "Easiest way to get a production Kubernetes up and running";
    homepage = https://github.com/kubernetes/kops;
    license = licenses.asl20;
-    maintainers = with maintainers; [offline];
+    maintainers = with maintainers; [offline zimbatm];
    platforms = platforms.unix;
  };
 }
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@ -3,14 +3,14 @@
 , glib_networking }:

 stdenv.mkDerivation rec {
-  version = "1.6";
+  version = "1.7.1";
  name = "corebird-${version}";

  src = fetchFromGitHub {
    owner = "baedert";
    repo = "corebird";
    rev = version;
-    sha256 = "1bxjlamdy5d2j3xdahmxf6lwc7f6xdfxbzi712ppvh1dwggw654v";
+    sha256 = "1g6wkzrl6j0mmgafpv0jpqa906s1x7p5hmiqdgs9qwm7q2wlwrqd";
  };

  preConfigure = ''
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@ -22,6 +22,11 @@
 # them with our own.

 let
+  ## Prefetch commands to run after update, from this directory:
+  ## e.g. with Emacs: C-u M-x shell-command
+  # nix-prefetch-url ../../../../ -A dropbox.src
+  # nix-prefetch-url ../../../../ -A pkgsi686Linux.dropbox.src
+
  # NOTE: When updating, please also update in current stable,
  # as older versions stop working
  version = "37.4.29";
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
  '';

  meta = with stdenv.lib; {
+    broken = true;
    description = "An extensible Twitter client";
    homepage = https://mikutter.hachune.net;
    maintainers = with maintainers; [ midchildan ];
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@ -4,7 +4,7 @@

 let

-  version = "5.4.0.1";
+  version = "5.5.0.1";

  rpath = stdenv.lib.makeLibraryPath [
    alsaLib
@ -54,7 +54,7 @@ let
    if stdenv.system == "x86_64-linux" then
      fetchurl {
        url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
-        sha256 = "1idjgmn0kym7jml30xq6zrcp8qinx64kgnxlw8m0ys4z6zlw0c8z";
+        sha256 = "1r65qlsjwp0n0fmlhvbp71h03b3x73r26jk9f4q687sjqnzmkvcr";
      }
    else
      throw "Skype for linux is not supported on ${stdenv.system}";
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@ -4,7 +4,7 @@

 let

-  version = "2.8.0";
+  version = "2.8.2";

  rpath = stdenv.lib.makeLibraryPath [
    alsaLib
@ -46,7 +46,7 @@ let
    if stdenv.system == "x86_64-linux" then
      fetchurl {
        url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "02khqi0qf8ryj6bkfla95mr3scvb99zrhihwdprdjqpgvy06wqhm";
+        sha256 = "019gzij6m1y9bv561nhbhgf2njp2svjqi5hs907pdjf7xwciwrkm";
      }
    else
      throw "Slack is not supported on ${stdenv.system}";
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, python3Packages }:

 stdenv.mkDerivation rec {
-  name = "bean-add-2017-09-13";
+  name = "bean-add-2017-10-31";

  src = fetchFromGitHub {
    owner = "simon-v";
    repo = "bean-add";
-    rev = "035f07a9e48a9dd23b49a27ba9c070ee9ddc4cc7";
-    sha256 = "0lj8940bn2h8541am4x0sfqpfk5xfnyfdnf3jpajfgx6wyjm2frg";
+    rev = "9ac64272a17e76f8292bd94deb5aee45c14130d2";
+    sha256 = "1vcwbbi2jsf87yq8f2hyf7nz9br1973sb20qjnsx5fxlmcpn47jh";
  };

  propagatedBuildInputs = with python3Packages; [ python ];
--- a/pkgs/applications/office/beancount/default.nix
+++ b/pkgs/applications/office/beancount/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchhg, pkgs, pythonPackages }:

 pythonPackages.buildPythonApplication rec {
-  version = "2.0b15";
+  version = "2.0rc1";
  name = "beancount-${version}";
  namePrefix = "";

  src = pkgs.fetchurl {
    url = "mirror://pypi/b/beancount/${name}.tar.gz";
-    sha256 = "1dvnpgja4v4k5zagfsmdjavlib0z3r9r4z197yvj86szhzs0z86k";
+    sha256 = "12vlkck4q3dax9866krp6963c6d845b7inkkwrlkk4njh84n71wf";
  };

  buildInputs = with pythonPackages; [ nose ];
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@ -0,0 +1,51 @@
+{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig
+# data, compression
+, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy
+# maths
+, blas, eigen, nlopt, lp_solve, colpack
+# libraries
+, libarchive, liblapack, libxml2
+# extra support
+, pythonSupport ? true, pythonPackages ? null
+, opencvSupport ? false, opencv ? null
+}:
+
+assert pythonSupport -> pythonPackages != null;
+assert opencvSupport -> opencv != null;
+
+stdenv.mkDerivation rec {
+
+  pname = "shogun";
+  version = "6.0.0";
+  name = pname + "-" + version;
+
+  src = fetchFromGitHub {
+    owner = pname + "-toolbox";
+    repo = pname;
+    rev = pname + "_" + version;
+    sha256 = "0f2zwzvn5apvwypkfkq371xp7c5bdb4g1fwqfh8c2d57ysjxhmgf";
+    fetchSubmodules = true;
+  };
+
+  CCACHE_DIR=".ccache";
+
+  buildInputs = with lib; [
+      blas bzip2 ccache cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo
+      protobuf nlopt snappy swig (libarchive.dev) liblapack libxml2
+    ]
+    ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ])
+    ++ optional  (opencvSupport) opencv;
+
+  cmakeFlags = with lib; []
+    ++ (optional (pythonSupport) "-DPythonModular=ON")
+    ++ (optional (opencvSupport) "-DOpenCV=ON")
+    ;
+
+  meta = with stdenv.lib; {
+    description = "A toolbox which offers a wide range of efficient and unified machine learning methods";
+    homepage = "http://shogun-toolbox.org/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+
+}
--- a/pkgs/applications/science/math/colpack/default.nix
+++ b/pkgs/applications/science/math/colpack/default.nix
@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }:
+
+stdenv.mkDerivation rec {
+
+  pname = "ColPack";
+  version = "1.0.10";
+  name = pname + "-" + version;
+
+  src = fetchFromGitHub {
+    owner = "CSCsw";
+    repo = pname;
+    rev = "v" + version;
+    sha256 = "1p05vry940mrjp6236c0z83yizmw9pk6ly2lb7d8rpb7j9h03glr";
+  };
+
+  buildInputs = [ autoconf automake gettext libtool ];
+
+  configurePhase = ''
+    autoreconf -vif
+    ./configure --prefix=$out --enable-openmp
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A package comprising of implementations of algorithms for
+    vertex coloring and derivative computation";
+    homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+
+}
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@ -14,12 +14,21 @@ stdenv.mkDerivation rec {
  buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ];

  configureScript = "./Configure";
-  configureFlags =
-    "--mt=pthread" +
-    "--with-gmp=${gmp.dev} " +
-    "--with-readline=${readline.dev}";
+  configureFlags = [
+    "--mt=pthread"
+    "--with-gmp=${gmp.dev}"
+    "--with-readline=${readline.dev}"
+  ] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin";

-  makeFlags = "all";
+  preConfigure = ''
+    export LD=$CC
+  '';
+
+  postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    echo 'echo x86_64-darwin' > config/arch-osname
+  '';
+
+  makeFlags = [ "all" ];

  meta = with stdenv.lib; {
    description = "Computer algebra system for high-performance number theory computations";
@ -36,12 +45,12 @@ stdenv.mkDerivation rec {
       Bordeaux I, France), PARI is now under the GPL and maintained by Karim
       Belabas with the help of many volunteer contributors.

-       - PARI is a C library, allowing fast computations.  
+       - PARI is a C library, allowing fast computations.
       - gp is an easy-to-use interactive shell giving access to the
          PARI functions.
       - GP is the name of gp's scripting language.
-       - gp2c, the GP-to-C compiler, combines the best of both worlds 
-          by compiling GP scripts to the C language and transparently loading 
+       - gp2c, the GP-to-C compiler, combines the best of both worlds
+          by compiling GP scripts to the C language and transparently loading
          the resulting functions into gp. (gp2c-compiled scripts will typically
          run 3 or 4 times faster.) gp2c currently only understands a subset
           of the GP language.
@ -50,7 +59,7 @@ stdenv.mkDerivation rec {
    downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
    license     = licenses.gpl2Plus;
    maintainers = with maintainers; [ ertes raskin AndersonTorres ];
-    platforms   = platforms.linux;
+    platforms   = platforms.linux ++ platforms.darwin;
    updateWalker = true;
  };
 }
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -58,6 +58,8 @@ rec {
  # support for bugzilla
  git-bz = callPackage ./git-bz { };

+  git-codeowners = callPackage ./git-codeowners { };
+
  git-cola = callPackage ./git-cola { };

  git-crypt = callPackage ./git-crypt { };
--- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
@ -0,0 +1,21 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+rustPlatform.buildRustPackage rec {
+  name = "git-codeowners-${version}";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "softprops";
+    repo = "git-codeowners";
+    rev = "v${version}";
+    sha256 = "0imxbi6y1165bi2rik0n98v79fkgp8alb615qh41idg1p2krzyy5";
+  };
+
+  cargoSha256 = "0h831rf5vlvpzfm4sr3fvwlc0ys776fqis90y414mczphkxvz437";
+
+  meta = with lib; {
+    homepage = "https://github.com/softprops/git-codeowners";
+    description = "a git extension to work with CODEOWNERS files";
+    license = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -13,7 +13,7 @@
 }:

 let
-  version = "2.14.3";
+  version = "2.15.0";
  svn = subversionClient.override { perlBindings = true; };
 in

@ -22,7 +22,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "078m0za5gyzcah5iaxdwx663yvdp8byvjc8rpzjzcrr4sl6rcc2k";
+    sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h";
  };

  hardeningDisable = [ "format" ];
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -190,7 +190,10 @@ in stdenv.mkDerivation {
    cp -rv out/linux.*/${buildType}/bin/src "$modsrc"
  '';

-  passthru = { inherit version; /* for guest additions */ };
+  passthru = {
+    inherit version;       # for guest additions
+    inherit extensionPack; # for inclusion in profile to prevent gc
+  };

  meta = {
    description = "PC emulator";
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@ -32,13 +32,15 @@ let
    udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
    alsaLib
  ];
+
+  xsa = import ./xsa-patches.nix { inherit fetchpatch; };
 in

 callPackage (import ./generic.nix (rec {
  version = "4.5.5";

  src = fetchurl {
-    url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
+    url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
    sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2";
  };

@ -183,227 +185,52 @@ callPackage (import ./generic.nix (rec {
    ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
    ++ optional (withInternalOVMF) "--enable-ovmf";

-  patches =
-    [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
-      ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
-      ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
-      (xsaPatch {
-        name = "190-4.5";
-        sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm";
-      })
-      (xsaPatch {
-        name = "191-4.6";
-        sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg";
-      })
-      (xsaPatch {
-        name = "192-4.5";
-        sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm";
-      })
-      (xsaPatch {
-        name = "193-4.5";
-        sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
-      })
-      (xsaPatch {
-        name = "195";
-        sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7";
-      })
-      (xsaPatch {
-        name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject";
-        sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
-      })
-      (xsaPatch {
-        name = "196-0002-x86-svm-Fix-injection-of-software-interrupts";
-        sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
-      })
-      (xsaPatch {
-        name = "198";
-        sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9";
-      })
-      (xsaPatch {
-        name = "200-4.6";
-        sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7";
-      })
-      (xsaPatch {
-        name = "202-4.6";
-        sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
-      })
-      (xsaPatch {
-        name = "204-4.5";
-        sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
-      })
-      (xsaPatch {
-        name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit";
-        sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4";
-      })
-      (xsaPatch {
-        name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-";
-        sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx";
-      })
-      (xsaPatch {
-        name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire";
-        sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s";
-      })
-      (xsaPatch {
-        name = "206-4.5/0004-oxenstored-remove-some-unused-parameters";
-        sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk";
-      })
-      (xsaPatch {
-        name = "206-4.5/0005-oxenstored-refactor-request-processing";
-        sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv";
-      })
-      (xsaPatch {
-        name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio";
-        sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg";
-      })
-      (xsaPatch {
-        name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat";
-        sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz";
-      })
-      (xsaPatch {
-        name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict";
-        sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g";
-      })
-      (xsaPatch {
-        name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti";
-        sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b";
-      })
-      (xsaPatch {
-        name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0";
-        sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj";
-      })
-      (xsaPatch {
-        name = "206-4.5/0011-oxenstored-comments-explaining-some-variables";
-        sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p";
-      })
-      (xsaPatch {
-        name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit";
-        sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8";
-      })
-      (xsaPatch {
-        name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit";
-        sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl";
-      })
-      (xsaPatch {
-        name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-";
-        sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb";
-      })
-      (xsaPatch {
-        name = "206-4.5/0015-oxenstored-support-commit-history-tracking";
-        sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj";
-      })
-      (xsaPatch {
-        name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-";
-        sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy";
-      })
-      (xsaPatch {
-        name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end";
-        sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps";
-      })
-      (xsaPatch {
-        name = "206-4.5/0018-oxenstored-track-commit-history";
-        sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd";
-      })
-      (xsaPatch {
-        name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa";
-        sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h";
-      })
-      (xsaPatch {
-        name = "206-4.5/0020-oxenstored-allow-self-conflicts";
-        sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy";
-      })
-      (xsaPatch {
-        name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions";
-        sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8";
-      })
-      (xsaPatch {
-        name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit";
-        sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy";
-      })
-      (xsaPatch {
-        name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging";
-        sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7";
-      })
-      (xsaPatch {
-        name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function";
-        sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8";
-      })
-      (xsaPatch {
-        name = "207";
-        sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
-      })
-      (xsaPatch {
-        name = "212";
-        sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d";
-      })
-      (xsaPatch {
-        name = "213-4.5";
-        sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm";
-      })
-      (xsaPatch {
-        name = "214";
-        sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk";
-      })
-      (xsaPatch {
-        name = "215";
-        sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs";
-      })
-      (xsaPatch {
-        name = "217-4.5";
-        sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4";
-      })
-      (xsaPatch {
-        name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures";
-        sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq";
-      })
-      (xsaPatch {
-        name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race";
-        sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k";
-      })
-      (xsaPatch {
-        name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry";
-        sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc";
-      })
-      (xsaPatch {
-        name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses";
-        sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2";
-      })
-      (xsaPatch {
-        name = "219-4.5";
-        sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm";
-      })
-      (xsaPatch {
-        name = "220-4.5";
-        sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp";
-      })
-      (xsaPatch {
-        name = "221";
-        sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26";
-      })
-      (xsaPatch {
-        name = "222-1-4.6";
-        sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf";
-      })
-      (xsaPatch {
-        name = "222-2-4.5";
-        sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd";
-      })
-      (xsaPatch {
-        name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
-        sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h";
-      })
-      (xsaPatch {
-        name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to";
-        sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq";
-      })
-      (xsaPatch {
-        name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m";
-        sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08";
-      })
-      (xsaPatch {
-        name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
-        sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav";
-      })
-    ];
+  patches = with xsa; flatten [
+    ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
+    ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
+    ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
+    XSA_190
+    XSA_191
+    XSA_192
+    XSA_193
+    XSA_195
+    XSA_196
+    XSA_198
+    XSA_200
+    XSA_202_45
+    XSA_204_45
+    XSA_206_45
+    XSA_207
+    XSA_212
+    XSA_213_45
+    XSA_214
+    XSA_215
+    XSA_217_45
+    XSA_218_45
+    XSA_219_45
+    XSA_220_45
+    XSA_221
+    XSA_222_45
+    XSA_223
+    XSA_224_45
+    XSA_227_45
+    XSA_230
+    XSA_231_45
+    XSA_232
+    XSA_233
+    XSA_234_45
+    XSA_235_45
+    XSA_236_45
+    XSA_237_45
+    XSA_238_45
+    XSA_239_45
+    XSA_240_45
+    XSA_241
+    XSA_242
+    XSA_243_45
+    XSA_244_45
+    XSA_245
+  ];

  # Fix build on Glibc 2.24.
  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@ -27,6 +27,8 @@ let
    inherit sha256;
  });

+  xsa = import ./xsa-patches.nix { inherit fetchpatch; };
+
  qemuDeps = [
    udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
    alsaLib
@ -34,11 +36,11 @@ let
 in

 callPackage (import ./generic.nix (rec {
-  version = "4.8.1";
+  version = "4.8.2";

  src = fetchurl {
-    url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
-    sha256 = "158kb1w61jmwxi3fc560s4269hhpxrin9xhm60ljj52njhxias8x";
+    url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
+    sha256 = "1ydgwbn8ab0s16jrbi3wzaa6j0y3zk0j8pay458qcgayk3qc476b";
  };

  # Sources needed to build tools and firmwares.
@ -141,68 +143,22 @@ callPackage (import ./generic.nix (rec {
    ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
    ++ optional (withInternalOVMF) "--enable-ovmf";

-  patches =
-    [ (xsaPatch {
-        name = "213-4.8";
-        sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2";
-      })
-      (xsaPatch {
-        name = "214";
-        sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk";
-      })
-      (xsaPatch {
-        name = "217";
-        sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj";
-      })
-      (xsaPatch {
-        name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race";
-        sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd";
-      })
-      (xsaPatch {
-        name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry";
-        sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc";
-      })
-      (xsaPatch {
-        name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses";
-        sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9";
-      })
-      (xsaPatch {
-        name = "219-4.8";
-        sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq";
-      })
-      (xsaPatch {
-        name = "220-4.8";
-        sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5";
-      })
-      (xsaPatch {
-        name = "221";
-        sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26";
-      })
-      (xsaPatch {
-        name = "222-1";
-        sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2";
-      })
-      (xsaPatch {
-        name = "222-2-4.8";
-        sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin";
-      })
-      (xsaPatch {
-        name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
-        sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4";
-      })
-      (xsaPatch {
-        name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to";
-        sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck";
-      })
-      (xsaPatch {
-        name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m";
-        sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2";
-      })
-      (xsaPatch {
-        name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
-        sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f";
-      })
-    ];
+  patches = with xsa; flatten [
+    XSA_231
+    XSA_232
+    XSA_233
+    XSA_234_48
+    XSA_236
+    XSA_237_48
+    XSA_238
+    XSA_239
+    XSA_240_48
+    XSA_241
+    XSA_242
+    XSA_243_48
+    XSA_244
+    XSA_245
+  ];

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

--- a/pkgs/build-support/closure-info.nix
+++ b/pkgs/build-support/closure-info.nix
@ -8,7 +8,10 @@

 { rootPaths }:

-if builtins.langVersion >= 5 then
+#if builtins.langVersion >= 5 then
+# FIXME: it doesn't work on Hydra, failing to find mkdir;
+#   perhaps .attrs.sh clobbers PATH with new nix?
+if false then

  # Nix >= 1.12: Include NAR hash / size info.

--- a/pkgs/build-support/fetchadc/builder.sh
+++ b/pkgs/build-support/fetchadc/builder.sh
@ -1,7 +0,0 @@
-source $stdenv/setup
-
-loginpage=`curl --insecure -s -L -b cookies.txt "$url"`
-
-[[ $loginpage =~ form[^\>]+action=\"([^\"]+)\" ]] && loginurl=${BASH_REMATCH[1]}
-
-curl  --insecure -s --output "$out" -L -b cookies.txt --data "appleId=${adc_user}&accountPassword=${adc_pass}" "https://idmsa.apple.com/IDMSWebAuth/${loginurl}"
--- a/pkgs/build-support/fetchadc/default.nix
+++ b/pkgs/build-support/fetchadc/default.nix
@ -1,36 +0,0 @@
-{ stdenv, curl, adc_user, adc_pass }:
-
-{ # Path to fetch.
-  path
-
-  # Hash of the downloaded file
-, sha256
-
-, # Additional curl options needed for the download to succeed.
-  curlOpts ? ""
-
-, # Name of the file.  If empty, use the basename of `path'.
-  name ? ""
-}:
-
-stdenv.mkDerivation {
-  url = "https://developer.apple.com/downloads/download.action?path=${path}";
-
-  name    = if name != "" then name else baseNameOf path;
-  builder = ./builder.sh;
-
-  buildInputs = [ curl ];
-
-  meta = {
-    # Password-guarded files from ADC are certainly unfree, as far as we're concerned!
-    license = stdenv.lib.licenses.unfree;
-  };
-
-  outputHashAlgo = "sha256";
-  outputHash     =  sha256;
-  outputHashMode = "flat";
-
-  inherit curlOpts adc_user adc_pass;
-
-  preferLocalBuild = true;
-}
--- a/pkgs/build-support/fetchbower/default.nix
+++ b/pkgs/build-support/fetchbower/default.nix
@ -4,13 +4,13 @@ let
    let
      components = lib.splitString "#" version;
      hash = lib.last components;
-      ver = if builtins.length components == 1 then version else hash;
+      ver = if builtins.length components == 1 then (cleanName version) else hash;
    in ver;

-  bowerName = name: lib.replaceStrings ["/"] ["-"] name;
+  cleanName = name: lib.replaceStrings ["/" ":"] ["-" "-"] name;

  fetchbower = name: version: target: outputHash: stdenv.mkDerivation {
-    name = "${bowerName name}-${bowerVersion version}";
+    name = "${cleanName name}-${bowerVersion version}";
    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
    buildCommand = ''
      fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}"
--- a/pkgs/build-support/fetchbzr/builder.sh
+++ b/pkgs/build-support/fetchbzr/builder.sh
@ -4,6 +4,6 @@ header "exporting \`$url' (revision $rev) into \`$out'"

 # Perform a lightweight checkout so that we don't end up importing
 # all the repository's history.
-bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url"
+BZR_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url"

 stopNest
--- a/pkgs/build-support/fetchgit/gitrepotoname.nix
+++ b/pkgs/build-support/fetchgit/gitrepotoname.nix
@ -1,19 +0,0 @@
-{ lib }:
-
-let
-  inherit (lib) removeSuffix hasPrefix removePrefix splitString stringToCharacters concatMapStrings last elem;
-
-  allowedChars = stringToCharacters "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-._?=";
-  sanitizeStoreName = s:
-    let
-      s' = concatMapStrings (c: if elem c allowedChars then c else "") (stringToCharacters s);
-      s'' = if hasPrefix "." s' then "_${removePrefix "." s'}" else s';
-    in
-      s'';
-in
-  urlOrRepo: rev:
-    let
-      repo' = last (splitString ":" (baseNameOf (removeSuffix ".git" (removeSuffix "/" urlOrRepo))));
-      rev' = baseNameOf rev;
-    in
-     "${sanitizeStoreName repo'}-${sanitizeStoreName rev'}-src"
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@ -39,7 +39,7 @@ usage(){

 Options:
      --out path      Path where the output would be stored.
-      --url url       Any url understand by 'git clone'.
+      --url url       Any url understood by 'git clone'.
      --rev ref       Any sha1 or references (such as refs/heads/master)
      --hash h        Expected hash.
      --deepClone     Clone the entire repository.
--- a/pkgs/build-support/fetchgitrevision/default.nix
+++ b/pkgs/build-support/fetchgitrevision/default.nix
@ -1,10 +0,0 @@
-runCommand: git: repository: branch:
-  import (runCommand "head-revision"
-    { buildInputs = [ git ];
-      dummy = builtins.currentTime;
-    }
-    ''
-      rev=$(git ls-remote ${repository} | grep "refs/${branch}$" | awk '{ print $1 }')
-      echo "[ \"$rev\" ]" > $out
-      echo Latest revision in ${branch} is $rev
-    '')
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@ -11,10 +11,11 @@
  stripRoot ? true
 , url
 , extraPostFetch ? ""
+, name ? "source"
 , ... } @ args:

 lib.overrideDerivation (fetchurl ({
-  name = args.name or (baseNameOf url);
+  inherit name;

  recursiveHash = true;

--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@ -2,16 +2,16 @@

 stdenv.mkDerivation rec {
  name = "tzdata-${version}";
-  version = "2016j";
+  version = "2017c";

  srcs =
    [ (fetchurl {
        url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "1j4xycpwhs57qnkcxwh3np8wnf3km69n3cf4w6p2yv2z247lxvpm";
+        sha256 = "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n";
      })
      (fetchurl {
        url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1dxhrk4z0n2di8p0yd6q00pa6bwyz5xqbrfbasiz8785ni7zrvxr";
+        sha256 = "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41";
      })
    ];

--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@ -45,7 +45,7 @@ let
    hitori gnome-taquin
  ];

-  inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2
+  inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2
    clutter clutter-gst clutter_gtk cogl gtkvnc;
  inherit (pkgs.gnome2) ORBit2;
  libsoup = pkgs.libsoup.override { gnomeSupport = true; };
@ -56,7 +56,6 @@ let
  gtkmm = gtkmm3;
  vala = pkgs.vala_0_32;
  gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
-  webkitgtk = webkitgtk216x;

 # Simplify the nixos module and gnome packages
  defaultIconTheme = adwaita-icon-theme;
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@ -1,5 +1,5 @@
 {
-  stdenv, fetchFromGitHub, fetchurl,
+  stdenv, fetchFromGitHub,
  cmake, pkgconfig, lxqt-build-tools,
  qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
  kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat,
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name    = "chez-scheme-${version}";
-  version = "9.4-${dver}";
-  dver    = "20160507";
+  version = "9.5-${dver}";
+  dver    = "20171012";

  src = fetchgit {
    url    = "https://github.com/cisco/chezscheme.git";
-    rev    = "65df1d1f7c37f5b5a93cd7e5b475dda9dbafe03c";
-    sha256 = "1b273il3njnn04z55w1hnygvcqllc6p5qg9mcwh10w39fwsd8fbs";
+    rev    = "adb3b7bb22ddaa1ba91b98b6f4a647427c3a4d9b";
+    sha256 = "0hiynf7g0q77ipqxjsqdm2zb0m15bl1hhp615fn3i2hv0qz5a4xr";
    fetchSubmodules = true;
  };

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
  */
  patchPhase = ''
    substituteInPlace ./configure \
-      --replace "git submodule init && git submodule update || exit 1" ""
+      --replace "git submodule init && git submodule update || exit 1" "true"

    substituteInPlace ./workarea \
      --replace "/bin/ln" "${coreutils}/bin/ln" \
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@ -40,11 +40,6 @@
 , coreutils
 , libiconv

-, ghcjsNodePkgs ? callPackage ../../../top-level/node-packages.nix {
-    generated = ./node-packages-generated.nix;
-    self = ghcjsNodePkgs;
-  }
-
 , version ? "0.2.0"
 , ghcjsSrc ? fetchFromGitHub {
    owner = "ghcjs";
@ -178,7 +173,7 @@ in mkDerivation (rec {
    isCross = true;
    isGhcjs = true;
    inherit nodejs ghcjsBoot;
-    inherit (ghcjsNodePkgs) "socket.io";
+    socket-io = pkgs.nodePackages."socket.io";

    inherit stage1Packages;
    mkStage2 = stage2 {
--- a/pkgs/development/compilers/ghcjs/node-packages-generated.nix
+++ b/pkgs/development/compilers/ghcjs/node-packages-generated.nix
@ -1,943 +0,0 @@
-{ self, fetchurl, fetchgit ? null, lib }:
-
-{
-  by-spec."accepts"."1.1.4" =
-    self.by-version."accepts"."1.1.4";
-  by-version."accepts"."1.1.4" = self.buildNodePackage {
-    name = "accepts-1.1.4";
-    version = "1.1.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
-      name = "accepts-1.1.4.tgz";
-      sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
-    };
-    deps = {
-      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
-      "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."after"."0.8.1" =
-    self.by-version."after"."0.8.1";
-  by-version."after"."0.8.1" = self.buildNodePackage {
-    name = "after-0.8.1";
-    version = "0.8.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz";
-      name = "after-0.8.1.tgz";
-      sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."arraybuffer.slice"."0.0.6" =
-    self.by-version."arraybuffer.slice"."0.0.6";
-  by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage {
-    name = "arraybuffer.slice-0.0.6";
-    version = "0.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz";
-      name = "arraybuffer.slice-0.0.6.tgz";
-      sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."backo2"."1.0.2" =
-    self.by-version."backo2"."1.0.2";
-  by-version."backo2"."1.0.2" = self.buildNodePackage {
-    name = "backo2-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
-      name = "backo2-1.0.2.tgz";
-      sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."base64-arraybuffer"."0.1.2" =
-    self.by-version."base64-arraybuffer"."0.1.2";
-  by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage {
-    name = "base64-arraybuffer-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
-      name = "base64-arraybuffer-0.1.2.tgz";
-      sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."base64id"."0.1.0" =
-    self.by-version."base64id"."0.1.0";
-  by-version."base64id"."0.1.0" = self.buildNodePackage {
-    name = "base64id-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
-      name = "base64id-0.1.0.tgz";
-      sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."benchmark"."1.0.0" =
-    self.by-version."benchmark"."1.0.0";
-  by-version."benchmark"."1.0.0" = self.buildNodePackage {
-    name = "benchmark-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
-      name = "benchmark-1.0.0.tgz";
-      sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."better-assert"."~1.0.0" =
-    self.by-version."better-assert"."1.0.2";
-  by-version."better-assert"."1.0.2" = self.buildNodePackage {
-    name = "better-assert-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz";
-      name = "better-assert-1.0.2.tgz";
-      sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
-    };
-    deps = {
-      "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."blob"."0.0.4" =
-    self.by-version."blob"."0.0.4";
-  by-version."blob"."0.0.4" = self.buildNodePackage {
-    name = "blob-0.0.4";
-    version = "0.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/blob/-/blob-0.0.4.tgz";
-      name = "blob-0.0.4.tgz";
-      sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."callsite"."1.0.0" =
-    self.by-version."callsite"."1.0.0";
-  by-version."callsite"."1.0.0" = self.buildNodePackage {
-    name = "callsite-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
-      name = "callsite-1.0.0.tgz";
-      sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."component-bind"."1.0.0" =
-    self.by-version."component-bind"."1.0.0";
-  by-version."component-bind"."1.0.0" = self.buildNodePackage {
-    name = "component-bind-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
-      name = "component-bind-1.0.0.tgz";
-      sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."component-emitter"."1.1.2" =
-    self.by-version."component-emitter"."1.1.2";
-  by-version."component-emitter"."1.1.2" = self.buildNodePackage {
-    name = "component-emitter-1.1.2";
-    version = "1.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
-      name = "component-emitter-1.1.2.tgz";
-      sha1 = "296594f2753daa63996d2af08d15a95116c9aec3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."component-emitter"."1.2.0" =
-    self.by-version."component-emitter"."1.2.0";
-  by-version."component-emitter"."1.2.0" = self.buildNodePackage {
-    name = "component-emitter-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz";
-      name = "component-emitter-1.2.0.tgz";
-      sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."component-inherit"."0.0.3" =
-    self.by-version."component-inherit"."0.0.3";
-  by-version."component-inherit"."0.0.3" = self.buildNodePackage {
-    name = "component-inherit-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
-      name = "component-inherit-0.0.3.tgz";
-      sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."debug"."0.7.4" =
-    self.by-version."debug"."0.7.4";
-  by-version."debug"."0.7.4" = self.buildNodePackage {
-    name = "debug-0.7.4";
-    version = "0.7.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
-      name = "debug-0.7.4.tgz";
-      sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."debug"."2.2.0" =
-    self.by-version."debug"."2.2.0";
-  by-version."debug"."2.2.0" = self.buildNodePackage {
-    name = "debug-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
-      name = "debug-2.2.0.tgz";
-      sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
-    };
-    deps = {
-      "ms-0.7.1" = self.by-version."ms"."0.7.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."engine.io"."1.6.8" =
-    self.by-version."engine.io"."1.6.8";
-  by-version."engine.io"."1.6.8" = self.buildNodePackage {
-    name = "engine.io-1.6.8";
-    version = "1.6.8";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io/-/engine.io-1.6.8.tgz";
-      name = "engine.io-1.6.8.tgz";
-      sha1 = "de05a06b757e7517695e088c7b051c47819f511b";
-    };
-    deps = {
-      "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "ws-1.0.1" = self.by-version."ws"."1.0.1";
-      "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4";
-      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."engine.io-client"."1.6.8" =
-    self.by-version."engine.io-client"."1.6.8";
-  by-version."engine.io-client"."1.6.8" = self.buildNodePackage {
-    name = "engine.io-client-1.6.8";
-    version = "1.6.8";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.8.tgz";
-      name = "engine.io-client-1.6.8.tgz";
-      sha1 = "6e2db11648b45e405c46b172ea3e3dac37cc0ceb";
-    };
-    deps = {
-      "has-cors-1.1.0" = self.by-version."has-cors"."1.1.0";
-      "ws-1.0.1" = self.by-version."ws"."1.0.1";
-      "xmlhttprequest-ssl-1.5.1" = self.by-version."xmlhttprequest-ssl"."1.5.1";
-      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
-      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
-      "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4";
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4";
-      "parsejson-0.0.1" = self.by-version."parsejson"."0.0.1";
-      "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2";
-      "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3";
-      "yeast-0.1.2" = self.by-version."yeast"."0.1.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."engine.io-parser"."1.2.4" =
-    self.by-version."engine.io-parser"."1.2.4";
-  by-version."engine.io-parser"."1.2.4" = self.buildNodePackage {
-    name = "engine.io-parser-1.2.4";
-    version = "1.2.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz";
-      name = "engine.io-parser-1.2.4.tgz";
-      sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42";
-    };
-    deps = {
-      "after-0.8.1" = self.by-version."after"."0.8.1";
-      "arraybuffer.slice-0.0.6" = self.by-version."arraybuffer.slice"."0.0.6";
-      "base64-arraybuffer-0.1.2" = self.by-version."base64-arraybuffer"."0.1.2";
-      "blob-0.0.4" = self.by-version."blob"."0.0.4";
-      "has-binary-0.1.6" = self.by-version."has-binary"."0.1.6";
-      "utf8-2.1.0" = self.by-version."utf8"."2.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."has-binary"."0.1.6" =
-    self.by-version."has-binary"."0.1.6";
-  by-version."has-binary"."0.1.6" = self.buildNodePackage {
-    name = "has-binary-0.1.6";
-    version = "0.1.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
-      name = "has-binary-0.1.6.tgz";
-      sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
-    };
-    deps = {
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."has-binary"."0.1.7" =
-    self.by-version."has-binary"."0.1.7";
-  by-version."has-binary"."0.1.7" = self.buildNodePackage {
-    name = "has-binary-0.1.7";
-    version = "0.1.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz";
-      name = "has-binary-0.1.7.tgz";
-      sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
-    };
-    deps = {
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."has-cors"."1.1.0" =
-    self.by-version."has-cors"."1.1.0";
-  by-version."has-cors"."1.1.0" = self.buildNodePackage {
-    name = "has-cors-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
-      name = "has-cors-1.1.0.tgz";
-      sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."indexof"."0.0.1" =
-    self.by-version."indexof"."0.0.1";
-  by-version."indexof"."0.0.1" = self.buildNodePackage {
-    name = "indexof-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
-      name = "indexof-0.0.1.tgz";
-      sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."isarray"."0.0.1" =
-    self.by-version."isarray"."0.0.1";
-  by-version."isarray"."0.0.1" = self.buildNodePackage {
-    name = "isarray-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
-      name = "isarray-0.0.1.tgz";
-      sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."json3"."3.2.6" =
-    self.by-version."json3"."3.2.6";
-  by-version."json3"."3.2.6" = self.buildNodePackage {
-    name = "json3-3.2.6";
-    version = "3.2.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
-      name = "json3-3.2.6.tgz";
-      sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."json3"."3.3.2" =
-    self.by-version."json3"."3.3.2";
-  by-version."json3"."3.3.2" = self.buildNodePackage {
-    name = "json3-3.3.2";
-    version = "3.3.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
-      name = "json3-3.3.2.tgz";
-      sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-db"."~1.12.0" =
-    self.by-version."mime-db"."1.12.0";
-  by-version."mime-db"."1.12.0" = self.buildNodePackage {
-    name = "mime-db-1.12.0";
-    version = "1.12.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
-      name = "mime-db-1.12.0.tgz";
-      sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-types"."~2.0.4" =
-    self.by-version."mime-types"."2.0.14";
-  by-version."mime-types"."2.0.14" = self.buildNodePackage {
-    name = "mime-types-2.0.14";
-    version = "2.0.14";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
-      name = "mime-types-2.0.14.tgz";
-      sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
-    };
-    deps = {
-      "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ms"."0.7.1" =
-    self.by-version."ms"."0.7.1";
-  by-version."ms"."0.7.1" = self.buildNodePackage {
-    name = "ms-0.7.1";
-    version = "0.7.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
-      name = "ms-0.7.1.tgz";
-      sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."negotiator"."0.4.9" =
-    self.by-version."negotiator"."0.4.9";
-  by-version."negotiator"."0.4.9" = self.buildNodePackage {
-    name = "negotiator-0.4.9";
-    version = "0.4.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
-      name = "negotiator-0.4.9.tgz";
-      sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."object-component"."0.0.3" =
-    self.by-version."object-component"."0.0.3";
-  by-version."object-component"."0.0.3" = self.buildNodePackage {
-    name = "object-component-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
-      name = "object-component-0.0.3.tgz";
-      sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."options".">=0.0.5" =
-    self.by-version."options"."0.0.6";
-  by-version."options"."0.0.6" = self.buildNodePackage {
-    name = "options-0.0.6";
-    version = "0.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz";
-      name = "options-0.0.6.tgz";
-      sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."parsejson"."0.0.1" =
-    self.by-version."parsejson"."0.0.1";
-  by-version."parsejson"."0.0.1" = self.buildNodePackage {
-    name = "parsejson-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
-      name = "parsejson-0.0.1.tgz";
-      sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
-    };
-    deps = {
-      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."parseqs"."0.0.2" =
-    self.by-version."parseqs"."0.0.2";
-  by-version."parseqs"."0.0.2" = self.buildNodePackage {
-    name = "parseqs-0.0.2";
-    version = "0.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
-      name = "parseqs-0.0.2.tgz";
-      sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
-    };
-    deps = {
-      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."parseuri"."0.0.4" =
-    self.by-version."parseuri"."0.0.4";
-  by-version."parseuri"."0.0.4" = self.buildNodePackage {
-    name = "parseuri-0.0.4";
-    version = "0.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
-      name = "parseuri-0.0.4.tgz";
-      sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
-    };
-    deps = {
-      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."socket.io"."*" =
-    self.by-version."socket.io"."1.4.5";
-  by-version."socket.io"."1.4.5" = self.buildNodePackage {
-    name = "socket.io-1.4.5";
-    version = "1.4.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io/-/socket.io-1.4.5.tgz";
-      name = "socket.io-1.4.5.tgz";
-      sha1 = "f202f49eeb9cf7cf6c0971ad75d8d96d451ea4f7";
-    };
-    deps = {
-      "engine.io-1.6.8" = self.by-version."engine.io"."1.6.8";
-      "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6";
-      "socket.io-client-1.4.5" = self.by-version."socket.io-client"."1.4.5";
-      "socket.io-adapter-0.4.0" = self.by-version."socket.io-adapter"."0.4.0";
-      "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7";
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "socket.io" = self.by-version."socket.io"."1.4.5";
-  by-spec."socket.io-adapter"."0.4.0" =
-    self.by-version."socket.io-adapter"."0.4.0";
-  by-version."socket.io-adapter"."0.4.0" = self.buildNodePackage {
-    name = "socket.io-adapter-0.4.0";
-    version = "0.4.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz";
-      name = "socket.io-adapter-0.4.0.tgz";
-      sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f";
-    };
-    deps = {
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "socket.io-parser-2.2.2" = self.by-version."socket.io-parser"."2.2.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."socket.io-client"."1.4.5" =
-    self.by-version."socket.io-client"."1.4.5";
-  by-version."socket.io-client"."1.4.5" = self.buildNodePackage {
-    name = "socket.io-client-1.4.5";
-    version = "1.4.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.5.tgz";
-      name = "socket.io-client-1.4.5.tgz";
-      sha1 = "400d630c31e7c9579e45173f977e4f5bd8dc7d2e";
-    };
-    deps = {
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "engine.io-client-1.6.8" = self.by-version."engine.io-client"."1.6.8";
-      "component-bind-1.0.0" = self.by-version."component-bind"."1.0.0";
-      "component-emitter-1.2.0" = self.by-version."component-emitter"."1.2.0";
-      "object-component-0.0.3" = self.by-version."object-component"."0.0.3";
-      "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6";
-      "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7";
-      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
-      "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4";
-      "to-array-0.1.4" = self.by-version."to-array"."0.1.4";
-      "backo2-1.0.2" = self.by-version."backo2"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."socket.io-parser"."2.2.2" =
-    self.by-version."socket.io-parser"."2.2.2";
-  by-version."socket.io-parser"."2.2.2" = self.buildNodePackage {
-    name = "socket.io-parser-2.2.2";
-    version = "2.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
-      name = "socket.io-parser-2.2.2.tgz";
-      sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
-    };
-    deps = {
-      "debug-0.7.4" = self.by-version."debug"."0.7.4";
-      "json3-3.2.6" = self.by-version."json3"."3.2.6";
-      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."socket.io-parser"."2.2.6" =
-    self.by-version."socket.io-parser"."2.2.6";
-  by-version."socket.io-parser"."2.2.6" = self.buildNodePackage {
-    name = "socket.io-parser-2.2.6";
-    version = "2.2.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz";
-      name = "socket.io-parser-2.2.6.tgz";
-      sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99";
-    };
-    deps = {
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "json3-3.3.2" = self.by-version."json3"."3.3.2";
-      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."to-array"."0.1.4" =
-    self.by-version."to-array"."0.1.4";
-  by-version."to-array"."0.1.4" = self.buildNodePackage {
-    name = "to-array-0.1.4";
-    version = "0.1.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
-      name = "to-array-0.1.4.tgz";
-      sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ultron"."1.0.x" =
-    self.by-version."ultron"."1.0.2";
-  by-version."ultron"."1.0.2" = self.buildNodePackage {
-    name = "ultron-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz";
-      name = "ultron-1.0.2.tgz";
-      sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."utf8"."2.1.0" =
-    self.by-version."utf8"."2.1.0";
-  by-version."utf8"."2.1.0" = self.buildNodePackage {
-    name = "utf8-2.1.0";
-    version = "2.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz";
-      name = "utf8-2.1.0.tgz";
-      sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ws"."1.0.1" =
-    self.by-version."ws"."1.0.1";
-  by-version."ws"."1.0.1" = self.buildNodePackage {
-    name = "ws-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ws/-/ws-1.0.1.tgz";
-      name = "ws-1.0.1.tgz";
-      sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9";
-    };
-    deps = {
-      "options-0.0.6" = self.by-version."options"."0.0.6";
-      "ultron-1.0.2" = self.by-version."ultron"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."xmlhttprequest-ssl"."1.5.1" =
-    self.by-version."xmlhttprequest-ssl"."1.5.1";
-  by-version."xmlhttprequest-ssl"."1.5.1" = self.buildNodePackage {
-    name = "xmlhttprequest-ssl-1.5.1";
-    version = "1.5.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz";
-      name = "xmlhttprequest-ssl-1.5.1.tgz";
-      sha1 = "3b7741fea4a86675976e908d296d4445961faa67";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."yeast"."0.1.2" =
-    self.by-version."yeast"."0.1.2";
-  by-version."yeast"."0.1.2" = self.buildNodePackage {
-    name = "yeast-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz";
-      name = "yeast-0.1.2.tgz";
-      sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-}
--- a/pkgs/development/compilers/ghcjs/node-packages.json
+++ b/pkgs/development/compilers/ghcjs/node-packages.json
@ -1 +0,0 @@
-[ "socket.io" ]
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@ -85,6 +85,9 @@ stdenv.mkDerivation {
    # https://reviews.llvm.org/rL281650
    rm -vr src/test/run-pass/issue-36474.rs || true

+    # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
+    sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
+
    # Disable some failing gdb tests. Try re-enabling these when gdb
    # is updated past version 7.12.
    rm src/test/debuginfo/basic-types-globals.rs
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@ -1,11 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:

 let param = {
-  "8.7" = {
-    version = "0.6.1";
-    rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663";
-    sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9";
-  };
  "8.6" = {
    version = "0.6.1";
    rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663";
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -98,7 +98,7 @@ self: super: {
      name = "git-annex-${drv.version}-src";
      url = "git://git-annex.branchable.com/";
      rev = "refs/tags/" + drv.version;
-      sha256 = "1143qcsljp66v0xvq2a2nqji24890rnmxcmwnxw8xj818gqk0p3m";
+      sha256 = "0iz0yz0bwkmpza5qahsxr9plg1ylmkv7znp1a8f0z65px7f300an";
    };
  })).override {
    dbus = if pkgs.stdenv.isLinux then self.dbus else null;
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -37,7 +37,7 @@ core-packages:
  - ghcjs-base-0

 default-package-overrides:
-  # LTS Haskell 9.10
+  # LTS Haskell 9.11
  - abstract-deque ==0.3
  - abstract-deque-tests ==0.3
  - abstract-par ==0.3.3
@ -323,7 +323,7 @@ default-package-overrides:
  - bytestring-strict-builder ==0.4.5
  - bytestring-tree-builder ==0.2.7.1
  - bytestring-trie ==0.2.4.1
-  - bzlib-conduit ==0.2.1.4
+  - bzlib-conduit ==0.2.1.5
  - c2hs ==0.28.2
  - Cabal ==1.24.2.0
  - cabal-dependency-licenses ==0.2.0.0
@ -669,7 +669,7 @@ default-package-overrides:
  - expiring-cache-map ==0.0.6.1
  - explicit-exception ==0.1.9
  - exp-pairs ==0.1.5.2
-  - extensible ==0.4.5
+  - extensible ==0.4.6
  - extensible-effects ==1.11.1.0
  - extensible-exceptions ==0.1.1.4
  - extra ==1.5.3
@ -686,6 +686,7 @@ default-package-overrides:
  - fclabels ==2.0.3.2
  - fdo-notify ==0.3.1
  - feature-flags ==0.1.0.1
+  - fedora-haskell-tools ==0.3
  - feed ==0.3.12.0
  - FenwickTree ==0.1.2.1
  - fft ==0.1.8.6
@ -790,7 +791,7 @@ default-package-overrides:
  - gi-soup ==2.4.14
  - git ==0.2.0
  - github ==0.16.0
-  - github-release ==1.0.6
+  - github-release ==1.0.7
  - github-types ==0.2.1
  - github-webhook-handler ==0.0.8
  - github-webhook-handler-snap ==0.0.7
@ -948,7 +949,7 @@ default-package-overrides:
  - haddock-api ==2.17.4
  - haddock-library ==1.4.3
  - haddock-test ==0.0.1
-  - hailgun ==0.4.1.5
+  - hailgun ==0.4.1.6
  - hailgun-simple ==0.1.0.0
  - hakyll ==4.9.8.0
  - hakyll-favicon ==0.1.0
@ -1024,12 +1025,12 @@ default-package-overrides:
  - hebrew-time ==0.1.1
  - hedgehog ==0.5
  - hedgehog-quickcheck ==0.1
-  - hedis ==0.9.10
+  - hedis ==0.9.11
  - here ==1.2.11
  - heredoc ==0.2.0.0
  - heterocephalus ==1.0.5.0
  - hex ==0.1.2
-  - hexml ==0.3.2
+  - hexml ==0.3.3
  - hexpat ==0.20.13
  - hexstring ==0.11.1
  - hformat ==0.3.1.0
@ -1090,8 +1091,8 @@ default-package-overrides:
  - hsebaysdk ==0.4.0.0
  - hse-cpp ==0.2
  - hsemail ==2
-  - hset ==2.2.0
  - HSet ==0.0.1
+  - hset ==2.2.0
  - hsexif ==0.6.1.4
  - hs-GeoIP ==0.3
  - hsignal ==0.2.7.5
@ -1207,7 +1208,7 @@ default-package-overrides:
  - inline-c ==0.5.6.1
  - inline-c-cpp ==0.1.0.0
  - inline-java ==0.6.5
-  - inline-r ==0.9.0.1
+  - inline-r ==0.9.0.2
  - insert-ordered-containers ==0.2.1.0
  - instance-control ==0.1.2.0
  - integer-logarithms ==1.0.2
@ -1232,10 +1233,10 @@ default-package-overrides:
  - ip6addr ==0.5.3
  - iproute ==1.7.1
  - IPv6Addr ==1.0.1
-  - IPv6DB ==0.2.2
+  - IPv6DB ==0.2.3
  - irc ==0.6.1.0
  - irc-client ==0.4.4.4
-  - irc-conduit ==0.2.2.3
+  - irc-conduit ==0.2.2.4
  - irc-ctcp ==0.1.3.0
  - irc-dcc ==2.0.1
  - islink ==0.1.0.0
@ -1283,7 +1284,7 @@ default-package-overrides:
  - kraken ==0.0.3
  - l10n ==0.1.0.1
  - labels ==0.3.3
-  - lackey ==0.4.3
+  - lackey ==0.4.4
  - lame ==0.1.1
  - language-c ==0.6.1
  - language-c-quote ==0.12.1
@ -1349,7 +1350,7 @@ default-package-overrides:
  - lmdb ==0.2.5
  - loch-th ==0.2.1
  - log ==0.9.0.1
-  - log-base ==0.7.3.0
+  - log-base ==0.7.4.0
  - log-domain ==0.11.2
  - log-elasticsearch ==0.9.1.0
  - logfloat ==0.13.3.3
@ -1630,14 +1631,14 @@ default-package-overrides:
  - perf ==0.1.2
  - persistable-record ==0.5.1.1
  - persistable-types-HDBC-pg ==0.0.1.5
-  - persistent ==2.7.0
+  - persistent ==2.7.1
  - persistent-mongoDB ==2.6.0
-  - persistent-mysql ==2.6.1
+  - persistent-mysql ==2.6.2.1
  - persistent-mysql-haskell ==0.3.0.0
-  - persistent-postgresql ==2.6.1
+  - persistent-postgresql ==2.6.2
  - persistent-redis ==2.5.2
  - persistent-refs ==0.4
-  - persistent-sqlite ==2.6.2
+  - persistent-sqlite ==2.6.3
  - persistent-template ==2.5.3
  - pgp-wordlist ==0.1.0.2
  - pg-transact ==0.1.0.1
@ -1646,7 +1647,7 @@ default-package-overrides:
  - picoparsec ==0.1.2.3
  - picosat ==0.1.4
  - pid1 ==0.1.2.0
-  - pinboard ==0.9.12.5
+  - pinboard ==0.9.12.6
  - pinch ==0.3.2.0
  - pinchot ==0.24.0.0
  - pipes ==4.3.6
@ -1735,8 +1736,8 @@ default-package-overrides:
  - prompt ==0.1.1.2
  - protobuf ==0.2.1.1
  - protobuf-simple ==0.1.0.4
-  - protocol-buffers ==2.4.4
-  - protocol-buffers-descriptor ==2.4.4
+  - protocol-buffers ==2.4.5
+  - protocol-buffers-descriptor ==2.4.5
  - proto-lens ==0.2.1.0
  - proto-lens-arbitrary ==0.1.1.1
  - proto-lens-combinators ==0.1.0.7
@ -1752,7 +1753,7 @@ default-package-overrides:
  - publicsuffix ==0.20170508
  - pure-io ==0.2.1
  - pureMD5 ==2.1.3
-  - purescript-bridge ==0.11.1.0
+  - purescript-bridge ==0.11.1.1
  - pusher-http-haskell ==1.2.0.1
  - pwstore-fast ==2.4.4
  - QuasiText ==0.1.2.6
@ -1783,7 +1784,7 @@ default-package-overrides:
  - rank-product ==0.2.0.1
  - Rasterific ==0.7.2.1
  - rasterific-svg ==0.3.3
-  - ratel ==0.3.5
+  - ratel ==0.3.6
  - ratel-wai ==0.2.0
  - rattletrap ==2.5.0
  - rawfilepath ==0.2.4
@ -1852,7 +1853,7 @@ default-package-overrides:
  - result ==0.2.6.0
  - rethinkdb ==2.2.0.10
  - rethinkdb-client-driver ==0.0.25
-  - retry ==0.7.4.2
+  - retry ==0.7.4.3
  - rev-state ==0.1.2
  - rfc5051 ==0.1.0.3
  - rng-utils ==0.2.1
@ -1921,16 +1922,16 @@ default-package-overrides:
  - servant-mock ==0.8.2
  - servant-purescript ==0.8.0.1
  - servant-ruby ==0.2.1.0
-  - servant-server ==0.11
+  - servant-server ==0.11.0.1
  - servant-static-th ==0.1.0.6
  - servant-subscriber ==0.6.0.0
  - servant-swagger ==1.1.3.1
-  - servant-swagger-ui ==0.2.4.3.0.20
+  - servant-swagger-ui ==0.2.4.3.4.0
  - servant-yaml ==0.1.0.0
  - serversession ==1.0.1
  - serversession-frontend-wai ==1.0
  - serversession-frontend-yesod ==1.0
-  - servius ==1.2.0.2
+  - servius ==1.2.0.3
  - set-cover ==0.0.8
  - setenv ==0.1.1.3
  - setlocale ==1.0.0.5
@ -2251,7 +2252,7 @@ default-package-overrides:
  - typography-geometry ==1.0.0.1
  - tz ==0.1.3.0
  - tzdata ==0.1.20170320.0
-  - ua-parser ==0.7.4
+  - ua-parser ==0.7.4.1
  - uglymemo ==0.1.0.1
  - unbound ==0.5.1
  - unbounded-delays ==0.1.1.0
@ -2357,7 +2358,7 @@ default-package-overrides:
  - wai-routes ==0.10.0
  - wai-routing ==0.13.0
  - wai-session ==0.3.2
-  - wai-session-postgresql ==0.2.1.0
+  - wai-session-postgresql ==0.2.1.1
  - wai-slack-middleware ==0.2.0
  - waitra ==0.0.4.0
  - wai-transformers ==0.0.7
@ -2802,6 +2803,7 @@ dont-distribute-packages:
  aeson-smart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  aeson-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  aeson-t:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-tiled:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  aeson-yak:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  affection:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3258,6 +3260,7 @@ dont-distribute-packages:
  cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  cabal-sort:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-toolkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  cabal2doap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3409,6 +3412,7 @@ dont-distribute-packages:
  clafer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  claferIG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  claferwiki:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clang-compilation-database:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  clang-pure:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  clanki:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  clarifai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3564,6 +3568,7 @@ dont-distribute-packages:
  Configurable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  congruence-relation:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  conjure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conkin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  conlogger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  Conscript:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  consistent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4229,6 +4234,7 @@ dont-distribute-packages:
  filediff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filepath-crypto:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  filepath-io-access:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  filepather:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  FilePather:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4335,7 +4341,9 @@ dont-distribute-packages:
  free-theorems-seq:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  free-theorems-webui:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  free-theorems:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-vector-spaces:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freelude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  freesect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  freesound:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  freetype-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4831,6 +4839,7 @@ dont-distribute-packages:
  haskell-brainfuck:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskell-cnc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskell-coffee:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-compression:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskell-course-preludes:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskell-eigen-util:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskell-formatter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5020,6 +5029,7 @@ dont-distribute-packages:
  Hermes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  hermit-syb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  hermit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  herms:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  herringbone-embed:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  herringbone-wai:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  herringbone:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5752,6 +5762,7 @@ dont-distribute-packages:
  karakuri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  karps:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  katip-elasticsearch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  katip-syslog:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  katt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  kawaii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  kazura-queue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5943,6 +5954,7 @@ dont-distribute-packages:
  libsystemd-daemon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  libtagc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  libvirt-hs:                                   [ "x86_64-darwin" ]
+  libvirt-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  libxls:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  libxml-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  libxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5964,6 +5976,7 @@ dont-distribute-packages:
  linear-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  linear-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  linear-vect:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linearmap-category:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  linearscan-hoopl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  LinearSplit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  LinkChecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5988,6 +6001,7 @@ dont-distribute-packages:
  liquid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  liquidhaskell-cabal-demo:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  liquidhaskell-cabal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  liquidhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  list-mux:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  list-t-attoparsec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  list-t-html-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6129,6 +6143,7 @@ dont-distribute-packages:
  mandulia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  mangopay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  manifold-random:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manifolds-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  manifolds:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  mappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  marionetta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6252,6 +6267,7 @@ dont-distribute-packages:
  mmtl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  moan:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  modelicaparser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  modern-uri:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  modsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  modular-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  modular-prelude-classy:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6314,6 +6330,7 @@ dont-distribute-packages:
  mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monoid-statistics:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  monoidplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  monoids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  monte-carlo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6324,6 +6341,7 @@ dont-distribute-packages:
  morfeusz:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  morph:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  mosaico-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  motor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  mount:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  movie-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  mp3decoder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6673,6 +6691,7 @@ dont-distribute-packages:
  paragon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  Paraiso:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  parallel-tasks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parameterized:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  paranoia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  parco-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6877,6 +6896,7 @@ dont-distribute-packages:
  postgresql-typed-lifted:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgrest-ws:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  postgrest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  postmark-streams:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7047,6 +7067,7 @@ dont-distribute-packages:
  rail-compiler-editor:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  rails-session:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  rainbow-tests:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Raincat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  raketka:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  rakhana:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  rakuten:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7175,6 +7196,7 @@ dont-distribute-packages:
  reify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  relation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  relational-postgresql8:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  relational-record-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  relative-date:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  reload:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  remark:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7236,6 +7258,7 @@ dont-distribute-packages:
  rewrite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  rewriting:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  rezoom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rhine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  rhythm-game-tutorial:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  riak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  RichConditional:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7323,6 +7346,7 @@ dont-distribute-packages:
  safer-file-handles:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  saferoute:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  sai-shape-syb:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sajson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  Salsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  saltine-quickcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  saltine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7392,6 +7416,7 @@ dont-distribute-packages:
  sdl2-cairo-image:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  sdl2-compositor:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  sdl2-gfx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-mixer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  seacat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  search:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7762,6 +7787,7 @@ dont-distribute-packages:
  step-function:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  stepwise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  stgi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  STLinkUSB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  stm-chunked-queues:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  stm-firehose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8354,6 +8380,7 @@ dont-distribute-packages:
  wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  wai-make-assets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-brotli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8435,6 +8462,7 @@ dont-distribute-packages:
  WikimediaParser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  wikipedia4epub:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  wild-bind-task-x11:                           [ "x86_64-darwin" ]
+  windns:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  windowslive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  winerror:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  winio:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8450,6 +8478,7 @@ dont-distribute-packages:
  woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  wolf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  WordAlignment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wordchoice:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  Wordlint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  WordNet-ghc74:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8509,6 +8538,7 @@ dont-distribute-packages:
  xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  xkbcommon:                                    [ "x86_64-darwin" ]
  xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xleb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  xls:                                          [ "x86_64-darwin" ]
  xlsior:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@ -362,8 +362,7 @@ stdenv.mkDerivation ({

    env = stdenv.mkDerivation {
      name = "interactive-${pname}-${version}-environment";
-      nativeBuildInputs = [ ghcEnv systemBuildInputs ]
-        ++ optional isGhcjs ghc."socket.io"; # for ghcjsi
+      nativeBuildInputs = [ ghcEnv systemBuildInputs ];
      LANG = "en_US.UTF-8";
      LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
      shellHook = ''
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@ -1,4 +1,4 @@
-{ stdenv, ghc, pkgconfig, glibcLocales, cacert }@depArgs:
+{ stdenv, ghc, pkgconfig, glibcLocales, cacert, stack }@depArgs:

 with stdenv.lib;

@ -6,15 +6,17 @@ with stdenv.lib;
 , extraArgs ? []
 , LD_LIBRARY_PATH ? []
 , ghc ? depArgs.ghc
+, stack ? depArgs.stack
 , ...
 }@args:

-stdenv.mkDerivation (args // {
+let stackCmd = "stack --internal-re-exec-version=${stack.version}";
+in stdenv.mkDerivation (args // {

  buildInputs =
    buildInputs ++
    optional stdenv.isLinux glibcLocales ++
-    [ ghc pkgconfig ];
+    [ ghc pkgconfig stack ];

  STACK_PLATFORM_VARIANT="nix";
  STACK_IN_NIX_SHELL=1;
@ -39,13 +41,13 @@ stdenv.mkDerivation (args // {
    export STACK_ROOT=$NIX_BUILD_TOP/.stack
  '';

-  buildPhase = args.buildPhase or "stack build";
+  buildPhase = args.buildPhase or "${stackCmd} build";

-  checkPhase = args.checkPhase or "stack test";
+  checkPhase = args.checkPhase or "${stackCmd} test";

  doCheck = args.doCheck or true;

  installPhase = args.installPhase or ''
-    stack --local-bin-path=$out/bin build --copy-bins
+    ${stackCmd} --local-bin-path=$out/bin build --copy-bins
  '';
 })
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@ -74,6 +74,9 @@ symlinkJoin {
          --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
          --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
          --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"                  \
+          ${lib.optionalString (ghc.isGhcjs or false)
+            ''--set NODE_PATH "${ghc.socket-io}/lib/node_modules"''
+          } \
          ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''}
      fi
    done
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/pkgs/development/idris-modules/with-packages.nix
@ -10,7 +10,7 @@

    installIdrisLib () {
      if [ -d $1/lib/${idris.name} ]; then
-        ln -sv $1/lib/${idris.name}/* $out/lib/${idris.name}
+        ln -fsv $1/lib/${idris.name}/* $out/lib/${idris.name}
      fi
    }

@ -34,7 +34,7 @@
  '';

  buildPhase = ''
-    gcc -O3 -o idris idris.c
+    $CC -O3 -o idris idris.c
  '';

  installPhase = ''
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/pkgs/development/interpreters/jython/default.nix
@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
  name = "jython-${version}";

-  version = "2.7.0";
+  version = "2.7.1";

  src = fetchurl {
    url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar";
-    sha256 = "0sk4myh9v7ma7nmzb8khg41na77xfi2zck7876bs7kq18n8nc1nx";
+    sha256 = "0jwc4ly75cna78blnisv4q8nfcn5s0g4wk7jf4d16j0rfcd0shf4";
  };

  buildInputs = [ makeWrapper ];
--- a/pkgs/development/interpreters/lua-5/5.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.3.nix
@ -5,11 +5,11 @@
 stdenv.mkDerivation rec {
  name = "lua-${version}";
  luaversion = "5.3";
-  version = "${luaversion}.0";
+  version = "${luaversion}.4";

  src = fetchurl {
-    url = "http://www.lua.org/ftp/${name}.tar.gz";
-    sha256 = "00fv1p6dv4701pyjrlvkrr6ykzxqy9hy1qxzj6qmwlb0ssr5wjmf";
+    url = "https://www.lua.org/ftp/${name}.tar.gz";
+    sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn";
  };

  nativeBuildInputs = [ readline ];
--- a/Show More
+++ b/Show More